cleanup - more reformatting; fixed bug introduced in prior commit

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

src/msw/mediactrl.cpp

@@ -2331,7 +2331,9 @@ bool wxMCIMediaBackend::Load(const wxString& fileName)
 
     if ( mciSendCommand(0, MCI_OPEN, MCI_OPEN_ELEMENT,
                         (DWORD)(LPVOID)&openParms) != 0)
+    {
         return false;
+    }
 
     m_hDev = openParms.wDeviceID;
 
@@ -2343,8 +2345,8 @@ bool wxMCIMediaBackend::Load(const wxString& fileName)
     if (mciSendCommand(m_hDev, MCI_SET, MCI_SET_TIME_FORMAT,
                          (DWORD)(LPVOID)&setParms) != 0)
     {
-    }
         return false;
+    }
 
     // tell the MCI device to display the video in our wxMediaCtrl
     MCI_DGV_WINDOW_PARMS windowParms;
@@ -2514,7 +2516,9 @@ wxLongLong wxMCIMediaBackend::GetPosition()
 
     if (mciSendCommand(m_hDev, MCI_STATUS, MCI_STATUS_ITEM,
                        (DWORD)(LPSTR)&statusParms) != 0)
+    {
         return 0;
+    }
 
     return statusParms.dwReturn;
 }
@@ -2533,7 +2537,9 @@ double wxMCIMediaBackend::GetVolume()
 
     if (mciSendCommand(m_hDev, MCI_STATUS, MCI_STATUS_ITEM,
                        (DWORD)(LPSTR)&statusParms) != 0)
+    {
         return 0;
+    }
 
     return ((double)statusParms.dwReturn) / 1000.0;
 }
@@ -2558,7 +2564,9 @@ bool wxMCIMediaBackend::SetVolume(double dVolume)
                         // MCI_DGV_SETAUDIO + (_ITEM | _VALUE)
                         0x00800000L | 0x01000000L,
                        (DWORD)(LPSTR)&audioParms) != 0)
+    {
         return false;
+    }
 
     return true;
 }
@@ -2575,7 +2583,9 @@ wxLongLong wxMCIMediaBackend::GetDuration()
 
     if (mciSendCommand(m_hDev, MCI_STATUS, MCI_STATUS_ITEM,
                         (DWORD)(LPSTR)&statusParms) != 0)
+    {
         return 0;
+    }
 
     return statusParms.dwReturn;
 }
@@ -2941,43 +2951,48 @@ bool wxQTMediaBackend::Load(const wxString& fileName)
     if (m_movie)
         Cleanup();
  
+    bool result = true;
+    OSErr err = noErr;
     short movieResFile = 0; //= 0 because of annoying VC6 warning
     FSSpec sfFile;
 
-    if (m_lib.NativePathNameToFSSpec(
+    err = m_lib.NativePathNameToFSSpec(
         (char*) (const char*) fileName.mb_str(),
-        &sfFile, 0) != noErr)
+        &sfFile, 0);
+    result = (err == noErr);
+
+    if (result)
     {
-        return false;
+        err = m_lib.OpenMovieFile(&sfFile, &movieResFile, fsRdPerm);
+        result = (err == noErr);
     }
 
-    if (m_lib.OpenMovieFile (&sfFile, &movieResFile, fsRdPerm) != noErr)
+    if (result)
-        return false;
+    {
-
         short movieResID = 0;
         Str255 movieName;
 
-    OSErr err = m_lib.NewMovieFromFile(
+        err = m_lib.NewMovieFromFile(
                    &m_movie,
                    movieResFile,
                    &movieResID,
                    movieName,
                    newMovieActive,
                    NULL ); // wasChanged
+        result = (err == noErr && m_lib.GetMoviesStickyError() == noErr);
 
-    // m_lib.GetMoviesStickyError() because it may not find the
+        // check m_lib.GetMoviesStickyError() because it may not find the
         // proper codec and play black video and other strange effects,
         // not to mention mess up the dynamic backend loading scheme
         // of wxMediaCtrl - so it just does what the QuickTime player does
-    if (err == noErr && m_lib.GetMoviesStickyError() == noErr)
+        if (result)
         {
             m_lib.CloseMovieFile(movieResFile);
-
             FinishLoad();
-        return true;
         }
-    else
+    }
-        return false;
+
+    return result;
 }
 
 //---------------------------------------------------------------------------
