Version

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

diff --git a/wxPython/src/_sound.i b/wxPython/src/_sound.i
index 8e938e3824d9ff124ae020530513db7b0193b731..27fab6cc913f4517c0127b92329133c537f00956 100644 (file)
--- a/wxPython/src/_sound.i
+++ b/wxPython/src/_sound.i
@@ -24,9 +24,9 @@
 
 enum wxSoundFlags
 {
 
 enum wxSoundFlags
 {

-    wxSOUND_SYNC   = 0,
-    wxSOUND_ASYNC  = 1,
-    wxSOUND_LOOP   = 2
+    wxSOUND_SYNC,
+    wxSOUND_ASYNC,
+    wxSOUND_LOOP

 };
 
 
 };
 
 


@@ -38,27 +38,27 @@ class wxSound : public wxObject
 {
 public:
     wxSound() {
 {
 public:
     wxSound() {

-        wxPyBeginBlockThreads();
+        bool blocked = wxPyBeginBlockThreads();

         PyErr_SetString(PyExc_NotImplementedError,
                         "wxSound is not available on this platform.");
         PyErr_SetString(PyExc_NotImplementedError,
                         "wxSound is not available on this platform.");

-        wxPyEndBlockThreads();
+        wxPyEndBlockThreads(blocked);

     }
     }

-    wxSound(const wxString&, bool) {
-        wxPyBeginBlockThreads();
+    wxSound(const wxString&/*, bool*/) {
+        bool blocked = wxPyBeginBlockThreads();

         PyErr_SetString(PyExc_NotImplementedError,
                         "wxSound is not available on this platform.");
         PyErr_SetString(PyExc_NotImplementedError,
                         "wxSound is not available on this platform.");

-        wxPyEndBlockThreads();
+        wxPyEndBlockThreads(blocked);

     }
     wxSound(int, const wxByte*) {
     }
     wxSound(int, const wxByte*) {

-        wxPyBeginBlockThreads();
+        bool blocked = wxPyBeginBlockThreads();

         PyErr_SetString(PyExc_NotImplementedError,
                         "wxSound is not available on this platform.");
         PyErr_SetString(PyExc_NotImplementedError,
                         "wxSound is not available on this platform.");

-        wxPyEndBlockThreads();
+        wxPyEndBlockThreads(blocked);

     }
     
     ~wxSound() {};
 
     }
     
     ~wxSound() {};
 

-    bool Create(const wxString&, bool) { return false; }
+    bool Create(const wxString&/*, bool*/) { return false; }

     bool Create(int, const wxByte*) { return false; };
     bool IsOk() { return false; };    
     bool Play(unsigned) const { return false; }
     bool Create(int, const wxByte*) { return false; };
     bool IsOk() { return false; };    
     bool Play(unsigned) const { return false; }


@@ -71,35 +71,64 @@ public:
 
 
 
 
 
 

+MustHaveApp(wxSound);
+MustHaveApp(wxSound::Play);
+MustHaveApp(wxSound::Stop);
+

 class wxSound /*: public wxObject*/
 {
 public:
 class wxSound /*: public wxObject*/
 {
 public:

-    %nokwargs wxSound;
-    wxSound();
-    wxSound(const wxString& fileName, bool isResource = false);
-    wxSound(int size, const wxByte* data);
+    %extend {
+        wxSound(const wxString& fileName = wxPyEmptyString /*, bool isResource = false*/) {
+            if (fileName.Length() == 0)
+                return new wxSound;
+            else
+                return new wxSound(fileName);
+        }
+        %RenameCtor(SoundFromData,  wxSound(PyObject* data))
+        {
+            unsigned char* buffer; int size;
+            wxSound *sound = NULL;
+
+            bool blocked = wxPyBeginBlockThreads();
+            if (!PyArg_Parse(data, "t#", &buffer, &size))
+                goto done;
+            sound = new wxSound(size, buffer);
+        done:
+            wxPyEndBlockThreads(blocked);
+            return sound;
+        }
+    }
+    

     ~wxSound();
 
     ~wxSound();
 

-    %nokwargs Create;
-    %nokwargs Play;

     
     // Create from resource or file
     
     // Create from resource or file

-    bool Create(const wxString& fileName, bool isResource = false);
+    bool Create(const wxString& fileName/*, bool isResource = false*/);

 
 

-#ifndef __WXMAC__
-    // Create from data
-    bool Create(int size, const wxByte* data);
-#else

     %extend {
     %extend {

-        bool Create(int size, const wxByte* data) {
-            wxPyBeginBlockThreads();
-            PyErr_SetString(PyExc_NotImplementedError,
-                            "Create from data  is not available on this platform.");
-            wxPyEndBlockThreads();
-            return False;
+        bool CreateFromData(PyObject* data) {
+        %#ifndef __WXMAC__
+            unsigned char* buffer;
+            int size;
+            bool rv = false;
+
+            bool blocked = wxPyBeginBlockThreads();
+            if (!PyArg_Parse(data, "t#", &buffer, &size))
+                goto done;
+            rv = self->Create(size, buffer);
+        done:
+            wxPyEndBlockThreads(blocked);
+            return rv;
+        %#else
+                 bool blocked = wxPyBeginBlockThreads();
+                 PyErr_SetString(PyExc_NotImplementedError,
+                                 "Create from data is not available on this platform.");
+                 wxPyEndBlockThreads(blocked);
+                 return false;
+        %#endif

         }
     }
         }
     }

-#endif

     
     bool  IsOk();
     
     
     bool  IsOk();
     


@@ -107,16 +136,9 @@ public:
     bool Play(unsigned flags = wxSOUND_ASYNC) const;
 
     // Plays sound from filename:
     bool Play(unsigned flags = wxSOUND_ASYNC) const;
 
     // Plays sound from filename:

-    %name(PlaySound)static bool Play(const wxString& filename, unsigned flags = wxSOUND_ASYNC);
+    %Rename(PlaySound,  static bool, Play(const wxString& filename, unsigned flags = wxSOUND_ASYNC));

 
 

-#ifndef __WXMAC__

     static void Stop();
     static void Stop();

-#else
-    %extend {
-        static void Stop()
-            { wxPyRaiseNotImplemented(); }
-    }
-#endif

 
     %pythoncode { def __nonzero__(self): return self.IsOk() }
 };
 
     %pythoncode { def __nonzero__(self): return self.IsOk() }
 };