updates from Adrián González Alba

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

diff --git a/src/mac/carbon/mediactrl.cpp b/src/mac/carbon/mediactrl.cpp
index e77383dd494218a62ff36ab920728612678847d6..e5cb61a1bc9a01c3dd36bc42b29805fd4c4e1ea8 100644 (file)
--- a/src/mac/carbon/mediactrl.cpp
+++ b/src/mac/carbon/mediactrl.cpp
@@ -1,62 +1,64 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        mac/carbon/mediactrl.cpp
+// Name:        src/mac/carbon/mediactrl.cpp

 // Purpose:     Built-in Media Backends for Mac
 // Author:      Ryan Norton <wxprojects@comcast.net>
 // Modified by:
 // Created:     11/07/04
 // RCS-ID:      $Id$
 // Purpose:     Built-in Media Backends for Mac
 // Author:      Ryan Norton <wxprojects@comcast.net>
 // Modified by:
 // Created:     11/07/04
 // RCS-ID:      $Id$

-// Copyright:   (c) 2004-2005 Ryan Norton
+// Copyright:   (c) 2004-2006 Ryan Norton

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

-// There are several known bugs with CreateMovieControl
-// on systems > 10.2 - see main.c of QTCarbonShell sample for details
+// OK, a casual overseer of this file may wonder why we don't use
+// either CreateMovieControl or HIMovieView...

 //
 //

-// Also, with either version it will overdraw anything below its TLW - so
-// its relatively useless on a notebook page (this happens in Opera too).
+// CreateMovieControl
+//      1) Need to dispose and create each time a new movie is loaded
+//      2) Not that many real advantages
+//      3) Progressively buggier in higher OSX versions
+//              (see main.c of QTCarbonShell sample for details)
+// HIMovieView
+//      1) Crashes on destruction in ALL cases on quite a few systems!
+//          (With the only real "alternative" is to simply not
+//           dispose of it and let it leak...)
+//      2) Massive refreshing bugs with its movie controller between
+//          movies

 //
 //

-// Even though though the CreateMovieControl version is the default
-// for OSX, the MovieController version is heavily tested and works
-// just as well...
+// At one point we had a complete implementation for CreateMovieControl
+// and on my (RN) local copy I had one for HIMovieView - but they
+// were simply deemed to be too buggy/unuseful. HIMovieView could
+// have been useful as well because it uses OpenGL contexts instead
+// of GWorlds. Perhaps someday when someone comes out with some
+// ingenious workarounds :).

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

-//===========================================================================
-//  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"
 

-//---------------------------------------------------------------------------
-// Includes
-//---------------------------------------------------------------------------
+#if wxUSE_MEDIACTRL
+

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

-//---------------------------------------------------------------------------
-// Compilation guard
-//---------------------------------------------------------------------------
-#if wxUSE_MEDIACTRL
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/timer.h"
+#endif

 
 

-//---------------------------------------------------------------------------
-// Whether or not to use OSX 10.2's CreateMovieControl for native QuickTime
-// control - i.e. native positioning and event handling etc..
-//---------------------------------------------------------------------------
-#ifndef wxUSE_CREATEMOVIECONTROL
-#    if defined( __WXMAC_OSX__ ) && \
-      ( MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_2 )
-#        define wxUSE_CREATEMOVIECONTROL 1
-#    else
-#        define wxUSE_CREATEMOVIECONTROL 0
-#    endif
+// uma is for wxMacFSSpec
+#include "wx/mac/uma.h"
+
+// standard QT stuff
+#ifndef __DARWIN__
+#include <Movies.h>
+#include <Gestalt.h>
+#include <QuickTimeComponents.h>
+#else
+#include <QuickTime/QuickTimeComponents.h>

 #endif
 
 //---------------------------------------------------------------------------
 #endif
 
 //---------------------------------------------------------------------------

-// Height and Width of movie controller in the movie control
+// Height and Width of movie controller in the movie control (apple samples)

 //---------------------------------------------------------------------------
 #define wxMCWIDTH   320
 #define wxMCHEIGHT  16
 //---------------------------------------------------------------------------
 #define wxMCWIDTH   320
 #define wxMCHEIGHT  16


@@ -66,24 +68,8 @@
 //===========================================================================
 
 //---------------------------------------------------------------------------
 //===========================================================================
 
 //---------------------------------------------------------------------------

-//

 //  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
 {


@@ -99,13 +85,13 @@ public:
                                      const wxValidator& validator,
                                      const wxString& name);
 
                                      const wxValidator& validator,
                                      const wxString& name);
 

+    virtual bool Load(const wxString& fileName);
+    virtual bool Load(const wxURI& location);
+

     virtual bool Play();
     virtual bool Pause();
     virtual bool Stop();
 
     virtual bool Play();
     virtual bool Pause();
     virtual bool Stop();
 

