From 99c9bc60d78b28c45a909ac6b419671dd4e5b3fa Mon Sep 17 00:00:00 2001 From: kervala Date: Thu, 29 Jul 2010 13:46:33 +0200 Subject: [PATCH] Changed: #1030 Don't add buffer to queue when using sync mode --- code/nel/src/sound/driver/openal/music_channel_al.cpp | 8 ++++---- code/ryzom/client/src/far_tp.cpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/nel/src/sound/driver/openal/music_channel_al.cpp b/code/nel/src/sound/driver/openal/music_channel_al.cpp index efff2465b..317d8fff9 100644 --- a/code/nel/src/sound/driver/openal/music_channel_al.cpp +++ b/code/nel/src/sound/driver/openal/music_channel_al.cpp @@ -83,9 +83,6 @@ bool CMusicChannelAL::fillBuffer(IBuffer *buffer, uint length) uint32 size = _MusicBuffer->getNextBytes(tmp, length, length); buffer->unlock(size); - // add buffer to streaming buffers queue - _Source->submitStreamingBuffer(buffer); - return true; } @@ -130,9 +127,12 @@ void CMusicChannelAL::run() // fill buffers for(uint i = 0; i < buffers.size(); ++i) + { fillBuffer(buffers[i], _Source->getStreamingBufferSize()); -// _Source->updateManualRolloff(); + // add buffer to streaming buffers queue + _Source->submitStreamingBuffer(buffers[i]); + } // play the source if (first) diff --git a/code/ryzom/client/src/far_tp.cpp b/code/ryzom/client/src/far_tp.cpp index 64930b2ce..e164ac60c 100644 --- a/code/ryzom/client/src/far_tp.cpp +++ b/code/ryzom/client/src/far_tp.cpp @@ -1062,7 +1062,7 @@ void CFarTP::disconnectFromPreviousShard() // Play music and fade out the Game Sound if (SoundMngr) { - SoundMngr->playEventMusic("Loading Music Loop.ogg", CSoundManager::LoadingMusicXFade, true); + SoundMngr->playEventMusic(ClientCfg.SoundOutGameMusic, CSoundManager::LoadingMusicXFade, true); // Loading Music Loop.ogg SoundMngr->fadeOutGameSound(ClientCfg.SoundTPFade); }