make cocoa mediactrl usable. Some touchups to carbon mediactrl code. Add notebook...

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

diff --git a/include/wx/mediactrl.h b/include/wx/mediactrl.h
index 0e27f8b541f979a8c4e52cc40783e84541e41be9..71c804b6b1db89790f1abfabb3113e56fe27334f 100644 (file)
--- a/include/wx/mediactrl.h
+++ b/include/wx/mediactrl.h
@@ -191,7 +191,7 @@ protected:
     wxSize DoGetBestSize() const;
 
 #ifdef __WXMAC__
     wxSize DoGetBestSize() const;
 
 #ifdef __WXMAC__

-    friend class wxMediaBackend;
+    friend class wxQTMediaBackend;

 #endif
 #ifdef __WXCOCOA__
     friend class wxQTMediaBackend;
 #endif
 #ifdef __WXCOCOA__
     friend class wxQTMediaBackend;


@@ -262,11 +262,6 @@ public:
     virtual wxMediaState GetState()
     {   return wxMEDIASTATE_STOPPED;    }
 
     virtual wxMediaState GetState()
     {   return wxMEDIASTATE_STOPPED;    }
 

-#ifdef __WXMAC__
-    wxMacControl* GetControlPeer(wxControl* ctrl) 
-    {  return ((wxMediaCtrl*)ctrl)->m_peer;    }
-#endif
-

     DECLARE_CLASS(wxMediaBackend)
 };
 
     DECLARE_CLASS(wxMediaBackend)
 };
 

diff --git a/samples/mediaplayer/mediaplayer.cpp b/samples/mediaplayer/mediaplayer.cpp
index 09489fb7ca454cabc2123839f4068a9b54c12793..b3d3cb273e350f64d4fdeced8993faa08c27f6f4 100644 (file)
--- a/samples/mediaplayer/mediaplayer.cpp
+++ b/samples/mediaplayer/mediaplayer.cpp
@@ -51,6 +51,7 @@
 #include "wx/sizer.h"       //for positioning controls/wxBoxSizer
 #include "wx/timer.h"       //timer for updating status bar
 #include "wx/textdlg.h"     //for getting user text from OpenURL
 #include "wx/sizer.h"       //for positioning controls/wxBoxSizer
 #include "wx/timer.h"       //timer for updating status bar
 #include "wx/textdlg.h"     //for getting user text from OpenURL

+#include "wx/notebook.h"    //for wxNotebook and putting movies in pages

 
 // ----------------------------------------------------------------------------
 // Bail out if the user doesn't want one of the
 
 // ----------------------------------------------------------------------------
 // Bail out if the user doesn't want one of the


@@ -61,10 +62,15 @@
 #error "This is a GUI sample"
 #endif
 
 #error "This is a GUI sample"
 #endif
 

-#if !wxUSE_MEDIACTRL || !wxUSE_MENUS || !wxUSE_SLIDER || !wxUSE_TIMER
-#error "menus, slider, mediactrl, and timers must all enabled for this sample!"
+#if !wxUSE_MEDIACTRL || !wxUSE_MENUS || !wxUSE_SLIDER || !wxUSE_TIMER || !wxUSE_NOTEBOOK
+#error "menus, slider, mediactrl, notebook, and timers must all be enabled for this sample!"

 #endif
 
 #endif
 

+#define MEDIASTUFF \
+        if (!m_notebook || !m_notebook->GetCurrentPage()) return; \
+        wxMediaCtrl* m_mediactrl = ((MyNotebookPage*)m_notebook->GetCurrentPage())->m_mediactrl; \
+        wxSlider* m_slider = ((MyNotebookPage*)m_notebook->GetCurrentPage())->m_slider; 
+

 // ============================================================================
 // Declarations
 // ============================================================================
 // ============================================================================
 // Declarations
 // ============================================================================


@@ -81,6 +87,7 @@ enum
     wxID_OPENFILE,
     wxID_PLAY,
     wxID_PAUSE,
     wxID_OPENFILE,
     wxID_PLAY,
     wxID_PAUSE,

+//    wxID_CLOSE,  [built-in to wxWidgets]

 //    wxID_STOP,   [built-in to wxWidgets]
 //    wxID_ABOUT,  [built-in to wxWidgets]
 //    wxID_EXIT,   [built-in to wxWidgets]
 //    wxID_STOP,   [built-in to wxWidgets]
 //    wxID_ABOUT,  [built-in to wxWidgets]
 //    wxID_EXIT,   [built-in to wxWidgets]


