avoid setting initial position if it was not specified, broken in r70734

[wxWidgets.git] / src / osx / carbon / mediactrl.cpp

diff --git a/src/osx/carbon/mediactrl.cpp b/src/osx/carbon/mediactrl.cpp
index cdf988e5d86c74fa42094c4e9ef00aa0a2b5ee2d..c3b00f5198a14d7e3127ad1e2813bab2ceacf1ec 100644 (file)
--- a/src/osx/carbon/mediactrl.cpp
+++ b/src/osx/carbon/mediactrl.cpp
@@ -4,7 +4,6 @@
 // Author:      Ryan Norton <wxprojects@comcast.net>
 // Modified by:
 // Created:     11/07/04
 // Author:      Ryan Norton <wxprojects@comcast.net>
 // Modified by:
 // Created:     11/07/04

-// RCS-ID:      $Id$

 // Copyright:   (c) 2004-2006 Ryan Norton
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2004-2006 Ryan Norton
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -327,7 +326,7 @@ wxQTMediaBackend::~wxQTMediaBackend()
         // Dispose of the movie controller
         ::DisposeMovieController(m_mc);
         m_mc = NULL;
         // Dispose of the movie controller
         ::DisposeMovieController(m_mc);
         m_mc = NULL;

-        
+

         // Dispose of offscreen GWorld
         ::DisposeGWorld(m_movieWorld);
     }
         // Dispose of offscreen GWorld
         ::DisposeGWorld(m_movieWorld);
     }


@@ -435,7 +434,7 @@ bool wxQTMediaBackend::Load(const wxString& fileName)
         NULL); // wasChanged
 
     // Do not use ::GetMoviesStickyError() here because it returns -2009
         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);
     if (err == noErr && ::GetMoviesError() == noErr)
     {
         ::CloseMovieFile(movieResFile);


@@ -875,11 +874,7 @@ wxMediaState wxQTMediaBackend::GetState()
 void wxQTMediaBackend::Cleanup()
 {
     m_bPlaying = false;
 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
 
     // Stop the movie:
     // Apple samples with CreateMovieControl typically


@@ -1162,7 +1157,7 @@ pascal void wxQTMediaBackend::PPRMProc(
 //---------------------------------------------------------------------------
 // wxQTMediaBackend::MCFilterProc (static)
 //
 //---------------------------------------------------------------------------
 // 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),
 //---------------------------------------------------------------------------
 pascal Boolean wxQTMediaBackend::MCFilterProc(
     MovieController WXUNUSED(theController),