X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8f2a8de6e754cbbd6d0d7c216c5b44518fae872e..47e175a24f862aa8b7ca7dd4a2bb5957991e7f2d:/src/osx/carbon/mediactrl.cpp diff --git a/src/osx/carbon/mediactrl.cpp b/src/osx/carbon/mediactrl.cpp index cdf988e5d8..c3f3c4ec68 100644 --- a/src/osx/carbon/mediactrl.cpp +++ b/src/osx/carbon/mediactrl.cpp @@ -327,7 +327,7 @@ wxQTMediaBackend::~wxQTMediaBackend() // Dispose of the movie controller ::DisposeMovieController(m_mc); m_mc = NULL; - + // Dispose of offscreen GWorld ::DisposeGWorld(m_movieWorld); } @@ -435,7 +435,7 @@ bool wxQTMediaBackend::Load(const wxString& fileName) NULL); // wasChanged // Do not use ::GetMoviesStickyError() here because it returns -2009 - // a.k.a. invalid track on valid mpegs + // a.k.a. invalid track on valid mpegs if (err == noErr && ::GetMoviesError() == noErr) { ::CloseMovieFile(movieResFile); @@ -875,11 +875,7 @@ wxMediaState wxQTMediaBackend::GetState() void wxQTMediaBackend::Cleanup() { m_bPlaying = false; - if (m_timer) - { - delete m_timer; - m_timer = NULL; - } + wxDELETE(m_timer); // Stop the movie: // Apple samples with CreateMovieControl typically @@ -1162,7 +1158,7 @@ pascal void wxQTMediaBackend::PPRMProc( //--------------------------------------------------------------------------- // wxQTMediaBackend::MCFilterProc (static) // -// Callback for when the movie controller recieves a message +// Callback for when the movie controller receives a message //--------------------------------------------------------------------------- pascal Boolean wxQTMediaBackend::MCFilterProc( MovieController WXUNUSED(theController),