X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c0badb709a86b91a203416784b649e3d00c699c7..eec960fa8987d15fd87e249c8441474188124425:/src/mac/carbon/mediactrl.cpp diff --git a/src/mac/carbon/mediactrl.cpp b/src/mac/carbon/mediactrl.cpp index e5cb61a1bc..946a3909eb 100644 --- a/src/mac/carbon/mediactrl.cpp +++ b/src/mac/carbon/mediactrl.cpp @@ -75,7 +75,7 @@ class WXDLLIMPEXP_MEDIA wxQTMediaBackend : public wxMediaBackendCommonBase { public: wxQTMediaBackend(); - ~wxQTMediaBackend(); + virtual ~wxQTMediaBackend(); virtual bool CreateControl(wxControl* ctrl, wxWindow* parent, wxWindowID id, @@ -323,8 +323,7 @@ wxQTMediaBackend::~wxQTMediaBackend() // Dispose of the movie controller ::DisposeMovieController(m_mc); m_mc = NULL; - DisposeMCActionFilterWithRefConUPP(m_mcactionupp); - + // Dispose of offscreen GWorld ::DisposeGWorld(m_movieWorld); } @@ -521,8 +520,7 @@ bool wxQTMediaBackend::Load(const wxURI& location) // require it if you don't use a Movie Controller, // which we don't by default. // - m_preprerollupp = - NewMoviePrePrerollCompleteUPP( wxQTMediaBackend::PPRMProc ); + m_preprerollupp = wxQTMediaBackend::PPRMProc; ::PrePrerollMovie( m_movie, timeNow, playRate, m_preprerollupp, (void*)this); @@ -567,8 +565,7 @@ void wxQTMediaBackend::DoNewMovieController() // Setup a callback so we can tell when the user presses // play on the player controls - m_mcactionupp = - NewMCActionFilterWithRefConUPP( wxQTMediaBackend::MCFilterProc ); + m_mcactionupp = wxQTMediaBackend::MCFilterProc; ::MCSetActionFilterWithRefCon( m_mc, m_mcactionupp, (long)this ); wxASSERT(::GetMoviesError() == noErr); @@ -625,9 +622,6 @@ void wxQTMediaBackend::DoNewMovieController() //--------------------------------------------------------------------------- void wxQTMediaBackend::FinishLoad() { - // Dispose of the PrePrerollMovieUPP if we used it - DisposeMoviePrePrerollCompleteUPP(m_preprerollupp); - // get the real size of the movie DoLoadBestSize();