-    virtual bool Load(const wxString& fileName);
-    virtual bool Load(const wxURI& location);
-

     virtual wxMediaState GetState();
 
     virtual bool SetPosition(wxLongLong where);
     virtual wxMediaState GetState();
 
     virtual bool SetPosition(wxLongLong where);


@@ -125,10 +111,12 @@ public:
     void FinishLoad();
 
     virtual bool ShowPlayerControls(wxMediaCtrlPlayerControls flags);
     void FinishLoad();
 
     virtual bool ShowPlayerControls(wxMediaCtrlPlayerControls flags);

-        
+

     virtual wxLongLong GetDownloadProgress();
     virtual wxLongLong GetDownloadTotal();
 
     virtual wxLongLong GetDownloadProgress();
     virtual wxLongLong GetDownloadTotal();
 

+    virtual void MacVisibilityChanged();
+

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


@@ -140,41 +128,41 @@ public:
 
     wxLongLong GetDataSizeFromStart(TimeValue end);
 
 
     wxLongLong GetDataSizeFromStart(TimeValue end);
 

+    Boolean IsQuickTime4Installed();
+    void DoNewMovieController();
+
+    static pascal void PPRMProc(
+        Movie theMovie, OSErr theErr, void* theRefCon);
+

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

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

         short action, void *params, long refCon);
 
         short action, void *params, long refCon);
 

-#if wxUSE_CREATEMOVIECONTROL
-    void DoCreateMovieControl();    
-#else
-    Boolean IsQuickTime4Installed();
-    void DoNewMovieController();
-    static pascal void PPRMProc (Movie theMovie,
-                                 OSErr theErr, void* theRefCon);
-#endif
+    static pascal OSStatus WindowEventHandler(
+        EventHandlerCallRef inHandlerCallRef,
+        EventRef inEvent, void *inUserData  );

 
     wxSize m_bestSize;          // Original movie size
 
     wxSize m_bestSize;          // Original movie size

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

     Movie m_movie;              // Movie instance
     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
+
+    // Event handlers and UPPs/Callbacks
+    EventHandlerRef             m_windowEventHandler;
+    EventHandlerUPP             m_windowUPP;
+

     MoviePrePrerollCompleteUPP  m_preprerollupp;
     MoviePrePrerollCompleteUPP  m_preprerollupp;

-    EventHandlerUPP             m_eventupp;

     MCActionFilterWithRefConUPP m_mcactionupp;
 
     MCActionFilterWithRefConUPP m_mcactionupp;
 

+    GWorldPtr m_movieWorld;  //Offscreen movie GWorld
+

     friend class wxQTMediaEvtHandler;
     friend class wxQTMediaEvtHandler;

-#endif    
+

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

-#if !wxUSE_CREATEMOVIECONTROL

 // helper to hijack background erasing for the QT window
 class WXDLLIMPEXP_MEDIA wxQTMediaEvtHandler : public wxEvtHandler
 {
 // helper to hijack background erasing for the QT window
 class WXDLLIMPEXP_MEDIA wxQTMediaEvtHandler : public wxEvtHandler
 {


@@ -183,7 +171,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);
     }


@@ -196,13 +185,6 @@ private:
     DECLARE_NO_COPY_CLASS(wxQTMediaEvtHandler)
 };
 
     DECLARE_NO_COPY_CLASS(wxQTMediaEvtHandler)
 };
 

-// Window event handler
-static pascal OSStatus wxQTMediaWindowEventHandler(
-                                    EventHandlerCallRef inHandlerCallRef, 
-                                    EventRef inEvent, void *inUserData);
-
-#endif
-

 //===========================================================================
 //  IMPLEMENTATION
 //===========================================================================
 //===========================================================================
 //  IMPLEMENTATION
 //===========================================================================


