From 397be962f4ff59bd43c5b9a0663cf995492d1e01 Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Thu, 18 Sep 2014 10:37:36 -0700 Subject: [PATCH 1/2] CR fixes --- libraries/avatars/src/Player.cpp | 21 ++++++++++----------- libraries/avatars/src/Player.h | 4 ++-- libraries/avatars/src/Recorder.cpp | 2 +- libraries/avatars/src/Recorder.h | 2 +- libraries/avatars/src/Recording.cpp | 12 ++++++------ libraries/avatars/src/Recording.h | 22 +++++++++++----------- 6 files changed, 31 insertions(+), 32 deletions(-) diff --git a/libraries/avatars/src/Player.cpp b/libraries/avatars/src/Player.cpp index f18c7f04aa..3b74ce595a 100644 --- a/libraries/avatars/src/Player.cpp +++ b/libraries/avatars/src/Player.cpp @@ -17,15 +17,15 @@ #include "Player.h" Player::Player(AvatarData* avatar) : -_recording(new Recording()), -_avatar(avatar), -_audioThread(NULL), -_playFromCurrentPosition(true), -_loop(false), -_useAttachments(true), -_useDisplayName(true), -_useHeadURL(true), -_useSkeletonURL(true) + _recording(new Recording()), + _avatar(avatar), + _audioThread(NULL), + _playFromCurrentPosition(true), + _loop(false), + _useAttachments(true), + _useDisplayName(true), + _useHeadURL(true), + _useSkeletonURL(true) { _timer.invalidate(); _options.setLoop(false); @@ -157,10 +157,9 @@ void Player::loopRecording() { setupAudioThread(); _currentFrame = 0; _timer.restart(); - } -void Player::loadFromFile(QString file) { +void Player::loadFromFile(QString& file) { if (_recording) { _recording->clear(); } else { diff --git a/libraries/avatars/src/Player.h b/libraries/avatars/src/Player.h index ba2ab9951a..bf8aed8576 100644 --- a/libraries/avatars/src/Player.h +++ b/libraries/avatars/src/Player.h @@ -34,10 +34,10 @@ public: RecordingPointer getRecording() const { return _recording; } - public slots: +public slots: void startPlaying(); void stopPlaying(); - void loadFromFile(QString file); + void loadFromFile(QString& file); void loadRecording(RecordingPointer recording); void play(); diff --git a/libraries/avatars/src/Recorder.cpp b/libraries/avatars/src/Recorder.cpp index 4c71dc1a18..5d966e34fb 100644 --- a/libraries/avatars/src/Recorder.cpp +++ b/libraries/avatars/src/Recorder.cpp @@ -86,7 +86,7 @@ void Recorder::stopRecording() { qDebug().nospace() << "Recorded " << _recording->getFrameNumber() << " during " << _recording->getLength() << " msec (" << _recording->getFrameNumber() / (_recording->getLength() / 1000.0f) << " fps)"; } -void Recorder::saveToFile(QString file) { +void Recorder::saveToFile(QString& file) { if (_recording->isEmpty()) { qDebug() << "Cannot save recording to file, recording is empty."; } diff --git a/libraries/avatars/src/Recorder.h b/libraries/avatars/src/Recorder.h index 454e8016fa..8534541b6c 100644 --- a/libraries/avatars/src/Recorder.h +++ b/libraries/avatars/src/Recorder.h @@ -38,7 +38,7 @@ public: public slots: void startRecording(); void stopRecording(); - void saveToFile(QString file); + void saveToFile(QString& file); void record(); void record(char* samples, int size); diff --git a/libraries/avatars/src/Recording.cpp b/libraries/avatars/src/Recording.cpp index 63f37a6885..2af1cd3acf 100644 --- a/libraries/avatars/src/Recording.cpp +++ b/libraries/avatars/src/Recording.cpp @@ -74,7 +74,7 @@ void Recording::addFrame(int timestamp, RecordingFrame &frame) { _frames << frame; } -void Recording::addAudioPacket(QByteArray byteArray) { +void Recording::addAudioPacket(QByteArray& byteArray) { if (!_audio) { _audio = new Sound(byteArray); return; @@ -89,7 +89,7 @@ void Recording::clear() { _audio = NULL; } -void writeVec3(QDataStream& stream, glm::vec3 value) { +void writeVec3(QDataStream& stream, glm::vec3& value) { unsigned char buffer[sizeof(value)]; memcpy(buffer, &value, sizeof(value)); stream.writeRawData(reinterpret_cast(buffer), sizeof(value)); @@ -102,7 +102,7 @@ bool readVec3(QDataStream& stream, glm::vec3& value) { return true; } -void writeQuat(QDataStream& stream, glm::quat value) { +void writeQuat(QDataStream& stream, glm::quat& value) { unsigned char buffer[256]; int writtenToBuffer = packOrientationQuatToBytes(buffer, value); stream.writeRawData(reinterpret_cast(buffer), writtenToBuffer); @@ -136,7 +136,7 @@ bool readFloat(QDataStream& stream, float& value, int radix) { return true; } -void writeRecordingToFile(RecordingPointer recording, QString filename) { +void writeRecordingToFile(RecordingPointer recording, QString& filename) { if (!recording || recording->getFrameNumber() < 1) { qDebug() << "Can't save empty recording"; return; @@ -377,7 +377,7 @@ void writeRecordingToFile(RecordingPointer recording, QString filename) { qDebug() << "Wrote" << file.size() << "bytes in" << writtingTime + checksumTime << "ms. (" << checksumTime << "ms for checksum)"; } -RecordingPointer readRecordingFromFile(RecordingPointer recording, QString filename) { +RecordingPointer readRecordingFromFile(RecordingPointer recording, QString& filename) { QByteArray byteArray; QUrl url(filename); QElapsedTimer timer; @@ -641,7 +641,7 @@ RecordingPointer readRecordingFromFile(RecordingPointer recording, QString filen } -RecordingPointer readRecordingFromRecFile(RecordingPointer recording, QString filename, QByteArray byteArray) { +RecordingPointer readRecordingFromRecFile(RecordingPointer recording, QString& filename, QByteArray& byteArray) { QElapsedTimer timer; timer.start(); diff --git a/libraries/avatars/src/Recording.h b/libraries/avatars/src/Recording.h index ddfebaeb5e..e361887d7f 100644 --- a/libraries/avatars/src/Recording.h +++ b/libraries/avatars/src/Recording.h @@ -62,7 +62,7 @@ public: protected: void addFrame(int timestamp, RecordingFrame& frame); - void addAudioPacket(QByteArray byteArray); + void addAudioPacket(QByteArray& byteArray); void clear(); private: @@ -74,9 +74,9 @@ private: friend class Recorder; friend class Player; - friend void writeRecordingToFile(RecordingPointer recording, QString file); - friend RecordingPointer readRecordingFromFile(RecordingPointer recording, QString file); - friend RecordingPointer readRecordingFromRecFile(RecordingPointer recording, QString filename, QByteArray byteArray); + friend void writeRecordingToFile(RecordingPointer recording, QString& file); + friend RecordingPointer readRecordingFromFile(RecordingPointer recording, QString& file); + friend RecordingPointer readRecordingFromRecFile(RecordingPointer recording, QString& filename, QByteArray& byteArray); }; /// Stores the different values associated to one recording frame @@ -101,7 +101,7 @@ protected: void setHeadRotation(glm::quat headRotation) { _headRotation = headRotation; } void setLeanSideways(float leanSideways) { _leanSideways = leanSideways; } void setLeanForward(float leanForward) { _leanForward = leanForward; } - void setLookAtPosition(glm::vec3 lookAtPosition) { _lookAtPosition = lookAtPosition; } + void setLookAtPosition(glm::vec3& lookAtPosition) { _lookAtPosition = lookAtPosition; } private: QVector _blendshapeCoefficients; @@ -115,13 +115,13 @@ private: glm::vec3 _lookAtPosition; friend class Recorder; - friend void writeRecordingToFile(RecordingPointer recording, QString file); - friend RecordingPointer readRecordingFromFile(RecordingPointer recording, QString file); - friend RecordingPointer readRecordingFromRecFile(RecordingPointer recording, QString filename, QByteArray byteArray); + friend void writeRecordingToFile(RecordingPointer recording, QString& file); + friend RecordingPointer readRecordingFromFile(RecordingPointer recording, QString& file); + friend RecordingPointer readRecordingFromRecFile(RecordingPointer recording, QString& filename, QByteArray& byteArray); }; -void writeRecordingToFile(RecordingPointer recording, QString filename); -RecordingPointer readRecordingFromFile(RecordingPointer recording, QString filename); -RecordingPointer readRecordingFromRecFile(RecordingPointer recording, QString filename, QByteArray byteArray); +void writeRecordingToFile(RecordingPointer recording, QString& filename); +RecordingPointer readRecordingFromFile(RecordingPointer recording, QString& filename); +RecordingPointer readRecordingFromRecFile(RecordingPointer recording, QString& filename, QByteArray& byteArray); #endif // hifi_Recording_h \ No newline at end of file From 72d8522adc578dc9fa62a7578d655612e7df6c2c Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Thu, 18 Sep 2014 10:45:12 -0700 Subject: [PATCH 2/2] Fixed typo + removed MesageBoxes --- libraries/avatars/src/Recording.cpp | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/libraries/avatars/src/Recording.cpp b/libraries/avatars/src/Recording.cpp index 2af1cd3acf..cc03d23d88 100644 --- a/libraries/avatars/src/Recording.cpp +++ b/libraries/avatars/src/Recording.cpp @@ -20,7 +20,6 @@ #include #include #include -#include #include #include "AvatarData.h" @@ -329,7 +328,7 @@ void writeRecordingToFile(RecordingPointer recording, QString& filename) { fileStream << recording->_audio->getByteArray(); - qint64 writtingTime = timer.restart(); + qint64 writingTime = timer.restart(); // Write data length and CRC-16 quint32 dataLength = file.pos() - dataOffset; file.seek(dataOffset); // Go to beginning of data for checksum @@ -374,7 +373,7 @@ void writeRecordingToFile(RecordingPointer recording, QString& filename) { } qint64 checksumTime = timer.elapsed(); - qDebug() << "Wrote" << file.size() << "bytes in" << writtingTime + checksumTime << "ms. (" << checksumTime << "ms for checksum)"; + qDebug() << "Wrote" << file.size() << "bytes in" << writingTime + checksumTime << "ms. (" << checksumTime << "ms for checksum)"; } RecordingPointer readRecordingFromFile(RecordingPointer recording, QString& filename) { @@ -416,10 +415,6 @@ RecordingPointer readRecordingFromFile(RecordingPointer recording, QString& file if (filename.endsWith(".rec") || filename.endsWith(".REC")) { qDebug() << "Old .rec format"; - QMessageBox::warning(NULL, - QString("Old recording format"), - QString("Converting your file to the new format."), - QMessageBox::Ok); readRecordingFromRecFile(recording, filename, byteArray); return recording; } else if (!filename.endsWith(".hfr") && !filename.endsWith(".HFR")) { @@ -797,10 +792,6 @@ RecordingPointer readRecordingFromRecFile(RecordingPointer recording, QString& f // Set recording to new format writeRecordingToFile(recording, filename); - QMessageBox::warning(NULL, - QString("New recording location"), - QString("The new recording was saved at:\n" + filename), - QMessageBox::Ok); qDebug() << "Recording has been successfully converted at" << filename; return recording; }