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 642663b2ae0bcee12c673be6fad378d847ac8465..d2db77b6671297354980db74c5242d4d280cc967 100644 (file)
--- a/wxPython/src/media.i
+++ b/wxPython/src/media.i
@@ -65,7 +65,7 @@ public:
 class wxMediaCtrl : public wxControl
 {
 public:
 class wxMediaCtrl : public wxControl
 {
 public:

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

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


@@ -76,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& ,


@@ -95,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; }


@@ -112,9 +92,6 @@ 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; }
 
     double GetPlaybackRate()  { return 0.0; }
     wxMediaState GetState() { return wxMEDIASTATE_STOPPED; }
 
     double GetPlaybackRate()  { return 0.0; }


@@ -125,6 +102,9 @@ public:
     
     wxFileOffset Tell()    { return 0; }
     wxFileOffset Length()    { 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_FINISHED = 0;


@@ -183,39 +163,7 @@ 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);
-//         }
-
-//         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);
-//         }
-//     }
-
+    %RenameCtor(PreMediaCtrl,  wxMediaCtrl());

 
     bool Create(wxWindow* parent,
                 wxWindowID id=-1,
 
     bool Create(wxWindow* parent,
                 wxWindowID id=-1,


@@ -232,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) {


@@ -239,9 +190,6 @@ public:
         }
     }
 
         }
     }
 

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

     wxMediaState GetState();
 
     double GetPlaybackRate();
     wxMediaState GetState();
 
     double GetPlaybackRate();