@@ -3058,13 +3073,13 @@ bool wxQTMediaBackend::Load(const wxURI& location)
         m_lib.PrePrerollMovie(m_movie, timeNow, playRate,
                               (WXFARPROC)wxQTMediaBackend::PPRMProc,
                               (void*)this);
+
         return true;
     }
     else
         return false;
 }
 
-
 //---------------------------------------------------------------------------
 // wxQTMediaBackend::FinishLoad
 //
@@ -3081,11 +3096,12 @@ void wxQTMediaBackend::FinishLoad()
     // Create the playing/streaming timer
     m_timer = new wxQTPlayTimer(m_movie, (wxQTMediaBackend*) this, &m_lib);
     wxASSERT(m_timer);
+
     m_timer->Start(MOVIE_DELAY, wxTIMER_CONTINUOUS);
 
     // get the real size of the movie
     Rect outRect;
-    memset(&outRect, 0, sizeof(Rect)); // for annoying VC6 warning
+    memset(&outRect, 0, sizeof(Rect)); // suppress annoying VC6 warning
     m_lib.GetMovieNaturalBoundsRect (m_movie, &outRect);
     wxASSERT(m_lib.GetMoviesError() == noErr);
 
@@ -3172,7 +3188,7 @@ bool wxQTMediaBackend::Stop()
 //---------------------------------------------------------------------------
 // wxQTMediaBackend::GetPlaybackRate
 //
