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
13 13
14#include <QVector3D>14#include <QVector3D>
15 15
16#include <shared/QtHelpers.h>
17
16#include "ScriptAudioInjector.h"18#include "ScriptAudioInjector.h"
17#include "ScriptEngineLogging.h"19#include "ScriptEngineLogging.h"
18 20
@@ -32,7 +34,7 @@ ScriptAudioInjector* AudioScriptingInterface::playSound(SharedSoundPointer sound · 13 unmodified lines
32 if (QThread::currentThread() != thread()) {34 if (QThread::currentThread() != thread()) {
33 ScriptAudioInjector* injector = NULL;35 ScriptAudioInjector* injector = NULL;
34 36
35 QMetaObject::invokeMethod(this, "playSound", Qt::BlockingQueuedConnection,37 hifi::qt::blockingInvokeMethod(this, "playSound",
36 Q_RETURN_ARG(ScriptAudioInjector*, injector),38 Q_RETURN_ARG(ScriptAudioInjector*, injector),
37 Q_ARG(SharedSoundPointer, sound),39 Q_ARG(SharedSoundPointer, sound),
38 Q_ARG(const AudioInjectorOptions&, injectorOptions));40 Q_ARG(const AudioInjectorOptions&, injectorOptions));