3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-10 00:07:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

FIX: Media playing state & detect play end

Browse source 
Change-Id: I378da3f104120110b8032a355a22a89ebe69a0fb
This commit is contained in:
chunmao.guo 2022-10-17 09:55:18 +08:00 • committed by Lane.Wei
parent 746d5960ba
commit 84a4622fdf
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -193,6 +193,9 @@ void MediaPlayCtrl::Stop()
m_tasks.push_back("<stop>"); m_tasks.push_back("<stop>");
m_cond.notify_all(); m_cond.notify_all();
m_last_state = MEDIASTATE_IDLE; m_last_state = MEDIASTATE_IDLE;
if (m_failed_code)
SetStatus(_L("Stopped [%d]!"), true);
else
SetStatus(_L("Stopped."), false); SetStatus(_L("Stopped."), false);
if (m_failed_code >= 100) // not keep retry on local error if (m_failed_code >= 100) // not keep retry on local error
m_next_retry = wxDateTime(); m_next_retry = wxDateTime();
@ -286,6 +289,7 @@ void MediaPlayCtrl::onStateChanged(wxMediaEvent& event)
} }
if ((last_state == wxMEDIASTATE_PAUSED || last_state == wxMEDIASTATE_PLAYING) && if ((last_state == wxMEDIASTATE_PAUSED || last_state == wxMEDIASTATE_PLAYING) &&
state == wxMEDIASTATE_STOPPED) { state == wxMEDIASTATE_STOPPED) {
m_failed_code = m_media_ctrl->GetLastError();
Stop(); Stop();
return; return;
} }
@ -306,9 +310,9 @@ void MediaPlayCtrl::onStateChanged(wxMediaEvent& event)
if (m_failed_code == 0) if (m_failed_code == 0)
m_failed_code = 2; m_failed_code = 2;
SetStatus(_L("Load failed [%d]!")); SetStatus(_L("Load failed [%d]!"));
} else {
m_last_state = last_state;
} }
} else {
m_last_state = state;
} }
} }