Showing the changes to libraries/script-engine/src/RecordingScriptingInterface.cpp (1 of 39 files). Show all
Unified · Split
| @@ -99,7 +99,7 @@ void RecordingScriptingInterface::loadRecording(const QString& url, QScriptValue · 98 unmodified lines | |||
| 99 | 99 | ||
| 100 | void RecordingScriptingInterface::startPlaying() { | 100 | void RecordingScriptingInterface::startPlaying() { |
| 101 | if (QThread::currentThread() != thread()) { | 101 | if (QThread::currentThread() != thread()) { |
| 102 | hifi::qt::blockingInvokeMethod(this, "startPlaying"); | 102 | BLOCKING_INVOKE_METHOD(this, "startPlaying"); |
| 103 | return; | 103 | return; |
| 104 | } | 104 | } |
| 105 | 105 | ||
| @@ -116,7 +116,7 @@ void RecordingScriptingInterface::setPlayerAudioOffset(float audioOffset) { · 10 unmodified lines | |||
| 116 | 116 | ||
| 117 | void RecordingScriptingInterface::setPlayerTime(float time) { | 117 | void RecordingScriptingInterface::setPlayerTime(float time) { |
| 118 | if (QThread::currentThread() != thread()) { | 118 | if (QThread::currentThread() != thread()) { |
| 119 | hifi::qt::blockingInvokeMethod(this, "setPlayerTime", Q_ARG(float, time)); | 119 | BLOCKING_INVOKE_METHOD(this, "setPlayerTime", Q_ARG(float, time)); |
| 120 | return; | 120 | return; |
| 121 | } | 121 | } |
| 122 | _player->seek(time); | 122 | _player->seek(time); |
| @@ -148,7 +148,7 @@ void RecordingScriptingInterface::setPlayerUseSkeletonModel(bool useSkeletonMode · 25 unmodified lines | |||
| 148 | 148 | ||
| 149 | void RecordingScriptingInterface::pausePlayer() { | 149 | void RecordingScriptingInterface::pausePlayer() { |
| 150 | if (QThread::currentThread() != thread()) { | 150 | if (QThread::currentThread() != thread()) { |
| 151 | hifi::qt::blockingInvokeMethod(this, "pausePlayer"); | 151 | BLOCKING_INVOKE_METHOD(this, "pausePlayer"); |
| 152 | return; | 152 | return; |
| 153 | } | 153 | } |
| 154 | _player->pause(); | 154 | _player->pause(); |
| @@ -156,7 +156,7 @@ void RecordingScriptingInterface::pausePlayer() { · 1 unmodified line | |||
| 156 | 156 | ||
| 157 | void RecordingScriptingInterface::stopPlaying() { | 157 | void RecordingScriptingInterface::stopPlaying() { |
| 158 | if (QThread::currentThread() != thread()) { | 158 | if (QThread::currentThread() != thread()) { |
| 159 | hifi::qt::blockingInvokeMethod(this, "stopPlaying"); | 159 | BLOCKING_INVOKE_METHOD(this, "stopPlaying"); |
| 160 | return; | 160 | return; |
| 161 | } | 161 | } |
| 162 | _player->stop(); | 162 | _player->stop(); |
| @@ -177,7 +177,7 @@ void RecordingScriptingInterface::startRecording() { · 14 unmodified lines | |||
| 177 | } | 177 | } |
| 178 | 178 | ||
| 179 | if (QThread::currentThread() != thread()) { | 179 | if (QThread::currentThread() != thread()) { |
| 180 | hifi::qt::blockingInvokeMethod(this, "startRecording"); | 180 | BLOCKING_INVOKE_METHOD(this, "startRecording"); |
| 181 | return; | 181 | return; |
| 182 | } | 182 | } |
| 183 | 183 | ||
| @@ -200,7 +200,7 @@ QString RecordingScriptingInterface::getDefaultRecordingSaveDirectory() { · 16 unmodified lines | |||
| 200 | 200 | ||
| 201 | void RecordingScriptingInterface::saveRecording(const QString& filename) { | 201 | void RecordingScriptingInterface::saveRecording(const QString& filename) { |
| 202 | if (QThread::currentThread() != thread()) { | 202 | if (QThread::currentThread() != thread()) { |
| 203 | hifi::qt::blockingInvokeMethod(this, "saveRecording", | 203 | BLOCKING_INVOKE_METHOD(this, "saveRecording", |
| 204 | Q_ARG(QString, filename)); | 204 | Q_ARG(QString, filename)); |
| 205 | return; | 205 | return; |
| 206 | } | 206 | } |
| @@ -221,7 +221,7 @@ bool RecordingScriptingInterface::saveRecordingToAsset(QScriptValue getClipAtpUr · 14 unmodified lines | |||
| 221 | 221 | ||
| 222 | if (QThread::currentThread() != thread()) { | 222 | if (QThread::currentThread() != thread()) { |
| 223 | bool result; | 223 | bool result; |
| 224 | hifi::qt::blockingInvokeMethod(this, "saveRecordingToAsset", | 224 | BLOCKING_INVOKE_METHOD(this, "saveRecordingToAsset", |
| 225 | Q_RETURN_ARG(bool, result), | 225 | Q_RETURN_ARG(bool, result), |
| 226 | Q_ARG(QScriptValue, getClipAtpUrl)); | 226 | Q_ARG(QScriptValue, getClipAtpUrl)); |
| 227 | return result; | 227 | return result; |
| @@ -258,7 +258,7 @@ bool RecordingScriptingInterface::saveRecordingToAsset(QScriptValue getClipAtpUr · 30 unmodified lines | |||
| 258 | 258 | ||
| 259 | void RecordingScriptingInterface::loadLastRecording() { | 259 | void RecordingScriptingInterface::loadLastRecording() { |
| 260 | if (QThread::currentThread() != thread()) { | 260 | if (QThread::currentThread() != thread()) { |
| 261 | hifi::qt::blockingInvokeMethod(this, "loadLastRecording"); | 261 | BLOCKING_INVOKE_METHOD(this, "loadLastRecording"); |
| 262 | return; | 262 | return; |
| 263 | } | 263 | } |
| 264 | 264 | ||