X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/65cf3a4b6a3f70a40db688f75e27d8e7457618d3..86ac84b8ce086e6bbda58f422d41f84268606e35:/include/wx/sound.h?ds=sidebyside diff --git a/include/wx/sound.h b/include/wx/sound.h index 0ceba36240..380baf2f1d 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,20 +23,13 @@ // ---------------------------------------------------------------------------- // Flags for wxSound::Play -#if WXWIN_COMPATIBILITY_2_4 - // NB: we can't use enum because there would be ambiguity between the - // two Play() prototypes when called without explicit parameters - #define wxSOUND_SYNC ((unsigned)0) - #define wxSOUND_ASYNC ((unsigned)1) - #define wxSOUND_LOOP ((unsigned)2) -#else - enum wxSoundFlags - { - wxSOUND_SYNC = 0, - wxSOUND_ASYNC = 1, - wxSOUND_LOOP = 2 - }; -#endif + +// 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) // Base class for wxSound implementations class WXDLLIMPEXP_ADV wxSoundBase : public wxObject @@ -54,13 +43,10 @@ public: _T("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; }; @@ -71,12 +57,14 @@ protected: #if defined(__WXMSW__) #include "wx/msw/sound.h" -#elif defined(__UNIX__) - #include "wx/unix/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__) + #include "wx/unix/sound.h" #endif // ---------------------------------------------------------------------------- @@ -89,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_