@@ -88,6 +95,7 @@ enum
     // id for our slider
     wxID_SLIDER,
 
     // id for our slider
     wxID_SLIDER,
 

+    wxID_NOTEBOOK,

     // id for our wxMediaCtrl
     wxID_MEDIACTRL
 };
     // id for our wxMediaCtrl
     wxID_MEDIACTRL
 };


@@ -124,27 +132,40 @@ public:
     void OnPlay(wxCommandEvent& event);
     void OnPause(wxCommandEvent& event);
     void OnStop(wxCommandEvent& event);
     void OnPlay(wxCommandEvent& event);
     void OnPause(wxCommandEvent& event);
     void OnStop(wxCommandEvent& event);

+    void OnClose(wxCommandEvent& event);

 
     // Slider event handlers
     void OnSeek(wxCommandEvent& event);
 
     // Media event handlers
     void OnMediaStop(wxMediaEvent& event);
 
     // Slider event handlers
     void OnSeek(wxCommandEvent& event);
 
     // Media event handlers
     void OnMediaStop(wxMediaEvent& event);

+    
+    void OnPageChange(wxNotebookEvent& event);
+    void OnClosePage(wxCommandEvent& event);

 
 private:
     // Rebuild base status string (see Implementation)
     void ResetStatus();
 
 
 private:
     // Rebuild base status string (see Implementation)
     void ResetStatus();
 

-    wxMediaCtrl* m_mediactrl;   //Our media control
-    wxSlider* m_slider;         //The slider below our media control

     class MyTimer* m_timer;     //Timer to write info to status bar
     wxString m_basestatus;      //Base status string (see ResetStatus())
     class MyTimer* m_timer;     //Timer to write info to status bar
     wxString m_basestatus;      //Base status string (see ResetStatus())

-    int m_nLoops;                //Counter, incremented each time media loops
+    wxNotebook* m_notebook;

 
     // So that mytimer can access MyFrame's members
     friend class MyTimer;
 };
 
 
     // So that mytimer can access MyFrame's members
     friend class MyTimer;
 };
 

+class MyNotebookPage : public wxPanel
+{
+    MyNotebookPage(wxNotebook* boook);
+    
+    
+public:
+    friend class MyFrame;
+    wxMediaCtrl* m_mediactrl;   //Our media control
+    wxSlider* m_slider;         //The slider below our media control
+};
+

 // ----------------------------------------------------------------------------
 // MyTimer
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // MyTimer
 // ----------------------------------------------------------------------------


@@ -264,6 +285,8 @@ MyFrame::MyFrame(const wxString& title)
     menuFile->Append(wxID_PAUSE, _T("P&ause"), _T("Pause playback"));
     menuFile->Append(wxID_STOP, _T("&Stop"), _T("Stop playback"));
     menuFile->AppendSeparator();
     menuFile->Append(wxID_PAUSE, _T("P&ause"), _T("Pause playback"));
     menuFile->Append(wxID_STOP, _T("&Stop"), _T("Stop playback"));
     menuFile->AppendSeparator();

+    menuFile->Append(wxID_CLOSE, _T("&Close"), _T("Close current notebook page"));
+    menuFile->AppendSeparator();

     menuFile->AppendCheckItem(wxID_LOOP,
                               _T("&Loop"),
                               _T("Loop Selected Media"));
     menuFile->AppendCheckItem(wxID_LOOP,
                               _T("&Loop"),
                               _T("Loop Selected Media"));


@@ -278,41 +301,7 @@ MyFrame::MyFrame(const wxString& title)
 
     SetMenuBar(menuBar);
 
 
     SetMenuBar(menuBar);
 

-    //
-    //  Create and attach the first/main sizer
-    //
-    wxBoxSizer* vertsizer = new wxBoxSizer(wxVERTICAL);
-    this->SetSizer(vertsizer);
-    this->SetAutoLayout(true);
-
-    //
-    //  Create our media control
-    //
-    m_mediactrl = new wxMediaCtrl(this, wxID_MEDIACTRL);
-    vertsizer->Add(m_mediactrl, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
-
-    //
-    //  Create our slider
-    //
-    m_slider = new wxSlider(this, wxID_SLIDER, 0, //init
-                            0, //start
-                            0, //end
-                            wxDefaultPosition, wxDefaultSize,
-                            wxSL_HORIZONTAL );
-    vertsizer->Add(m_slider, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND , 5);
-
-
-    //
-    //  Create the second sizer which will position things
-    //  vertically -
-    //
-    //  -------Menu----------
-    //  [m_mediactrl]
-    //
-    //  [m_slider]
-    //
-    wxBoxSizer* horzsizer = new wxBoxSizer(wxHORIZONTAL);
-    vertsizer->Add(horzsizer, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
+    m_notebook = new wxNotebook(this, wxID_NOTEBOOK);

 
     //
     //  Create our status bar
 
     //
     //  Create our status bar


@@ -418,6 +407,9 @@ MyFrame::MyFrame(const wxString& title)
                   (wxObjectEventFunction) (wxEventFunction)
                   (wxCommandEventFunction) &MyFrame::OnStop);
 
                   (wxObjectEventFunction) (wxEventFunction)
                   (wxCommandEventFunction) &MyFrame::OnStop);
 

