X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c220a8ec4fcb4e7b620e88c76b0a84be4554b28b..ede3a6d68af66772b4f5f94208b4126bab566cc8:/src/common/mediactrlcmn.cpp

diff --git a/src/common/mediactrlcmn.cpp b/src/common/mediactrlcmn.cpp
index 3d91560123..074777d486 100644
--- a/src/common/mediactrlcmn.cpp
+++ b/src/common/mediactrlcmn.cpp
@@ -70,7 +70,7 @@ DEFINE_EVENT_TYPE(wxEVT_MEDIA_STOP);
 //
 // This searches by searching the global RTTI hashtable, class by class,
 // attempting to call CreateControl on each one found that is a derivative
-// of wxMediaBackend - if it succeededs Create returns true, otherwise
+// of wxMediaBackend - if it succeeded Create returns true, otherwise
 // it keeps iterating through the hashmap.
 //---------------------------------------------------------------------------
 bool wxMediaCtrl::Create(wxWindow* parent, wxWindowID id,
@@ -93,7 +93,7 @@ bool wxMediaCtrl::Create(wxWindow* parent, wxWindowID id,
 
         if (!fileName.empty())
         {
-            if (!m_imp->Load(fileName))
+            if (!Load(fileName))
             {
                 delete m_imp;
                 m_imp = NULL;
@@ -101,15 +101,16 @@ bool wxMediaCtrl::Create(wxWindow* parent, wxWindowID id,
             }
         }
 
+        SetBestFittingSize(size);
         return true;
     }
     else
     {
         wxClassInfo::sm_classTable->BeginFind();
 
-        wxClassInfo* classInfo = NextBackend();
+        wxClassInfo* classInfo;
 
-        while(classInfo)
+        while((classInfo = NextBackend()) != NULL)
         {
             if(!DoCreate(classInfo, parent, id,
                          pos, size, style, validator, name))
@@ -117,15 +118,19 @@ bool wxMediaCtrl::Create(wxWindow* parent, wxWindowID id,
 
             if (!fileName.empty())
             {
-                if (m_imp->Load(fileName))
+                if (Load(fileName))
+                {
+                    SetBestFittingSize(size);
                     return true;
+                }
                 else
                     delete m_imp;
             }
             else
+            {
+                SetBestFittingSize(size);
                 return true;
-
-            classInfo = NextBackend();
+            }
         }
 
         m_imp = NULL;
@@ -151,33 +156,35 @@ bool wxMediaCtrl::Create(wxWindow* parent, wxWindowID id,
             return false;
         }
 
-        if (!m_imp->Load(location))
+        if (!Load(location))
         {
             delete m_imp;
             m_imp = NULL;
             return false;
         }
 
+        SetBestFittingSize(size);
         return true;
     }
     else
     {
         wxClassInfo::sm_classTable->BeginFind();
 
-        wxClassInfo* classInfo = NextBackend();
+        wxClassInfo* classInfo;
 
-        while(classInfo)
+        while((classInfo = NextBackend()) != NULL)
         {
             if(!DoCreate(classInfo, parent, id,
                          pos, size, style, validator, name))
                 continue;
 
-            if (m_imp->Load(location))
+            if (Load(location))
+            {
+                SetBestFittingSize(size);
                 return true;
+            }
             else
                 delete m_imp;
-
-            classInfo = NextBackend();
         }
 
         m_imp = NULL;
@@ -203,10 +210,6 @@ bool wxMediaCtrl::DoCreate(wxClassInfo* classInfo,
     if( m_imp->CreateControl(this, parent, id, pos, size,
                              style, validator, name) )
     {
-        this->Connect(GetId(), wxEVT_MEDIA_FINISHED,
-                        (wxObjectEventFunction) (wxEventFunction)
-                        (wxMediaEventFunction)
-                            &wxMediaCtrl::OnMediaFinished);
         return true;
     }
 
@@ -290,9 +293,9 @@ bool wxMediaCtrl::Load(const wxURI& location)
 // wxMediaCtrl::Stop
 // wxMediaCtrl::GetPlaybackRate
 // wxMediaCtrl::SetPlaybackRate
-// wxMediaCtrl::SetPosition
-// wxMediaCtrl::GetPosition
-// wxMediaCtrl::GetDuration
+// wxMediaCtrl::Seek --> SetPosition
+// wxMediaCtrl::Tell --> GetPosition
+// wxMediaCtrl::Length --> GetDuration
 // wxMediaCtrl::GetState
 // wxMediaCtrl::DoGetBestSize
 //
@@ -335,25 +338,43 @@ bool wxMediaCtrl::SetPlaybackRate(double dRate)
     return false;
 }
 
-bool wxMediaCtrl::SetPosition(wxLongLong where)
+wxFileOffset wxMediaCtrl::Seek(wxFileOffset where, wxSeekMode mode)
 {
-    if(m_imp && m_bLoaded)
-        return m_imp->SetPosition(where);
-    return false;
+    wxFileOffset offset;
+
+    switch (mode)
+    {
+    case wxFromStart:
+        offset = where;
+        break;
+    case wxFromEnd:
+        offset = Length() - where;
+        break;
+//    case wxFromCurrent:
+    default:
+        offset = Tell() + where;
+        break;
+    }
+
+    if(m_imp && m_bLoaded && m_imp->SetPosition(offset))
+        return offset;
+    return wxInvalidOffset;
 }
 
-wxLongLong wxMediaCtrl::GetPosition()
+wxFileOffset wxMediaCtrl::Tell()
 {
+    //FIXME
     if(m_imp && m_bLoaded)
-        return m_imp->GetPosition();
-    return 0;
+        return (wxFileOffset) m_imp->GetPosition().ToLong();
+    return wxInvalidOffset;
 }
 
-wxLongLong wxMediaCtrl::GetDuration()
+wxFileOffset wxMediaCtrl::Length()
 {
+    //FIXME
     if(m_imp && m_bLoaded)
-        return m_imp->GetDuration();
-    return 0;
+        return (wxFileOffset) m_imp->GetDuration().ToLong();
+    return wxInvalidOffset;
 }
 
 wxMediaState wxMediaCtrl::GetState()
@@ -386,32 +407,10 @@ void wxMediaCtrl::DoMoveWindow(int x, int y, int w, int h)
         m_imp->Move(x, y, w, h);
 }
 
-void wxMediaCtrl::Loop(bool bLoop)
-{
-    m_bLoop = bLoop;
-}
-
-bool wxMediaCtrl::IsLooped()
-{
-    return m_bLoop;
-}
-
-void wxMediaCtrl::OnMediaFinished(wxMediaEvent& WXUNUSED(evt))
-{
-    if(m_bLoop)
-    {
-#ifdef __WXDEBUG__
-        wxASSERT( Play() );
-#else
-        Play();
-#endif
-    }
-}
-
 //DARWIN gcc compiler badly screwed up - needs destructor impl in source
 wxMediaBackend::~wxMediaBackend()
 {                               }
-#include <wx/html/forcelnk.h>
+#include "wx/html/forcelnk.h"
 FORCE_LINK(basewxmediabackends);
 
 //---------------------------------------------------------------------------