From 7e9baec4410fc41564c61a99e0a94f5232dd8e1c Mon Sep 17 00:00:00 2001 From: kervala Date: Tue, 27 Jul 2010 13:16:41 +0200 Subject: [PATCH] Changed: #878 Fix typos in comments/code --- code/nel/src/sound/driver/dsound/source_dsound.cpp | 8 ++++---- code/nel/src/sound/driver/dsound/source_dsound.h | 2 +- code/nel/src/sound/driver/fmod/music_channel_fmod.cpp | 2 +- code/nel/src/sound/driver/fmod/music_channel_fmod.h | 9 +++++---- code/nel/src/sound/driver/fmod/source_fmod.cpp | 6 +++--- code/nel/src/sound/driver/fmod/source_fmod.h | 2 +- code/nel/src/sound/music_sound_manager.cpp | 2 +- code/nel/src/sound/sample_bank.cpp | 2 +- 8 files changed, 17 insertions(+), 16 deletions(-) diff --git a/code/nel/src/sound/driver/dsound/source_dsound.cpp b/code/nel/src/sound/driver/dsound/source_dsound.cpp index 3c10ac875..9213872af 100644 --- a/code/nel/src/sound/driver/dsound/source_dsound.cpp +++ b/code/nel/src/sound/driver/dsound/source_dsound.cpp @@ -102,7 +102,7 @@ CSourceDSound::CSourceDSound( uint sourcename ) _Format = Mono8; _SampleFreq = _DefaultSampleRate; _FillOffset = 0; - _State = source_stoped; + _State = source_stopped; _PlayOffset = 0; _LastPlayPos = 0; _PosRelative= false; @@ -831,7 +831,7 @@ void CSourceDSound::stop() // nldebug("Stop"); EnterCriticalSection(&_CriticalSection); - if (_State != source_stoped && _State != source_silencing) + if (_State != source_stopped && _State != source_silencing) { // retreive the cursors; TCursors cursors; @@ -1042,7 +1042,7 @@ bool CSourceDSound::isPaused() const bool CSourceDSound::isStopped() const { - return _State == source_silencing || _State == source_stoped; + return _State == source_silencing || _State == source_stopped; // return (_UserState == NL_DSOUND_STOPPED); } @@ -1212,7 +1212,7 @@ bool CSourceDSound::update() _SilenceWriten += updateSize; if (_SilenceWriten == _SecondaryBufferSize) - _State = source_stoped; + _State = source_stopped; } else { diff --git a/code/nel/src/sound/driver/dsound/source_dsound.h b/code/nel/src/sound/driver/dsound/source_dsound.h index 153fcecdb..9feda9a61 100644 --- a/code/nel/src/sound/driver/dsound/source_dsound.h +++ b/code/nel/src/sound/driver/dsound/source_dsound.h @@ -267,7 +267,7 @@ private: enum TSourceState { - source_stoped, + source_stopped, source_playing, source_silencing, source_swap_pending diff --git a/code/nel/src/sound/driver/fmod/music_channel_fmod.cpp b/code/nel/src/sound/driver/fmod/music_channel_fmod.cpp index 084c6e278..9c502ea1a 100644 --- a/code/nel/src/sound/driver/fmod/music_channel_fmod.cpp +++ b/code/nel/src/sound/driver/fmod/music_channel_fmod.cpp @@ -229,7 +229,7 @@ void CMusicChannelFMod::stop() if (_MusicStream) { /* just append this channel for closing. We have to maintain such a list because in case of async playing, - FMod FSOUND_Stream_Stop() and FSOUND_Stream_Close() calls fail if the file is not ready (hapens if music stoped + FMod FSOUND_Stream_Stop() and FSOUND_Stream_Close() calls fail if the file is not ready (hapens if music stopped in the 50 ms after the play for instance) */ _WaitingForClose.push_back(_MusicStream); diff --git a/code/nel/src/sound/driver/fmod/music_channel_fmod.h b/code/nel/src/sound/driver/fmod/music_channel_fmod.h index 1f61fa3f8..d9a17fd99 100644 --- a/code/nel/src/sound/driver/fmod/music_channel_fmod.h +++ b/code/nel/src/sound/driver/fmod/music_channel_fmod.h @@ -21,7 +21,8 @@ struct FSOUND_STREAM; -namespace NLSOUND { +namespace NLSOUND +{ class CSoundDriverFMod; /** @@ -40,13 +41,13 @@ protected: /// Volume set by user float _Gain; /// The FMod stream - FSOUND_STREAM *_MusicStream; + FSOUND_STREAM *_MusicStream; /// the RAM buffer (representation of a MP3 file, only for sync play) - uint8 *_MusicBuffer; + uint8 *_MusicBuffer; /// channel played for music. CAN BE -1 while _MusicStream!=NULL in case of Async Loading sint _MusicChannel; /// true if the fmod end callback said the stream is ended - bool _CallBackEnded; + bool _CallBackEnded; /// see stopMusicFader() std::list _WaitingForClose; /// Sound driver that created this diff --git a/code/nel/src/sound/driver/fmod/source_fmod.cpp b/code/nel/src/sound/driver/fmod/source_fmod.cpp index 323213a90..1167afb0d 100644 --- a/code/nel/src/sound/driver/fmod/source_fmod.cpp +++ b/code/nel/src/sound/driver/fmod/source_fmod.cpp @@ -38,7 +38,7 @@ CSourceFMod::CSourceFMod( uint sourcename ) { _Sample = NULL; _NextSample = NULL; - _State = source_stoped; + _State = source_stopped; _PosRelative= false; _Loop = false; @@ -202,7 +202,7 @@ void CSourceFMod::stop() _NextSample= NULL; } - _State= source_stoped; + _State= source_stopped; // Stop the FMod channel if(_FModChannel!=-1) @@ -267,7 +267,7 @@ bool CSourceFMod::isPaused() const bool CSourceFMod::isStopped() const { - return _State == source_silencing || _State == source_stoped; + return _State == source_silencing || _State == source_stopped; } diff --git a/code/nel/src/sound/driver/fmod/source_fmod.h b/code/nel/src/sound/driver/fmod/source_fmod.h index 307da4ec5..19e78acb7 100644 --- a/code/nel/src/sound/driver/fmod/source_fmod.h +++ b/code/nel/src/sound/driver/fmod/source_fmod.h @@ -230,7 +230,7 @@ private: enum TSourceState { - source_stoped, + source_stopped, source_playing, source_silencing, source_swap_pending diff --git a/code/nel/src/sound/music_sound_manager.cpp b/code/nel/src/sound/music_sound_manager.cpp index b57d6a633..9bdb2dd13 100644 --- a/code/nel/src/sound/music_sound_manager.cpp +++ b/code/nel/src/sound/music_sound_manager.cpp @@ -207,7 +207,7 @@ void CMusicSoundManager::startMusic(CMusicSound *newMs, CMusicSource *newSrc) // start play the new music, xFade with the old CAudioMixerUser::instance()->playMusic(CStringMapper::unmap(newMs->getFileName()), uint(xFade), true, newMs->getLooping()); - // Mark the old one as stoped + // Mark the old one as stopped if(_CurrentMusicPlaying) { _CurrentMusicPlaying->LastStopTime= CTime::getLocalTime(); diff --git a/code/nel/src/sound/sample_bank.cpp b/code/nel/src/sound/sample_bank.cpp index 9cce83496..a83166879 100644 --- a/code/nel/src/sound/sample_bank.cpp +++ b/code/nel/src/sound/sample_bank.cpp @@ -342,7 +342,7 @@ void CSampleBank::onUpdate() _SampleBankManager->m_AudioMixer->unregisterUpdate(this); _LoadingDone = true; - // Force an update in the background manager (can restar stoped sound). + // Force an update in the background manager (can restar stopped sound). _SampleBankManager->m_AudioMixer->getBackgroundSoundManager()->updateBackgroundStatus(); nlinfo("Sample bank %s loaded.", CStringMapper::unmap(_Name).c_str());