X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0c7e0a87719f1034c8a9b3e748f5e0ca1cdaeb13..9869c26285dc51d13607cddaa04f65ce983653a5:/include/wx/unix/sound.h diff --git a/include/wx/unix/sound.h b/include/wx/unix/sound.h index f420f9485c..76efeae3dc 100644 --- a/include/wx/unix/sound.h +++ b/include/wx/unix/sound.h @@ -4,7 +4,6 @@ // Author: Julian Smart, Vaclav Slavik // Modified by: // Created: 25/10/98 -// RCS-ID: $Id$ // Copyright: (c) Julian Smart, Vaclav Slavik // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -22,9 +21,9 @@ // wxSound: simple audio playback class // ---------------------------------------------------------------------------- -class WXDLLIMPEXP_ADV wxSoundBackend; -class WXDLLIMPEXP_ADV wxSound; -class WXDLLIMPEXP_BASE wxDynamicLibrary; +class WXDLLIMPEXP_FWD_ADV wxSoundBackend; +class WXDLLIMPEXP_FWD_ADV wxSound; +class WXDLLIMPEXP_FWD_BASE wxDynamicLibrary; /// Sound data, as loaded from .wav file: class WXDLLIMPEXP_ADV wxSoundData @@ -60,13 +59,13 @@ class WXDLLIMPEXP_ADV wxSound : public wxSoundBase public: wxSound(); wxSound(const wxString& fileName, bool isResource = false); - wxSound(int size, const wxByte* data); + wxSound(size_t size, const void* data); virtual ~wxSound(); // Create from resource or file bool Create(const wxString& fileName, bool isResource = false); // Create from data - bool Create(int size, const wxByte* data); + bool Create(size_t size, const void* data); bool IsOk() const { return m_data != NULL; } @@ -84,7 +83,7 @@ protected: static void EnsureBackend(); void Free(); - bool LoadWAV(const wxUint8 *data, size_t length, bool copyData); + bool LoadWAV(const void* data, size_t length, bool copyData); static wxSoundBackend *ms_backend; #if wxUSE_LIBSDL && wxUSE_PLUGINS