@@ -232,29 +214,25 @@ IMPLEMENT_DYNAMIC_CLASS(wxQTMediaBackend, wxMediaBackend)
 class wxQTMediaLoadTimer : public wxTimer
 {
 public:
 class wxQTMediaLoadTimer : public wxTimer
 {
 public:

-    wxQTMediaLoadTimer(Movie movie, wxQTMediaBackend* parent) :
-      m_movie(movie), m_parent(parent) {}
+    wxQTMediaLoadTimer(wxQTMediaBackend* parent) :
+      m_parent(parent) {}

 
     void Notify()
     {
 
     void Notify()
     {

-        //Note that the CreateMovieControl variety performs
-        //its own custom idleing
-#if !wxUSE_CREATEMOVIECONTROL

         ::MCIdle(m_parent->m_mc);
         ::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_parent->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
+    wxQTMediaBackend *m_parent;     // Backend pointer

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


@@ -268,13 +246,11 @@ protected:
 class wxQTMediaPlayTimer : public wxTimer
 {
 public:
 class wxQTMediaPlayTimer : public wxTimer
 {
 public:

-    wxQTMediaPlayTimer(Movie movie, wxQTMediaBackend* parent) :
-        m_movie(movie), m_parent(parent) {}
+    wxQTMediaPlayTimer(wxQTMediaBackend* parent) :
+        m_parent(parent) {}

 
     void Notify()
 
     void Notify()

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

         //
         //  OK, a little explaining - basically originally
         //  we only called MoviesTask if the movie was actually
         //
         //  OK, a little explaining - basically originally
         //  we only called MoviesTask if the movie was actually


@@ -288,14 +264,13 @@ public:
         //  correctly.
         //
         ::MCIdle(m_parent->m_mc);
         //  correctly.
         //
         ::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_parent->m_movie))
+        {

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


@@ -307,8 +282,7 @@ public:
     }
 
 protected:
     }
 
 protected:

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

 };
 
 
 };
 
 


@@ -317,12 +291,10 @@ 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
+      , m_preprerollupp(NULL), m_movieWorld(NULL)

 {
 }
 
 {
 }
 


@@ -337,25 +309,27 @@ wxQTMediaBackend::wxQTMediaBackend()
 //---------------------------------------------------------------------------
 wxQTMediaBackend::~wxQTMediaBackend()
 {
 //---------------------------------------------------------------------------
 wxQTMediaBackend::~wxQTMediaBackend()
 {

-    if(m_movie)
+    if (m_movie)

         Cleanup();
 
         Cleanup();
 

-#if !wxUSE_CREATEMOVIECONTROL

     // Cleanup for moviecontroller
     // Cleanup for moviecontroller

-    if(m_mc)
+    if (m_mc)

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

-        RemoveEventHandler((EventHandlerRef&)m_pEventHandlerRef);
-        DisposeEventHandlerUPP(m_eventupp);
+        RemoveEventHandler(m_windowEventHandler);
+        DisposeEventHandlerUPP(m_windowUPP);

 
         // Dispose of the movie controller
         ::DisposeMovieController(m_mc);
 
         // Dispose of the movie controller
         ::DisposeMovieController(m_mc);

+        m_mc = NULL;

         DisposeMCActionFilterWithRefConUPP(m_mcactionupp);
         DisposeMCActionFilterWithRefConUPP(m_mcactionupp);

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

     }
     }

-#endif

 
 

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

     ExitMovies();
 }
 
     ExitMovies();
 }
 


@@ -365,22 +339,23 @@ 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
-#if !wxUSE_CREATEMOVIECONTROL

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

-#endif

 
     EnterMovies();
 
 
     EnterMovies();
 

+    wxMediaCtrl* mediactrl = (wxMediaCtrl*)ctrl;
+

     //
     // Create window
     // By default wxWindow(s) is created with a border -
     //
     // Create window
     // By default wxWindow(s) is created with a border -


@@ -389,36 +364,36 @@ bool wxQTMediaBackend::CreateControl(wxControl* ctrl, wxWindow* parent,
     // Since we don't have a child window like most other
     // backends, we don't need wxCLIP_CHILDREN
     //
     // 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 ( !mediactrl->wxControl::Create(
+        parent, id, pos, size,
+        wxWindow::MacRemoveBordersFromStyle(style),
+        validator, name))
+    {

         return false;
         return false;

+    }

 
 #if wxUSE_VALIDATORS
 
 #if wxUSE_VALIDATORS

-    ctrl->SetValidator(validator);
+    mediactrl->SetValidator(validator);

 #endif
 
 #endif
 

-    m_ctrl = (wxMediaCtrl*)ctrl;
+    m_ctrl = mediactrl;

     return true;
 }
 
 //---------------------------------------------------------------------------
 // wxQTMediaBackend::IsQuickTime4Installed
 //
     return true;
 }
 
 //---------------------------------------------------------------------------
 // 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()
 {
 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);
 }
     return (error == noErr) && (((result >> 16) & 0xffff) >= 0x0400);
 }

-#endif

 
 //---------------------------------------------------------------------------
 // wxQTMediaBackend::Load (file version)
 
 //---------------------------------------------------------------------------
 // wxQTMediaBackend::Load (file version)


