mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-10-02 10:26:45 +02:00
Code Issues Projects Releases Wiki Activity

- sound system is now threaded by default (hopefully this fixes buffer underruns errors from openal)

Browse Source 
- background music now plays when game is loading
This commit is contained in:
Mark Vejvoda
2011-01-18 01:24:45 +00:00
parent 9ba8668751
commit d16f6a93bc
8 changed files with 54 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/glest_game/main/program.cpp
View File

@@ -301,7 +301,7 @@ void Program::loopWorker() {
if(prevState == this->programState) {
//SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s %d]\n",__FILE__,__FUNCTION__,__LINE__);
if(soundThreadManager == NULL) {
if(soundThreadManager == NULL || soundThreadManager->isThreadExecutionLagging()) {
SoundRenderer::getInstance().update();
if(chronoUpdateLoop.getMillis() > 0) SystemFlags::OutputDebug(SystemFlags::debugPerformance,"In [%s::%s Line: %d] SoundRenderer::getInstance().update() took msecs: %lld, updateCount = %d\n",__FILE__,__FUNCTION__,__LINE__,chronoUpdateLoop.getMillis(),updateCount);
if(chronoUpdateLoop.getMillis() > 0) chronoUpdateLoop.start();
@@ -553,10 +553,11 @@ void Program::init(WindowGl *window, bool initSound, bool toggleFullScreen){
}
// Run sound streaming in a background thread if enabled
if(config.getBool("ThreadedSoundStream","false") == true) {
BaseThread::shutdownAndWait(soundThreadManager);
delete soundThreadManager;
soundThreadManager = new SimpleTaskThread(&SoundRenderer::getInstance(),0,50);
if(SoundRenderer::getInstance().runningThreaded() == true) {
if(BaseThread::shutdownAndWait(soundThreadManager) == true) {
delete soundThreadManager;
}
soundThreadManager = new SimpleTaskThread(&SoundRenderer::getInstance(),0,10);
soundThreadManager->setUniqueID(__FILE__);
soundThreadManager->start();
}