no changes, just corrected the comment for wxConvLocal

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

diff --git a/src/mac/carbon/mediactrl.cpp b/src/mac/carbon/mediactrl.cpp
index 1a22a896dc02ec755b0dfde316cf7b8d08ed72e0..d8cd5c284f7d3a1e10a5c7c5312db2e2fc2d37ab 100644 (file)
--- a/src/mac/carbon/mediactrl.cpp
+++ b/src/mac/carbon/mediactrl.cpp
@@ -12,31 +12,33 @@
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 // There are several known bugs with CreateMovieControl
 // on systems > 10.2 - see main.c of QTCarbonShell sample for details
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 // There are several known bugs with CreateMovieControl
 // on systems > 10.2 - see main.c of QTCarbonShell sample for details

+//
+// Also, with either version it will overdraw anything below its TLW - so
+// it's relatively useless on a notebook page (this happens in Opera too).
+//
+// Even though though the CreateMovieControl version is the default
+// for OSX, the MovieController version is heavily tested and works
+// just as well...

 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 

-//===========================================================================
-//  DECLARATIONS
-//===========================================================================
-
-//---------------------------------------------------------------------------
-// Pre-compiled header stuff
-//---------------------------------------------------------------------------
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-//---------------------------------------------------------------------------
-// Includes
-//---------------------------------------------------------------------------

 #include "wx/mediactrl.h"
 
 #include "wx/mediactrl.h"
 

-//---------------------------------------------------------------------------
-// Compilation guard
-//---------------------------------------------------------------------------
+// uma is for wxMacFSSpec
+#include "wx/mac/uma.h"
+#include "wx/timer.h"
+
+#ifndef __DARWIN__
+// standard QT stuff
+#include <Movies.h>
+#include <Gestalt.h>
+#include <QuickTimeComponents.h>
+#else
+#include <QuickTime/QuickTimeComponents.h>
+#endif
+

 #if wxUSE_MEDIACTRL
 
 //---------------------------------------------------------------------------
 #if wxUSE_MEDIACTRL
 
 //---------------------------------------------------------------------------


@@ -63,24 +65,9 @@
 //===========================================================================
 
 //---------------------------------------------------------------------------
 //===========================================================================
 
 //---------------------------------------------------------------------------

-//

 //  wxQTMediaBackend
 //  wxQTMediaBackend

-//

 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
 

-//---------------------------------------------------------------------------
-//  QT Includes
-//---------------------------------------------------------------------------
-//uma is for wxMacFSSpec
-#include "wx/mac/uma.h"
-#include "wx/timer.h"
-#ifndef __DARWIN__
-#include <Movies.h>
-#include <Gestalt.h>
-#include <QuickTimeComponents.h>    //Standard QT stuff
-#else
-#include <QuickTime/QuickTimeComponents.h>
-#endif

 
 class WXDLLIMPEXP_MEDIA wxQTMediaBackend : public wxMediaBackendCommonBase
 {
 
 class WXDLLIMPEXP_MEDIA wxQTMediaBackend : public wxMediaBackendCommonBase
 {


@@ -122,41 +109,55 @@ public:
     void FinishLoad();
 
     virtual bool ShowPlayerControls(wxMediaCtrlPlayerControls flags);
     void FinishLoad();
 
     virtual bool ShowPlayerControls(wxMediaCtrlPlayerControls flags);

-        
+
+    virtual wxLongLong GetDownloadProgress();
+    virtual wxLongLong GetDownloadTotal();

 
     //
     //  ------  Implementation from now on  --------
     //
 
     //
     //  ------  Implementation from now on  --------
     //

+    bool DoPause();
+    bool DoStop();
+

     void DoLoadBestSize();
     void DoSetControllerVisible(wxMediaCtrlPlayerControls flags);
 
     void DoLoadBestSize();
     void DoSetControllerVisible(wxMediaCtrlPlayerControls flags);
 

+    wxLongLong GetDataSizeFromStart(TimeValue end);
+

     //TODO: Last param actually long - does this work on 64bit machines?
     //TODO: Last param actually long - does this work on 64bit machines?

-    static Boolean MCFilterProc (MovieController theController,
+    static pascal Boolean MCFilterProc(MovieController theController,

         short action, void *params, long refCon);
 
 #if wxUSE_CREATEMOVIECONTROL
         short action, void *params, long refCon);
 
 #if wxUSE_CREATEMOVIECONTROL

-    void DoCreateMovieControl();    
+    void DoCreateMovieControl();

 #else
     Boolean IsQuickTime4Installed();
     void DoNewMovieController();
 #else
     Boolean IsQuickTime4Installed();
     void DoNewMovieController();

-    static void PPRMProc (Movie theMovie, OSErr theErr, void* theRefCon);
+    static pascal void PPRMProc(Movie theMovie, OSErr theErr, void* theRefCon);

 #endif
 
     wxSize m_bestSize;          // Original movie size
 #endif
 
     wxSize m_bestSize;          // Original movie size

+

 #ifdef __WXMAC_OSX__
     struct MovieType** m_movie; // QT Movie handle/instance
 #else
     Movie m_movie;              // Movie instance
 #endif
 #ifdef __WXMAC_OSX__
     struct MovieType** m_movie; // QT Movie handle/instance
 #else
     Movie m_movie;              // Movie instance
 #endif

+

     bool m_bPlaying;            // Whether media is playing or not
     class wxTimer* m_timer;     // Timer for streaming the movie
     MovieController m_mc;       // MovieController instance
     wxMediaCtrlPlayerControls m_interfaceflags; // Saved interface flags
     bool m_bPlaying;            // Whether media is playing or not
     class wxTimer* m_timer;     // Timer for streaming the movie
     MovieController m_mc;       // MovieController instance
     wxMediaCtrlPlayerControls m_interfaceflags; // Saved interface flags

+

 #if !wxUSE_CREATEMOVIECONTROL
     EventHandlerRef m_pEventHandlerRef; // Event handler to cleanup
 #if !wxUSE_CREATEMOVIECONTROL
     EventHandlerRef m_pEventHandlerRef; // Event handler to cleanup

+    MoviePrePrerollCompleteUPP  m_preprerollupp;
+    EventHandlerUPP             m_eventupp;
+    MCActionFilterWithRefConUPP m_mcactionupp;

 
     friend class wxQTMediaEvtHandler;
 
     friend class wxQTMediaEvtHandler;

-#endif    
+#endif
+

     DECLARE_DYNAMIC_CLASS(wxQTMediaBackend)
 };
 
     DECLARE_DYNAMIC_CLASS(wxQTMediaBackend)
 };
 


@@ -169,7 +170,8 @@ public:
     {
         m_qtb = qtb;
 
     {
         m_qtb = qtb;
 

-        qtb->m_ctrl->Connect(qtb->m_ctrl->GetId(), wxEVT_ERASE_BACKGROUND,
+        qtb->m_ctrl->Connect(
+            qtb->m_ctrl->GetId(), wxEVT_ERASE_BACKGROUND,

             wxEraseEventHandler(wxQTMediaEvtHandler::OnEraseBackground),
             NULL, this);
     }
             wxEraseEventHandler(wxQTMediaEvtHandler::OnEraseBackground),
             NULL, this);
     }


@@ -184,9 +186,8 @@ private:
 
 // Window event handler
 static pascal OSStatus wxQTMediaWindowEventHandler(
 
 // Window event handler
 static pascal OSStatus wxQTMediaWindowEventHandler(

-                                    EventHandlerCallRef inHandlerCallRef, 
-                                    EventRef inEvent, void *inUserData);
-DEFINE_ONE_SHOT_HANDLER_GETTER( wxQTMediaWindowEventHandler );
+    EventHandlerCallRef inHandlerCallRef,
+    EventRef inEvent, void *inUserData);

 
 #endif
 
 
 #endif
 


@@ -196,12 +197,10 @@ DEFINE_ONE_SHOT_HANDLER_GETTER( wxQTMediaWindowEventHandler );
 
 
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

