diff --git a/src/content/sdl_video_frame_stream2.cpp b/src/content/sdl_video_frame_stream2.cpp index f75e6fc..dfa8287 100644 --- a/src/content/sdl_video_frame_stream2.cpp +++ b/src/content/sdl_video_frame_stream2.cpp @@ -9,6 +9,7 @@ SDLVideoCameraContent::SDLVideoCameraContent(void) { int devcount {0}; SDL_CameraDeviceID *devices = SDL_GetCameraDevices(&devcount); + std::cout << "SDL Camera Driver: " << SDL_GetCurrentCameraDriver() << "\n"; if (devices == nullptr || devcount < 1) { throw int(1); // TODO: proper exception? diff --git a/src/main.cpp b/src/main.cpp index fc1f0ec..0cc58b8 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -13,6 +13,7 @@ #include "./start_screen.hpp" #include "./content/sdl_video_frame_stream2.hpp" +#include "./content/sdl_audio_frame_stream2.hpp" #include #include @@ -77,7 +78,7 @@ int main(int argc, char** argv) { // optionally init audio and camera if (SDL_Init(SDL_INIT_AUDIO) < 0) { std::cerr << "SDL_Init AUDIO failed (" << SDL_GetError() << ")\n"; - } else { + } else if (false) { SDLAudioInputDeviceDefault aidd; auto* reader = aidd.aquireSubStream(); @@ -99,7 +100,8 @@ int main(int argc, char** argv) { if (SDL_Init(SDL_INIT_CAMERA) < 0) { std::cerr << "SDL_Init CAMERA failed (" << SDL_GetError() << ")\n"; - } else { // HACK + } else if (false) { // HACK + std::cerr << "CAMERA initialized\n"; SDLVideoCameraContent vcc; auto* reader = vcc.aquireSubStream(); for (size_t i = 0; i < 20; i++) { diff --git a/src/object_store_ui.cpp b/src/object_store_ui.cpp index eeb895a..677e052 100644 --- a/src/object_store_ui.cpp +++ b/src/object_store_ui.cpp @@ -90,7 +90,7 @@ template<> void ComponentEditorWidget(e ObjectStoreUI::ObjectStoreUI( ObjectStore2& os ) : _os(os) { - _ee.show_window = false; + _ee.show_window = true; _ee.registerComponent("ID"); _ee.registerComponent("DataCompressionType");