aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-12-13 21:34:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changed: #878 Fix typos in comments/code

Browse source
This commit is contained in:
kervala 2010-07-27 13:16:41 +02:00
parent 4002412896
commit ecba804cea
8 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
code/nel/src/sound/driver/dsound/source_dsound.cpp
View file

@ -102,7 +102,7 @@ CSourceDSound::CSourceDSound( uint sourcename )
_Format = Mono8; _Format = Mono8;
_SampleFreq = _DefaultSampleRate; _SampleFreq = _DefaultSampleRate;
_FillOffset = 0; _FillOffset = 0;
_State = source_stoped; _State = source_stopped;
_PlayOffset = 0; _PlayOffset = 0;
_LastPlayPos = 0; _LastPlayPos = 0;
_PosRelative= false; _PosRelative= false;
@ -831,7 +831,7 @@ void CSourceDSound::stop()
// nldebug("Stop"); // nldebug("Stop");
EnterCriticalSection(&_CriticalSection); EnterCriticalSection(&_CriticalSection);
if (_State != source_stoped && _State != source_silencing) if (_State != source_stopped && _State != source_silencing)
{ {
// retreive the cursors; // retreive the cursors;
TCursors cursors; TCursors cursors;
@ -1042,7 +1042,7 @@ bool CSourceDSound::isPaused() const
bool CSourceDSound::isStopped() const bool CSourceDSound::isStopped() const
{ {
return _State == source_silencing || _State == source_stoped; return _State == source_silencing || _State == source_stopped;
// return (_UserState == NL_DSOUND_STOPPED); // return (_UserState == NL_DSOUND_STOPPED);
} }
@ -1212,7 +1212,7 @@ bool CSourceDSound::update()
_SilenceWriten += updateSize; _SilenceWriten += updateSize;
if (_SilenceWriten == _SecondaryBufferSize) if (_SilenceWriten == _SecondaryBufferSize)
_State = source_stoped; _State = source_stopped;
} }
else else
{ {

2
code/nel/src/sound/driver/dsound/source_dsound.h
View file

@ -267,7 +267,7 @@ private:
enum TSourceState enum TSourceState
{ {
source_stoped, source_stopped,
source_playing, source_playing,
source_silencing, source_silencing,
source_swap_pending source_swap_pending

2
code/nel/src/sound/driver/fmod/music_channel_fmod.cpp
View file

@ -229,7 +229,7 @@ void CMusicChannelFMod::stop()
if (_MusicStream) if (_MusicStream)
{ {
/* just append this channel for closing. We have to maintain such a list because in case of async playing, /* 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) in the 50 ms after the play for instance)
*/ */
_WaitingForClose.push_back(_MusicStream); _WaitingForClose.push_back(_MusicStream);

9
code/nel/src/sound/driver/fmod/music_channel_fmod.h
View file

@ -21,7 +21,8 @@
struct FSOUND_STREAM; struct FSOUND_STREAM;
namespace NLSOUND { namespace NLSOUND
{
class CSoundDriverFMod; class CSoundDriverFMod;
/** /**
@ -40,13 +41,13 @@ protected:
/// Volume set by user /// Volume set by user
float _Gain; float _Gain;
/// The FMod stream /// The FMod stream
FSOUND_STREAM *_MusicStream; FSOUND_STREAM *_MusicStream;
/// the RAM buffer (representation of a MP3 file, only for sync play) /// 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 /// channel played for music. CAN BE -1 while _MusicStream!=NULL in case of Async Loading
sint _MusicChannel; sint _MusicChannel;
/// true if the fmod end callback said the stream is ended /// true if the fmod end callback said the stream is ended
bool _CallBackEnded; bool _CallBackEnded;
/// see stopMusicFader() /// see stopMusicFader()
std::list<FSOUND_STREAM *> _WaitingForClose; std::list<FSOUND_STREAM *> _WaitingForClose;
/// Sound driver that created this /// Sound driver that created this

6
code/nel/src/sound/driver/fmod/source_fmod.cpp
View file

@ -38,7 +38,7 @@ CSourceFMod::CSourceFMod( uint sourcename )
{ {
_Sample = NULL; _Sample = NULL;
_NextSample = NULL; _NextSample = NULL;
_State = source_stoped; _State = source_stopped;
_PosRelative= false; _PosRelative= false;
_Loop = false; _Loop = false;
@ -202,7 +202,7 @@ void CSourceFMod::stop()
_NextSample= NULL; _NextSample= NULL;
} }
_State= source_stoped; _State= source_stopped;
// Stop the FMod channel // Stop the FMod channel
if(_FModChannel!=-1) if(_FModChannel!=-1)
@ -267,7 +267,7 @@ bool CSourceFMod::isPaused() const
bool CSourceFMod::isStopped() const bool CSourceFMod::isStopped() const
{ {
return _State == source_silencing || _State == source_stoped; return _State == source_silencing || _State == source_stopped;
} }

2
code/nel/src/sound/driver/fmod/source_fmod.h
View file

@ -230,7 +230,7 @@ private:
enum TSourceState enum TSourceState
{ {
source_stoped, source_stopped,
source_playing, source_playing,
source_silencing, source_silencing,
source_swap_pending source_swap_pending

2
code/nel/src/sound/music_sound_manager.cpp
View file

@ -207,7 +207,7 @@ void CMusicSoundManager::startMusic(CMusicSound *newMs, CMusicSource *newSrc)
// start play the new music, xFade with the old // start play the new music, xFade with the old
CAudioMixerUser::instance()->playMusic(CStringMapper::unmap(newMs->getFileName()), uint(xFade), true, newMs->getLooping()); 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) if(_CurrentMusicPlaying)
{ {
_CurrentMusicPlaying->LastStopTime= CTime::getLocalTime(); _CurrentMusicPlaying->LastStopTime= CTime::getLocalTime();

2
code/nel/src/sound/sample_bank.cpp
View file

@ -342,7 +342,7 @@ void CSampleBank::onUpdate()
_SampleBankManager->m_AudioMixer->unregisterUpdate(this); _SampleBankManager->m_AudioMixer->unregisterUpdate(this);
_LoadingDone = true; _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(); _SampleBankManager->m_AudioMixer->getBackgroundSoundManager()->updateBackgroundStatus();
nlinfo("Sample bank %s loaded.", CStringMapper::unmap(_Name).c_str()); nlinfo("Sample bank %s loaded.", CStringMapper::unmap(_Name).c_str());