Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: #1030 Don't add buffer to queue when using sync mode

Browse source
This commit is contained in:
kervala 2010-07-29 13:46:33 +02:00
parent 79d0b4fced
commit 99c9bc60d7
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
code/nel/src/sound/driver/openal/music_channel_al.cpp
View file

@ -83,9 +83,6 @@ bool CMusicChannelAL::fillBuffer(IBuffer *buffer, uint length)
uint32 size = _MusicBuffer->getNextBytes(tmp, length, length); uint32 size = _MusicBuffer->getNextBytes(tmp, length, length);
buffer->unlock(size); buffer->unlock(size);
// add buffer to streaming buffers queue
_Source->submitStreamingBuffer(buffer);
return true; return true;
} }
@ -130,9 +127,12 @@ void CMusicChannelAL::run()
// fill buffers // fill buffers
for(uint i = 0; i < buffers.size(); ++i) for(uint i = 0; i < buffers.size(); ++i)
{
fillBuffer(buffers[i], _Source->getStreamingBufferSize()); fillBuffer(buffers[i], _Source->getStreamingBufferSize());
// _Source->updateManualRolloff(); // add buffer to streaming buffers queue
_Source->submitStreamingBuffer(buffers[i]);
}
// play the source // play the source
if (first) if (first)

2
code/ryzom/client/src/far_tp.cpp
View file

@ -1062,7 +1062,7 @@ void CFarTP::disconnectFromPreviousShard()
// Play music and fade out the Game Sound // Play music and fade out the Game Sound
if (SoundMngr) 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); SoundMngr->fadeOutGameSound(ClientCfg.SoundTPFade);
} }