From 7b48feca662b6f43bf2a641e5ab731c203c4d8ad Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Fri, 14 Apr 2017 11:53:11 -0700 Subject: [PATCH] address code review comments --- libraries/recording/src/recording/ClipCache.cpp | 3 ++- .../script-engine/src/RecordingScriptingInterface.cpp | 3 ++- .../script-engine/src/RecordingScriptingInterface.h | 1 - script-archive/acScripts/PlayRecordingOnAC.js | 2 ++ script-archive/acScripts/triggeredRecordingOnAC.js | 2 ++ script-archive/tests/playbackAcTest.js | 10 +++++++--- script-archive/vrShop/cash/shopCashierAC.js | 2 ++ script-archive/vrShop/review/shopReviewerAC.js | 2 +- scripts/developer/utilities/record/recorder.js | 2 ++ 9 files changed, 20 insertions(+), 7 deletions(-) diff --git a/libraries/recording/src/recording/ClipCache.cpp b/libraries/recording/src/recording/ClipCache.cpp index 0665608bad..5c55c6bb1c 100644 --- a/libraries/recording/src/recording/ClipCache.cpp +++ b/libraries/recording/src/recording/ClipCache.cpp @@ -10,6 +10,7 @@ #include "ClipCache.h" #include "impl/PointerClip.h" +#include "Logging.h" using namespace recording; NetworkClipLoader::NetworkClipLoader(const QUrl& url) : @@ -45,7 +46,7 @@ NetworkClipLoaderPointer ClipCache::getClipLoader(const QUrl& url) { } QSharedPointer ClipCache::createResource(const QUrl& url, const QSharedPointer& fallback, const void* extra) { - qDebug() << "Loading recording at" << url; + qCDebug(recordingLog) << "Loading recording at" << url; return QSharedPointer(new NetworkClipLoader(url), &Resource::deleter); } diff --git a/libraries/script-engine/src/RecordingScriptingInterface.cpp b/libraries/script-engine/src/RecordingScriptingInterface.cpp index e76a3859f0..36de1c1ef7 100644 --- a/libraries/script-engine/src/RecordingScriptingInterface.cpp +++ b/libraries/script-engine/src/RecordingScriptingInterface.cpp @@ -61,7 +61,8 @@ void RecordingScriptingInterface::loadRecording(const QString& url, QScriptValue auto weakClipLoader = clipLoader.toWeakRef(); // when clip loaded, call the callback with the URL and success boolean - connect(clipLoader.data(), &recording::NetworkClipLoader::clipLoaded, this, [this, weakClipLoader, url, callback]() mutable { + connect(clipLoader.data(), &recording::NetworkClipLoader::clipLoaded, this, + [this, weakClipLoader, url, callback]() mutable { if (auto clipLoader = weakClipLoader.toStrongRef()) { qCDebug(scriptengine) << "Loaded recording from" << url; diff --git a/libraries/script-engine/src/RecordingScriptingInterface.h b/libraries/script-engine/src/RecordingScriptingInterface.h index f6d335b17d..a9fdf1deb4 100644 --- a/libraries/script-engine/src/RecordingScriptingInterface.h +++ b/libraries/script-engine/src/RecordingScriptingInterface.h @@ -31,7 +31,6 @@ public: void setScriptEngine(QScriptEngine* scriptEngine) { _scriptEngine = scriptEngine; } public slots: - void loadRecording(const QString& url, QScriptValue callback = QScriptValue()); void startPlaying(); diff --git a/script-archive/acScripts/PlayRecordingOnAC.js b/script-archive/acScripts/PlayRecordingOnAC.js index 015f247e4a..5979913d23 100644 --- a/script-archive/acScripts/PlayRecordingOnAC.js +++ b/script-archive/acScripts/PlayRecordingOnAC.js @@ -23,6 +23,8 @@ Agent.isAvatar = true; Recording.loadRecording(recordingFile, function(success) { if (success) { Script.update.connect(update); + } else { + print("Failed to load recording from " + recordingFile); } }); diff --git a/script-archive/acScripts/triggeredRecordingOnAC.js b/script-archive/acScripts/triggeredRecordingOnAC.js index c3a87bc44e..964e82321f 100644 --- a/script-archive/acScripts/triggeredRecordingOnAC.js +++ b/script-archive/acScripts/triggeredRecordingOnAC.js @@ -47,6 +47,8 @@ var playRecording = function() { Recording.startPlaying(); isPlaying = true; isPlayable = false; // Set this true again after the cooldown period + } else { + print("Failed to load recording from " + CLIP_URL); } }); }; diff --git a/script-archive/tests/playbackAcTest.js b/script-archive/tests/playbackAcTest.js index 51ff1bdf02..5439f6f474 100644 --- a/script-archive/tests/playbackAcTest.js +++ b/script-archive/tests/playbackAcTest.js @@ -10,9 +10,13 @@ Agent.isAvatar = true; Script.setTimeout(function () { Avatar.position = origin; - Recording.loadRecording("d:/hifi.rec", function(success){ - Recording.setPlayerLoop(true); - Recording.startPlaying(); + Recording.loadRecording("d:/hifi.rec", function(success) { + if (success) { + Recording.setPlayerLoop(true); + Recording.startPlaying(); + } else { + print("Failed to load recording"); + } }); }, millisecondsToWaitBeforeStarting); diff --git a/script-archive/vrShop/cash/shopCashierAC.js b/script-archive/vrShop/cash/shopCashierAC.js index 91b45484fd..5236fa1218 100644 --- a/script-archive/vrShop/cash/shopCashierAC.js +++ b/script-archive/vrShop/cash/shopCashierAC.js @@ -60,6 +60,8 @@ function update(deltaTime) { Recording.setPlayerUseHeadModel(false); Recording.setPlayerUseSkeletonModel(useAvatarModel); Agent.isAvatar = true; + } else { + print("Failed to load recording from " + clip_url); } }); } diff --git a/script-archive/vrShop/review/shopReviewerAC.js b/script-archive/vrShop/review/shopReviewerAC.js index c39aaa2f4a..47b08e0a85 100644 --- a/script-archive/vrShop/review/shopReviewerAC.js +++ b/script-archive/vrShop/review/shopReviewerAC.js @@ -49,7 +49,7 @@ function getAction(channel, message, senderID) { case SHOW: print("Show"); - Recording.loadRecording(clip_url, function(success){ + Recording.loadRecording(clip_url, function(success) { if (success) { Agent.isAvatar = true; Recording.setPlayerTime(0.0); diff --git a/scripts/developer/utilities/record/recorder.js b/scripts/developer/utilities/record/recorder.js index b335274372..bda4edc125 100644 --- a/scripts/developer/utilities/record/recorder.js +++ b/scripts/developer/utilities/record/recorder.js @@ -284,6 +284,8 @@ function mousePressEvent(event) { Recording.loadRecording(recordingFile, function(success) { if (success) { setDefaultPlayerOptions(); + } else { + print("Failed to load recording from " + recordingFile); } }); }