History

open up ASI playSound method to ScriptEngine

Stephen Birarda committed 12 years ago

Commit f24eff31 parent 443c94a9 files · +65 −37Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+6−0
@@ -90,6 +90,8 @@ bool ScriptEngine::setScriptContents(const QString& scriptContents) { · 89 unmodified lines
90 return true;90 return true;
91}91}
92 92
93Q_SCRIPT_DECLARE_QMETAOBJECT(AudioInjectorOptions, QObject*)
94
93void ScriptEngine::run() {95void ScriptEngine::run() {
94 _isRunning = true;96 _isRunning = true;
95 QScriptEngine engine;97 QScriptEngine engine;
@@ -109,10 +111,14 @@ void ScriptEngine::run() { · 13 unmodified lines
109 QScriptValue particleScripterValue = engine.newQObject(&_particlesScriptingInterface);111 QScriptValue particleScripterValue = engine.newQObject(&_particlesScriptingInterface);
110 engine.globalObject().setProperty("Particles", particleScripterValue);112 engine.globalObject().setProperty("Particles", particleScripterValue);
111 113
114
112 QScriptValue soundConstructorValue = engine.newFunction(soundConstructor);115 QScriptValue soundConstructorValue = engine.newFunction(soundConstructor);
113 QScriptValue soundMetaObject = engine.newQMetaObject(&Sound::staticMetaObject, soundConstructorValue);116 QScriptValue soundMetaObject = engine.newQMetaObject(&Sound::staticMetaObject, soundConstructorValue);
114 engine.globalObject().setProperty("Sound", soundMetaObject);117 engine.globalObject().setProperty("Sound", soundMetaObject);
115 118
119 QScriptValue injectionOptionValue = engine.scriptValueFromQMetaObject<AudioInjectorOptions>();
120 engine.globalObject().setProperty("AudioInjectionOptions", injectionOptionValue);
121
116 QScriptValue audioScriptingInterfaceValue = engine.newQObject(&_audioScriptingInterface);122 QScriptValue audioScriptingInterfaceValue = engine.newQObject(&_audioScriptingInterface);
117 engine.globalObject().setProperty("Audio", audioScriptingInterfaceValue);123 engine.globalObject().setProperty("Audio", audioScriptingInterfaceValue);
118 124