X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/da32eb53cbe7947f3f4599d7b6b5caa21a68d27f..0a5bb138a71dfc1c706fc0858fb2801500e2c2e8:/wxPython/src/_sound.i?ds=sidebyside diff --git a/wxPython/src/_sound.i b/wxPython/src/_sound.i index e120cf52a8..bed230c51c 100644 --- a/wxPython/src/_sound.i +++ b/wxPython/src/_sound.i @@ -24,9 +24,9 @@ enum wxSoundFlags { - wxSOUND_SYNC = 0, - wxSOUND_ASYNC = 1, - wxSOUND_LOOP = 2 + wxSOUND_SYNC, + wxSOUND_ASYNC, + wxSOUND_LOOP }; @@ -38,19 +38,19 @@ class wxSound : public wxObject { public: wxSound() { - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); PyErr_SetString(PyExc_NotImplementedError, "wxSound is not available on this platform."); wxPyEndBlockThreads(blocked); } - wxSound(const wxString&, bool) { - bool blocked = wxPyBeginBlockThreads(); + wxSound(const wxString&/*, bool*/) { + wxPyBlock_t blocked = wxPyBeginBlockThreads(); PyErr_SetString(PyExc_NotImplementedError, "wxSound is not available on this platform."); wxPyEndBlockThreads(blocked); } wxSound(int, const wxByte*) { - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); PyErr_SetString(PyExc_NotImplementedError, "wxSound is not available on this platform."); wxPyEndBlockThreads(blocked); @@ -58,7 +58,7 @@ public: ~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; } @@ -71,35 +71,64 @@ public: +MustHaveApp(wxSound); +MustHaveApp(wxSound::Play); +MustHaveApp(wxSound::Stop); + 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; + + wxPyBlock_t blocked = wxPyBeginBlockThreads(); + if (!PyArg_Parse(data, "t#", &buffer, &size)) + goto done; + sound = new wxSound(size, buffer); + done: + wxPyEndBlockThreads(blocked); + return sound; + } + } + ~wxSound(); - %nokwargs Create; - %nokwargs Play; // 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 { - bool Create(int size, const wxByte* data) { - bool blocked = wxPyBeginBlockThreads(); - PyErr_SetString(PyExc_NotImplementedError, - "Create from data is not available on this platform."); + bool CreateFromData(PyObject* data) { + %#ifndef __WXMAC__ + unsigned char* buffer; + int size; + bool rv = false; + + wxPyBlock_t blocked = wxPyBeginBlockThreads(); + if (!PyArg_Parse(data, "t#", &buffer, &size)) + goto done; + rv = self->Create(size, buffer); + done: wxPyEndBlockThreads(blocked); - return False; + return rv; + %#else + wxPyBlock_t blocked = wxPyBeginBlockThreads(); + PyErr_SetString(PyExc_NotImplementedError, + "Create from data is not available on this platform."); + wxPyEndBlockThreads(blocked); + return false; + %#endif } } -#endif bool IsOk(); @@ -107,16 +136,9 @@ public: 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(); -#else - %extend { - static void Stop() - { wxPyRaiseNotImplemented(); } - } -#endif %pythoncode { def __nonzero__(self): return self.IsOk() } };