fixing usage of load states, set controller visible correctly

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72391 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/osx/cocoa/mediactrl.mm b/src/osx/cocoa/mediactrl.mm
index 1a3f203f7b8069077168bb2bc436ff469212638a..7faa4bc3a26891654e29716f6f286634322286e5 100644 (file)
--- a/src/osx/cocoa/mediactrl.mm
+++ b/src/osx/cocoa/mediactrl.mm
@@ -192,17 +192,17 @@ private:
 {
     QTMovie *movie = [notification object];
     long loadState = [[movie attributeForKey:QTMovieLoadStateAttribute] longValue];
 {
     QTMovie *movie = [notification object];
     long loadState = [[movie attributeForKey:QTMovieLoadStateAttribute] longValue];

-    if (loadState >= QTMovieLoadStatePlayable)
+    if ( loadState == QTMovieLoadStateError )

     {
     {

-        // the movie has loaded enough media data to begin playing
+        // error occurred 

     }
     }

-    else if (loadState >= QTMovieLoadStateLoaded)
+    else if (loadState >= QTMovieLoadStatePlayable)

     {
     {

-        m_backend->FinishLoad();
+        // the movie has loaded enough media data to begin playing, but we don't have an event for that yet

     }
     }

-    else if (loadState == -1)
+    else if (loadState >= QTMovieLoadStateComplete) // we might use QTMovieLoadStatePlaythroughOK

     {
     {

-        // error occurred 
+        m_backend->FinishLoad();

     }
 }
 
     }
 }
 


@@ -225,8 +225,8 @@ private:
 IMPLEMENT_DYNAMIC_CLASS(wxQTMediaBackend, wxMediaBackend);
 
 wxQTMediaBackend::wxQTMediaBackend() : 
 IMPLEMENT_DYNAMIC_CLASS(wxQTMediaBackend, wxMediaBackend);
 
 wxQTMediaBackend::wxQTMediaBackend() : 

-    m_interfaceflags(wxMEDIACTRLPLAYERCONTROLS_NONE),
-    m_movie(nil), m_movieview(nil)
+    m_movie(nil), m_movieview(nil),
+    m_interfaceflags(wxMEDIACTRLPLAYERCONTROLS_NONE)

 {
 }
 
 {
 }
 


@@ -300,7 +300,7 @@ bool wxQTMediaBackend::Load(const wxURI& location)
         // also check the load state here and finish our initialization if it has
         // been loaded.
         long loadState = [[m_movie attributeForKey:QTMovieLoadStateAttribute] longValue];
         // also check the load state here and finish our initialization if it has
         // been loaded.
         long loadState = [[m_movie attributeForKey:QTMovieLoadStateAttribute] longValue];

-        if (loadState >= QTMovieLoadStateLoaded)
+        if (loadState >= QTMovieLoadStateComplete)

         {
             FinishLoad();
         }        
         {
             FinishLoad();
         }        


@@ -407,6 +407,7 @@ wxSize wxQTMediaBackend::GetVideoSize() const
 
 void wxQTMediaBackend::Move(int x, int y, int w, int h)
 {
 
 void wxQTMediaBackend::Move(int x, int y, int w, int h)
 {

+    // as we have a native player, no need to move the video area 

 }
 
 bool wxQTMediaBackend::ShowPlayerControls(wxMediaCtrlPlayerControls flags)
 }
 
 bool wxQTMediaBackend::ShowPlayerControls(wxMediaCtrlPlayerControls flags)


@@ -426,6 +427,8 @@ void wxQTMediaBackend::DoShowPlayerControls(wxMediaCtrlPlayerControls flags)
     }
     else 
     {
     }
     else 
     {

+        [m_movieview setControllerVisible:YES];
+        

         [m_movieview setStepButtonsVisible:(flags & wxMEDIACTRLPLAYERCONTROLS_STEP) ? YES:NO];
         [m_movieview setVolumeButtonVisible:(flags & wxMEDIACTRLPLAYERCONTROLS_VOLUME) ? YES:NO];
     }
         [m_movieview setStepButtonsVisible:(flags & wxMEDIACTRLPLAYERCONTROLS_STEP) ? YES:NO];
         [m_movieview setVolumeButtonVisible:(flags & wxMEDIACTRLPLAYERCONTROLS_VOLUME) ? YES:NO];
     }