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/RecordingScriptingInterface.cpp (1 of 45 files). Show all

Unified · Split

libraries/script-engine/src/RecordingScriptingInterface.cpp+9−8

 #include <QtScript/QScriptValue>
 #include <QtWidgets/QFileDialog>
+#include <shared/QtHelpers.h>
 #include <AssetClient.h>
 #include <AssetUpload.h>
 #include <BuildInfo.h>
 void RecordingScriptingInterface::startPlaying() {
     if (QThread::currentThread() != thread()) {
-        QMetaObject::invokeMethod(this, "startPlaying", Qt::BlockingQueuedConnection);
+        hifi::qt::blockingInvokeMethod(this, "startPlaying");
         return;
     }
 void RecordingScriptingInterface::setPlayerTime(float time) {
     if (QThread::currentThread() != thread()) {
-        QMetaObject::invokeMethod(this, "setPlayerTime", Qt::BlockingQueuedConnection, Q_ARG(float, time));
+        hifi::qt::blockingInvokeMethod(this, "setPlayerTime", Q_ARG(float, time));
         return;
     }
     _player->seek(time);
 void RecordingScriptingInterface::pausePlayer() {
     if (QThread::currentThread() != thread()) {
-        QMetaObject::invokeMethod(this, "pausePlayer", Qt::BlockingQueuedConnection);
+        hifi::qt::blockingInvokeMethod(this, "pausePlayer");
         return;
     }
     _player->pause();
 void RecordingScriptingInterface::stopPlaying() {
     if (QThread::currentThread() != thread()) {
-        QMetaObject::invokeMethod(this, "stopPlaying", Qt::BlockingQueuedConnection);
+        hifi::qt::blockingInvokeMethod(this, "stopPlaying");
         return;
     }
     _player->stop();
     }
     if (QThread::currentThread() != thread()) {
-        QMetaObject::invokeMethod(this, "startRecording", Qt::BlockingQueuedConnection);
+        hifi::qt::blockingInvokeMethod(this, "startRecording");
         return;
     }
 void RecordingScriptingInterface::saveRecording(const QString& filename) {
     if (QThread::currentThread() != thread()) {
-        QMetaObject::invokeMethod(this, "saveRecording", Qt::BlockingQueuedConnection,
+        hifi::qt::blockingInvokeMethod(this, "saveRecording",
             Q_ARG(QString, filename));
         return;
     }
     if (QThread::currentThread() != thread()) {
         bool result;
-        QMetaObject::invokeMethod(this, "saveRecordingToAsset", Qt::BlockingQueuedConnection,
+        hifi::qt::blockingInvokeMethod(this, "saveRecordingToAsset",
             Q_RETURN_ARG(bool, result),
             Q_ARG(QScriptValue, getClipAtpUrl));
         return result;
 void RecordingScriptingInterface::loadLastRecording() {
     if (QThread::currentThread() != thread()) {
-        QMetaObject::invokeMethod(this, "loadLastRecording", Qt::BlockingQueuedConnection);
+        hifi::qt::blockingInvokeMethod(this, "loadLastRecording");
         return;
     }