Use the wx.ART_NORMAL_FILE icon

[wxWidgets.git] / wxPython / src / media.i

diff --git a/wxPython/src/media.i b/wxPython/src/media.i
index bb5471677f91d1d22d9aef7599a09b381d3d29b3..d2db77b6671297354980db74c5242d4d280cc967 100644 (file)
--- a/wxPython/src/media.i
+++ b/wxPython/src/media.i
@@ -11,7 +11,7 @@
 /////////////////////////////////////////////////////////////////////////////
 
 %define DOCSTRING
 /////////////////////////////////////////////////////////////////////////////
 
 %define DOCSTRING

-"Classes for a medai player control"
+"Classes for a media player control"

 %enddef
 
 %module(package="wx", docstring=DOCSTRING) media
 %enddef
 
 %module(package="wx", docstring=DOCSTRING) media


@@ -22,6 +22,7 @@
 #include "wx/wxPython/pyclasses.h"
 
 #include <wx/mediactrl.h>
 #include "wx/wxPython/pyclasses.h"
 
 #include <wx/mediactrl.h>

+#include <wx/uri.h>

 %}
 
 //----------------------------------------------------------------------
 %}
 
 //----------------------------------------------------------------------


@@ -54,21 +55,17 @@ enum wxMediaState
     wxMEDIASTATE_PLAYING=0
 };
 
     wxMEDIASTATE_PLAYING=0
 };
 

-enum wxMediaTimeFormat
-{
-    wxMEDIATIMEFORMAT_TIME=0
-};

 
 

-class WXDLLIMPEXP_MEDIA wxMediaEvent : public wxNotifyEvent
+class wxMediaEvent : public wxNotifyEvent

 {
 public:
 {
 public:

-    wxMediaEvent(wxEventTypL, int )    { wxPyRaiseNotImplemented(); }
+    wxMediaEvent(wxEventType, int )    { wxPyRaiseNotImplemented(); }

 };
 
 class wxMediaCtrl : public wxControl
 {
 public:
 };
 
 class wxMediaCtrl : public wxControl
 {
 public:

-      wxMediaCtrl()    { wxPyRaiseNotImplemented(); }
+    wxMediaCtrl()    { wxPyRaiseNotImplemented(); }

 
     wxMediaCtrl(wxWindow* , wxWindowID ,
                 const wxString& ,
 
     wxMediaCtrl(wxWindow* , wxWindowID ,
                 const wxString& ,


@@ -79,16 +76,6 @@ public:
                 const wxValidator& ,
                 const wxString& ) { wxPyRaiseNotImplemented(); }
 
                 const wxValidator& ,
                 const wxString& ) { wxPyRaiseNotImplemented(); }
 

-    wxMediaCtrl(wxWindow* ,
-                wxWindowID ,
-                const wxURI& ,
-                const wxPoint&,
-                const wxSize& .
-                long style,
-                const wxString& ,
-                const wxValidator& ,
-                const wxString& ) { wxPyRaiseNotImplemented(); }
-

     bool Create(wxWindow* , wxWindowID ,
                 const wxString& ,
                 const wxPoint& ,
     bool Create(wxWindow* , wxWindowID ,
                 const wxString& ,
                 const wxPoint& ,


@@ -98,16 +85,6 @@ public:
                 const wxValidator& ,
                 const wxString& ) { return false; }
 
                 const wxValidator& ,
                 const wxString& ) { return false; }
 

-    bool Create(wxWindow* ,
-                wxWindowID ,
-                const wxURI& ,
-                const wxPoint&,
-                const wxSize& .
-                long style,
-                const wxString& ,
-                const wxValidator& ,
-                const wxString& ) { return false; }
-    

     bool Play() { return false; }
     bool Pause() { return false; }
     bool Stop() { return false; }
     bool Play() { return false; }
     bool Pause() { return false; }
     bool Stop() { return false; }


@@ -115,18 +92,24 @@ public:
     bool Load(const wxString& fileName) { return false; }
     bool Load(const wxURI& location) { return false; }
 
     bool Load(const wxString& fileName) { return false; }
     bool Load(const wxURI& location) { return false; }
 

-    void Loop(bool bLoop = true) {}
-    bool IsLooped() { return false; }
-

     wxMediaState GetState() { return wxMEDIASTATE_STOPPED; }
 
     wxMediaState GetState() { return wxMEDIASTATE_STOPPED; }
 

-    double GetPlaybackRate() { return 0.0; };
+    double GetPlaybackRate()  { return 0.0; }

     bool SetPlaybackRate(double dRate) { return false; }
 
     bool SetPlaybackRate(double dRate) { return false; }
 

-    bool SetPosition(wxLongLong where) { return false; }
-    wxLongLong GetPosition() { return 0; }
-    wxLongLong GetDuration() { return 0; }
+    wxFileOffset Seek(wxFileOffset where, wxSeekMode mode = wxFromStart)
+    { return 0; }
+    
+    wxFileOffset Tell()    { return 0; }
+    wxFileOffset Length()    { return 0; }
+
+    double GetVolume() { return 0.0; }
+    bool   SetVolume(double dVolume) { return false; }

 };
 };

