From 80418162d4f1035ba6217de001e21e08f47fbffc Mon Sep 17 00:00:00 2001 From: Bruno Herbelin Date: Thu, 3 Oct 2024 16:18:46 +0200 Subject: [PATCH] Enabling GST_BUS_MESSAGE for mediaplayer and stream --- CMakeLists.txt | 2 +- src/UserInterfaceManager.cpp | 17 ++++++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 766b88f..ee0c344 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -116,7 +116,7 @@ endif() # add_definitions(-DUSE_GST_OPENGL_SYNC_HANDLER) # add_definitions(-DUSE_GL_BUFFER_SUBDATA) -add_definitions(-DIGNORE_GST_BUS_MESSAGE) +# add_definitions(-DIGNORE_GST_BUS_MESSAGE) ##### ##### Dependencies diff --git a/src/UserInterfaceManager.cpp b/src/UserInterfaceManager.cpp index d5e16fc..1d4b433 100644 --- a/src/UserInterfaceManager.cpp +++ b/src/UserInterfaceManager.cpp @@ -4705,9 +4705,12 @@ void Navigator::RenderMainPannelSession() ImGui::EndCombo(); } ImVec2 pos = ImGui::GetCursorPos(); -// ImGui::SameLine(); -// if ( ImGuiToolkit::IconButton(ICON_FA_FILE_DOWNLOAD, "Save")) -// UserInterface::manager().saveOrSaveAs(); + if (!Mixer::manager().session()->filename().empty()) { + ImGui::SameLine(); + if ( ImGuiToolkit::IconButton(ICON_FA_TIMES, "Close")) + Mixer::manager().close(); + ImGui::SetCursorPos(pos); + } //// if ( Mixer::manager().session()->filename().empty()) { //// if ( ImGuiToolkit::IconButton(ICON_FA_FILE_DOWNLOAD, "Save as")) //// UserInterface::manager().saveOrSaveAs(); @@ -4715,7 +4718,6 @@ void Navigator::RenderMainPannelSession() //// if (ImGuiToolkit::IconButton(3, 5, "Show in finder")) //// SystemToolkit::open(SystemToolkit::path_filename(Mixer::manager().session()->filename())); //// } -// ImGui::SetCursorPos(pos); // // Preview session @@ -6367,10 +6369,11 @@ void ShowSandbox(bool* p_open) ImGui::Separator(); ImGui::Text("Reset GST"); - if (ImGui::Button("RESET GSTREAMER")){ + if (ImGui::Button("RESET")){ + + + - gst_deinit(); - // gst_init (NULL, NULL); }