X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f74fd79b8e0b396659b99a92effa20672b0254d8..726cc8697cd44a41b43257f05ca8cdd42b71a711:/src/common/mediactrlcmn.cpp diff --git a/src/common/mediactrlcmn.cpp b/src/common/mediactrlcmn.cpp index 8128dfddd3..555c6e71e3 100644 --- a/src/common/mediactrlcmn.cpp +++ b/src/common/mediactrlcmn.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: common/mediactrl.cpp +// Name: src/common/mediactrlcmn.cpp // Purpose: wxMediaCtrl common code // Author: Ryan Norton // Modified by: @@ -12,30 +12,28 @@ // TODO: Platform specific backend defaults? //=========================================================================== -// Definitions +// Declarations //=========================================================================== //--------------------------------------------------------------------------- -// Pre-compiled header stuff +// Includes //--------------------------------------------------------------------------- #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif -//--------------------------------------------------------------------------- -// Includes -//--------------------------------------------------------------------------- -#include "wx/mediactrl.h" -#include "wx/hash.h" - -//--------------------------------------------------------------------------- -// Compilation guard -//--------------------------------------------------------------------------- #if wxUSE_MEDIACTRL +#ifndef WX_PRECOMP + #include "wx/hash.h" + #include "wx/log.h" +#endif + +#include "wx/mediactrl.h" + //=========================================================================== // // Implementation @@ -47,14 +45,14 @@ //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ IMPLEMENT_CLASS(wxMediaCtrl, wxControl) -DEFINE_EVENT_TYPE(wxEVT_MEDIA_STATECHANGED) -DEFINE_EVENT_TYPE(wxEVT_MEDIA_PLAY) -DEFINE_EVENT_TYPE(wxEVT_MEDIA_PAUSE) +wxDEFINE_EVENT( wxEVT_MEDIA_STATECHANGED, wxMediaEvent ); +wxDEFINE_EVENT( wxEVT_MEDIA_PLAY, wxMediaEvent ); +wxDEFINE_EVENT( wxEVT_MEDIA_PAUSE, wxMediaEvent ); IMPLEMENT_CLASS(wxMediaBackend, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxMediaEvent, wxEvent) -DEFINE_EVENT_TYPE(wxEVT_MEDIA_FINISHED) -DEFINE_EVENT_TYPE(wxEVT_MEDIA_LOADED) -DEFINE_EVENT_TYPE(wxEVT_MEDIA_STOP) +wxDEFINE_EVENT( wxEVT_MEDIA_FINISHED, wxMediaEvent ); +wxDEFINE_EVENT( wxEVT_MEDIA_LOADED, wxMediaEvent ); +wxDEFINE_EVENT( wxEVT_MEDIA_STOP, wxMediaEvent ); //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ // @@ -109,22 +107,21 @@ bool wxMediaCtrl::Create(wxWindow* parent, wxWindowID id, { if (!Load(fileName)) { - delete m_imp; - m_imp = NULL; + wxDELETE(m_imp); return false; } } - SetBestFittingSize(size); + SetInitialSize(size); return true; } else { - wxClassInfo::sm_classTable->BeginFind(); + wxClassInfo::const_iterator it = wxClassInfo::begin_classinfo(); - wxClassInfo* classInfo; + const wxClassInfo* classInfo; - while((classInfo = NextBackend()) != NULL) + while((classInfo = NextBackend(&it)) != NULL) { if(!DoCreate(classInfo, parent, id, pos, size, style, validator, name)) @@ -134,7 +131,7 @@ bool wxMediaCtrl::Create(wxWindow* parent, wxWindowID id, { if (Load(fileName)) { - SetBestFittingSize(size); + SetInitialSize(size); return true; } else @@ -142,7 +139,7 @@ bool wxMediaCtrl::Create(wxWindow* parent, wxWindowID id, } else { - SetBestFittingSize(size); + SetInitialSize(size); return true; } } @@ -173,21 +170,20 @@ bool wxMediaCtrl::Create(wxWindow* parent, wxWindowID id, if (!Load(location)) { - delete m_imp; - m_imp = NULL; + wxDELETE(m_imp); return false; } - SetBestFittingSize(size); + SetInitialSize(size); return true; } else { - wxClassInfo::sm_classTable->BeginFind(); + wxClassInfo::const_iterator it = wxClassInfo::begin_classinfo(); - wxClassInfo* classInfo; + const wxClassInfo* classInfo; - while((classInfo = NextBackend()) != NULL) + while((classInfo = NextBackend(&it)) != NULL) { if(!DoCreate(classInfo, parent, id, pos, size, style, validator, name)) @@ -195,7 +191,7 @@ bool wxMediaCtrl::Create(wxWindow* parent, wxWindowID id, if (Load(location)) { - SetBestFittingSize(size); + SetInitialSize(size); return true; } else @@ -212,7 +208,7 @@ bool wxMediaCtrl::Create(wxWindow* parent, wxWindowID id, // // Attempts to create the control from a backend //--------------------------------------------------------------------------- -bool wxMediaCtrl::DoCreate(wxClassInfo* classInfo, +bool wxMediaCtrl::DoCreate(const wxClassInfo* classInfo, wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, @@ -246,19 +242,18 @@ bool wxMediaCtrl::DoCreate(wxClassInfo* classInfo, // incompatible with the old 2.4 stable version - but since // we're in 2.5+ only we don't need to worry about the new version //--------------------------------------------------------------------------- -wxClassInfo* wxMediaCtrl::NextBackend() +const wxClassInfo* wxMediaCtrl::NextBackend(wxClassInfo::const_iterator* it) { - wxHashTable::compatibility_iterator - node = wxClassInfo::sm_classTable->Next(); - while (node) + for ( wxClassInfo::const_iterator end = wxClassInfo::end_classinfo(); + *it != end; ++(*it) ) { - wxClassInfo* classInfo = (wxClassInfo *)node->GetData(); + const wxClassInfo* classInfo = **it; if ( classInfo->IsKindOf(CLASSINFO(wxMediaBackend)) && classInfo != CLASSINFO(wxMediaBackend) ) { + ++(*it); return classInfo; } - node = wxClassInfo::sm_classTable->Next(); } // @@ -417,21 +412,21 @@ wxSize wxMediaCtrl::DoGetBestSize() const return wxSize(0,0); } -double wxMediaCtrl::GetVolume() +double wxMediaCtrl::GetVolume() { if(m_imp && m_bLoaded) return m_imp->GetVolume(); return 0.0; } -bool wxMediaCtrl::SetVolume(double dVolume) +bool wxMediaCtrl::SetVolume(double dVolume) { if(m_imp && m_bLoaded) return m_imp->SetVolume(dVolume); return false; } -bool wxMediaCtrl::ShowPlayerControls(wxMediaCtrlPlayerControls flags) +bool wxMediaCtrl::ShowPlayerControls(wxMediaCtrlPlayerControls flags) { if(m_imp) return m_imp->ShowPlayerControls(flags); @@ -468,6 +463,19 @@ void wxMediaCtrl::DoMoveWindow(int x, int y, int w, int h) m_imp->Move(x, y, w, h); } +//--------------------------------------------------------------------------- +// wxMediaCtrl::MacVisibilityChanged +//--------------------------------------------------------------------------- +#ifdef __WXOSX_CARBON__ +void wxMediaCtrl::MacVisibilityChanged() +{ + wxControl::MacVisibilityChanged(); + + if(m_imp) + m_imp->MacVisibilityChanged(); +} +#endif + //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ // // wxMediaBackendCommonBase @@ -502,13 +510,13 @@ bool wxMediaBackendCommonBase::SendStopEvent() { wxMediaEvent theEvent(wxEVT_MEDIA_STOP, m_ctrl->GetId()); - return !m_ctrl->ProcessEvent(theEvent) || theEvent.IsAllowed(); + return !m_ctrl->GetEventHandler()->ProcessEvent(theEvent) || theEvent.IsAllowed(); } void wxMediaBackendCommonBase::QueueEvent(wxEventType evtType) { wxMediaEvent theEvent(evtType, m_ctrl->GetId()); - m_ctrl->AddPendingEvent(theEvent); + m_ctrl->GetEventHandler()->AddPendingEvent(theEvent); } void wxMediaBackendCommonBase::QueuePlayEvent() @@ -539,12 +547,8 @@ void wxMediaBackendCommonBase::QueueStopEvent() #ifdef __WXMSW__ // MSW has huge backends so we do it seperately FORCE_LINK(wxmediabackend_am) FORCE_LINK(wxmediabackend_wmp10) -#else +#elif !defined(__WXOSX_COCOA__) FORCE_LINK(basewxmediabackends) #endif -//--------------------------------------------------------------------------- -// End of compilation guard and of file -//--------------------------------------------------------------------------- -#endif //wxUSE_MEDIACTRL - +#endif //wxUSE_MEDIACTRL