@@ -431,81 +406,50 @@ Boolean wxQTMediaBackend::IsQuickTime4Installed()
 //---------------------------------------------------------------------------
 bool wxQTMediaBackend::Load(const wxString& fileName)
 {
 //---------------------------------------------------------------------------
 bool wxQTMediaBackend::Load(const wxString& fileName)
 {

-    if(m_movie)
+    if (m_movie)

         Cleanup();
 
         Cleanup();
 

+    ::ClearMoviesStickyError(); // clear previous errors so
+                                // GetMoviesStickyError is useful
+

     OSErr err = noErr;
     short movieResFile;
     FSSpec sfFile;
 
     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?
-    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;
 

-    err = NewMovieFromFile (
-    &m_movie,
-    movieResFile,
-    &movieResID,
-    movieName,
-    newMovieActive,
-    NULL); //wasChanged
-
-    //No ::GetMoviesStickyError() here because it returns -2009 
-    // a.k.a. invalid track on valid mpegs
-    if(err == noErr)
+    err = NewMovieFromFile(
+        &m_movie,
+        movieResFile,
+        &movieResID,
+        movieName,
+        newMovieActive,
+        NULL); // wasChanged
+
+    //
+    // check 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 && ::GetMoviesStickyError() == noErr)

     {
     {

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

 
         // Create movie controller/control
 
         // Create movie controller/control

-#if wxUSE_CREATEMOVIECONTROL
-        DoCreateMovieControl();
-#else

         DoNewMovieController();
         DoNewMovieController();

-#endif
-    FinishLoad();
+
+        FinishLoad();

         return true;
     }
         return true;
     }

-    else
-    {
-        return false;        
-    }
-}

 
 

-//---------------------------------------------------------------------------
-// wxQTMediaBackend::PPRMProc (static)
-//
-// Called when done PrePrerolling the movie.
-// Note that in 99% of the cases this does nothing...
-// Anyway we set up the loading timer here to tell us when the movie is done
-//---------------------------------------------------------------------------
-#if !wxUSE_CREATEMOVIECONTROL
-pascal void wxQTMediaBackend::PPRMProc (Movie theMovie,
-                                 OSErr WXUNUSED_UNLESS_DEBUG(theErr),
-                                 void* theRefCon)
-{
-    wxASSERT( theMovie );
-    wxASSERT( theRefCon );
-    wxASSERT( theErr == noErr );
-
-    wxQTMediaBackend* pBE = (wxQTMediaBackend*) theRefCon;
-
-    long lTime = ::GetMovieTime(theMovie,NULL);
-    Fixed rate = ::GetMoviePreferredRate(theMovie);
-    ::PrerollMovie(theMovie,lTime,rate);
-    pBE->m_timer = new wxQTMediaLoadTimer(pBE->m_movie, pBE);
-    pBE->m_timer->Start(MOVIE_DELAY);
+    return false;

 }
 }

-#endif

 
 //---------------------------------------------------------------------------
 // wxQTMediaBackend::Load (URL Version)
 
 //---------------------------------------------------------------------------
 // wxQTMediaBackend::Load (URL Version)


