From f156e20c8e21594f901bfce15db4459208ec9571 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Mon, 2 Feb 2004 13:34:35 +0000 Subject: [PATCH] renamed wxWave to wxSound; compatibility fixes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25474 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/unix/sound.cpp | 8 +++----- src/unix/sound_sdl.cpp | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/unix/sound.cpp b/src/unix/sound.cpp index 76e04c483a..30ce40656f 100644 --- a/src/unix/sound.cpp +++ b/src/unix/sound.cpp @@ -5,7 +5,7 @@ // Modified by: // Created: 25/10/98 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart, Vaclav Slavik +// Copyright: (c) Julian Smart, Open Source Applications Foundation // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -23,7 +23,7 @@ #pragma hdrstop #endif -#if wxUSE_WAVE +#if wxUSE_SOUND #include #include @@ -515,10 +515,8 @@ bool wxSound::Create(int size, const wxByte* data) } } -bool wxSound::DoPlay(unsigned flags) +bool wxSound::DoPlay(unsigned flags) const { - wxASSERT_MSG( (flags & wxSOUND_LOOP) == 0 || (flags & wxSOUND_ASYNC) != 0, - _T("sound can only be looped asynchronously") ); wxCHECK_MSG( IsOk(), false, _T("Attempt to play invalid wave data") ); EnsureBackend(); diff --git a/src/unix/sound_sdl.cpp b/src/unix/sound_sdl.cpp index 8d782ad8bd..1ecc0212e1 100644 --- a/src/unix/sound_sdl.cpp +++ b/src/unix/sound_sdl.cpp @@ -5,7 +5,7 @@ // Modified by: // Created: 2004/01/31 // RCS-ID: $Id$ -// Copyright: (c) 2004, Vaclav Slavik +// Copyright: (c) 2004, Open Source Applications Foundation // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -18,7 +18,7 @@ #pragma hdrstop #endif -#if wxUSE_WAVE && wxUSE_LIBSDL +#if wxUSE_SOUND && wxUSE_LIBSDL #include @@ -335,4 +335,4 @@ extern "C" wxSoundBackend *wxCreateSoundBackendSDL() return new wxSoundBackendSDL(); } -#endif // wxUSE_WAVE && wxUSE_LIBSDL +#endif // wxUSE_SOUND && wxUSE_LIBSDL -- 2.45.2