History

fix script engine shutdown

SamGondelman committed 7 years ago

Commit 300dd391 parent f013b9a6 files · +7 −25Browse files

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

Unified · Split

libraries/script-engine/src/AudioScriptingInterface.cpp+0−10
@@ -46,16 +46,6 @@ ScriptAudioInjector* AudioScriptingInterface::playSystemSound(SharedSoundPointer · 45 unmodified lines
4646 }
4747
4848 ScriptAudioInjector* AudioScriptingInterface::playSound(SharedSoundPointer sound, const AudioInjectorOptions& injectorOptions) {
49− if (QThread::currentThread() != thread()) {
50− ScriptAudioInjector* injector = NULL;
51−
52− BLOCKING_INVOKE_METHOD(this, "playSound",
53− Q_RETURN_ARG(ScriptAudioInjector*, injector),
54− Q_ARG(SharedSoundPointer, sound),
55− Q_ARG(const AudioInjectorOptions&, injectorOptions));
56− return injector;
57− }
58−
5949 if (sound) {
6050 // stereo option isn't set from script, this comes from sound metadata or filename
6151 AudioInjectorOptions optionsCopy = injectorOptions;