+    this->Connect(wxID_CLOSE, wxEVT_COMMAND_MENU_SELECTED,
+                  (wxObjectEventFunction) (wxEventFunction)
+                  (wxCommandEventFunction) &MyFrame::OnClosePage);

 
     //
     // Slider events
 
     //
     // Slider events


@@ -433,15 +425,14 @@ MyFrame::MyFrame(const wxString& title)
                   (wxObjectEventFunction) (wxEventFunction)
                   (wxMediaEventFunction) &MyFrame::OnMediaStop);
 
                   (wxObjectEventFunction) (wxEventFunction)
                   (wxMediaEventFunction) &MyFrame::OnMediaStop);
 

+    this->Connect(wxID_NOTEBOOK, wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED,
+                  (wxObjectEventFunction) (wxEventFunction)
+                  (wxNotebookEventFunction) &MyFrame::OnPageChange);
+    

     //
     // End of Events
     //
 
     //
     // End of Events
     //
 

-    //
-    //  Set our loop counter to 0
-    //
-    m_nLoops = 0;
-

     //
     //  Create a timer to update our status bar
     //
     //
     //  Create a timer to update our status bar
     //


@@ -479,6 +470,9 @@ MyFrame::~MyFrame()
 // ----------------------------------------------------------------------------
 void MyFrame::ResetStatus()
 {
 // ----------------------------------------------------------------------------
 void MyFrame::ResetStatus()
 {

+
+    MEDIASTUFF
+

     m_basestatus = wxString::Format(_T("Size(x,y):%i,%i ")
                                     _T("Length(Seconds):%u Speed:%1.1fx"),
     m_mediactrl->GetBestSize().x,
     m_basestatus = wxString::Format(_T("Size(x,y):%i,%i ")
                                     _T("Length(Seconds):%u Speed:%1.1fx"),
     m_mediactrl->GetBestSize().x,


@@ -489,7 +483,6 @@ void MyFrame::ResetStatus()
 
     m_slider->SetRange(0, (int)(m_mediactrl->Length() / 1000));
 
 
     m_slider->SetRange(0, (int)(m_mediactrl->Length() / 1000));
 

-    m_nLoops = 0;

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


@@ -527,6 +520,7 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 // ----------------------------------------------------------------------------
 void MyFrame::OnLoop(wxCommandEvent& WXUNUSED(event))
 {
 // ----------------------------------------------------------------------------
 void MyFrame::OnLoop(wxCommandEvent& WXUNUSED(event))
 {

+    MEDIASTUFF

     m_mediactrl->Loop( !m_mediactrl->IsLooped() );
 }
 
     m_mediactrl->Loop( !m_mediactrl->IsLooped() );
 }
 


@@ -542,6 +536,10 @@ void MyFrame::OnOpenFile(wxCommandEvent& WXUNUSED(event))
 
     if(fd.ShowModal() == wxID_OK)
     {
 
     if(fd.ShowModal() == wxID_OK)
     {

+        m_notebook->AddPage(new MyNotebookPage(m_notebook), fd.GetPath(), true);
+        
+        MEDIASTUFF
+        

         if( !m_mediactrl->Load(fd.GetPath()) )
             wxMessageBox(wxT("Couldn't load file!"));
 
         if( !m_mediactrl->Load(fd.GetPath()) )
             wxMessageBox(wxT("Couldn't load file!"));
 


@@ -560,6 +558,7 @@ void MyFrame::OnOpenFile(wxCommandEvent& WXUNUSED(event))
 // ----------------------------------------------------------------------------
 void MyFrame::OnPlay(wxCommandEvent& WXUNUSED(event))
 {
 // ----------------------------------------------------------------------------
 void MyFrame::OnPlay(wxCommandEvent& WXUNUSED(event))
 {

+    MEDIASTUFF

     if( !m_mediactrl->Play() )
         wxMessageBox(wxT("Couldn't play movie!"));
 }
     if( !m_mediactrl->Play() )
         wxMessageBox(wxT("Couldn't play movie!"));
 }


@@ -572,6 +571,7 @@ void MyFrame::OnPlay(wxCommandEvent& WXUNUSED(event))
 // ----------------------------------------------------------------------------
 void MyFrame::OnPause(wxCommandEvent& WXUNUSED(event))
 {
 // ----------------------------------------------------------------------------
 void MyFrame::OnPause(wxCommandEvent& WXUNUSED(event))
 {

+    MEDIASTUFF

     if( !m_mediactrl->Pause() )
         wxMessageBox(wxT("Couldn't pause movie!"));
 }
     if( !m_mediactrl->Pause() )
         wxMessageBox(wxT("Couldn't pause movie!"));
 }


@@ -587,6 +587,7 @@ void MyFrame::OnPause(wxCommandEvent& WXUNUSED(event))
 // ----------------------------------------------------------------------------
 void MyFrame::OnStop(wxCommandEvent& WXUNUSED(event))
 {
 // ----------------------------------------------------------------------------
 void MyFrame::OnStop(wxCommandEvent& WXUNUSED(event))
 {

+    MEDIASTUFF

     if( !m_mediactrl->Stop() )
         wxMessageBox(wxT("Couldn't stop movie!"));
 }
     if( !m_mediactrl->Stop() )
         wxMessageBox(wxT("Couldn't stop movie!"));
 }


@@ -600,6 +601,7 @@ void MyFrame::OnStop(wxCommandEvent& WXUNUSED(event))
 // ----------------------------------------------------------------------------
 void MyFrame::OnSeek(wxCommandEvent& WXUNUSED(event))
 {
 // ----------------------------------------------------------------------------
 void MyFrame::OnSeek(wxCommandEvent& WXUNUSED(event))
 {

+    MEDIASTUFF

     if( m_mediactrl->Seek( m_slider->GetValue() * 1000 ) == wxInvalidOffset )
         wxMessageBox(wxT("Couldn't seek in movie!"));
 }
     if( m_mediactrl->Seek( m_slider->GetValue() * 1000 ) == wxInvalidOffset )
         wxMessageBox(wxT("Couldn't seek in movie!"));
 }


@@ -608,11 +610,24 @@ void MyFrame::OnSeek(wxCommandEvent& WXUNUSED(event))
 // MyFrame::OnMediaStop
 //
 // Called when the media is about to stop playing.
 // MyFrame::OnMediaStop
 //
 // Called when the media is about to stop playing.

-// Here we just increase our loop counter

 // ----------------------------------------------------------------------------
 void MyFrame::OnMediaStop(wxMediaEvent& WXUNUSED(event))
 {
 // ----------------------------------------------------------------------------
 void MyFrame::OnMediaStop(wxMediaEvent& WXUNUSED(event))
 {

-    ++m_nLoops;
+}
+
+void MyFrame::OnPageChange(wxNotebookEvent& WXUNUSED(event))
+{
+    ResetStatus();
+}
+
+void MyFrame::OnClosePage(wxCommandEvent& WXUNUSED(event))
+{
+        int sel = m_notebook->GetSelection();
+
+        if (sel != wxNOT_FOUND)
+        {
+            m_notebook->DeletePage(sel);
+        }    

 }
 
 // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 }
 
 // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++


@@ -631,21 +646,72 @@ void MyFrame::OnMediaStop(wxMediaEvent& WXUNUSED(event))
 // ----------------------------------------------------------------------------
 void MyTimer::Notify()
 {
 // ----------------------------------------------------------------------------
 void MyTimer::Notify()
 {

-    long lPosition = (long)( m_frame->m_mediactrl->Tell() / 1000 );
-    m_frame->m_slider->SetValue(lPosition);
+
+    if (!m_frame->m_notebook || !m_frame->m_notebook->GetCurrentPage()) return;
+        wxMediaCtrl* m_mediactrl = ((MyNotebookPage*)m_frame->m_notebook->GetCurrentPage())->m_mediactrl; 
+        wxSlider* m_slider = ((MyNotebookPage*)m_frame->m_notebook->GetCurrentPage())->m_slider; 
+        if (!m_mediactrl) return;
+
+    long lPosition = (long)( m_mediactrl->Tell() / 1000 );
+    m_slider->SetValue(lPosition);

 
 #if wxUSE_STATUSBAR
     m_frame->SetStatusText(wxString::Format(
 
 #if wxUSE_STATUSBAR
     m_frame->SetStatusText(wxString::Format(

-                     _T("%s Pos:%u State:%s Loops:%i"),
+                     _T("%s Pos:%u State:%s"),

                      m_frame->m_basestatus.c_str(),
                      (unsigned int)lPosition,
                      m_frame->m_basestatus.c_str(),
                      (unsigned int)lPosition,

-                     wxGetMediaStateText(m_frame->m_mediactrl->GetState()),
-                     m_frame->m_nLoops
+                     wxGetMediaStateText(m_mediactrl->GetState())
+                    

                                             )
                            );
 #endif
                                             )
                            );
 #endif

+
+}
+
+
+MyNotebookPage::MyNotebookPage(wxNotebook* theBook) :
+    wxPanel(theBook, wxID_ANY)
+{
+
+    //
+    //  Create and attach the first/main sizer
+    //
+    wxBoxSizer* vertsizer = new wxBoxSizer(wxVERTICAL);
+    this->SetSizer(vertsizer);
+    this->SetAutoLayout(true);
+
+    //
+    //  Create our media control
+    //
+    m_mediactrl = new wxMediaCtrl(this, wxID_MEDIACTRL);
+    vertsizer->Add(m_mediactrl, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
+
+    //
+    //  Create our slider
+    //
+    m_slider = new wxSlider(this, wxID_SLIDER, 0, //init
+                            0, //start
+                            0, //end
+                            wxDefaultPosition, wxDefaultSize,
+                            wxSL_HORIZONTAL );
+    vertsizer->Add(m_slider, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND , 5);
+
+
+    //
+    //  Create the second sizer which will position things
+    //  vertically -
+    //
+    //  -------Menu----------
+    //  [m_mediactrl]
+    //
+    //  [m_slider]
+    //
+    wxBoxSizer* horzsizer = new wxBoxSizer(wxHORIZONTAL);
+    vertsizer->Add(horzsizer, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
+

 }
 
 }
 

+

 //
 // End of MediaPlayer sample
 //
 //
 // End of MediaPlayer sample
 //

diff --git a/src/cocoa/mediactrl.mm b/src/cocoa/mediactrl.mm
index 0d09279525842935e94e84de9072023aeca4600f..f350636a95810fec4b5ba18300a77052759dc47d 100644 (file)
--- a/src/cocoa/mediactrl.mm
+++ b/src/cocoa/mediactrl.mm
@@ -51,7 +51,6 @@
 //---------------------------------------------------------------------------
 //  QT Includes
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
 //  QT Includes
 //---------------------------------------------------------------------------

-#include "wx/timer.h"

 #include <QuickTime/QuickTime.h>
 
 #include "wx/cocoa/autorelease.h"
 #include <QuickTime/QuickTime.h>
 
 #include "wx/cocoa/autorelease.h"


@@ -103,7 +102,6 @@ public:
     NSMovieView* m_movieview;       //NSMovieView instance
     wxControl* m_ctrl;              //Parent control
     bool m_bVideo;                  //Whether or not we have video
     NSMovieView* m_movieview;       //NSMovieView instance
     wxControl* m_ctrl;              //Parent control
     bool m_bVideo;                  //Whether or not we have video

-    class _wxQTTimer* m_timer;      //Timer for streaming the movie

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


@@ -117,74 +115,12 @@ public:
 
 IMPLEMENT_DYNAMIC_CLASS(wxQTMediaBackend, wxMediaBackend);
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxQTMediaBackend, wxMediaBackend);
 

-//Time between timer calls
-#define MOVIE_DELAY 100
-
-// --------------------------------------------------------------------------
-//          wxQTTimer - Handle Asyncronous Playing
-// --------------------------------------------------------------------------
-class _wxQTTimer : public wxTimer
-{
-public:
-    _wxQTTimer(Movie movie, wxQTMediaBackend* parent) :
-        m_movie(movie), m_bPaused(false), m_parent(parent)
-    {
-    }
-
-    ~_wxQTTimer()
-    {
-    }
-
-    bool GetPaused() {return m_bPaused;}
-    void SetPaused(bool bPaused) {m_bPaused = bPaused;}
-
-    //-----------------------------------------------------------------------
-    // _wxQTTimer::Notify
-    //
-    // 1) Checks to see if the movie is done, and if not continues
-    //    streaming the movie
-    // 2) Sends the wxEVT_MEDIA_STOP event if we have reached the end of
-    //    the movie.
-    //-----------------------------------------------------------------------
-    void Notify()
-    {
-        if (!m_bPaused)
-        {
-            if(!IsMovieDone(m_movie))
-                MoviesTask(m_movie, MOVIE_DELAY); 
-            else
-            {
-                wxMediaEvent theEvent(wxEVT_MEDIA_STOP, 
-                                      m_parent->m_ctrl->GetId());
-                m_parent->m_ctrl->ProcessEvent(theEvent);
-
-                if(theEvent.IsAllowed())
-                {
-                    Stop();
-                    m_parent->Stop();
-                    wxASSERT(::GetMoviesError() == noErr);
-
-                    //send the event to our child
-                    wxMediaEvent theEvent(wxEVT_MEDIA_FINISHED, 
-                                          m_parent->m_ctrl->GetId());
-                    m_parent->m_ctrl->ProcessEvent(theEvent);
-                }
-            }
-        }
-    }
-
-protected:
-    Movie m_movie;                  //Our movie instance
-    bool m_bPaused;                 //Whether we are paused or not
-    wxQTMediaBackend* m_parent;     //Backend pointer
-};
-

 //---------------------------------------------------------------------------
 // wxQTMediaBackend Constructor
 //
 // Sets m_timer to NULL signifying we havn't loaded anything yet
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
 // wxQTMediaBackend Constructor
 //
 // Sets m_timer to NULL signifying we havn't loaded anything yet
 //---------------------------------------------------------------------------

-wxQTMediaBackend::wxQTMediaBackend() : m_timer(NULL)
+wxQTMediaBackend::wxQTMediaBackend()

 {
 }
 
 {
 }
 


@@ -199,11 +135,10 @@ wxQTMediaBackend::wxQTMediaBackend() : m_timer(NULL)
 //---------------------------------------------------------------------------
 wxQTMediaBackend::~wxQTMediaBackend()
 {
 //---------------------------------------------------------------------------
 wxQTMediaBackend::~wxQTMediaBackend()
 {

-    if(m_timer)
-        Cleanup();
+    Cleanup();

 
     //Note that ExitMovies() is not neccessary...
 
     //Note that ExitMovies() is not neccessary...

-    ExitMovies();
+    ::ExitMovies();

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


@@ -225,11 +160,11 @@ bool wxQTMediaBackend::CreateControl(wxControl* inctrl, wxWindow* parent,
     wxMediaCtrl* ctrl = (wxMediaCtrl*) inctrl;
 
     //Create the control base
     wxMediaCtrl* ctrl = (wxMediaCtrl*) inctrl;
 
     //Create the control base

-    wxASSERT(ctrl->CreateBase(parent,wid,pos,size,style, validator, size));
+    wxASSERT(ctrl->CreateBase(parent,wid,pos,size,style, validator, name));

     
     //Create the NSMovieView
     ctrl->SetNSView(NULL);
     
     //Create the NSMovieView
     ctrl->SetNSView(NULL);

-    NSView* theView = [[NSMovieView alloc] initWithFrame: ctrl->MakeDefaultNSRect(size)];
+    NSMovieView* theView = [[NSMovieView alloc] initWithFrame: ctrl->MakeDefaultNSRect(size)];

     ctrl->SetNSView(theView);
     [theView release];
 
     ctrl->SetNSView(theView);
     [theView release];
 


@@ -240,6 +175,7 @@ bool wxQTMediaBackend::CreateControl(wxControl* inctrl, wxWindow* parent,
         ctrl->SetInitialFrameRect(pos,size);
     }
     
         ctrl->SetInitialFrameRect(pos,size);
     }
     

+    [theView showController:false adjustingSize:true];

     m_movieview = theView;
     m_ctrl = ctrl;
     return true;
     m_movieview = theView;
     m_ctrl = ctrl;
     return true;


@@ -267,8 +203,7 @@ bool wxQTMediaBackend::Load(const wxString& fileName)
 //---------------------------------------------------------------------------
 bool wxQTMediaBackend::Load(const wxURI& location)
 {
 //---------------------------------------------------------------------------
 bool wxQTMediaBackend::Load(const wxURI& location)
 {

-    if(m_timer)
-        Cleanup();
+    Cleanup();

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


@@ -277,16 +212,6 @@ bool wxQTMediaBackend::Load(const wxURI& location)
 
     m_movie = (Movie) [[m_movieview movie] QTMovie];
 
 
     m_movie = (Movie) [[m_movieview movie] QTMovie];
 

-    //preroll movie for streaming
-    //TODO:Async this using threads?
-    TimeValue timeNow;
-    Fixed playRate;
-    timeNow = GetMovieTime(m_movie, NULL);
-    playRate = GetMoviePreferredRate(m_movie);
-    PrePrerollMovie(m_movie, timeNow, playRate, NULL, NULL);
-    PrerollMovie(m_movie, timeNow, playRate);
-    SetMovieRate(m_movie, playRate);
-

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


@@ -294,20 +219,9 @@ bool wxQTMediaBackend::Load(const wxURI& location)
 
 //---------------------------------------------------------------------------
 // wxQTMediaBackend::FinishLoad
 
 //---------------------------------------------------------------------------
 // wxQTMediaBackend::FinishLoad

-//
-// 1) Create the movie timer
-// 2) Get real size of movie for GetBestSize/sizers
-// 3) See if there is video in the movie, and if so then either
-//    SetMovieGWorld if < 10.2 or use Native CreateMovieControl
-// 4) Set the movie time scale to something usable so that seeking
-//    etc.  will work correctly
-// 5) Refresh parent window

 //---------------------------------------------------------------------------
 void wxQTMediaBackend::FinishLoad()
 {
 //---------------------------------------------------------------------------
 void wxQTMediaBackend::FinishLoad()
 {

-    m_timer = new _wxQTTimer(m_movie, (wxQTMediaBackend*) this);
-    wxASSERT(m_timer);
-

     //get the real size of the movie
     Rect outRect;
     ::GetMovieNaturalBoundsRect (m_movie, &outRect);
     //get the real size of the movie
     Rect outRect;
     ::GetMovieNaturalBoundsRect (m_movie, &outRect);


@@ -339,9 +253,7 @@ void wxQTMediaBackend::FinishLoad()
 //---------------------------------------------------------------------------
 bool wxQTMediaBackend::Play()
 {
 //---------------------------------------------------------------------------
 bool wxQTMediaBackend::Play()
 {

-    ::StartMovie(m_movie);
-    m_timer->SetPaused(false);
-    m_timer->Start(MOVIE_DELAY, wxTIMER_CONTINUOUS);
+    [m_movieview start:NULL];

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


@@ -353,9 +265,7 @@ bool wxQTMediaBackend::Play()
 //---------------------------------------------------------------------------
 bool wxQTMediaBackend::Pause()
 {
 //---------------------------------------------------------------------------
 bool wxQTMediaBackend::Pause()
 {

-    ::StopMovie(m_movie);
-    m_timer->SetPaused(true);
-    m_timer->Stop();
+    [m_movieview stop:NULL];

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


@@ -368,14 +278,8 @@ bool wxQTMediaBackend::Pause()
 //---------------------------------------------------------------------------
 bool wxQTMediaBackend::Stop()
 {
 //---------------------------------------------------------------------------
 bool wxQTMediaBackend::Stop()
 {

-    m_timer->SetPaused(false);
-    m_timer->Stop();
-
-    ::StopMovie(m_movie);
-    if(::GetMoviesError() != noErr)
-        return false;
-    
-    ::GoToBeginningOfMovie(m_movie);
+    [m_movieview stop:NULL];
+    [m_movieview gotoBeginning:NULL];

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


@@ -449,12 +353,11 @@ wxLongLong wxQTMediaBackend::GetDuration()
 //---------------------------------------------------------------------------
 wxMediaState wxQTMediaBackend::GetState()
 {
 //---------------------------------------------------------------------------
 wxMediaState wxQTMediaBackend::GetState()
 {

-    if ( !m_timer || (m_timer->IsRunning() == false && 
-                      m_timer->GetPaused() == false) )
-        return wxMEDIASTATE_STOPPED;
-
-    if( m_timer->IsRunning() == true )
+    if ( [m_movieview isPlaying] )

         return wxMEDIASTATE_PLAYING;
         return wxMEDIASTATE_PLAYING;

+
+    if( wxQTMediaBackend::GetPosition() == 0 )
+        return wxMEDIASTATE_STOPPED;

     else
         return wxMEDIASTATE_PAUSED;
 }
     else
         return wxMEDIASTATE_PAUSED;
 }


@@ -467,11 +370,11 @@ wxMediaState wxQTMediaBackend::GetState()
 //---------------------------------------------------------------------------
 void wxQTMediaBackend::Cleanup()
 {
 //---------------------------------------------------------------------------
 void wxQTMediaBackend::Cleanup()
 {

-    delete m_timer;
-    m_timer = NULL;
-
-    [[m_movieview movie] release];
-    [m_movieview setMovie:NULL];
+    if([m_movieview movie])
+    {
+        [[m_movieview movie] release];
+        [m_movieview setMovie:NULL];
+    }

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

diff --git a/src/mac/carbon/mediactrl.cpp b/src/mac/carbon/mediactrl.cpp
index 716590fefd06638aa14939a110706d05a35b1299..f54f814547932d6445e5b73129a98568b32feec5 100644 (file)
--- a/src/mac/carbon/mediactrl.cpp
+++ b/src/mac/carbon/mediactrl.cpp
@@ -257,17 +257,21 @@ bool wxQTMediaBackend::CreateControl(wxControl* ctrl, wxWindow* parent,
     if ( !
     
 #if wxUSE_CREATEMOVIECONTROL    
     if ( !
     
 #if wxUSE_CREATEMOVIECONTROL    

-    ctrl->wxControl::Create(parent, id, pos, size,
-                            m_ctrl->MacRemoveBordersFromStyle(style),
-                            validator, name)
-#else

     ctrl->wxWindow::Create(parent, id, pos, size,
                             m_ctrl->MacRemoveBordersFromStyle(style),
                             name)
     ctrl->wxWindow::Create(parent, id, pos, size,
                             m_ctrl->MacRemoveBordersFromStyle(style),
                             name)

+#else
+    ctrl->wxControl::Create(parent, id, pos, size,
+                            m_ctrl->MacRemoveBordersFromStyle(style),
+                            validator, name)

 #endif                            
         )
         return false;
 
 #endif                            
         )
         return false;
 

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

     m_ctrl = ctrl;
     return true;
 }
     m_ctrl = ctrl;
     return true;
 }


@@ -401,6 +405,8 @@ void wxQTMediaBackend::FinishLoad()
     //Native CreateMovieControl QT control (Thanks to Kevin Olliver's
     //wxQTMovie for some of this).
     //
     //Native CreateMovieControl QT control (Thanks to Kevin Olliver's
     //wxQTMovie for some of this).
     //

+    #define GetControlPeer(whatever) ctrl->m_peer
+    wxMediaCtrl* ctrl = (wxMediaCtrl*) m_ctrl;

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


@@ -419,7 +425,7 @@ void wxQTMediaBackend::FinishLoad()
     //ManuallyIdled - app handles movie idling rather than internal timer event loop
         ::CreateMovieControl( 
                     (WindowRef)
     //ManuallyIdled - app handles movie idling rather than internal timer event loop
         ::CreateMovieControl( 
                     (WindowRef)

-                       m_ctrl->MacGetTopLevelWindowRef(),      //parent
+                       ctrl->MacGetTopLevelWindowRef(),        //parent

                        &bounds,                                                        //control bounds
                        m_movie,                                                                //movie handle
                        kMovieControlOptionHideController 
                        &bounds,                                                        //control bounds
                        m_movie,                                                                //movie handle
                        kMovieControlOptionHideController 


@@ -427,10 +433,9 @@ void wxQTMediaBackend::FinishLoad()
                        | kMovieControlOptionSetKeysEnabled 
 //                       | kMovieControlOptionManuallyIdled
                        ,                                                                       //flags
                        | kMovieControlOptionSetKeysEnabled 
 //                       | kMovieControlOptionManuallyIdled
                        ,                                                                       //flags

-                       GetControlPeer(m_ctrl)->GetControlRefAddr() );
+                       ctrl->m_peer->GetControlRefAddr() );

                        
                        

-        ::EmbedControl(GetControlPeer(m_ctrl)->GetControlRef(), 
-                       (ControlRef) m_ctrl->GetParent()->GetHandle());
+        ::EmbedControl(ctrl->m_peer->GetControlRef(), (ControlRef)ctrl->GetParent()->GetHandle());

 #else
     //
     //"Emulation"
 #else
     //
     //"Emulation"


@@ -600,7 +605,7 @@ void wxQTMediaBackend::Cleanup()
     m_timer = NULL;
     
 #if wxUSE_CREATEMOVIECONTROL    
     m_timer = NULL;
     
 #if wxUSE_CREATEMOVIECONTROL    

-    DisposeControl(GetControlPeer(m_ctrl)->GetControlRef());
+    DisposeControl(((wxMediaCtrl*)m_ctrl)->m_peer->GetControlRef());

 #endif
 
     StopMovie(m_movie);
 #endif
 
     StopMovie(m_movie);