amd/orcaslicer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

FIX: stop video when not visible

Browse source 
Change-Id: Ibc5204084efec5381a7ede9face0519276592aa8
This commit is contained in:
chunmao.guo 2022-08-31 17:15:34 +08:00 committed by Lane.Wei
parent 08c9385383
commit 4601022aaa
3 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/slic3r/GUI/MediaFilePanel.cpp
View file

@ -146,9 +146,10 @@ MediaFilePanel::MediaFilePanel(wxWindow * parent)
m_button_delete->Bind(wxEVT_COMMAND_BUTTON_CLICKED, [this](auto &e) { m_image_grid->DoActionOnSelection(0); }); m_button_delete->Bind(wxEVT_COMMAND_BUTTON_CLICKED, [this](auto &e) { m_image_grid->DoActionOnSelection(0); });
auto onShowHide = [this](auto &e) { auto onShowHide = [this](auto &e) {
e.Skip();
if (m_isBeingDeleted) return; if (m_isBeingDeleted) return;
auto fs = m_image_grid ? m_image_grid->GetFileSystem() : nullptr; auto fs = m_image_grid ? m_image_grid->GetFileSystem() : nullptr;
if (fs) e.IsShown() && IsShown() ? fs->Start() : fs->Stop(); if (fs) IsShownOnScreen() ? fs->Start() : fs->Stop();
}; };
Bind(wxEVT_SHOW, onShowHide); Bind(wxEVT_SHOW, onShowHide);
parent->GetParent()->Bind(wxEVT_SHOW, onShowHide); parent->GetParent()->Bind(wxEVT_SHOW, onShowHide);

12
src/slic3r/GUI/MediaPlayCtrl.cpp
View file

@ -40,6 +40,14 @@ MediaPlayCtrl::MediaPlayCtrl(wxWindow *parent, wxMediaCtrl2 *media_ctrl, const w
#if BBL_RELEASE_TO_PUBLIC #if BBL_RELEASE_TO_PUBLIC
m_next_retry = wxDateTime::Now(); m_next_retry = wxDateTime::Now();
#endif #endif
auto onShowHide = [this](auto &e) {
e.Skip();
if (m_isBeingDeleted) return;
IsShownOnScreen() ? Play() : Stop();
};
parent->Bind(wxEVT_SHOW, onShowHide);
parent->GetParent()->GetParent()->Bind(wxEVT_SHOW, onShowHide);
} }
MediaPlayCtrl::~MediaPlayCtrl() MediaPlayCtrl::~MediaPlayCtrl()
@ -72,6 +80,10 @@ void MediaPlayCtrl::SetMachineObject(MachineObject* obj)
void MediaPlayCtrl::Play() void MediaPlayCtrl::Play()
{ {
if (!m_next_retry.IsValid())
return;
if (!IsShownOnScreen())
return;
if (m_machine.empty()) { if (m_machine.empty()) {
Stop(); Stop();
SetStatus(_L("Initialize failed (No Device)!")); SetStatus(_L("Initialize failed (No Device)!"));

3
src/slic3r/GUI/Monitor.cpp
View file

@ -402,7 +402,7 @@ void MonitorPanel::update_all()
m_upgrade_panel->update(obj); m_upgrade_panel->update(obj);
m_status_info_panel->m_media_play_ctrl->SetMachineObject(IsShown() ? obj : nullptr); m_status_info_panel->m_media_play_ctrl->SetMachineObject(obj);
m_media_file_panel->SetMachineObject(obj); m_media_file_panel->SetMachineObject(obj);
update_status(obj); update_status(obj);
@ -466,7 +466,6 @@ bool MonitorPanel::Show(bool show)
} }
} else { } else {
m_refresh_timer->Stop(); m_refresh_timer->Stop();
m_status_info_panel->m_media_play_ctrl->SetMachineObject(nullptr);
} }
return wxPanel::Show(show); return wxPanel::Show(show);
} }