@@ -520,43 +464,47 @@ pascal void wxQTMediaBackend::PPRMProc (Movie theMovie,
 //---------------------------------------------------------------------------
 bool wxQTMediaBackend::Load(const wxURI& location)
 {
 //---------------------------------------------------------------------------
 bool wxQTMediaBackend::Load(const wxURI& location)
 {

-    if(m_movie)
+    if (m_movie)

         Cleanup();
 
         Cleanup();
 

+    ::ClearMoviesStickyError(); // clear previous errors so
+                                // GetMoviesStickyError is useful
+

     wxString theURI = location.BuildURI();
     wxString theURI = location.BuildURI();

+    OSErr err;

 
 

-    OSErr err = noErr;
+    size_t len;
+    const char* theURIString;
+
+#if wxUSE_UNICODE
+    wxCharBuffer buf = wxConvLocal.cWC2MB(theURI, theURI.length(), &len);
+    theURIString = buf;
+#else
+    theURIString = theURI;
+    len = theURI.length();
+#endif

 
 

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

     wxASSERT(theHandle);
 
     wxASSERT(theHandle);
 

-    ::BlockMove(theURI.mb_str(), *theHandle, theURI.length() + 1);
+    ::BlockMoveData(theURIString, *theHandle, len + 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)
+    if (err == noErr && ::GetMoviesStickyError() == noErr)

     {
     {

-#if wxUSE_CREATEMOVIECONTROL
-        // 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
-        // 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);


@@ -574,86 +522,15 @@ bool wxQTMediaBackend::Load(const wxURI& location)
         //  which we don't by default.
         //
         m_preprerollupp =
         //  which we don't by default.
         //
         m_preprerollupp =

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

 
 

-        ::PrePrerollMovie(m_movie, timeNow, playRate,
-                              m_preprerollupp,
-                              (void*)this);
-#endif

         return true;
     }
         return true;
     }

-    else
-        return false;
-}

 
 

-//---------------------------------------------------------------------------
-// wxQTMediaBackend::DoCreateMovieControl
-//
-// Calls CreateMovieControl and performs setup related to it
-//
-// Note that we always hide the controller initially becuase when loading
-// from a url it displays about a 40x40 box with the word loading... in it,
-// but the box is outside the range of the control, which is bad (0,0
-// i believe), so we need to wait until finishload to actually display
-// the movie controller in this instance
-//---------------------------------------------------------------------------
-#if wxUSE_CREATEMOVIECONTROL
-void wxQTMediaBackend::DoCreateMovieControl()
-{
-        //
-        //Native CreateMovieControl QT control (Thanks to Kevin Olliver's
-    // wxQTMovie for how to do 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();
-
-        //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
-        //
-    long 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
-    ::MCSetActionFilterWithRefCon(m_mc, 
-            (MCActionFilterWithRefConUPP)wxQTMediaBackend::MCFilterProc,
-            (long)this);
+    return false;

 }
 }

-#endif

 
 //---------------------------------------------------------------------------
 // wxQTMediaBackend::DoNewMovieController
 
 //---------------------------------------------------------------------------
 // wxQTMediaBackend::DoNewMovieController


@@ -661,87 +538,85 @@ void wxQTMediaBackend::DoCreateMovieControl()
 // Attaches movie to moviecontroller or creates moviecontroller
 // if not created yet
 //---------------------------------------------------------------------------
 // Attaches movie to moviecontroller or creates moviecontroller
 // if not created yet
 //---------------------------------------------------------------------------

-#if !wxUSE_CREATEMOVIECONTROL

 void wxQTMediaBackend::DoNewMovieController()
 {
 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
         m_mcactionupp =
         wxASSERT(::GetMoviesError() == noErr);
 
         // Setup a callback so we can tell when the user presses
         // play on the player controls
         m_mcactionupp =

-            NewMCActionFilterWithRefConUPP(
-                wxQTMediaBackend::MCFilterProc
-                                          );
-        ::MCSetActionFilterWithRefCon(m_mc, 
-            m_mcactionupp,
-            (long)this);
+            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
-        EventTypeSpec theEventTypes[] = { 
-                    { kEventClassMouse,     kEventMouseDown },
-                    { kEventClassMouse,     kEventMouseUp },
-                    { kEventClassMouse,     kEventMouseDragged },
-                    { kEventClassKeyboard,  kEventRawKeyDown },
-                    { kEventClassKeyboard,  kEventRawKeyRepeat },
-                    { kEventClassKeyboard,  kEventRawKeyUp },
-                    { kEventClassWindow,    kEventWindowUpdate },
-                    { kEventClassWindow,    kEventWindowActivated },
-                    { kEventClassWindow,    kEventWindowDeactivated } 
-                                        };
-                                        
-        // Catch window messages - 
+
+        // Create offscreen GWorld for where to "show" when window is hidden
+        Rect worldRect;
+        worldRect.left = worldRect.top = 0;
+        worldRect.right = worldRect.bottom = 1;
+        ::NewGWorld(&m_movieWorld, 0, &worldRect, NULL, NULL, 0);
+
+        // 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...

-        m_eventupp = NewEventHandlerUPP(
-                                        wxQTMediaWindowEventHandler
-                                                      );
-        InstallWindowEventHandler( wrTLW, 
-                m_eventupp,
-                GetEventTypeCount( theEventTypes ), theEventTypes, 
-                m_mc, (&(EventHandlerRef&)m_pEventHandlerRef) );
+        EventTypeSpec theWindowEventTypes[] =
+        {
+            { kEventClassMouse,     kEventMouseDown },
+            { kEventClassMouse,     kEventMouseUp },
+            { kEventClassMouse,     kEventMouseDragged },
+            { kEventClassKeyboard,  kEventRawKeyDown },
+            { kEventClassKeyboard,  kEventRawKeyRepeat },
+            { kEventClassKeyboard,  kEventRawKeyUp },
+            { kEventClassWindow,    kEventWindowUpdate },
+            { kEventClassWindow,    kEventWindowActivated },
+            { kEventClassWindow,    kEventWindowDeactivated }
+        };
+        m_windowUPP =
+            NewEventHandlerUPP( wxQTMediaBackend::WindowEventHandler );
+        InstallWindowEventHandler(
+            wrTLW,
+            m_windowUPP,
+            GetEventTypeCount( theWindowEventTypes ), theWindowEventTypes,
+            this,
+            &m_windowEventHandler );

     }
     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);
     }
 }

