eessppeelllloo/vimix
1
0
Fork 0
mirror of https://github.com/brunoherbelin/vimix.git synced 2025-12-11 10:19:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

BugFix Improve GUI Transcode and cancel on source delete

Browse Source
This commit is contained in:
brunoherbelin
2025-11-28 16:38:00 +01:00
parent 78e8e3b394
commit a7fc34298c
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/ImGuiVisitor.cpp
View File

@@ -737,7 +737,8 @@ void ImGuiVisitor::visit (MediaSource& s)
static Transcoder *transcoder = nullptr; static Transcoder *transcoder = nullptr;
static guint64 transcode_id = 0; static guint64 transcode_id = 0;
static bool _transcoding = false; static bool _transcoding = false;
float w_height = (!_transcoding || (transcode_id != 0 && transcode_id != s.id())) ? bool show_content = _transcoding && (transcode_id == 0 || transcode_id == s.id());
float w_height = (!show_content) ?
ImGui::GetFrameHeight() : (6.1f * ImGui::GetFrameHeightWithSpacing()); ImGui::GetFrameHeight() : (6.1f * ImGui::GetFrameHeightWithSpacing());
ImGui::PushStyleColor(ImGuiCol_ChildBg, ImGui::GetColorU32(ImGuiCol_PopupBg)); ImGui::PushStyleColor(ImGuiCol_ChildBg, ImGui::GetColorU32(ImGuiCol_PopupBg));
@@ -745,7 +746,16 @@ void ImGuiVisitor::visit (MediaSource& s)
true, ImGuiWindowFlags_MenuBar); true, ImGuiWindowFlags_MenuBar);
if (ImGui::BeginMenuBar()) if (ImGui::BeginMenuBar())
{ {
if ( ImGui::Selectable( (_transcoding ? ICON_FA_CHEVRON_DOWN " Transcoding": " " ICON_FA_CHEVRON_RIGHT " Transcoding"), false, std::string title = " Transcoding";
if (show_content)
title.insert(0, ICON_FA_CHEVRON_DOWN " ");
else {
title.insert(0, ICON_FA_CHEVRON_RIGHT " ");
if (transcoder != nullptr)
title += " (" + std::to_string((int)(100.0 * transcoder->progress())) + "%)";
}
if ( ImGui::Selectable( title.c_str(), false,
(transcoder != nullptr ? ImGuiSelectableFlags_Disabled : 0)) ) (transcoder != nullptr ? ImGuiSelectableFlags_Disabled : 0)) )
_transcoding = !_transcoding; _transcoding = !_transcoding;
ImGui::EndMenuBar(); ImGui::EndMenuBar();
@@ -810,7 +820,9 @@ void ImGuiVisitor::visit (MediaSource& s)
float progress = transcoder->progress(); float progress = transcoder->progress();
ImGui::ProgressBar(progress, ImVec2(IMGUI_RIGHT_ALIGN,0), progress < EPSILON ? "working..." : nullptr); ImGui::ProgressBar(progress, ImVec2(IMGUI_RIGHT_ALIGN,0), progress < EPSILON ? "working..." : nullptr);
ImGui::SameLine(); ImGui::SameLine();
if (ImGui::Button( ICON_FA_TIMES " Cancel", ImVec2(0,0))) { if (ImGui::Button( ICON_FA_TIMES " Cancel", ImVec2(0,0)) ||
Mixer::manager().findSource(transcode_id) == nullptr ) {
// cancel transcoding by user or source removed
transcoder->stop(); transcoder->stop();
} }
} }