From 1db6d0e3c192b669e03a46f938b3ca5ee43c0f66 Mon Sep 17 00:00:00 2001 From: EdgarPironti Date: Thu, 19 Nov 2015 22:51:36 -0800 Subject: [PATCH] Upload QByteArray --- .../src/RecordingScriptingInterface.cpp | 21 +++++++------------ .../src/RecordingScriptingInterface.h | 3 --- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/libraries/script-engine/src/RecordingScriptingInterface.cpp b/libraries/script-engine/src/RecordingScriptingInterface.cpp index fbabdc73af..128182d2a8 100644 --- a/libraries/script-engine/src/RecordingScriptingInterface.cpp +++ b/libraries/script-engine/src/RecordingScriptingInterface.cpp @@ -177,8 +177,7 @@ void RecordingScriptingInterface::saveRecording(const QString& filename) { } bool RecordingScriptingInterface::saveRecordingToAsset(QScriptValue getClipAtpUrl) { - - if (!getClipAtpUrl.isFunction()) + if (!getClipAtpUrl.isFunction()) return false; if (QThread::currentThread() != thread()) { @@ -192,13 +191,14 @@ bool RecordingScriptingInterface::saveRecordingToAsset(QScriptValue getClipAtpUr return false; } - QString filename = "./temp.hfr"; - recording::Clip::toFile(filename, _lastClip); + //QString filename = "./temp.hfr"; + //recording::Clip::toFile(filename, _lastClip); - QUrl url{ filename }; - - if (auto upload = DependencyManager::get()->createUpload(url.toLocalFile())) { // Here we should use the other implementation of createUpload, but we need the QByteArray of the _lastClip + //QUrl url{ filename }; + //if (auto upload = DependencyManager::get()->createUpload(url.toLocalFile())) { + + if (auto upload = DependencyManager::get()->createUpload(recording::Clip::toBuffer(_lastClip), HFR_EXTENSION)) { QObject::connect(upload, &AssetUpload::finished, this, [=](AssetUpload* upload, const QString& hash) mutable { auto filename = QFileInfo(upload->getFilename()).fileName(); QString clip_atp_url = ""; @@ -215,18 +215,13 @@ bool RecordingScriptingInterface::saveRecordingToAsset(QScriptValue getClipAtpUr args << clip_atp_url; getClipAtpUrl.call(QScriptValue(), args); }); - - // start the upload now upload->start(); return true; - - } + } return false; - } - void RecordingScriptingInterface::loadLastRecording() { if (QThread::currentThread() != thread()) { QMetaObject::invokeMethod(this, "loadLastRecording", Qt::BlockingQueuedConnection); diff --git a/libraries/script-engine/src/RecordingScriptingInterface.h b/libraries/script-engine/src/RecordingScriptingInterface.h index 704e10efa1..21aa9b35d4 100644 --- a/libraries/script-engine/src/RecordingScriptingInterface.h +++ b/libraries/script-engine/src/RecordingScriptingInterface.h @@ -82,9 +82,6 @@ protected: Flag _useAttachments { false }; Flag _useSkeletonModel { false }; recording::ClipPointer _lastClip; - -private: - void clipUploadFinished(AssetUpload* upload, const QString& hash); }; #endif // hifi_RecordingScriptingInterface_h