Showing the changes to libraries/script-engine/src/RecordingScriptingInterface.cpp (1 of 9 files). Show all
Unified · Split
| @@ -8,14 +8,15 @@ · 7 unmodified lines | |||
| 8 | 8 | ||
| 9 | #include "RecordingScriptingInterface.h" | 9 | #include "RecordingScriptingInterface.h" |
| 10 | 10 | ||
| 11 | #include <QThread> | 11 | #include <QtCore/QThread> |
| 12 | 12 | ||
| 13 | #include <NumericalConstants.h> | ||
| 14 | #include <Transform.h> | ||
| 13 | #include <recording/Deck.h> | 15 | #include <recording/Deck.h> |
| 14 | #include <recording/Recorder.h> | 16 | #include <recording/Recorder.h> |
| 15 | #include <recording/Clip.h> | 17 | #include <recording/Clip.h> |
| 16 | #include <recording/Frame.h> | 18 | #include <recording/Frame.h> |
| 17 | #include <NumericalConstants.h> | 19 | #include <recording/ClipCache.h> |
| 18 | #include <Transform.h> | ||
| 19 | 20 | ||
| 20 | #include "ScriptEngineLogging.h" | 21 | #include "ScriptEngineLogging.h" |
| 21 | 22 | ||
| @@ -43,20 +44,17 @@ float RecordingScriptingInterface::playerLength() const { · 21 unmodified lines | |||
| 43 | return _player->length(); | 44 | return _player->length(); |
| 44 | } | 45 | } |
| 45 | 46 | ||
| 46 | void RecordingScriptingInterface::loadRecording(const QString& filename) { | 47 | void RecordingScriptingInterface::loadRecording(const QString& url) { |
| 47 | using namespace recording; | 48 | using namespace recording; |
| 48 | 49 | ||
| 49 | if (QThread::currentThread() != thread()) { | 50 | if (QThread::currentThread() != thread()) { |
| 50 | QMetaObject::invokeMethod(this, "loadRecording", Qt::BlockingQueuedConnection, | 51 | QMetaObject::invokeMethod(this, "loadRecording", Qt::BlockingQueuedConnection, |
| 51 | Q_ARG(QString, filename)); | 52 | Q_ARG(QString, url)); |
| 52 | return; | 53 | return; |
| 53 | } | 54 | } |
| 54 | 55 | ||
| 55 | ClipPointer clip = Clip::fromFile(filename); | 56 | // FIXME make blocking and force off main thread? |
| 56 | if (!clip) { | 57 | _player->queueClip(ClipCache::instance().getClipLoader(url)->getClip()); |
| 57 | qWarning() << "Unable to load clip data from " << filename; | ||
| 58 | } | ||
| 59 | _player->queueClip(clip); | ||
| 60 | } | 58 | } |
| 61 | 59 | ||
| 62 | void RecordingScriptingInterface::startPlaying() { | 60 | void RecordingScriptingInterface::startPlaying() { |