Add a note about a few other wxGTK changes that were made

[wxWidgets.git] / include / wx / mediactrl.h

diff --git a/include/wx/mediactrl.h b/include/wx/mediactrl.h
index 78e62fc1ed6ee0ef1b90914222fc99b81f042c85..4caa45cc70ec98e63b7be7a1cadfabf2bc065864 100644 (file)
--- a/include/wx/mediactrl.h
+++ b/include/wx/mediactrl.h
@@ -58,6 +58,7 @@ enum wxMediaState
 #define wxMEDIABACKEND_DIRECTSHOW   wxT("wxAMMediaBackend")
 #define wxMEDIABACKEND_MCI          wxT("wxMCIMediaBackend")
 #define wxMEDIABACKEND_QUICKTIME    wxT("wxQTMediaBackend")
 #define wxMEDIABACKEND_DIRECTSHOW   wxT("wxAMMediaBackend")
 #define wxMEDIABACKEND_MCI          wxT("wxMCIMediaBackend")
 #define wxMEDIABACKEND_QUICKTIME    wxT("wxQTMediaBackend")

+#define wxMEDIABACKEND_GSTREAMER    wxT("wxGStreamerMediaBackend")

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


@@ -109,7 +110,7 @@ public:
 class WXDLLIMPEXP_MEDIA wxMediaCtrl : public wxControl
 {
 public:
 class WXDLLIMPEXP_MEDIA wxMediaCtrl : public wxControl
 {
 public:

-    wxMediaCtrl() : m_imp(NULL), m_bLoaded(false), m_bLoop(false)
+    wxMediaCtrl() : m_imp(NULL), m_bLoaded(false)

     {                                                                   }
 
     wxMediaCtrl(wxWindow* parent, wxWindowID winid,
     {                                                                   }
 
     wxMediaCtrl(wxWindow* parent, wxWindowID winid,


@@ -120,7 +121,7 @@ public:
                 const wxString& szBackend = wxEmptyString,
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxT("mediaCtrl"))
                 const wxString& szBackend = wxEmptyString,
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxT("mediaCtrl"))

-                : m_imp(NULL), m_bLoaded(false), m_bLoop(false)
+                : m_imp(NULL), m_bLoaded(false)

     {   Create(parent, winid, fileName, pos, size, style,
                szBackend, validator, name);                             }
 
     {   Create(parent, winid, fileName, pos, size, style,
                szBackend, validator, name);                             }
 


@@ -132,7 +133,7 @@ public:
                 const wxString& szBackend = wxEmptyString,
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxT("mediaCtrl"))
                 const wxString& szBackend = wxEmptyString,
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxT("mediaCtrl"))

-                : m_imp(NULL), m_bLoop(false)
+                : m_imp(NULL), m_bLoaded(false)

     {   Create(parent, winid, location, pos, size, style,
                szBackend, validator, name);                             }
 
     {   Create(parent, winid, location, pos, size, style,
                szBackend, validator, name);                             }
 


@@ -169,20 +170,23 @@ public:
     bool Stop();
 
     bool Load(const wxString& fileName);
     bool Stop();
 
     bool Load(const wxString& fileName);

-    bool Load(const wxURI& location); //DirectShow only

 
 

-    void Loop(bool bLoop = true);
-    bool IsLooped();

 
     wxMediaState GetState();
 
 
     wxMediaState GetState();
 

-    double GetPlaybackRate();           //All but MCI
-    bool SetPlaybackRate(double dRate); //All but MCI
-

     wxFileOffset Seek(wxFileOffset where, wxSeekMode mode = wxFromStart);
     wxFileOffset Tell(); //FIXME: This should be const
     wxFileOffset Length(); //FIXME: This should be const
 
     wxFileOffset Seek(wxFileOffset where, wxSeekMode mode = wxFromStart);
     wxFileOffset Tell(); //FIXME: This should be const
     wxFileOffset Length(); //FIXME: This should be const
 

+    //
+    // Unofficial parts of API 
+    //
+    //DirectShow/GStreamer only.  Quicktime too, but somewhat buggy...
+    bool Load(const wxURI& location);  
+
+    double GetPlaybackRate();           //All but MCI & GStreamer
+    bool SetPlaybackRate(double dRate); //All but MCI & GStreamer
+

 protected:
     static wxClassInfo* NextBackend();
 
 protected:
     static wxClassInfo* NextBackend();
 


@@ -190,6 +194,8 @@ protected:
     virtual void DoMoveWindow(int x, int y, int w, int h);
     wxSize DoGetBestSize() const;
 
     virtual void DoMoveWindow(int x, int y, int w, int h);
     wxSize DoGetBestSize() const;
 

+    //FIXME:  This is nasty... find a better way to work around
+    //inheritance issues

 #ifdef __WXMAC__
     friend class wxQTMediaBackend;
 #endif
 #ifdef __WXMAC__
     friend class wxQTMediaBackend;
 #endif


@@ -198,7 +204,6 @@ protected:
 #endif
     class wxMediaBackend* m_imp;
     bool m_bLoaded;
 #endif
     class wxMediaBackend* m_imp;
     bool m_bLoaded;

-    bool m_bLoop;

 
     DECLARE_DYNAMIC_CLASS(wxMediaCtrl)
 };
 
     DECLARE_DYNAMIC_CLASS(wxMediaCtrl)
 };


@@ -252,7 +257,7 @@ public:
                       int WXUNUSED(w), int WXUNUSED(h))
     {                                   }
     virtual wxSize GetVideoSize() const
                       int WXUNUSED(w), int WXUNUSED(h))
     {                                   }
     virtual wxSize GetVideoSize() const

-    {   return wxSize();                }
+    {   return wxSize(0,0);             }

 
     virtual double GetPlaybackRate()
     {   return 0.0;                     }
 
     virtual double GetPlaybackRate()
     {   return 0.0;                     }