From 36deabbb5a36e05e670bafea40c8dbbdcb113191 Mon Sep 17 00:00:00 2001 From: v0lt Date: Sun, 29 Jul 2012 19:27:34 +0400 Subject: [PATCH] changed the type of m_iMediaLoadState always stop IMediaControl in CMainFrame::CloseMediaPrivate() function (ticket #2471) --- src/mpc-hc/MainFrm.cpp | 5 +++-- src/mpc-hc/MainFrm.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/mpc-hc/MainFrm.cpp b/src/mpc-hc/MainFrm.cpp index 21b91a70da2..e3b437e49f7 100644 --- a/src/mpc-hc/MainFrm.cpp +++ b/src/mpc-hc/MainFrm.cpp @@ -11941,8 +11941,9 @@ bool CMainFrame::OpenMediaPrivate(CAutoPtr pOMD) void CMainFrame::CloseMediaPrivate() { - SetLoadState(MLS_CLOSING); + SetLoadState(MLS_CLOSING); // why it before OnPlayStop()? // TODO: remake or add detailed comments OnPlayStop(); // SendMessage(WM_COMMAND, ID_PLAY_STOP); + pMC->Stop(); // neead for StreamBufferSource, because m_iMediaLoadState is always MLS_CLOSED // TODO: to fix the opening for such media SetPlaybackMode(PM_NONE); m_fLiveWM = false; m_fEndOfStream = false; @@ -14527,7 +14528,7 @@ void CMainFrame::DisplayCurrentChannelInfo() void CMainFrame::SetLoadState(MPC_LOADSTATE iState) { m_iMediaLoadState = iState; - SendAPICommand(CMD_STATE, L"%d", m_iMediaLoadState); + SendAPICommand(CMD_STATE, L"%d", iState); } void CMainFrame::SetPlayState(MPC_PLAYSTATE iState) diff --git a/src/mpc-hc/MainFrm.h b/src/mpc-hc/MainFrm.h index 91d77e3df59..36c8fc2fe37 100644 --- a/src/mpc-hc/MainFrm.h +++ b/src/mpc-hc/MainFrm.h @@ -365,7 +365,7 @@ class CMainFrame : public CFrameWnd, public CDropTarget CControlBar* m_pLastBar; protected: - int m_iMediaLoadState; + MPC_LOADSTATE m_iMediaLoadState; bool m_fClosingState;