From ac588a569e570063233d21053f539ace6e8ec64d Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 18 Sep 2014 11:12:11 -0700 Subject: [PATCH] add const to recording methods where arguments are passed by reference --- libraries/avatars/src/Player.h | 2 +- libraries/avatars/src/Recorder.h | 2 +- libraries/avatars/src/Recording.cpp | 12 ++++++------ libraries/avatars/src/Recording.h | 20 ++++++++++---------- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/libraries/avatars/src/Player.h b/libraries/avatars/src/Player.h index bf8aed8576..772209d435 100644 --- a/libraries/avatars/src/Player.h +++ b/libraries/avatars/src/Player.h @@ -37,7 +37,7 @@ public: public slots: void startPlaying(); void stopPlaying(); - void loadFromFile(QString& file); + void loadFromFile(const QString& file); void loadRecording(RecordingPointer recording); void play(); diff --git a/libraries/avatars/src/Recorder.h b/libraries/avatars/src/Recorder.h index 8534541b6c..e03218287d 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(const 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 3afc6b5526..0bc323a8f7 100644 --- a/libraries/avatars/src/Recording.cpp +++ b/libraries/avatars/src/Recording.cpp @@ -73,7 +73,7 @@ void Recording::addFrame(int timestamp, RecordingFrame &frame) { _frames << frame; } -void Recording::addAudioPacket(QByteArray& byteArray) { +void Recording::addAudioPacket(const QByteArray& byteArray) { if (!_audio) { _audio = new Sound(byteArray); return; @@ -88,7 +88,7 @@ void Recording::clear() { _audio = NULL; } -void writeVec3(QDataStream& stream, glm::vec3& value) { +void writeVec3(QDataStream& stream, const glm::vec3& value) { unsigned char buffer[sizeof(value)]; memcpy(buffer, &value, sizeof(value)); stream.writeRawData(reinterpret_cast(buffer), sizeof(value)); @@ -101,7 +101,7 @@ bool readVec3(QDataStream& stream, glm::vec3& value) { return true; } -void writeQuat(QDataStream& stream, glm::quat& value) { +void writeQuat(QDataStream& stream, const glm::quat& value) { unsigned char buffer[256]; int writtenToBuffer = packOrientationQuatToBytes(buffer, value); stream.writeRawData(reinterpret_cast(buffer), writtenToBuffer); @@ -135,7 +135,7 @@ bool readFloat(QDataStream& stream, float& value, int radix) { return true; } -void writeRecordingToFile(RecordingPointer recording, QString& filename) { +void writeRecordingToFile(RecordingPointer recording, const QString& filename) { if (!recording || recording->getFrameNumber() < 1) { qDebug() << "Can't save empty recording"; return; @@ -376,7 +376,7 @@ void writeRecordingToFile(RecordingPointer recording, QString& filename) { qDebug() << "Wrote" << file.size() << "bytes in" << writingTime + checksumTime << "ms. (" << checksumTime << "ms for checksum)"; } -RecordingPointer readRecordingFromFile(RecordingPointer recording, QString& filename) { +RecordingPointer readRecordingFromFile(RecordingPointer recording, const QString& filename) { QByteArray byteArray; QUrl url(filename); QElapsedTimer timer; @@ -636,7 +636,7 @@ RecordingPointer readRecordingFromFile(RecordingPointer recording, QString& file } -RecordingPointer readRecordingFromRecFile(RecordingPointer recording, QString& filename, QByteArray& byteArray) { +RecordingPointer readRecordingFromRecFile(RecordingPointer recording, const QString& filename, const QByteArray& byteArray) { QElapsedTimer timer; timer.start(); diff --git a/libraries/avatars/src/Recording.h b/libraries/avatars/src/Recording.h index e361887d7f..bffa923ed0 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(const 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, const QString& file); + friend RecordingPointer readRecordingFromFile(RecordingPointer recording, const QString& file); + friend RecordingPointer readRecordingFromRecFile(RecordingPointer recording, const QString& filename, const QByteArray& byteArray); }; /// Stores the different values associated to one recording frame @@ -95,13 +95,13 @@ public: protected: void setBlendshapeCoefficients(QVector blendshapeCoefficients); void setJointRotations(QVector jointRotations) { _jointRotations = jointRotations; } - void setTranslation(glm::vec3 translation) { _translation = translation; } - void setRotation(glm::quat rotation) { _rotation = rotation; } + void setTranslation(const glm::vec3& translation) { _translation = translation; } + void setRotation(const glm::quat& rotation) { _rotation = rotation; } void setScale(float scale) { _scale = scale; } 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(const glm::vec3& lookAtPosition) { _lookAtPosition = lookAtPosition; } private: QVector _blendshapeCoefficients; @@ -115,9 +115,9 @@ 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, const QString& file); + friend RecordingPointer readRecordingFromFile(RecordingPointer recording, const QString& file); + friend RecordingPointer readRecordingFromRecFile(RecordingPointer recording, const QString& filename, const QByteArray& byteArray); }; void writeRecordingToFile(RecordingPointer recording, QString& filename);