X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/85c9f98b509e8a7870a99fb580775f6fda4cf38e..60dbc04c461334f22c189fff24c16451e7cae7a5:/include/wx/cocoa/sound.h diff --git a/include/wx/cocoa/sound.h b/include/wx/cocoa/sound.h index c85e7d3978..75ded5c136 100644 --- a/include/wx/cocoa/sound.h +++ b/include/wx/cocoa/sound.h @@ -1,9 +1,9 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: sound.h +// Name: wx/cocoa/sound.h // Purpose: wxSound class (loads and plays short Windows .wav files). // Optional on non-Windows platforms. // Authors: David Elliott, Ryan Norton -// Modified by: +// Modified by: // Created: 2004-10-02 // RCS-ID: $Id$ // Copyright: (c) 2004 David Elliott, Ryan Norton @@ -16,7 +16,7 @@ #include "wx/object.h" #include "wx/cocoa/ObjcRef.h" -class WXDLLEXPORT wxSound : public wxSoundBase +class WXDLLIMPEXP_ADV wxSound : public wxSoundBase { public: wxSound() @@ -25,11 +25,11 @@ public: wxSound(const wxString& fileName, bool isResource = false) : m_cocoaNSSound(NULL) { Create(fileName, isResource); } - wxSound(int size, const wxByte* data) + wxSound(size_t size, const void* data) : m_cocoaNSSound(NULL) { LoadWAV(data,size,true); } wxSound(const wxSound& sound); // why not? - ~wxSound(); + virtual ~wxSound(); public: bool Create(const wxString& fileName, bool isResource = false); @@ -41,9 +41,9 @@ public: void SetNSSound(WX_NSSound cocoaNSSound); inline WX_NSSound GetNSSound() { return m_cocoaNSSound; } -protected: +protected: bool DoPlay(unsigned flags) const; - bool LoadWAV(const wxUint8 *data, size_t length, bool copyData); + bool LoadWAV(const void* data, size_t length, bool copyData); private: WX_NSSound m_cocoaNSSound; static const wxObjcAutoRefFromAlloc sm_cocoaDelegate;