X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b65ac702f1a44c042b1057cf79acf4741d714097..30e24d9dd5a5abf1c9a375ea259eb239b122b7f7:/wxPython/src/_sound.i diff --git a/wxPython/src/_sound.i b/wxPython/src/_sound.i index 2339bb2cec..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(); + 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); @@ -71,6 +71,10 @@ public: +MustHaveApp(wxSound); +MustHaveApp(wxSound::Play); +MustHaveApp(wxSound::Stop); + class wxSound /*: public wxObject*/ { public: @@ -81,11 +85,12 @@ public: else return new wxSound(fileName); } - %name(SoundFromData) wxSound(PyObject* data) { + %RenameCtor(SoundFromData, wxSound(PyObject* data)) + { unsigned char* buffer; int size; wxSound *sound = NULL; - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); if (!PyArg_Parse(data, "t#", &buffer, &size)) goto done; sound = new wxSound(size, buffer); @@ -106,9 +111,9 @@ public: %#ifndef __WXMAC__ unsigned char* buffer; int size; - bool rv = False; + bool rv = false; - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); if (!PyArg_Parse(data, "t#", &buffer, &size)) goto done; rv = self->Create(size, buffer); @@ -116,11 +121,11 @@ public: wxPyEndBlockThreads(blocked); return rv; %#else - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); PyErr_SetString(PyExc_NotImplementedError, "Create from data is not available on this platform."); wxPyEndBlockThreads(blocked); - return False; + return false; %#endif } } @@ -131,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() } };