-//

 // wxQTMediaBackend
 // wxQTMediaBackend

-//

 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 

-IMPLEMENT_DYNAMIC_CLASS(wxQTMediaBackend, wxMediaBackend);
+IMPLEMENT_DYNAMIC_CLASS(wxQTMediaBackend, wxMediaBackend)

 
 //Time between timer calls - this is the Apple recommondation to the TCL
 //team I believe
 
 //Time between timer calls - this is the Apple recommondation to the TCL
 //team I believe


@@ -224,24 +223,25 @@ public:
 
     void Notify()
     {
 
     void Notify()
     {

-        //Note that the CreateMovieControl variety performs
-        //its own custom idleing
+        // Note that the CreateMovieControl variety performs
+        // its own custom idling

 #if !wxUSE_CREATEMOVIECONTROL
         ::MCIdle(m_parent->m_mc);
 #endif
 #if !wxUSE_CREATEMOVIECONTROL
         ::MCIdle(m_parent->m_mc);
 #endif

-        //kMovieLoadStatePlayable is not enough on MAC
-        //- it plays, but IsMovieDone might return true (!)
-        //sure we need to wait until kMovieLoadStatePlaythroughOK
-        if(::GetMovieLoadState(m_movie) >= 20000)
-    {
+
+        // kMovieLoadStatePlayable is not enough on MAC:
+        // it plays, but IsMovieDone might return true (!)
+        // sure we need to wait until kMovieLoadStatePlaythroughOK
+        if (::GetMovieLoadState(m_movie) >= 20000)
+        {

             m_parent->FinishLoad();
             delete this;
             m_parent->FinishLoad();
             delete this;

-    }
+        }

     }
 
 protected:
     }
 
 protected:

-    Movie m_movie;                  //Our movie instance
-    wxQTMediaBackend* m_parent;     //Backend pointer
+    Movie m_movie;                  // Our movie instance
+    wxQTMediaBackend *m_parent;     // Backend pointer

 };
 
 // --------------------------------------------------------------------------
 };
 
 // --------------------------------------------------------------------------


@@ -259,7 +259,7 @@ public:
         m_movie(movie), m_parent(parent) {}
 
     void Notify()
         m_movie(movie), m_parent(parent) {}
 
     void Notify()

