X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..81853b98619293be66074d74d2557973c0f3ab21:/include/wx/mac/carbon/sound.h diff --git a/include/wx/mac/carbon/sound.h b/include/wx/mac/carbon/sound.h index 70c25c2016..cec0de6bc1 100644 --- a/include/wx/mac/carbon/sound.h +++ b/include/wx/mac/carbon/sound.h @@ -2,21 +2,17 @@ // Name: sound.h // Purpose: wxSound class (loads and plays short Windows .wav files). // Optional on non-Windows platforms. -// Author: Stefan Csomor +// Author: Ryan Norton, Stefan Csomor // Modified by: // Created: 1998-01-01 // RCS-ID: $Id$ -// Copyright: (c) Stefan Csomor -// Licence: wxWidgets licence +// Copyright: (c) Ryan Norton, Stefan Csomor +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_SOUND_H_ #define _WX_SOUND_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "sound.h" -#endif - #if wxUSE_SOUND #include "wx/object.h" @@ -32,20 +28,26 @@ public: public: bool Create(const wxString& fileName, bool isResource = FALSE); bool IsOk() const { return !m_sndname.IsEmpty(); } + static void Stop(); + static bool IsPlaying(); -protected: - // prevent collision with some BSD definitions of macro Free() - bool FreeData(); - + void* GetHandle(); +protected: bool DoPlay(unsigned flags) const; private: - void* m_sndChan; - - wxString m_sndname; - void* m_hSnd; - int m_waveLength; - bool m_isResource; + wxString m_sndname; //file path + char* m_hSnd; //pointer to resource or memory location + int m_waveLength; //size of file in memory mode + void* m_pTimer; //timer + + enum wxSoundType + { + wxSound_MEMORY, + wxSound_FILE, + wxSound_RESOURCE, + wxSound_NONE + } m_type; //mode }; #endif