-#endif

 
 //---------------------------------------------------------------------------
 // wxQTMediaBackend::FinishLoad
 
 //---------------------------------------------------------------------------
 // wxQTMediaBackend::FinishLoad


@@ -749,28 +624,27 @@ 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
+{
+    // Dispose of the PrePrerollMovieUPP if we used it

     DisposeMoviePrePrerollCompleteUPP(m_preprerollupp);
     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
-    m_timer = new wxQTMediaPlayTimer(m_movie, (wxQTMediaBackend*) this);
+    // start movie progress timer
+    m_timer = new wxQTMediaPlayTimer(this);

     wxASSERT(m_timer);
     m_timer->Start(MOVIE_DELAY, wxTIMER_CONTINUOUS);
 
     wxASSERT(m_timer);
     m_timer->Start(MOVIE_DELAY, wxTIMER_CONTINUOUS);
 

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

     NotifyMovieLoaded();
 }
 
     NotifyMovieLoaded();
 }
 


@@ -781,12 +655,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;
 }


@@ -800,24 +674,22 @@ void wxQTMediaBackend::DoLoadBestSize()
 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);

 
 

-    if(::GetMoviesError() == noErr)
+    bool result = (::GetMoviesError() == noErr);
+    if (result)

     {
     {

-
-    m_bPlaying = true;
+        m_bPlaying = true;

         QueuePlayEvent();
         QueuePlayEvent();

-        return true;

     }
     }

-    else
-        return false;
+
+    return result;

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


@@ -827,27 +699,25 @@ bool wxQTMediaBackend::Play()
 //---------------------------------------------------------------------------
 bool wxQTMediaBackend::DoPause()
 {
 //---------------------------------------------------------------------------
 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();
 }
 
 bool wxQTMediaBackend::Pause()
 {
     bool bSuccess = DoPause();

-    if(bSuccess)
-    {
+    if (bSuccess)

         this->QueuePauseEvent();
         this->QueuePauseEvent();

-        return true;
-    }
-    else
-        return false;
+
+    return bSuccess;

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


@@ -858,7 +728,7 @@ bool wxQTMediaBackend::Pause()
 //---------------------------------------------------------------------------
 bool wxQTMediaBackend::DoStop()
 {
 //---------------------------------------------------------------------------
 bool wxQTMediaBackend::DoStop()
 {

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

         return false;
 
     ::GoToBeginningOfMovie(m_movie);
         return false;
 
     ::GoToBeginningOfMovie(m_movie);


@@ -868,13 +738,10 @@ bool wxQTMediaBackend::DoStop()
 bool wxQTMediaBackend::Stop()
 {
     bool bSuccess = DoStop();
 bool wxQTMediaBackend::Stop()
 {
     bool bSuccess = DoStop();

-    if(bSuccess)
-    {
+    if (bSuccess)

         QueueStopEvent();
         QueueStopEvent();

-        return true;
-    }
-    else
-        return false;
+
+    return bSuccess;

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


@@ -948,10 +815,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;

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


@@ -974,8 +841,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


@@ -994,11 +861,11 @@ 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;
         return wxMEDIASTATE_PLAYING;

-    else if ( !m_movie || wxQTMediaBackend::GetPosition() == 0)
+    else if (!m_movie || wxQTMediaBackend::GetPosition() == 0)

         return wxMEDIASTATE_STOPPED;
     else
         return wxMEDIASTATE_PAUSED;
         return wxMEDIASTATE_STOPPED;
     else
         return wxMEDIASTATE_PAUSED;


@@ -1013,62 +880,28 @@ 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();
-#else

     Point thePoint;
     thePoint.h = thePoint.v = 0;
     ::MCSetVisible(m_mc, false);
     ::MCSetMovie(m_mc, NULL, NULL, thePoint);
     Point thePoint;
     thePoint.h = thePoint.v = 0;
     ::MCSetVisible(m_mc, false);
     ::MCSetMovie(m_mc, NULL, NULL, thePoint);

-#endif

 
     ::DisposeMovie(m_movie);
 
     ::DisposeMovie(m_movie);

-}
-
-//---------------------------------------------------------------------------
-// wxQTMediaBackend::MCFilterProc (static)
-//
-// Callback for when the movie controller recieves a message
-//---------------------------------------------------------------------------
-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;
-
-        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;
-        }
-    }
-    return 0;
+    m_movie = NULL;

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


@@ -1096,36 +929,27 @@ 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)
 {

-#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
 #if 0 // see note above

-        ::MCSetControllerAttached(m_mc, FALSE);
-            wxASSERT(::GetMoviesError() == noErr);
+        ::MCSetControllerAttached(m_mc, false);
+         wxASSERT(::GetMoviesError() == noErr);

 #endif
 #endif

+

         ::MCSetControllerBoundsRect(m_mc, &theRect);
         wxASSERT(::GetMoviesError() == noErr);
 
 #if 0 // see note above
         ::MCSetControllerBoundsRect(m_mc, &theRect);
         wxASSERT(::GetMoviesError() == noErr);
 
 #if 0 // see note above

-        if(m_interfaceflags)
+        if (m_interfaceflags)

         {
         {

-            ::MCSetVisible(m_mc, TRUE);
-                wxASSERT(::GetMoviesError() == noErr);
-    }
+            ::MCSetVisible(m_mc, true);
+            wxASSERT(::GetMoviesError() == noErr);
+        }

 #endif
     }
 #endif
     }

