avoid Qt QTimer thread bug by putting SoundCache on same thread

Stephen Birarda committed 12 years ago

Commit e10d1321 parent a771f7211 files · +74 −61Browse files

Showing the changes to interface/src/Application.cpp (1 of 11 files). Show all

Unified · Split

interface/src/Application.cpp+2−0

@@ -65,6 +65,7 @@ · 64 unmodified lines
65	65	#include <PacketHeaders.h>
66	66	#include <PerfStat.h>
67	67	#include <ResourceCache.h>
	68	+#include <SoundCache.h>
68	69	#include <UserActivityLogger.h>
69	70	#include <UUID.h>
70	71
@@ -3916,6 +3917,7 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEngine* scri · 3845 unmodified lines
3916	3917	scriptEngine->registerGlobalObject("Settings", SettingsScriptingInterface::getInstance());
3917	3918	scriptEngine->registerGlobalObject("AudioDevice", AudioDeviceScriptingInterface::getInstance());
3918	3919	scriptEngine->registerGlobalObject("AnimationCache", &_animationCache);
	3920	+ scriptEngine->registerGlobalObject("SoundCache", &SoundCache::getInstance());
3919	3921	scriptEngine->registerGlobalObject("AudioReflector", &_audioReflector);
3920	3922	scriptEngine->registerGlobalObject("Account", AccountScriptingInterface::getInstance());
3921	3923	scriptEngine->registerGlobalObject("Metavoxels", &_metavoxels);