Create OpenAL sound sources asychronously

auriamg · auriamg · commit bf14e49ea4e4 · 2015-11-09T19:22:06.000-05:00
diff --git a/src/audio/sfx_manager.cpp b/src/audio/sfx_manager.cpp
@@ -378,7 +378,10 @@ void* SFXManager::mainLoop(void *obj)
         case SFX_MUSIC_DEFAULT_VOLUME:
         {
             current->m_music_information->setDefaultVolume();
+            break;
         }
+        case SFX_CREATE_SOURCE:
+            current->m_sfx->init(); break;
         default: assert("Not yet supported.");
         }
         delete current;
diff --git a/src/audio/sfx_manager.hpp b/src/audio/sfx_manager.hpp
@@ -88,6 +88,7 @@ class SFXManager : public NoCopy, public CanBeDeleted
         SFX_MUSIC_WAITING,
         SFX_MUSIC_DEFAULT_VOLUME,
         SFX_EXIT,
+        SFX_CREATE_SOURCE
     };   // SFXCommands
 
     /**
diff --git a/src/audio/sfx_openal.cpp b/src/audio/sfx_openal.cpp
@@ -58,7 +58,8 @@ SFXOpenAL::SFXOpenAL(SFXBuffer* buffer, bool positional, float volume,
     // will not be used anyway.
     if (SFXManager::get()->sfxAllowed())
     {
-        init();
+        SFXManager::get()->queue(SFXManager::SFX_CREATE_SOURCE, this);
+        //init();
     }
 }   // SFXOpenAL
 

Original file line number	Diff line number	Diff line change
`@@ -378,7 +378,10 @@ void* SFXManager::mainLoop(void *obj)`
`378`	`378`	`case SFX_MUSIC_DEFAULT_VOLUME:`
`379`	`379`	`{`
`380`	`380`	`current->m_music_information->setDefaultVolume();`
	`381`	`+ break;`
`381`	`382`	`}`
	`383`	`+ case SFX_CREATE_SOURCE:`
	`384`	`+ current->m_sfx->init(); break;`
`382`	`385`	`default: assert("Not yet supported.");`
`383`	`386`	`}`
`384`	`387`	`delete current;`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,8 @@ SFXOpenAL::SFXOpenAL(SFXBuffer* buffer, bool positional, float volume,`
`58`	`58`	`// will not be used anyway.`
`59`	`59`	`if (SFXManager::get()->sfxAllowed())`
`60`	`60`	`{`
`61`		`- init();`
	`61`	`+ SFXManager::get()->queue(SFXManager::SFX_CREATE_SOURCE, this);`
	`62`	`+ //init();`
`62`	`63`	`}`
`63`	`64`	`} // SFXOpenAL`
`64`	`65`