X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f53b1c1e6f5546e9916debbf5f93c652edca0ef6..58ce18f2fdadecffb21e27555115af708325cf18:/include/wx/sound.h diff --git a/include/wx/sound.h b/include/wx/sound.h index 1da13bffe8..ef473443f7 100644 --- a/include/wx/sound.h +++ b/include/wx/sound.h @@ -6,16 +6,12 @@ // Created: 2004/02/01 // RCS-ID: $Id$ // Copyright: (c) 2004, Vaclav Slavik -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_SOUND_H_BASE_ #define _WX_SOUND_H_BASE_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "soundbase.h" -#endif - #include "wx/defs.h" #if wxUSE_SOUND @@ -27,13 +23,10 @@ // ---------------------------------------------------------------------------- // Flags for wxSound::Play - -// NB: We can't use enum because there would be ambiguity between the -// two Play() prototypes when called without explicit parameters -// if WXWIN_COMPATIBILITY_2_4. -// We can't use enum with some compilers either, because they -// keep reporting nonexistent ambiguities between -// Play(unsigned) and static Play(const wxString&, unsigned). + +// NB: We can't use enum with some compilers, because they keep reporting +// nonexistent ambiguities between Play(unsigned) and static Play(const +// wxString&, unsigned). #define wxSOUND_SYNC ((unsigned)0) #define wxSOUND_ASYNC ((unsigned)1) #define wxSOUND_LOOP ((unsigned)2) @@ -47,16 +40,13 @@ public: { wxASSERT_MSG( (flags & wxSOUND_LOOP) == 0 || (flags & wxSOUND_ASYNC) != 0, - _T("sound can only be looped asynchronously") ); + wxT("sound can only be looped asynchronously") ); return DoPlay(flags); } -#if WXWIN_COMPATIBILITY_2_4 - wxDEPRECATED( bool Play(bool async, bool looped = false) const ); -#endif // Plays sound from filename: static bool Play(const wxString& filename, unsigned flags = wxSOUND_ASYNC); - + protected: virtual bool DoPlay(unsigned flags) const = 0; }; @@ -67,8 +57,10 @@ protected: #if defined(__WXMSW__) #include "wx/msw/sound.h" +#elif defined(__WXCOCOA__) + #include "wx/cocoa/sound.h" #elif defined(__WXMAC__) - #include "wx/mac/sound.h" + #include "wx/osx/sound.h" #elif defined(__WXPM__) #include "wx/os2/sound.h" #elif defined(__UNIX__) @@ -85,16 +77,6 @@ inline bool wxSoundBase::Play(const wxString& filename, unsigned flags) return snd.IsOk() ? snd.Play(flags) : false; } -#if WXWIN_COMPATIBILITY_2_4 -inline bool wxSoundBase::Play(bool async, bool looped) const -{ - unsigned flags = 0; - if (async) flags |= wxSOUND_ASYNC; - if (looped) flags |= wxSOUND_LOOP | wxSOUND_ASYNC; - return DoPlay(flags); -} -#endif - #endif // wxUSE_SOUND #endif // _WX_SOUND_H_BASE_