X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5276b0a53cef4815230e39b54d2ecda14f72cbd1..60372b0d54379701d62edf5595a7dc25c48330e1:/src/osx/sound_osx.cpp diff --git a/src/osx/sound_osx.cpp b/src/osx/sound_osx.cpp index ba8d3166f6..d671a5da22 100644 --- a/src/osx/sound_osx.cpp +++ b/src/osx/sound_osx.cpp @@ -2,9 +2,9 @@ // Name: src/osx/sound_osx.cpp // Purpose: wxSound class common osx code // Author: Stefan Csomor -// Modified by: +// Modified by: // Created: 2009-09-01 -// RCS-ID: $Id: sound.cpp 61475 2009-07-20 16:47:54Z VZ $ +// RCS-ID: $Id$ // Copyright: (c) Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -35,20 +35,20 @@ public: : m_sound(snd) { } - + virtual ~wxSoundTimer() { Stop(); if (m_sound) m_sound->DoStop(); } - + void Notify() { if (m_sound) m_sound->SoundTask(); } - + protected: wxSoundData* m_sound; }; @@ -90,7 +90,7 @@ void wxSoundData::CreateAndStartTimer() m_pTimer->Start(MOVIE_DELAY, wxTIMER_CONTINUOUS); } -wxSound::wxSound() +wxSound::wxSound() { Init(); } @@ -101,7 +101,7 @@ wxSound::wxSound(const wxString& sFileName, bool isResource) Create(sFileName, isResource); } -wxSound::wxSound(int size, const wxByte* data) +wxSound::wxSound(size_t size, const void* data) { Init(); Create( size, data ); @@ -122,7 +122,7 @@ wxSound::~wxSound() break; } } - + if (isPlaying) m_data->MarkForDeletion(); else @@ -142,7 +142,7 @@ bool wxSound::DoPlay(unsigned flags) const if ( !m_data->Play(flags) ) s_soundsPlaying.pop_back(); } - + return false; } @@ -166,7 +166,7 @@ void wxSound::SoundStopped(const wxSoundData* data) for ( wxVector::iterator s = s_soundsPlaying.begin(); s != s_soundsPlaying.end(); ++s ) { - if ( (*s) == data ) + if ( (*s) == data ) { s_soundsPlaying.erase(s); break;