-// 1) Get the movie playback rate from ::GetMovieRate
+// Get the movie playback rate from ::GetMovieRate
 //---------------------------------------------------------------------------
 double wxQTMediaBackend::GetPlaybackRate()
 {
@@ -3182,7 +3198,7 @@ double wxQTMediaBackend::GetPlaybackRate()
 //---------------------------------------------------------------------------
 // wxQTMediaBackend::SetPlaybackRate
 //
-// 1) Convert dRate to Fixed and Set the movie rate through SetMovieRate
+// Convert dRate to Fixed and Set the movie rate through SetMovieRate
 //---------------------------------------------------------------------------
 bool wxQTMediaBackend::SetPlaybackRate(double dRate)
 {
@@ -3290,8 +3306,8 @@ wxLongLong wxQTMediaBackend::GetDuration()
 //---------------------------------------------------------------------------
 // wxQTMediaBackend::GetState
 //
-// Determines the current state - if we are at the beginning we
+// Determines the current state:
-// are stopped
+// if we are at the beginning, then we are stopped
 //---------------------------------------------------------------------------
 wxMediaState wxQTMediaBackend::GetState()
 {
@@ -3347,7 +3363,9 @@ bool wxQTMediaBackend::ShowPlayerControls(wxMediaCtrlPlayerControls flags)
         wxSetWindowProc((HWND)m_ctrl->GetHWND(), wxWndProc);
         m_lib.DisposeMovieController(m_pMC);
         m_pMC = NULL;
-        m_bestSize.y -= 16; //movie controller height
+
+        // movie controller height
+        m_bestSize.y -= 16;
     }
 
     if (flags && m_movie)
@@ -3375,29 +3393,27 @@ bool wxQTMediaBackend::ShowPlayerControls(wxMediaCtrlPlayerControls flags)
                 (WXFARPROC)wxQTMediaBackend::MCFilterProc, (void*)this);
             m_bestSize.y += 16; // movie controller height
 
-            //
+            // By default the movie controller uses its own colour palette
-            // By default the movie controller uses its own color
+            // for the movie which can be bad on some files, so turn it off.
-            // pallette for the movie which can be bad on some files -
+            // Also turn off its frame/border for the movie
-            // so turn it off.  Also turn off its frame/border for
+            // Also take care of a couple of the interface flags here
-            // the movie
-            //
-            // Also we take care of a couple of the interface flags here
-            //
             long mcFlags = 0;
             m_lib.MCDoAction(m_pMC, 39/*mcActionGetFlags*/, (void*)&mcFlags);
-            mcFlags |= (  //(1<< 0)/*mcFlagSuppressMovieFrame*/ |
+
+            mcFlags |= 
+                // (1<< 0) /*mcFlagSuppressMovieFrame*/ |
                 (1<< 3) /*mcFlagsUseWindowPalette*/
                 | ((flags & wxMEDIACTRLPLAYERCONTROLS_STEP)
                       ? 0 : (1<< 1) /*mcFlagSuppressStepButtons*/)
                 | ((flags & wxMEDIACTRLPLAYERCONTROLS_VOLUME)
                       ? 0 : (1<< 2) /*mcFlagSuppressSpeakerButton*/)
 //              | (1<< 4) /*mcFlagDontInvalidate*/ // if we take care of repainting ourselves
-                      );
+                      ;
+
             m_lib.MCDoAction(m_pMC, 38/*mcActionSetFlags*/, (void*)mcFlags);
 
             // intercept the wndproc of our control window
-            wxSetWindowProc((HWND)m_ctrl->GetHWND(),
+            wxSetWindowProc((HWND)m_ctrl->GetHWND(), wxQTMediaBackend::QTWndProc);
-                wxQTMediaBackend::QTWndProc);
 
             // set the user data of our window
             wxSetWindowUserData((HWND)m_ctrl->GetHWND(), this);
@@ -3414,13 +3430,10 @@ bool wxQTMediaBackend::ShowPlayerControls(wxMediaCtrlPlayerControls flags)
 //
 // Callback for when the movie controller recieves a message
 //---------------------------------------------------------------------------
-Boolean
+Boolean wxQTMediaBackend::MCFilterProc(MovieController WXUNUSED(theController),
-wxQTMediaBackend::MCFilterProc(MovieController WXUNUSED(theController),
                                short action,
                                void * WXUNUSED(params),
                                LONG_PTR refCon)
-{
-    if (action != 1) // don't process idle events
 {
     wxQTMediaBackend* pThis = (wxQTMediaBackend*)refCon;
 
@@ -3429,6 +3442,7 @@ wxQTMediaBackend::MCFilterProc(MovieController WXUNUSED(theController),
     case 8:
         // play button triggered - MC will set movie to opposite state
         // of current - playing ? paused : playing
+        if (pThis)
             pThis->m_bPlaying = !(pThis->m_bPlaying);
 
         // NB: Sometimes it doesn't redraw properly -
@@ -3438,10 +3452,14 @@ wxQTMediaBackend::MCFilterProc(MovieController WXUNUSED(theController),
         // to help this unfortunately
         break;
 
+    case 1:
+        // don't process idle events
+        break;
+
     default:
         break;
     }
-    }
+
     return 0;
 }
 
@@ -3503,10 +3521,9 @@ void wxQTMediaEvtHandler::OnEraseBackground(wxEraseEvent& evt)
         m_pLib.MCDoAction(m_qtb->m_pMC, 2 /*mcActionDraw*/,
                             m_pLib.GetNativeWindowPort(m_hwnd));
     }
-    else // no movie controller
+    else if ( m_qtb->m_movie )
-    {
-        if ( m_qtb->m_movie )
     {
+        // no movie controller
         CGrafPtr port = (CGrafPtr)m_pLib.GetNativeWindowPort(m_hwnd);
 
         m_pLib.BeginUpdate(port);
@@ -3514,13 +3531,13 @@ void wxQTMediaEvtHandler::OnEraseBackground(wxEraseEvent& evt)
         wxASSERT(m_pLib.GetMoviesError() == noErr);
         m_pLib.EndUpdate(port);
     }
-        else // no movie
+    else
     {
+        // no movie
         // let the system repaint the window
         evt.Skip();
     }
 }
-}
 
 //---------------------------------------------------------------------------
 //  End QT Backend