-        {
+    {

         //Note that CreateMovieControl performs its own idleing
 #if !wxUSE_CREATEMOVIECONTROL
         //
         //Note that CreateMovieControl performs its own idleing
 #if !wxUSE_CREATEMOVIECONTROL
         //


@@ -277,12 +277,10 @@ public:
         ::MCIdle(m_parent->m_mc);
 #endif
 
         ::MCIdle(m_parent->m_mc);
 #endif
 

-        //

         //  Handle the stop event - if the movie has reached
         //  the end, notify our handler
         //  Handle the stop event - if the movie has reached
         //  the end, notify our handler

-        //
-        if(::IsMovieDone(m_movie))
-                {
+        if (::IsMovieDone(m_movie))
+        {

             if ( m_parent->SendStopEvent() )
             {
                     m_parent->Stop();
             if ( m_parent->SendStopEvent() )
             {
                     m_parent->Stop();


@@ -294,8 +292,8 @@ public:
     }
 
 protected:
     }
 
 protected:

-    Movie m_movie;                  //Our movie instance
-    wxQTMediaBackend* m_parent;     //Backend pointer
+    Movie m_movie;                  // Our movie instance
+    wxQTMediaBackend* m_parent;     // Backend pointer

 };
 
 
 };
 
 


@@ -304,9 +302,12 @@ protected:
 //
 // Sets m_timer to NULL signifying we havn't loaded anything yet
 //---------------------------------------------------------------------------
 //
 // Sets m_timer to NULL signifying we havn't loaded anything yet
 //---------------------------------------------------------------------------

-wxQTMediaBackend::wxQTMediaBackend() 
+wxQTMediaBackend::wxQTMediaBackend()

     : m_movie(NULL), m_bPlaying(false), m_timer(NULL)
       , m_mc(NULL), m_interfaceflags(wxMEDIACTRLPLAYERCONTROLS_NONE)
     : m_movie(NULL), m_bPlaying(false), m_timer(NULL)
       , m_mc(NULL), m_interfaceflags(wxMEDIACTRLPLAYERCONTROLS_NONE)

+#if !wxUSE_CREATEMOVIECONTROL
+      , m_preprerollupp(NULL)
+#endif

 {
 }
 
 {
 }
 


@@ -321,21 +322,25 @@ wxQTMediaBackend::wxQTMediaBackend()
 //---------------------------------------------------------------------------
 wxQTMediaBackend::~wxQTMediaBackend()
 {
 //---------------------------------------------------------------------------
 wxQTMediaBackend::~wxQTMediaBackend()
 {

-    if(m_movie)
+    if (m_movie)

         Cleanup();
 
 #if !wxUSE_CREATEMOVIECONTROL
     // Cleanup for moviecontroller
         Cleanup();
 
 #if !wxUSE_CREATEMOVIECONTROL
     // Cleanup for moviecontroller

-    if(m_mc)
+    if (m_mc)

     {
         // destroy wxQTMediaEvtHandler we pushed on it
         m_ctrl->PopEventHandler(true);
         RemoveEventHandler((EventHandlerRef&)m_pEventHandlerRef);
     {
         // destroy wxQTMediaEvtHandler we pushed on it
         m_ctrl->PopEventHandler(true);
         RemoveEventHandler((EventHandlerRef&)m_pEventHandlerRef);

+        DisposeEventHandlerUPP(m_eventupp);
+
+        // Dispose of the movie controller

         ::DisposeMovieController(m_mc);
         ::DisposeMovieController(m_mc);

+        DisposeMCActionFilterWithRefConUPP(m_mcactionupp);

     }
 #endif
 
     }
 #endif
 

-    //Note that ExitMovies() is not necessary...
+    // Note that ExitMovies() is not necessary...

     ExitMovies();
 }
 
     ExitMovies();
 }
 


@@ -345,15 +350,17 @@ wxQTMediaBackend::~wxQTMediaBackend()
 // 1) Intializes QuickTime
 // 2) Creates the control window
 //---------------------------------------------------------------------------
 // 1) Intializes QuickTime
 // 2) Creates the control window
 //---------------------------------------------------------------------------

-bool wxQTMediaBackend::CreateControl(wxControl* ctrl, wxWindow* parent,
-                                     wxWindowID id,
-                                     const wxPoint& pos,
-                                     const wxSize& size,
-                                     long style,
-                                     const wxValidator& validator,
-                                     const wxString& name)
+bool wxQTMediaBackend::CreateControl(
+    wxControl* ctrl,
+    wxWindow* parent,
+    wxWindowID id,
+    const wxPoint& pos,
+    const wxSize& size,
+    long style,
+    const wxValidator& validator,
+    const wxString& name)

 {
 {

-    //Don't bother in Native control mode
+    // Don't bother in Native control mode

 #if !wxUSE_CREATEMOVIECONTROL
     if (!IsQuickTime4Installed())
         return false;
 #if !wxUSE_CREATEMOVIECONTROL
     if (!IsQuickTime4Installed())
         return false;


@@ -361,19 +368,19 @@ bool wxQTMediaBackend::CreateControl(wxControl* ctrl, wxWindow* parent,
 
     EnterMovies();
 
 
     EnterMovies();
 

-    //

     // Create window
     // By default wxWindow(s) is created with a border -
     // so we need to get rid of those
     //
     // Since we don't have a child window like most other
     // backends, we don't need wxCLIP_CHILDREN
     // Create window
     // By default wxWindow(s) is created with a border -
     // so we need to get rid of those
     //
     // Since we don't have a child window like most other
     // backends, we don't need wxCLIP_CHILDREN

-    //
-    if ( !ctrl->wxControl::Create(parent, id, pos, size,
-                                 wxWindow::MacRemoveBordersFromStyle(style),
-                                  validator, name)
-        )
+    if ( !ctrl->wxControl::Create(
+        parent, id, pos, size,
+        wxWindow::MacRemoveBordersFromStyle(style),
+        validator, name))
+    {

         return false;
         return false;

+    }

 
 #if wxUSE_VALIDATORS
     ctrl->SetValidator(validator);
 
 #if wxUSE_VALIDATORS
     ctrl->SetValidator(validator);


@@ -386,16 +393,16 @@ bool wxQTMediaBackend::CreateControl(wxControl* ctrl, wxWindow* parent,
 //---------------------------------------------------------------------------
 // wxQTMediaBackend::IsQuickTime4Installed
 //
 //---------------------------------------------------------------------------
 // wxQTMediaBackend::IsQuickTime4Installed
 //

-// Determines whether version 4 of QT is installed 
-// (Pretty much for classic only)
+// Determines whether version 4 of QT is installed
+// (Pretty much for Classic only)

 //---------------------------------------------------------------------------
 #if !wxUSE_CREATEMOVIECONTROL
 Boolean wxQTMediaBackend::IsQuickTime4Installed()
 {
 //---------------------------------------------------------------------------
 #if !wxUSE_CREATEMOVIECONTROL
 Boolean wxQTMediaBackend::IsQuickTime4Installed()
 {

-    short error;
+    OSErr error;

     long result;
 
     long result;
 

-    error = Gestalt (gestaltQuickTime, &result);
+    error = Gestalt(gestaltQuickTime, &result);

     return (error == noErr) && (((result >> 16) & 0xffff) >= 0x0400);
 }
 #endif
     return (error == noErr) && (((result >> 16) & 0xffff) >= 0x0400);
 }
 #endif


@@ -411,40 +418,41 @@ Boolean wxQTMediaBackend::IsQuickTime4Installed()
 //---------------------------------------------------------------------------
 bool wxQTMediaBackend::Load(const wxString& fileName)
 {
 //---------------------------------------------------------------------------
 bool wxQTMediaBackend::Load(const wxString& fileName)
 {

-    if(m_movie)
+    if (m_movie)

         Cleanup();
 
     OSErr err = noErr;
     short movieResFile;
     FSSpec sfFile;
 
         Cleanup();
 
     OSErr err = noErr;
     short movieResFile;
     FSSpec sfFile;
 

-    //FIXME:wxMacFilename2FSSpec crashes on empty string -
-    //does it crash on other strings too and should this
-    //"fix" be put in the carbon wxSound?
+    // FIXME:wxMacFilename2FSSpec crashes on empty string -
+    // does it crash on other strings too and should this
+    // "fix" be put in the Carbon wxSound?

     if (fileName.empty())
         return false;
 
     if (fileName.empty())
         return false;
 

-    wxMacFilename2FSSpec( fileName , &sfFile );
-
-    if (OpenMovieFile (&sfFile, &movieResFile, fsRdPerm) != noErr)
+    wxMacFilename2FSSpec( fileName, &sfFile );
+    if (OpenMovieFile( &sfFile, &movieResFile, fsRdPerm ) != noErr)

         return false;
 
     short movieResID = 0;
     Str255 movieName;
         return false;
 
     short movieResID = 0;
     Str255 movieName;

+    bool result;

 
 

-    err = NewMovieFromFile (
-    &m_movie,
-    movieResFile,
-    &movieResID,
-    movieName,
-    newMovieActive,
-    NULL); //wasChanged
+    err = NewMovieFromFile(
+        &m_movie,
+        movieResFile,
+        &movieResID,
+        movieName,
+        newMovieActive,
+        NULL); // wasChanged

 
 

-    //No ::GetMoviesStickyError() here because it returns -2009 
+    // No ::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)
+    result = (err == noErr);
+    if (result)

     {
     {

-        ::CloseMovieFile (movieResFile);
+        ::CloseMovieFile(movieResFile);

 
         // Create movie controller/control
 #if wxUSE_CREATEMOVIECONTROL
 
         // Create movie controller/control
 #if wxUSE_CREATEMOVIECONTROL


@@ -452,13 +460,11 @@ bool wxQTMediaBackend::Load(const wxString& fileName)
 #else
         DoNewMovieController();
 #endif
 #else
         DoNewMovieController();
 #endif

-    FinishLoad();
-        return true;
-    }
-    else
-    {
-        return false;        
+
+        FinishLoad();

     }
     }

+
+    return result;

 }
 
 //---------------------------------------------------------------------------
 }
 
 //---------------------------------------------------------------------------


@@ -469,9 +475,10 @@ bool wxQTMediaBackend::Load(const wxString& fileName)
 // Anyway we set up the loading timer here to tell us when the movie is done
 //---------------------------------------------------------------------------
 #if !wxUSE_CREATEMOVIECONTROL
 // Anyway we set up the loading timer here to tell us when the movie is done
 //---------------------------------------------------------------------------
 #if !wxUSE_CREATEMOVIECONTROL

-void wxQTMediaBackend::PPRMProc (Movie theMovie,
-                                 OSErr WXUNUSED_UNLESS_DEBUG(theErr),
-                                 void* theRefCon)
+pascal void wxQTMediaBackend::PPRMProc(
+    Movie theMovie,
+    OSErr WXUNUSED_UNLESS_DEBUG(theErr),
+    void* theRefCon)

 {
     wxASSERT( theMovie );
     wxASSERT( theRefCon );
 {
     wxASSERT( theMovie );
     wxASSERT( theRefCon );


@@ -500,42 +507,46 @@ void wxQTMediaBackend::PPRMProc (Movie theMovie,
 //---------------------------------------------------------------------------
 bool wxQTMediaBackend::Load(const wxURI& location)
 {
 //---------------------------------------------------------------------------
 bool wxQTMediaBackend::Load(const wxURI& location)
 {

-    if(m_movie)
+    if (m_movie)

         Cleanup();
 
     wxString theURI = location.BuildURI();
 
     OSErr err = noErr;
         Cleanup();
 
     wxString theURI = location.BuildURI();
 
     OSErr err = noErr;

+    bool result;

 
 

+    // FIXME: lurking Unicode problem here

     Handle theHandle = ::NewHandleClear(theURI.length() + 1);
     wxASSERT(theHandle);
 
     Handle theHandle = ::NewHandleClear(theURI.length() + 1);
     wxASSERT(theHandle);
 

-    ::BlockMove(theURI.mb_str(), *theHandle, theURI.length() + 1);
+    ::BlockMoveData(theURI.mb_str(), *theHandle, theURI.length() + 1);

 
 

-    //create the movie from the handle that refers to the URI
-    err = ::NewMovieFromDataRef(&m_movie, newMovieActive |
-                                                    newMovieAsyncOK
-                                                    /*|newMovieIdleImportOK*/,
-                                NULL, theHandle,
-                                URLDataHandlerSubType);
+    // create the movie from the handle that refers to the URI
+    err = ::NewMovieFromDataRef(
+        &m_movie,
+        newMovieActive | newMovieAsyncOK /* | newMovieIdleImportOK*/,
+        NULL, theHandle,
+        URLDataHandlerSubType);

 
     ::DisposeHandle(theHandle);
 
 
     ::DisposeHandle(theHandle);
 

-    if (err == noErr)
+    result = (err == noErr);
+    if (result)

     {
 #if wxUSE_CREATEMOVIECONTROL
     {
 #if wxUSE_CREATEMOVIECONTROL

-        // Movie control resets prerolling, so we must create first
+        // Movie control does its own "(pre)prerolling"
+        // but we still need to buffer the movie for the URL

         DoCreateMovieControl();
 
         // Setup timer to catch load event
         m_timer = new wxQTMediaLoadTimer(m_movie, this);
         m_timer->Start(MOVIE_DELAY);
 #else
         DoCreateMovieControl();
 
         // Setup timer to catch load event
         m_timer = new wxQTMediaLoadTimer(m_movie, this);
         m_timer->Start(MOVIE_DELAY);
 #else

-        // Movie controller resets prerolling, so we must create first 
+        // Movie controller resets prerolling, so we must create first

         DoNewMovieController();
         DoNewMovieController();

-        
+

         long timeNow;
         long timeNow;

-    Fixed playRate;
+        Fixed playRate;

 
         timeNow = ::GetMovieTime(m_movie, NULL);
         wxASSERT(::GetMoviesError() == noErr);
 
         timeNow = ::GetMovieTime(m_movie, NULL);
         wxASSERT(::GetMoviesError() == noErr);


@@ -543,7 +554,6 @@ bool wxQTMediaBackend::Load(const wxURI& location)
         playRate = ::GetMoviePreferredRate(m_movie);
         wxASSERT(::GetMoviesError() == noErr);
 
         playRate = ::GetMoviePreferredRate(m_movie);
         wxASSERT(::GetMoviesError() == noErr);
 

-        //

         //  Note that the callback here is optional,
         //  but without it PrePrerollMovie can be buggy
         //  (see Apple ml).  Also, some may wonder
         //  Note that the callback here is optional,
         //  but without it PrePrerollMovie can be buggy
         //  (see Apple ml).  Also, some may wonder


@@ -552,14 +562,12 @@ bool wxQTMediaBackend::Load(const wxURI& location)
         //  require it if you don't use a Movie Controller,
         //  which we don't by default.
         //
         //  require it if you don't use a Movie Controller,
         //  which we don't by default.
         //

-        ::PrePrerollMovie(m_movie, timeNow, playRate,
-                              wxQTMediaBackend::PPRMProc,
-                              (void*)this);
+        m_preprerollupp = NewMoviePrePrerollCompleteUPP( wxQTMediaBackend::PPRMProc );
+        ::PrePrerollMovie( m_movie, timeNow, playRate, m_preprerollupp, (void*)this);

 #endif
 #endif

-        return true;

     }
     }

-    else
-        return false;
+
+    return result;

 }
 
 //---------------------------------------------------------------------------
 }
 
 //---------------------------------------------------------------------------


@@ -576,55 +584,53 @@ bool wxQTMediaBackend::Load(const wxURI& location)
 #if wxUSE_CREATEMOVIECONTROL
 void wxQTMediaBackend::DoCreateMovieControl()
 {
 #if wxUSE_CREATEMOVIECONTROL
 void wxQTMediaBackend::DoCreateMovieControl()
 {

-        //
-        //Native CreateMovieControl QT control (Thanks to Kevin Olliver's
-        //wxQTMovie for some of this).
-        //
-            Rect bounds = wxMacGetBoundsForControl(m_ctrl,
-                                                   m_ctrl->GetPosition(),
-                                                   m_ctrl->GetSize());
-
-        //Dispose of old control for new one
+    // Native CreateMovieControl QT control (Thanks to Kevin Olliver's
+    // wxQTMovie for some of this).
+    Rect bounds = wxMacGetBoundsForControl(
+        m_ctrl,
+        m_ctrl->GetPosition(),
+        m_ctrl->GetSize());
+
+    // Dispose of old control for new one

     if (m_ctrl->m_peer && m_ctrl->m_peer->Ok() )
         m_ctrl->m_peer->Dispose();
 
     if (m_ctrl->m_peer && m_ctrl->m_peer->Ok() )
         m_ctrl->m_peer->Dispose();
 

-        //Options-
-        //kMovieControlOptionXXX
-        //HideController - hide the movie controller
-        //LocateTopLeft - movie is pinned to top left rather than centered in the control
-        //EnableEditing - Allows programmatic editing and dragn'drop
-        //HandleEditingHI- Installs event stuff for edit menu - forces EnableEditing also
-        //SetKeysEnabled - Allows keyboard input
-        //ManuallyIdled - app handles movie idling rather than internal timer event loop
-        ::CreateMovieControl(
-                    (WindowRef)
-                   m_ctrl->MacGetTopLevelWindowRef(), //parent
-                       &bounds,                         //control bounds
-                       m_movie,                         //movie handle
-                       kMovieControlOptionHideController
-                       | kMovieControlOptionLocateTopLeft
-                       | kMovieControlOptionSetKeysEnabled
-                 //  | kMovieControlOptionManuallyIdled
-                       ,                                //flags
-                   m_ctrl->m_peer->GetControlRefAddr() );
-
-    ::EmbedControl(m_ctrl->m_peer->GetControlRef(), 
-                    (ControlRef)m_ctrl->GetParent()->GetHandle());    
-                    
-        //
-    // Setup MovieController for the new movie
-        //
+    // Options:
+    // kMovieControlOptionXXX
+    // HideController - hide the movie controller
+    // LocateTopLeft - movie is pinned to top left rather than centered in the control
+    // EnableEditing - Allows programmatic editing and dragn'drop
+    // HandleEditingHI- Installs event stuff for edit menu - forces EnableEditing also
+    // SetKeysEnabled - Allows keyboard input
+    // ManuallyIdled - app handles movie idling rather than internal timer event loop
+    ::CreateMovieControl(
+        (WindowRef) m_ctrl->MacGetTopLevelWindowRef(), //parent
+        &bounds,                         // control bounds
+        m_movie,                         // movie handle
+        kMovieControlOptionHideController// flags
+            // | kMovieControlOptionManuallyIdled
+            | kMovieControlOptionLocateTopLeft
+            | kMovieControlOptionSetKeysEnabled,
+        m_ctrl->m_peer->GetControlRefAddr() );
+
+    ::EmbedControl(
+        m_ctrl->m_peer->GetControlRef(),
+        (ControlRef)m_ctrl->GetParent()->GetHandle());
+
+    // set up MovieController for the new movie

     long dataSize;
 
     long dataSize;
 

-    //Get movie controller from our control
-    ::GetControlData(   m_ctrl->m_peer->GetControlRef(), 0, 
-                    kMovieControlDataMovieController, 
-                    sizeof(MovieController), (Ptr)&m_mc, &dataSize );
+    // Get movie controller from our control
+    ::GetControlData(
+        m_ctrl->m_peer->GetControlRef(), 0,
+        kMovieControlDataMovieController,
+        sizeof(MovieController), (Ptr)&m_mc, &dataSize );

 
     // Setup a callback so we can tell when the user presses
     // play on the player controls
 
     // Setup a callback so we can tell when the user presses
     // play on the player controls

-    ::MCSetActionFilterWithRefCon(m_mc, 
-            wxQTMediaBackend::MCFilterProc, (long)this);
+    ::MCSetActionFilterWithRefCon(m_mc,
+            (MCActionFilterWithRefConUPP)wxQTMediaBackend::MCFilterProc,
+            (long)this);

 }
 #endif
 
 }
 #endif
 


@@ -637,71 +643,74 @@ void wxQTMediaBackend::DoCreateMovieControl()
 #if !wxUSE_CREATEMOVIECONTROL
 void wxQTMediaBackend::DoNewMovieController()
 {
 #if !wxUSE_CREATEMOVIECONTROL
 void wxQTMediaBackend::DoNewMovieController()
 {

-    if(!m_mc)
+    if (!m_mc)

     {
         // Get top level window ref for some mac functions
         WindowRef wrTLW = (WindowRef) m_ctrl->MacGetTopLevelWindowRef();
     {
         // Get top level window ref for some mac functions
         WindowRef wrTLW = (WindowRef) m_ctrl->MacGetTopLevelWindowRef();

-        
-        // MovieController not setup yet - 
-        // so we need to create a new one.
-        // You have to pass a valid movie to 
-        // NewMovieController, evidently
+
+        // MovieController not set up yet, so we need to create a new one.
+        // You have to pass a valid movie to NewMovieController, evidently

         ::SetMovieGWorld(m_movie,
                        (CGrafPtr) GetWindowPort(wrTLW),
                        NULL);
         wxASSERT(::GetMoviesError() == noErr);
 
         ::SetMovieGWorld(m_movie,
                        (CGrafPtr) GetWindowPort(wrTLW),
                        NULL);
         wxASSERT(::GetMoviesError() == noErr);
 

-        Rect bounds = wxMacGetBoundsForControl(m_ctrl,
-                                           m_ctrl->GetPosition(),
-                                           m_ctrl->GetSize());
+        Rect bounds = wxMacGetBoundsForControl(
+            m_ctrl,
+            m_ctrl->GetPosition(),
+            m_ctrl->GetSize());

 
 

-        m_mc = ::NewMovieController(m_movie, &bounds, mcTopLeftMovie |
-                                                //mcWithFrame |
-                                                mcNotVisible);
+        m_mc = ::NewMovieController(
+            m_movie, &bounds,
+            mcTopLeftMovie | mcNotVisible /* | mcWithFrame */ );

         wxASSERT(::GetMoviesError() == noErr);
         wxASSERT(::GetMoviesError() == noErr);

-        ::MCDoAction(m_mc, 32, (void*)true); //mcActionSetKeysEnabled
+
+        ::MCDoAction(m_mc, 32, (void*)true); // mcActionSetKeysEnabled

         wxASSERT(::GetMoviesError() == noErr);
 
         // Setup a callback so we can tell when the user presses
         // play on the player controls
         wxASSERT(::GetMoviesError() == noErr);
 
         // Setup a callback so we can tell when the user presses
         // play on the player controls

-        ::MCSetActionFilterWithRefCon(m_mc, 
-            wxQTMediaBackend::MCFilterProc, (long)this);
+        m_mcactionupp = NewMCActionFilterWithRefConUPP( wxQTMediaBackend::MCFilterProc );
+        ::MCSetActionFilterWithRefCon( m_mc, m_mcactionupp, (long)this );

         wxASSERT(::GetMoviesError() == noErr);
 
         wxASSERT(::GetMoviesError() == noErr);
 

-        //Part of a suggestion from Greg Hazel to repaint
-        //movie when idle
+        // Part of a suggestion from Greg Hazel to repaint movie when idle

         m_ctrl->PushEventHandler(new wxQTMediaEvtHandler(this));
         m_ctrl->PushEventHandler(new wxQTMediaEvtHandler(this));

-        
+

         // Event types to catch from the TLW
         // for the moviecontroller
         // Event types to catch from the TLW
         // for the moviecontroller

-        EventTypeSpec theEventTypes[] = { 
-                    { kEventClassMouse,     kEventMouseDown },
-                    { kEventClassMouse,     kEventMouseUp },
-                    { kEventClassKeyboard,  kEventRawKeyDown },
-                    { kEventClassKeyboard,  kEventRawKeyRepeat },
-                    { kEventClassKeyboard,  kEventRawKeyUp },
-                    { kEventClassWindow,    kEventWindowUpdate },
-                    { kEventClassWindow,    kEventWindowActivated },
-                    { kEventClassWindow,    kEventWindowDeactivated } 
-                                        };
-                                        
-        // Catch window messages - 
+        EventTypeSpec theEventTypes[] =
+        {
+            { kEventClassMouse,     kEventMouseDown },
+            { kEventClassMouse,     kEventMouseUp },
+            { kEventClassMouse,     kEventMouseDragged },
+            { kEventClassKeyboard,  kEventRawKeyDown },
+            { kEventClassKeyboard,  kEventRawKeyRepeat },
+            { kEventClassKeyboard,  kEventRawKeyUp },
+            { kEventClassWindow,    kEventWindowUpdate },
+            { kEventClassWindow,    kEventWindowActivated },
+            { kEventClassWindow,    kEventWindowDeactivated }
+        };
+
+        // Catch window messages:

         // if we do not do this and if the user clicks the play
         // button on the controller, for instance, nothing will happen...
         // if we do not do this and if the user clicks the play
         // button on the controller, for instance, nothing will happen...

-        InstallWindowEventHandler( wrTLW, 
-                GetwxQTMediaWindowEventHandlerUPP(), 
-                GetEventTypeCount( theEventTypes ), theEventTypes, 
-                m_mc, (&(EventHandlerRef&)m_pEventHandlerRef) );
+        m_eventupp = NewEventHandlerUPP( wxQTMediaWindowEventHandler );
+        InstallWindowEventHandler(
+            wrTLW,
+            m_eventupp,
+            GetEventTypeCount( theEventTypes ), theEventTypes,
+            m_mc, (&(EventHandlerRef&)m_pEventHandlerRef) );

     }
     else
     {
     }
     else
     {

-        // MovieController already created - 
+        // MovieController already created:

         // Just change the movie in it and we're good to go
         Point thePoint;
         thePoint.h = thePoint.v = 0;
         // Just change the movie in it and we're good to go
         Point thePoint;
         thePoint.h = thePoint.v = 0;

-        ::MCSetMovie(m_mc, m_movie,  
+        ::MCSetMovie(m_mc, m_movie,

               (WindowRef)m_ctrl->MacGetTopLevelWindowRef(),
               (WindowRef)m_ctrl->MacGetTopLevelWindowRef(),

-               thePoint);
+              thePoint);

         wxASSERT(::GetMoviesError() == noErr);
     }
 }
         wxASSERT(::GetMoviesError() == noErr);
     }
 }


@@ -713,24 +722,29 @@ void wxQTMediaBackend::DoNewMovieController()
 // Performs operations after a movie ready to play/loaded.
 //---------------------------------------------------------------------------
 void wxQTMediaBackend::FinishLoad()
 // Performs operations after a movie ready to play/loaded.
 //---------------------------------------------------------------------------
 void wxQTMediaBackend::FinishLoad()

-{                    
+{
+    // Dispose of the PrePrerollMovieUPP if we used it
+#if !wxUSE_CREATEMOVIECONTROL
+    DisposeMoviePrePrerollCompleteUPP(m_preprerollupp);
+#endif
+

     // get the real size of the movie
     DoLoadBestSize();
 
     // get the real size of the movie
     DoLoadBestSize();
 

-    // Show the player controls if the user wants to
-    if(m_interfaceflags)
+    // show the player controls if the user wants to
+    if (m_interfaceflags)

         DoSetControllerVisible(m_interfaceflags);
 
         DoSetControllerVisible(m_interfaceflags);
 

-    //we want millisecond precision
+    // we want millisecond precision

     ::SetMovieTimeScale(m_movie, 1000);
     wxASSERT(::GetMoviesError() == noErr);
 
     ::SetMovieTimeScale(m_movie, 1000);
     wxASSERT(::GetMoviesError() == noErr);
 

-    // Start movie progress timer
+    // start movie progress timer

     m_timer = new wxQTMediaPlayTimer(m_movie, (wxQTMediaBackend*) this);
     wxASSERT(m_timer);
     m_timer->Start(MOVIE_DELAY, wxTIMER_CONTINUOUS);
 
     m_timer = new wxQTMediaPlayTimer(m_movie, (wxQTMediaBackend*) this);
     wxASSERT(m_timer);
     m_timer->Start(MOVIE_DELAY, wxTIMER_CONTINUOUS);
 

-    //send loaded event & refresh size
+    // send loaded event and refresh size

     NotifyMovieLoaded();
 }
 
     NotifyMovieLoaded();
 }
 


@@ -741,12 +755,12 @@ void wxQTMediaBackend::FinishLoad()
 //---------------------------------------------------------------------------
 void wxQTMediaBackend::DoLoadBestSize()
 {
 //---------------------------------------------------------------------------
 void wxQTMediaBackend::DoLoadBestSize()
 {

-    //get the real size of the movie
+    // get the real size of the movie

     Rect outRect;
     Rect outRect;

-    ::GetMovieNaturalBoundsRect (m_movie, &outRect);
+    ::GetMovieNaturalBoundsRect(m_movie, &outRect);

     wxASSERT(::GetMoviesError() == noErr);
 
     wxASSERT(::GetMoviesError() == noErr);
 

-    //determine best size
+    // determine best size

     m_bestSize.x = outRect.right - outRect.left;
     m_bestSize.y = outRect.bottom - outRect.top;
 }
     m_bestSize.x = outRect.right - outRect.left;
     m_bestSize.y = outRect.bottom - outRect.top;
 }


@@ -755,21 +769,27 @@ void wxQTMediaBackend::DoLoadBestSize()
 // wxQTMediaBackend::Play
 //
 // Start the QT movie
 // wxQTMediaBackend::Play
 //
 // Start the QT movie

+// (Apple recommends mcActionPrerollAndPlay but that's QT 4.1+)

 //---------------------------------------------------------------------------
 bool wxQTMediaBackend::Play()
 {
     Fixed fixRate = (Fixed) (wxQTMediaBackend::GetPlaybackRate() * 0x10000);
 //---------------------------------------------------------------------------
 bool wxQTMediaBackend::Play()
 {
     Fixed fixRate = (Fixed) (wxQTMediaBackend::GetPlaybackRate() * 0x10000);

-    if(!fixRate)
+    if (!fixRate)

         fixRate = ::GetMoviePreferredRate(m_movie);
         fixRate = ::GetMoviePreferredRate(m_movie);

-    
+

     wxASSERT(fixRate != 0);
 
     wxASSERT(fixRate != 0);
 

-    if(!m_bPlaying)
-        ::MCDoAction(   m_mc, 8, // mcActionPlay 
-           (void *) fixRate);
+    if (!m_bPlaying)
+        ::MCDoAction( m_mc, 8 /* mcActionPlay */, (void*) fixRate);

 
 

-    m_bPlaying = true;
-    return ::GetMoviesError() == noErr;
+    bool result = (::GetMoviesError() == noErr);
+    if (result)
+    {
+        m_bPlaying = true;
+        QueuePlayEvent();
+    }
+
+    return result;

 }
 
 //---------------------------------------------------------------------------
 }
 
 //---------------------------------------------------------------------------


@@ -777,17 +797,27 @@ bool wxQTMediaBackend::Play()
 //
 // Stop the movie
 //---------------------------------------------------------------------------
 //
 // Stop the movie
 //---------------------------------------------------------------------------

-bool wxQTMediaBackend::Pause()
+bool wxQTMediaBackend::DoPause()

 {
 {

-    //Stop the movie A.K.A. ::StopMovie(m_movie);
-    if(m_bPlaying)
+    // Stop the movie A.K.A. ::StopMovie(m_movie);
+    if (m_bPlaying)

     {
     {

-        ::MCDoAction(   m_mc, 8 /*mcActionPlay*/, 
-                        (void *) 0);
+        ::MCDoAction( m_mc, 8 /*mcActionPlay*/,  (void *) 0);

         m_bPlaying = false;
         m_bPlaying = false;

-    return ::GetMoviesError() == noErr;
+        return ::GetMoviesError() == noErr;

     }
     }

-    return true; //already paused
+
+    // already paused
+    return true;
+}
+
+bool wxQTMediaBackend::Pause()
+{
+    bool bSuccess = DoPause();
+    if (bSuccess)
+        this->QueuePauseEvent();
+
+    return bSuccess;

 }
 
 //---------------------------------------------------------------------------
 }
 
 //---------------------------------------------------------------------------


@@ -796,15 +826,24 @@ bool wxQTMediaBackend::Pause()
 // 1) Stop the movie
 // 2) Seek to the beginning of the movie
 //---------------------------------------------------------------------------
 // 1) Stop the movie
 // 2) Seek to the beginning of the movie
 //---------------------------------------------------------------------------

-bool wxQTMediaBackend::Stop()
+bool wxQTMediaBackend::DoStop()

 {
 {

-    if(!wxQTMediaBackend::Pause())
+    if (!wxQTMediaBackend::DoPause())

         return false;
 
     ::GoToBeginningOfMovie(m_movie);
     return ::GetMoviesError() == noErr;
 }
 
         return false;
 
     ::GoToBeginningOfMovie(m_movie);
     return ::GetMoviesError() == noErr;
 }
 

+bool wxQTMediaBackend::Stop()
+{
+    bool bSuccess = DoStop();
+    if (bSuccess)
+        QueueStopEvent();
+
+    return bSuccess;
+}
+

 //---------------------------------------------------------------------------
 // wxQTMediaBackend::GetPlaybackRate
 //
 //---------------------------------------------------------------------------
 // wxQTMediaBackend::GetPlaybackRate
 //


@@ -876,10 +915,10 @@ double wxQTMediaBackend::GetVolume()
 {
     short sVolume = ::GetMovieVolume(m_movie);
 
 {
     short sVolume = ::GetMovieVolume(m_movie);
 

-    if(sVolume & (128 << 8)) //negative - no sound
+    if (sVolume & (128 << 8)) //negative - no sound

         return 0.0;
 
         return 0.0;
 

-    return sVolume/256.0;
+    return sVolume / 256.0;

 }
 
 //---------------------------------------------------------------------------
 }
 
 //---------------------------------------------------------------------------


@@ -902,8 +941,8 @@ bool wxQTMediaBackend::SetVolume(double dVolume)
     ::SetMovieVolume(m_movie, (short) (dVolume * 256));
     return true;
 }
     ::SetMovieVolume(m_movie, (short) (dVolume * 256));
     return true;
 }

- 
- //---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------

 // wxQTMediaBackend::GetDuration
 //
 // Calls GetMovieDuration
 // wxQTMediaBackend::GetDuration
 //
 // Calls GetMovieDuration


@@ -922,9 +961,9 @@ wxLongLong wxQTMediaBackend::GetDuration()
 wxMediaState wxQTMediaBackend::GetState()
 {
     // Could use
 wxMediaState wxQTMediaBackend::GetState()
 {
     // Could use

-    // GetMovieActive/IsMovieDone/SetMovieActive 
+    // GetMovieActive/IsMovieDone/SetMovieActive

     // combo if implemented that way
     // combo if implemented that way

-    if (m_bPlaying == true)
+    if (m_bPlaying)

         return wxMEDIASTATE_PLAYING;
     else if ( !m_movie || wxQTMediaBackend::GetPosition() == 0)
         return wxMEDIASTATE_STOPPED;
         return wxMEDIASTATE_PLAYING;
     else if ( !m_movie || wxQTMediaBackend::GetPosition() == 0)
         return wxMEDIASTATE_STOPPED;


@@ -941,23 +980,21 @@ wxMediaState wxQTMediaBackend::GetState()
 void wxQTMediaBackend::Cleanup()
 {
     m_bPlaying = false;
 void wxQTMediaBackend::Cleanup()
 {
     m_bPlaying = false;

-    if(m_timer)
+    if (m_timer)

     {
     {

-    delete m_timer;
-    m_timer = NULL;
+        delete m_timer;
+        m_timer = NULL;

     }
 
     }
 

-    // Stop the movie
+    // Stop the movie:

     // Apple samples with CreateMovieControl typically
     // install a event handler and do this on the dispose
     // event, but we do it here for simplicity
     // (It might keep playing for several seconds after
     // Apple samples with CreateMovieControl typically
     // install a event handler and do this on the dispose
     // event, but we do it here for simplicity
     // (It might keep playing for several seconds after

-    //  control destruction if not)
+    // control destruction if not)

     wxQTMediaBackend::Pause();
     wxQTMediaBackend::Pause();

-    
-    //
+

     // Dispose of control or remove movie from MovieController
     // Dispose of control or remove movie from MovieController

-    //

 #if wxUSE_CREATEMOVIECONTROL
     if (m_ctrl->m_peer && m_ctrl->m_peer->Ok() )
         m_ctrl->m_peer->Dispose();
 #if wxUSE_CREATEMOVIECONTROL
     if (m_ctrl->m_peer && m_ctrl->m_peer->Ok() )
         m_ctrl->m_peer->Dispose();


@@ -969,6 +1006,7 @@ void wxQTMediaBackend::Cleanup()
 #endif
 
     ::DisposeMovie(m_movie);
 #endif
 
     ::DisposeMovie(m_movie);

+    m_movie = NULL;

 }
 
 //---------------------------------------------------------------------------
 }
 
 //---------------------------------------------------------------------------


@@ -976,26 +1014,30 @@ void wxQTMediaBackend::Cleanup()
 //
 // Callback for when the movie controller recieves a message
 //---------------------------------------------------------------------------
 //
 // Callback for when the movie controller recieves a message
 //---------------------------------------------------------------------------

-Boolean wxQTMediaBackend::MCFilterProc(
-                               MovieController WXUNUSED(theController),
-                               short action,
-                               void * WXUNUSED(params),
-                               long refCon)
+pascal Boolean wxQTMediaBackend::MCFilterProc(
+    MovieController WXUNUSED(theController),
+    short action,
+    void * WXUNUSED(params),
+    long refCon)

 {
 {

-    if(action != 1) //don't process idle events
-    {
-        wxQTMediaBackend* pThis = (wxQTMediaBackend*)refCon;
+    wxQTMediaBackend* pThis = (wxQTMediaBackend*)refCon;

 
 

-        switch(action)
-        {
-        case 8: //play button triggered - MC will set movie to opposite state
-                //of current - playing ? paused : playing
-            pThis->m_bPlaying = !(pThis->m_bPlaying);
-            break;
-        default:
-            break;
-        }
+    switch (action)
+    {
+    case 1:
+        // don't process idle events
+        break;
+
+    case 8:
+        // play button triggered - MC will set movie to opposite state
+        // of current - playing ? paused : playing
+        pThis->m_bPlaying = !(pThis->m_bPlaying);
+        break;
+
+    default:
+        break;

     }
     }

+

     return 0;
 }
 
     return 0;
 }
 


@@ -1012,25 +1054,46 @@ wxSize wxQTMediaBackend::GetVideoSize() const
 //---------------------------------------------------------------------------
 // wxQTMediaBackend::Move
 //
 //---------------------------------------------------------------------------
 // wxQTMediaBackend::Move
 //

-// We need to do this even when using native qt control because
-// CreateMovieControl is broken in this regard...
+// Move the movie controller or movie control
+// (we need to actually move the movie control manually...)
+// Top 10 things to do with quicktime in March 93's issue
+// of DEVELOP - very useful
+// http:// www.mactech.com/articles/develop/issue_13/031-033_QuickTime_column.html
+// OLD NOTE: Calling MCSetControllerBoundsRect without detaching
+//          supposively resulted in a crash back then. Current code even
+//          with CFM classic runs fine. If there is ever a problem,
+//          take out the if 0 lines below

 //---------------------------------------------------------------------------
 void wxQTMediaBackend::Move(int x, int y, int w, int h)
 {
 #if !wxUSE_CREATEMOVIECONTROL
 //---------------------------------------------------------------------------
 void wxQTMediaBackend::Move(int x, int y, int w, int h)
 {
 #if !wxUSE_CREATEMOVIECONTROL

-    if(m_timer)
+    if (m_timer)

     {
     {

-            m_ctrl->GetParent()->MacWindowToRootWindow(&x, &y);
-        Rect theRect = {y, x, y+h, x+w};
+        m_ctrl->GetParent()->MacWindowToRootWindow(&x, &y);
+        Rect theRect = {y, x, y + h, x + w};
+
+#if 0
+        // see note above
+        ::MCSetControllerAttached(m_mc, false);
+         wxASSERT(::GetMoviesError() == noErr);
+#endif

 
         ::MCSetControllerBoundsRect(m_mc, &theRect);
         wxASSERT(::GetMoviesError() == noErr);
 
         ::MCSetControllerBoundsRect(m_mc, &theRect);
         wxASSERT(::GetMoviesError() == noErr);

+
+#if 0 // see note above
+        if (m_interfaceflags)
+        {
+            ::MCSetVisible(m_mc, true);
+            wxASSERT(::GetMoviesError() == noErr);
+        }
+#endif

     }
 #else
     }
 #else

-    if(m_timer && m_ctrl)
-    {
-        m_ctrl->GetParent()->MacWindowToRootWindow(&x, &y);

 
 

+    if (m_timer && m_ctrl)
+    {
+        m_ctrl->GetParent()->MacWindowToRootWindow( &x, &y );

         ::MoveControl( (ControlRef) m_ctrl->GetHandle(), x, y );
         m_ctrl->GetParent()->Refresh();
         m_ctrl->GetParent()->Update();
         ::MoveControl( (ControlRef) m_ctrl->GetHandle(), x, y );
         m_ctrl->GetParent()->Refresh();
         m_ctrl->GetParent()->Update();


@@ -1045,35 +1108,32 @@ void wxQTMediaBackend::Move(int x, int y, int w, int h)
 // and showing/hiding the particular controls on it
 //---------------------------------------------------------------------------
 void wxQTMediaBackend::DoSetControllerVisible(wxMediaCtrlPlayerControls flags)
 // and showing/hiding the particular controls on it
 //---------------------------------------------------------------------------
 void wxQTMediaBackend::DoSetControllerVisible(wxMediaCtrlPlayerControls flags)

-{    
-    ::MCSetVisible(m_mc, TRUE);
-    
-    //
+{
+    ::MCSetVisible(m_mc, true);
+

     // Take care of subcontrols
     // Take care of subcontrols

-    //
-    if(::GetMoviesError() == noErr)
+    if (::GetMoviesError() == noErr)

     {
         long mcFlags = 0;
         ::MCDoAction(m_mc, 39/*mcActionGetFlags*/, (void*)&mcFlags);
     {
         long mcFlags = 0;
         ::MCDoAction(m_mc, 39/*mcActionGetFlags*/, (void*)&mcFlags);

-        
-        if(::GetMoviesError() == noErr)
-        {            
+
+        if (::GetMoviesError() == noErr)
+        {

              mcFlags |= (  //(1<<0)/*mcFlagSuppressMovieFrame*/ |
              mcFlags |= (  //(1<<0)/*mcFlagSuppressMovieFrame*/ |

-                     (1<<3)/*mcFlagsUseWindowPalette*/
+                     (1 << 3)/*mcFlagsUseWindowPalette*/

                        | ((flags & wxMEDIACTRLPLAYERCONTROLS_STEP)
                        | ((flags & wxMEDIACTRLPLAYERCONTROLS_STEP)

-                          ? 0 : (1<<1)/*mcFlagSuppressStepButtons*/)
+                          ? 0 : (1 << 1)/*mcFlagSuppressStepButtons*/)

                        | ((flags & wxMEDIACTRLPLAYERCONTROLS_VOLUME)
                        | ((flags & wxMEDIACTRLPLAYERCONTROLS_VOLUME)

-                          ? 0 : (1<<2)/*mcFlagSuppressSpeakerButton*/)
-         //              | (1<<4) /*mcFlagDontInvalidate*/ //if we take care of repainting ourselves
+                          ? 0 : (1 << 2)/*mcFlagSuppressSpeakerButton*/)
+         //              | (1 << 4) /*mcFlagDontInvalidate*/ //if we take care of repainting ourselves

                           );
                           );

-            ::MCDoAction(m_mc, 38/*mcActionSetFlags*/, (void*)mcFlags);   
+
+            ::MCDoAction(m_mc, 38/*mcActionSetFlags*/, (void*)mcFlags);

         }
         }

-    }    
-    
-    //
-    //Adjust height and width of best size for movie controller
-    //if the user wants it shown
-    //
+    }
+
+    // Adjust height and width of best size for movie controller
+    // if the user wants it shown

     m_bestSize.x = m_bestSize.x > wxMCWIDTH ? m_bestSize.x : wxMCWIDTH;
     m_bestSize.y += wxMCHEIGHT;
 }
     m_bestSize.x = m_bestSize.x > wxMCWIDTH ? m_bestSize.x : wxMCWIDTH;
     m_bestSize.y += wxMCHEIGHT;
 }


@@ -1085,36 +1145,85 @@ void wxQTMediaBackend::DoSetControllerVisible(wxMediaCtrlPlayerControls flags)
 //---------------------------------------------------------------------------
 bool wxQTMediaBackend::ShowPlayerControls(wxMediaCtrlPlayerControls flags)
 {
 //---------------------------------------------------------------------------
 bool wxQTMediaBackend::ShowPlayerControls(wxMediaCtrlPlayerControls flags)
 {

-    if(!m_mc)
-        return false; //no movie controller...
-        
+    if (!m_mc)
+        return false; // no movie controller...
+

     bool bSizeChanged = false;
     bool bSizeChanged = false;

-    
-    //if the controller is visible and we want to hide it do so
-    if(m_interfaceflags && !flags)
+
+    // if the controller is visible and we want to hide it do so
+    if (m_interfaceflags && !flags)

     {
         bSizeChanged = true;
         DoLoadBestSize();
     {
         bSizeChanged = true;
         DoLoadBestSize();

-        ::MCSetVisible(m_mc, FALSE);
+        ::MCSetVisible(m_mc, false);

     }
     }

-    else if(!m_interfaceflags && flags) //show controller if hidden
+    else if (!m_interfaceflags && flags) // show controller if hidden

     {
         bSizeChanged = true;
         DoSetControllerVisible(flags);
     }
     {
         bSizeChanged = true;
         DoSetControllerVisible(flags);
     }

-    
-    //readjust parent sizers
-    if(bSizeChanged)
+
+    // readjust parent sizers
+    if (bSizeChanged)

     {
     {

-        NotifyMovieSizeChanged();   
-        
-        //remember state in case of loading new media
+        NotifyMovieSizeChanged();
+
+        // remember state in case of loading new media

         m_interfaceflags = flags;
         m_interfaceflags = flags;

-    }        
-    
+    }
+

     return ::GetMoviesError() == noErr;
 }
 
     return ::GetMoviesError() == noErr;
 }
 

+//---------------------------------------------------------------------------
+// wxQTMediaBackend::GetDataSizeFromStart
+//
+// Calls either GetMovieDataSize or GetMovieDataSize64 with a value
+// of 0 for the starting value
+//---------------------------------------------------------------------------
+wxLongLong wxQTMediaBackend::GetDataSizeFromStart(TimeValue end)
+{
+#if 0 // old pre-qt4 way
+    return ::GetMovieDataSize(m_movie, 0, end)
+#else // qt4 way
+    wide llDataSize;
+    ::GetMovieDataSize64(m_movie, 0, end, &llDataSize);
+    return wxLongLong(llDataSize.hi, llDataSize.lo);
+#endif
+}
+
+//---------------------------------------------------------------------------
+// wxQTMediaBackend::GetDownloadProgress
+//---------------------------------------------------------------------------
+wxLongLong wxQTMediaBackend::GetDownloadProgress()
+{
+#if 0 // hackish and slow
+    Handle hMovie = NewHandle(0);
+    PutMovieIntoHandle(m_movie, hMovie);
+    long lSize = GetHandleSize(hMovie);
+    DisposeHandle(hMovie);
+
+    return lSize;
+#else
+    TimeValue tv;
+    if (::GetMaxLoadedTimeInMovie(m_movie, &tv) != noErr)
+    {
+        wxLogDebug(wxT("GetMaxLoadedTimeInMovie failed"));
+        return 0;
+    }
+
+    return wxQTMediaBackend::GetDataSizeFromStart(tv);
+#endif
+}
+
+//---------------------------------------------------------------------------
+// wxQTMediaBackend::GetDownloadTotal
+//---------------------------------------------------------------------------
+wxLongLong wxQTMediaBackend::GetDownloadTotal()
+{
+    return wxQTMediaBackend::GetDataSizeFromStart( ::GetMovieDuration(m_movie) );
+}
+

 //---------------------------------------------------------------------------
 // wxQTMediaBackend::OnEraseBackground
 //
 //---------------------------------------------------------------------------
 // wxQTMediaBackend::OnEraseBackground
 //


@@ -1124,10 +1233,9 @@ bool wxQTMediaBackend::ShowPlayerControls(wxMediaCtrlPlayerControls flags)
 #if !wxUSE_CREATEMOVIECONTROL
 void wxQTMediaEvtHandler::OnEraseBackground(wxEraseEvent& evt)
 {
 #if !wxUSE_CREATEMOVIECONTROL
 void wxQTMediaEvtHandler::OnEraseBackground(wxEraseEvent& evt)
 {

-    // Work around Nasty OSX drawing bug -
+    // Work around Nasty OSX drawing bug:

     // http://lists.apple.com/archives/QuickTime-API/2002/Feb/msg00311.html
     // http://lists.apple.com/archives/QuickTime-API/2002/Feb/msg00311.html

-    WindowRef wrTLW = 
-        (WindowRef) m_qtb->m_ctrl->MacGetTopLevelWindowRef();
+    WindowRef wrTLW = (WindowRef) m_qtb->m_ctrl->MacGetTopLevelWindowRef();

 
     RgnHandle region = MCGetControllerBoundsRgn(m_qtb->m_mc);
     MCInvalidate(m_qtb->m_mc, wrTLW, region);
 
     RgnHandle region = MCGetControllerBoundsRgn(m_qtb->m_mc);
     MCInvalidate(m_qtb->m_mc, wrTLW, region);


@@ -1139,27 +1247,47 @@ void wxQTMediaEvtHandler::OnEraseBackground(wxEraseEvent& evt)
 // wxQTMediaWindowEventHandler
 //
 // Event callback for the top level window of our control that passes
 // wxQTMediaWindowEventHandler
 //
 // Event callback for the top level window of our control that passes

-// messages to our moviecontroller so it can recieve mouse clicks etc.
+// messages to our moviecontroller so it can receive mouse clicks etc.

 //---------------------------------------------------------------------------
 #if !wxUSE_CREATEMOVIECONTROL
 //---------------------------------------------------------------------------
 #if !wxUSE_CREATEMOVIECONTROL

-OSStatus wxQTMediaWindowEventHandler(EventHandlerCallRef inHandlerCallRef, 
-                                        EventRef inEvent, void *inUserData)
+static pascal OSStatus wxQTMediaWindowEventHandler(
+    EventHandlerCallRef inHandlerCallRef,
+    EventRef inEvent,
+    void *inUserData)

 {
 {

+    // for the overly paranoid....
+#if 0
+    UInt32 eventClass = GetEventClass( eventRef );
+    UInt32 eventKind = GetEventKind( inEvent );
+
+    if (eventKind != kEventMouseDown &&
+       eventKind != kEventMouseUp &&
+       eventKind != kEventMouseDragged &&
+       eventKind != kEventRawKeyDown &&
+       eventKind != kEventRawKeyRepeat &&
+       eventKind != kEventRawKeyUp &&
+       eventKind != kEventWindowUpdate &&
+       eventKind != kEventWindowActivated &&
+       eventKind != kEventWindowDeactivated)
+            return eventNotHandledErr;
+#endif
+

     EventRecord theEvent;
     ConvertEventRefToEventRecord( inEvent, &theEvent );
     OSStatus err;
     EventRecord theEvent;
     ConvertEventRefToEventRecord( inEvent, &theEvent );
     OSStatus err;

+

     err = ::MCIsPlayerEvent( (MovieController) inUserData, &theEvent );
     err = ::MCIsPlayerEvent( (MovieController) inUserData, &theEvent );

-    
+

     // pass on to other event handlers if not handled- i.e. wx
     // pass on to other event handlers if not handled- i.e. wx

-    if(err)
+    if (err != noErr)

         return noErr;
     else
         return eventNotHandledErr;
 }
 #endif
 
         return noErr;
     else
         return eventNotHandledErr;
 }
 #endif
 

-//in source file that contains stuff you don't directly use
+// in source file that contains stuff you don't directly use

 #include "wx/html/forcelnk.h"
 #include "wx/html/forcelnk.h"

-FORCE_LINK_ME(basewxmediabackends);
+FORCE_LINK_ME(basewxmediabackends)

 
 

-#endif //wxUSE_MEDIACTRL
+#endif // wxUSE_MEDIACTRL