History

Don't use blocking connections on the main thread

Brad Davis committed 9 years ago

Commit b52dd7b1 parent b22daa945 files · +377 −178Browse files

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

Unified · Split

libraries/script-engine/src/AudioScriptingInterface.cpp+3−1
@@ -13,6 +13,8 @@ · 12 unmodified lines
1313
1414 #include <QVector3D>
1515
16+#include <shared/QtHelpers.h>
17+
1618 #include "ScriptAudioInjector.h"
1719 #include "ScriptEngineLogging.h"
1820
@@ -32,7 +34,7 @@ ScriptAudioInjector* AudioScriptingInterface::playSound(SharedSoundPointer sound · 13 unmodified lines
3234 if (QThread::currentThread() != thread()) {
3335 ScriptAudioInjector* injector = NULL;
3436
35− QMetaObject::invokeMethod(this, "playSound", Qt::BlockingQueuedConnection,
37+ hifi::qt::blockingInvokeMethod(this, "playSound",
3638 Q_RETURN_ARG(ScriptAudioInjector*, injector),
3739 Q_ARG(SharedSoundPointer, sound),
3840 Q_ARG(const AudioInjectorOptions&, injectorOptions));