History

repairs to AudioMixer and audio injection flow

Stephen Birarda committed 12 years ago

Commit 443c94a1 parent 594bd5813 files · +95 −41Browse files

Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 13 files). Show all

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+3−0
@@ -113,6 +113,9 @@ void ScriptEngine::run() { · 112 unmodified lines
113 QScriptValue soundMetaObject = engine.newQMetaObject(&Sound::staticMetaObject, soundConstructorValue);113 QScriptValue soundMetaObject = engine.newQMetaObject(&Sound::staticMetaObject, soundConstructorValue);
114 engine.globalObject().setProperty("Sound", soundMetaObject);114 engine.globalObject().setProperty("Sound", soundMetaObject);
115 115
116 QScriptValue audioScriptingInterfaceValue = engine.newQObject(&_audioScriptingInterface);
117 engine.globalObject().setProperty("Audio", audioScriptingInterfaceValue);
118
116 if (_controllerScriptingInterface) {119 if (_controllerScriptingInterface) {
117 QScriptValue controllerScripterValue = engine.newQObject(_controllerScriptingInterface);120 QScriptValue controllerScripterValue = engine.newQObject(_controllerScriptingInterface);
118 engine.globalObject().setProperty("Controller", controllerScripterValue);121 engine.globalObject().setProperty("Controller", controllerScripterValue);