+
+const wxEventType wxEVT_MEDIA_FINISHED = 0;
+const wxEventType wxEVT_MEDIA_STOP = 0;
+

 #endif
 %}
 
 #endif
 %}
 


@@ -141,15 +124,11 @@ enum wxMediaState
     wxMEDIASTATE_PLAYING
 };
 
     wxMEDIASTATE_PLAYING
 };
 

-enum wxMediaTimeFormat
-{
-    wxMEDIATIMEFORMAT_TIME
-};

 
 
 
 

-MAKE_CONST_WXSTRING(MEDIABACKEND_DIRECTSHOW);
-MAKE_CONST_WXSTRING(MEDIABACKEND_MCI       );
-MAKE_CONST_WXSTRING(MEDIABACKEND_QUICKTIME );
+// MAKE_CONST_WXSTRING(MEDIABACKEND_DIRECTSHOW);
+// MAKE_CONST_WXSTRING(MEDIABACKEND_MCI       );
+// MAKE_CONST_WXSTRING(MEDIABACKEND_QUICKTIME );

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


@@ -163,7 +142,7 @@ public:
 //---------------------------------------------------------------------------
 
 MAKE_CONST_WXSTRING_NOSWIG(EmptyString);
 //---------------------------------------------------------------------------
 
 MAKE_CONST_WXSTRING_NOSWIG(EmptyString);

-MAKE_CONST_WXSTRING2(MediaCtrlNameStr, "mediaCtrl");
+MAKE_CONST_WXSTRING2(MediaCtrlNameStr, wxT("mediaCtrl"));

 MustHaveApp(wxMediaCtrl);
 
 
 MustHaveApp(wxMediaCtrl);
 
 


@@ -174,7 +153,8 @@ public:
     %pythonAppend wxMediaCtrl()    ""
 
 
     %pythonAppend wxMediaCtrl()    ""
 
 

-    wxMediaCtrl(wxWindow* parent, wxWindowID id=-1,
+    wxMediaCtrl(wxWindow* parent,
+                wxWindowID id=-1,

                 const wxString& fileName = wxPyEmptyString,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 const wxString& fileName = wxPyEmptyString,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,


@@ -183,39 +163,10 @@ public:
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxPyMediaCtrlNameStr);
     
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxPyMediaCtrlNameStr);
     

-    %name(PreMediaCtrl) wxMediaCtrl();
-
-    %extend {
-        %name(MediaCtrlFromURI)
-             wxMediaCtrl(wxWindow* parent, wxWindowID id=-1,
-                         const wxString& location=wxPyEmptyString,
-                         const wxPoint& pos = wxDefaultPosition,
-                         const wxSize& size = wxDefaultSize,
-                         long style = 0,
-                         const wxString& szBackend = wxPyEmptyString,
-                         const wxValidator& validator = wxDefaultValidator,
-                         const wxString& name = wxPyMediaCtrlNameStr)
-        {
-            return new wxMediaCtrl(parent, id, wxURI(location),
-                                   pos, size, style, szBackend, validator, name);
-        }
+    %RenameCtor(PreMediaCtrl,  wxMediaCtrl());

 
 

-        bool CreateFromURI(wxWindow* parent, wxWindowID id=-1,
-                           const wxString& location=wxPyEmptyString,
-                           const wxPoint& pos = wxDefaultPosition,
-                           const wxSize& size = wxDefaultSize,
-                           long style = 0,
-                           const wxString& szBackend = wxPyEmptyString,
-                           const wxValidator& validator = wxDefaultValidator,
-                           const wxString& name = wxPyMediaCtrlNameStr)
-        {
-            return self->Create(parent, id, wxURI(location),
-                                pos, size, style, szBackend, validator, name);
-        }
-    }
-
-
-    bool Create(wxWindow* parent, wxWindowID id=-1,
+    bool Create(wxWindow* parent,
+                wxWindowID id=-1,

                 const wxString& fileName = wxPyEmptyString,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 const wxString& fileName = wxPyEmptyString,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,


@@ -229,6 +180,9 @@ public:
     bool Pause();
     bool Stop();
 
     bool Pause();
     bool Stop();
 

+    double GetVolume();                 //DirectShow only
+    bool   SetVolume(double dVolume);   //DirectShow only
+

     bool Load(const wxString& fileName);
     %extend {
         bool LoadFromURI(const wxString& location) {
     bool Load(const wxString& fileName);
     %extend {
         bool LoadFromURI(const wxString& location) {


@@ -236,17 +190,14 @@ public:
         }
     }
 
         }
     }
 

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

     wxMediaState GetState();
 
     double GetPlaybackRate();
     bool SetPlaybackRate(double dRate);
 
     wxMediaState GetState();
 
     double GetPlaybackRate();
     bool SetPlaybackRate(double dRate);
 

-    bool SetPosition(wxLongLong where);
-    wxLongLong GetPosition();
-    wxLongLong GetDuration();
+    wxFileOffset Seek(wxFileOffset where, wxSeekMode mode = wxFromStart);    
+    wxFileOffset Tell();
+    wxFileOffset Length();

 };
 
 
 };