-#else
-    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();
-    }
-#endif

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


@@ -1134,36 +958,35 @@ void wxQTMediaBackend::Move(int x, int y, int w, int h)
 // Utility function that takes care of showing the moviecontroller
 // and showing/hiding the particular controls on it
 //---------------------------------------------------------------------------
 // Utility function that takes care of showing the moviecontroller
 // and showing/hiding the particular controls on it
 //---------------------------------------------------------------------------

-void wxQTMediaBackend::DoSetControllerVisible(wxMediaCtrlPlayerControls flags)
-{    
-    ::MCSetVisible(m_mc, TRUE);
-    
-    //
+void wxQTMediaBackend::DoSetControllerVisible(
+                        wxMediaCtrlPlayerControls flags)
+{
+    ::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*/)
+                          //if we take care of repainting ourselves
+         //              | (1 << 4) /*mcFlagDontInvalidate*/

                           );
                           );

-            ::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;
 }


@@ -1175,32 +998,33 @@ 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;
 }
 


@@ -1231,14 +1055,16 @@ wxLongLong wxQTMediaBackend::GetDownloadProgress()
     PutMovieIntoHandle(m_movie, hMovie);
     long lSize = GetHandleSize(hMovie);
     DisposeHandle(hMovie);
     PutMovieIntoHandle(m_movie, hMovie);
     long lSize = GetHandleSize(hMovie);
     DisposeHandle(hMovie);

+

     return lSize;
 #else
     TimeValue tv;
     return lSize;
 #else
     TimeValue tv;

-    if(::GetMaxLoadedTimeInMovie(m_movie, &tv) != noErr)
+    if (::GetMaxLoadedTimeInMovie(m_movie, &tv) != noErr)

     {
         wxLogDebug(wxT("GetMaxLoadedTimeInMovie failed"));
         return 0;
     }
     {
         wxLogDebug(wxT("GetMaxLoadedTimeInMovie failed"));
         return 0;
     }

+

     return wxQTMediaBackend::GetDataSizeFromStart(tv);
 #endif
 }
     return wxQTMediaBackend::GetDataSizeFromStart(tv);
 #endif
 }


@@ -1250,9 +1076,51 @@ wxLongLong wxQTMediaBackend::GetDownloadTotal()
 {
     return wxQTMediaBackend::GetDataSizeFromStart(
                     ::GetMovieDuration(m_movie)
 {
     return wxQTMediaBackend::GetDataSizeFromStart(
                     ::GetMovieDuration(m_movie)

-                                                );
+                                                 );

 }
 
 }
 

+//---------------------------------------------------------------------------
+// wxQTMediaBackend::MacVisibilityChanged
+//
+// The main problem here is that Windows quicktime, for example,
+// renders more directly to a HWND. Mac quicktime does not do this
+// and instead renders to the port of the WindowRef/WindowPtr on top
+// of everything else/all other windows.
+//
+// So, for example, if you were to have a CreateTabsControl/wxNotebook
+// and change pages, even if you called HIViewSetVisible/SetControlVisibility
+// directly the movie will still continue playing on top of everything else
+// if you went to a different tab.
+//
+// Note that another issue, and why we call MCSetControllerPort instead
+// of SetMovieGWorld directly, is that in addition to rendering on
+// top of everything else the last created controller steals mouse and
+// other input from everything else in the window, including other
+// controllers. Setting the port of it releases this behaviour.
+//---------------------------------------------------------------------------
+void wxQTMediaBackend::MacVisibilityChanged()
+{
+    if(!m_mc || !m_ctrl->m_bLoaded)
+        return; //not initialized yet
+
+    if(m_ctrl->MacIsReallyShown())
+    {
+        //The window is being shown again, so set the GWorld of the
+        //controller back to the port of the parent WindowRef
+        WindowRef wrTLW =
+            (WindowRef) m_ctrl->MacGetTopLevelWindowRef();
+
+        ::MCSetControllerPort(m_mc, (CGrafPtr) GetWindowPort(wrTLW));
+        wxASSERT(::GetMoviesError() == noErr);
+    }
+    else
+    {
+        //We are being hidden - set the GWorld of the controller
+        //to the offscreen GWorld
+        ::MCSetControllerPort(m_mc, m_movieWorld);
+        wxASSERT(::GetMoviesError() == noErr);
+    }
+}

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


