Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1. extracted code common to all backends in wxMediaBackendCommonBase

Browse Source 
2. don't refresh the parent on movie load/size change unless it does use
   a sizer (i.e. made code follow the existing comment)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35113 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-08-05 22:01:48 +00:00
parent 6ab9bf57a5
commit 7e41b689a7
1 changed files with 93 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

195
src/msw/mediactrl.cpp
View File

@@ -64,6 +64,34 @@ LRESULT WXDLLIMPEXP_CORE APIENTRY _EXPORT wxWndProc(HWND hWnd, UINT message,
// BACKEND DECLARATIONS // BACKEND DECLARATIONS
//=========================================================================== //===========================================================================
// ----------------------------------------------------------------------------
// common backend base class used by all other backends
// ----------------------------------------------------------------------------
class wxMediaBackendCommonBase : public wxMediaBackend
{
public:
// add a pending wxMediaEvent of the given type
void QueueEvent(wxEventType evtType);
// notify that the movie playback is finished
void QueueFinishEvent() { QueueEvent(wxEVT_MEDIA_FINISHED); }
// send the stop event and return true if it hasn't been vetoed
bool SendStopEvent();
protected:
// call this when the movie size has changed but not because it has just
// been loaded (in this case, call NotifyMovieLoaded() below)
void NotifyMovieSizeChanged();
// call this when the movie is fully loaded
void NotifyMovieLoaded();
wxControl *m_ctrl; // parent control
};
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// //
// wxAMMediaBackend // wxAMMediaBackend
@@ -1775,7 +1803,7 @@ void wxActiveX::OnKillFocus(wxFocusEvent& event)
typedef BOOL (WINAPI* LPAMGETERRORTEXT)(HRESULT, wxChar *, DWORD); typedef BOOL (WINAPI* LPAMGETERRORTEXT)(HRESULT, wxChar *, DWORD);
class WXDLLIMPEXP_MEDIA wxAMMediaBackend : public wxMediaBackend class WXDLLIMPEXP_MEDIA wxAMMediaBackend : public wxMediaBackendCommonBase
{ {
public: public:
wxAMMediaBackend(); wxAMMediaBackend();
@@ -1833,7 +1861,6 @@ public:
return total; return total;
} }
wxControl* m_ctrl;
wxActiveX* m_pAX; wxActiveX* m_pAX;
IActiveMovie* m_pAM; IActiveMovie* m_pAM;
IMediaPlayer* m_pMP; IMediaPlayer* m_pMP;
@@ -1859,7 +1886,7 @@ public:
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
#include <mmsystem.h> #include <mmsystem.h>
class WXDLLIMPEXP_MEDIA wxMCIMediaBackend : public wxMediaBackend class WXDLLIMPEXP_MEDIA wxMCIMediaBackend : public wxMediaBackendCommonBase
{ {
public: public:
@@ -1907,7 +1934,6 @@ public:
WPARAM wParam, LPARAM lParam); WPARAM wParam, LPARAM lParam);
MCIDEVICEID m_hDev; //Our MCI Device ID/Handler MCIDEVICEID m_hDev; //Our MCI Device ID/Handler
wxControl* m_ctrl; //Parent control
HWND m_hNotifyWnd; //Window to use for MCI events HWND m_hNotifyWnd; //Window to use for MCI events
bool m_bVideo; //Whether or not we have video bool m_bVideo; //Whether or not we have video
@@ -2215,7 +2241,7 @@ bool wxQuickTimeLibrary::Initialize()
return true; return true;
} }
class WXDLLIMPEXP_MEDIA wxQTMediaBackend : public wxMediaBackend class WXDLLIMPEXP_MEDIA wxQTMediaBackend : public wxMediaBackendCommonBase
{ {
public: public:
wxQTMediaBackend(); wxQTMediaBackend();
@@ -2269,7 +2295,6 @@ public:
wxSize m_bestSize; //Original movie size wxSize m_bestSize; //Original movie size
Movie m_movie; //QT Movie handle/instance Movie m_movie; //QT Movie handle/instance
wxControl* m_ctrl; //Parent control
bool m_bVideo; //Whether or not we have video bool m_bVideo; //Whether or not we have video
bool m_bPlaying; //Whether or not movie is playing bool m_bPlaying; //Whether or not movie is playing
wxTimer* m_timer; //Load or Play timer wxTimer* m_timer; //Load or Play timer
@@ -2283,12 +2308,17 @@ public:
class WXDLLIMPEXP_MEDIA wxQTMediaEvtHandler : public wxEvtHandler class WXDLLIMPEXP_MEDIA wxQTMediaEvtHandler : public wxEvtHandler
{ {
public: public:
wxQTMediaEvtHandler(wxQTMediaBackend *qtb) { m_qtb = qtb; } wxQTMediaEvtHandler(wxQTMediaBackend *qtb, WXHWND hwnd)
{
m_qtb = qtb;
m_hwnd = hwnd;
}
void OnEraseBackground(wxEraseEvent& event); void OnEraseBackground(wxEraseEvent& event);
private: private:
wxQTMediaBackend *m_qtb; wxQTMediaBackend *m_qtb;
WXHWND m_hwnd;
DECLARE_NO_COPY_CLASS(wxQTMediaEvtHandler) DECLARE_NO_COPY_CLASS(wxQTMediaEvtHandler)
}; };
@@ -2298,6 +2328,47 @@ private:
// IMPLEMENTATION // IMPLEMENTATION
//=========================================================================== //===========================================================================
// ----------------------------------------------------------------------------
// wxMediaBackendCommonBase
// ----------------------------------------------------------------------------
void wxMediaBackendCommonBase::NotifyMovieSizeChanged()
{
// our best size changed after opening a new file
m_ctrl->InvalidateBestSize();
m_ctrl->SetSize(m_ctrl->GetSize());
// if the parent of the control has a sizer ask it to refresh our size
wxWindow * const parent = m_ctrl->GetParent();
if ( parent->GetSizer() )
{
m_ctrl->GetParent()->Layout();
m_ctrl->GetParent()->Refresh();
m_ctrl->GetParent()->Update();
}
}
void wxMediaBackendCommonBase::NotifyMovieLoaded()
{
NotifyMovieSizeChanged();
// notify about movie being fully loaded
QueueEvent(wxEVT_MEDIA_LOADED);
}
bool wxMediaBackendCommonBase::SendStopEvent()
{
wxMediaEvent theEvent(wxEVT_MEDIA_STOP, m_ctrl->GetId());
return !m_ctrl->ProcessEvent(theEvent) || theEvent.IsAllowed();
}
void wxMediaBackendCommonBase::QueueEvent(wxEventType evtType)
{
wxMediaEvent theEvent(evtType, m_ctrl->GetId());
m_ctrl->AddPendingEvent(theEvent);
}
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
// //
// wxAMMediaBackend // wxAMMediaBackend
@@ -2431,20 +2502,14 @@ public:
//they can still get sent in some cases //they can still get sent in some cases
m_parent->GetPosition() == m_parent->GetDuration()) m_parent->GetPosition() == m_parent->GetDuration())
{ {
wxMediaEvent theEvent(wxEVT_MEDIA_STOP, if ( m_parent->SendStopEvent() )
m_parent->m_ctrl->GetId());
m_parent->m_ctrl->ProcessEvent(theEvent);
if(theEvent.IsAllowed())
{ {
//Seek to beginning of movie //Seek to beginning of movie
m_parent->wxAMMediaBackend::SetPosition(0); m_parent->wxAMMediaBackend::SetPosition(0);
Stop(); Stop();
//send the event to our child //send the event to our child
wxMediaEvent theEvent(wxEVT_MEDIA_FINISHED, m_parent->QueueFinishEvent();
m_parent->m_ctrl->GetId());
m_parent->m_ctrl->AddPendingEvent(theEvent);
} }
} }
} }
@@ -2510,18 +2575,11 @@ public:
// If this is the end of the clip, notify handler // If this is the end of the clip, notify handler
else if(1 == evCode) //EC_COMPLETE else if(1 == evCode) //EC_COMPLETE
{ {
wxMediaEvent theEvent(wxEVT_MEDIA_STOP, if ( m_pBE->SendStopEvent() )
m_pBE->m_ctrl->GetId());
m_pBE->m_ctrl->ProcessEvent(theEvent);
if(theEvent.IsAllowed())
{ {
Stop(); Stop();
//send the event to our child m_pBE->QueueFinishEvent();
wxMediaEvent theEvent(wxEVT_MEDIA_FINISHED,
m_pBE->m_ctrl->GetId());
m_pBE->m_ctrl->AddPendingEvent(theEvent);
} }
} }
} }
@@ -2782,20 +2840,7 @@ void wxAMMediaBackend::FinishLoad()
// //
m_pTimer = new wxAMPlayTimer(this); m_pTimer = new wxAMPlayTimer(this);
//Here, if the parent of the control has a sizer - we NotifyMovieLoaded();
//tell it to recalculate the size of this control since
//the user opened a separate media file
//
m_ctrl->InvalidateBestSize();
m_ctrl->GetParent()->Layout();
m_ctrl->GetParent()->Refresh();
m_ctrl->GetParent()->Update();
m_ctrl->SetSize(m_ctrl->GetSize());
//Send event to our children
wxMediaEvent theEvent(wxEVT_MEDIA_LOADED,
m_ctrl->GetId());
m_ctrl->AddPendingEvent(theEvent);
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
@@ -3362,21 +3407,7 @@ bool wxMCIMediaBackend::Load(const wxString& fileName)
wxSetWindowProc(m_hNotifyWnd, wxMCIMediaBackend::NotifyWndProc); wxSetWindowProc(m_hNotifyWnd, wxMCIMediaBackend::NotifyWndProc);
wxSetWindowUserData(m_hNotifyWnd, this); wxSetWindowUserData(m_hNotifyWnd, this);
// NotifyMovieLoaded();
//Here, if the parent of the control has a sizer - we
//tell it to recalculate the size of this control since
//the user opened a separate media file
//
m_ctrl->InvalidateBestSize();
m_ctrl->GetParent()->Layout();
m_ctrl->GetParent()->Refresh();
m_ctrl->GetParent()->Update();
m_ctrl->SetSize(m_ctrl->GetSize());
//send loaded event
wxMediaEvent theEvent(wxEVT_MEDIA_LOADED,
m_ctrl->GetId());
m_ctrl->AddPendingEvent(theEvent);
return true; return true;
} }
@@ -3675,18 +3706,12 @@ LRESULT CALLBACK wxMCIMediaBackend::OnNotifyWndProc(HWND hWnd, UINT nMsg,
wxASSERT(lParam == (LPARAM) m_hDev); wxASSERT(lParam == (LPARAM) m_hDev);
if(wParam == MCI_NOTIFY_SUCCESSFUL && lParam == (LPARAM)m_hDev) if(wParam == MCI_NOTIFY_SUCCESSFUL && lParam == (LPARAM)m_hDev)
{ {
wxMediaEvent theEvent(wxEVT_MEDIA_STOP, m_ctrl->GetId()); if ( SendStopEvent() )
m_ctrl->ProcessEvent(theEvent);
if(theEvent.IsAllowed())
{ {
wxMCIVERIFY( mciSendCommand(m_hDev, MCI_SEEK, wxMCIVERIFY( mciSendCommand(m_hDev, MCI_SEEK,
MCI_SEEK_TO_START, 0) ); MCI_SEEK_TO_START, 0) );
//send the event to our child QueueFinishEvent();
wxMediaEvent theEvent(wxEVT_MEDIA_FINISHED,
m_ctrl->GetId());
m_ctrl->ProcessEvent(theEvent);
} }
} }
} }
@@ -3785,19 +3810,12 @@ public:
{ {
if(m_pLib->IsMovieDone(m_movie)) if(m_pLib->IsMovieDone(m_movie))
{ {
wxMediaEvent theEvent(wxEVT_MEDIA_STOP, if ( m_parent->SendStopEvent() )
m_parent->m_ctrl->GetId());
m_parent->m_ctrl->ProcessEvent(theEvent);
if(theEvent.IsAllowed())
{ {
m_parent->Stop(); m_parent->Stop();
wxASSERT(m_pLib->GetMoviesError() == noErr); wxASSERT(m_pLib->GetMoviesError() == noErr);
//send the event to our child m_parent->QueueFinishEvent();
wxMediaEvent theEvent(wxEVT_MEDIA_FINISHED,
m_parent->m_ctrl->GetId());
m_parent->m_ctrl->AddPendingEvent(theEvent);
} }
} }
} }
@@ -3928,7 +3946,7 @@ bool wxQTMediaBackend::CreateControl(wxControl* ctrl, wxWindow* parent,
//Part of a suggestion from Greg Hazel to repaint //Part of a suggestion from Greg Hazel to repaint
//movie when idle //movie when idle
m_ctrl->PushEventHandler(new wxQTMediaEvtHandler(this)); m_ctrl->PushEventHandler(new wxQTMediaEvtHandler(this, m_ctrl->GetHWND()));
// done // done
return true; return true;
@@ -4126,23 +4144,7 @@ void wxQTMediaBackend::FinishLoad()
m_lib.SetMovieTimeScale(m_movie, 1000); m_lib.SetMovieTimeScale(m_movie, 1000);
wxASSERT(m_lib.GetMoviesError() == noErr); wxASSERT(m_lib.GetMoviesError() == noErr);
// NotifyMovieLoaded();
//Here, if the parent of the control has a sizer - we
//tell it to recalculate the size of this control since
//the user opened a separate media file
//
m_ctrl->InvalidateBestSize();
m_ctrl->GetParent()->Layout();
m_ctrl->GetParent()->Refresh();
m_ctrl->GetParent()->Update();
m_ctrl->SetSize(m_ctrl->GetSize());
//loaded - note that MoviesTask must and will be called before this
//by the previous timer since this gets appended to the event list after
//the timer's first go
wxMediaEvent theEvent(wxEVT_MEDIA_LOADED,
m_ctrl->GetId());
m_ctrl->AddPendingEvent(theEvent);
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
@@ -4432,16 +4434,7 @@ bool wxQTMediaBackend::ShowPlayerControls(wxMediaCtrlPlayerControls flags)
} }
} }
// NotifyMovieSizeChanged();
//Here, if the parent of the control has a sizer - we
//tell it to recalculate the size of this control since
//the user opened a separate media file
//
m_ctrl->InvalidateBestSize();
m_ctrl->GetParent()->Layout();
m_ctrl->GetParent()->Refresh();
m_ctrl->GetParent()->Update();
m_ctrl->SetSize(m_ctrl->GetSize());
return m_lib.GetMoviesError() == noErr; return m_lib.GetMoviesError() == noErr;
} }
@@ -4536,13 +4529,11 @@ void wxQTMediaEvtHandler::OnEraseBackground(wxEraseEvent& evt)
{ {
//repaint movie controller //repaint movie controller
m_pLib.MCDoAction(m_qtb->m_pMC, 2 /*mcActionDraw*/, m_pLib.MCDoAction(m_qtb->m_pMC, 2 /*mcActionDraw*/,
m_pLib.GetNativeWindowPort(m_qtb->m_ctrl->GetHWND()) m_pLib.GetNativeWindowPort(m_hwnd));
);
} }
else if(m_qtb->m_movie) else if(m_qtb->m_movie)
{ {
CGrafPtr port = (CGrafPtr)m_pLib.GetNativeWindowPort CGrafPtr port = (CGrafPtr)m_pLib.GetNativeWindowPort(m_hwnd);
(m_qtb->m_ctrl->GetHWND());
m_pLib.BeginUpdate(port); m_pLib.BeginUpdate(port);
m_pLib.UpdateMovie(m_qtb->m_movie); m_pLib.UpdateMovie(m_qtb->m_movie);