@@ -1260,63 +1128,116 @@ wxLongLong wxQTMediaBackend::GetDownloadTotal()
 // Suggestion from Greg Hazel to repaint the movie when idle
 // (on pause also)
 //---------------------------------------------------------------------------
 // Suggestion from Greg Hazel to repaint the movie when idle
 // (on pause also)
 //---------------------------------------------------------------------------

-#if !wxUSE_CREATEMOVIECONTROL

 void wxQTMediaEvtHandler::OnEraseBackground(wxEraseEvent& evt)
 {
 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);
     ::MCIdle(m_qtb->m_mc);
 }
 
     RgnHandle region = ::MCGetControllerBoundsRgn(m_qtb->m_mc);
     ::MCInvalidate(m_qtb->m_mc, wrTLW, region);
     ::MCIdle(m_qtb->m_mc);
 }

-#endif

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

-// wxQTMediaWindowEventHandler
+// wxQTMediaBackend::PPRMProc (static)
+//
+// Called when done PrePrerolling the movie.
+// Note that in 99% of the cases this does nothing...
+// Anyway we set up the loading timer here to tell us when the movie is done
+//---------------------------------------------------------------------------
+pascal void wxQTMediaBackend::PPRMProc(
+    Movie theMovie,
+    OSErr WXUNUSED_UNLESS_DEBUG(theErr),
+    void* theRefCon)
+{
+    wxASSERT( theMovie );
+    wxASSERT( theRefCon );
+    wxASSERT( theErr == noErr );
+
+    wxQTMediaBackend* pBE = (wxQTMediaBackend*) theRefCon;
+
+    long lTime = ::GetMovieTime(theMovie,NULL);
+    Fixed rate = ::GetMoviePreferredRate(theMovie);
+    ::PrerollMovie(theMovie,lTime,rate);
+    pBE->m_timer = new wxQTMediaLoadTimer(pBE);
+    pBE->m_timer->Start(MOVIE_DELAY);
+}
+
+//---------------------------------------------------------------------------
+// wxQTMediaBackend::MCFilterProc (static)
+//
+// Callback for when the movie controller recieves a message
+//---------------------------------------------------------------------------
+pascal Boolean wxQTMediaBackend::MCFilterProc(
+    MovieController WXUNUSED(theController),
+    short action,
+    void * WXUNUSED(params),
+    long refCon)
+{
+    wxQTMediaBackend* pThis = (wxQTMediaBackend*)refCon;
+
+    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;
+}
+
+//---------------------------------------------------------------------------
+// wxQTMediaBackend::WindowEventHandler [static]

 //
 // Event callback for the top level window of our control that passes
 //
 // 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
-static pascal OSStatus wxQTMediaWindowEventHandler(
-                                    EventHandlerCallRef inHandlerCallRef,
-                                        EventRef inEvent, void *inUserData)
+pascal OSStatus wxQTMediaBackend::WindowEventHandler(
+    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                )
+    wxQTMediaBackend* be = (wxQTMediaBackend*) inUserData;
+
+    // Only process keyboard messages on this window if it actually
+    // has focus, otherwise it will steal keystrokes from other windows!
+    // As well as when it is not loaded properly as it
+    // will crash in MCIsPlayerEvent
+    if((GetEventClass(inEvent) == kEventClassKeyboard &&
+        wxWindow::FindFocus() != be->m_ctrl)
+        || !be->m_ctrl->m_bLoaded)

             return eventNotHandledErr;
             return eventNotHandledErr;

-#endif
+
+    // Pass the event onto the movie controller

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

-    err = ::MCIsPlayerEvent( (MovieController) inUserData, &theEvent );
-    
-    // pass on to other event handlers if not handled- i.e. wx
-    if(err)
+    // TODO: Apple says MCIsPlayerEvent is depreciated and
+    // MCClick, MCKey, MCIdle etc. should be used
+    // (RN: Of course that's what they say about
+    //  CreateMovieControl and HIMovieView as well, LOL!)
+    err = ::MCIsPlayerEvent( be->m_mc, &theEvent );
+
+    // Pass on to other event handlers if not handled- i.e. wx
+    if (err != noErr)

         return noErr;
     else
         return eventNotHandledErr;
 }
         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"
 FORCE_LINK_ME(basewxmediabackends)
 
 #include "wx/html/forcelnk.h"
 FORCE_LINK_ME(basewxmediabackends)
 

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