Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 23:01:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

add const to recording methods where arguments are passed by reference

Browse source
This commit is contained in:
Stephen Birarda 2014-09-18 11:12:11 -07:00
parent 6e39f049c8
commit ac588a569e
4 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/avatars/src/Player.h
View file

@ -37,7 +37,7 @@ public:
public slots: public slots:
void startPlaying(); void startPlaying();
void stopPlaying(); void stopPlaying();
void loadFromFile(QString& file); void loadFromFile(const QString& file);
void loadRecording(RecordingPointer recording); void loadRecording(RecordingPointer recording);
void play(); void play();

2
libraries/avatars/src/Recorder.h
View file

@ -38,7 +38,7 @@ public:
public slots: public slots:
void startRecording(); void startRecording();
void stopRecording(); void stopRecording();
void saveToFile(QString& file); void saveToFile(const QString& file);
void record(); void record();
void record(char* samples, int size); void record(char* samples, int size);

12
libraries/avatars/src/Recording.cpp
View file

@ -73,7 +73,7 @@ void Recording::addFrame(int timestamp, RecordingFrame &frame) {
_frames << frame; _frames << frame;
} }
void Recording::addAudioPacket(QByteArray& byteArray) { void Recording::addAudioPacket(const QByteArray& byteArray) {
if (!_audio) { if (!_audio) {
_audio = new Sound(byteArray); _audio = new Sound(byteArray);
return; return;
@ -88,7 +88,7 @@ void Recording::clear() {
_audio = NULL; _audio = NULL;
} }
void writeVec3(QDataStream& stream, glm::vec3& value) { void writeVec3(QDataStream& stream, const glm::vec3& value) {
unsigned char buffer[sizeof(value)]; unsigned char buffer[sizeof(value)];
memcpy(buffer, &value, sizeof(value)); memcpy(buffer, &value, sizeof(value));
stream.writeRawData(reinterpret_cast<char*>(buffer), sizeof(value)); stream.writeRawData(reinterpret_cast<char*>(buffer), sizeof(value));
@ -101,7 +101,7 @@ bool readVec3(QDataStream& stream, glm::vec3& value) {
return true; return true;
} }
void writeQuat(QDataStream& stream, glm::quat& value) { void writeQuat(QDataStream& stream, const glm::quat& value) {
unsigned char buffer[256]; unsigned char buffer[256];
int writtenToBuffer = packOrientationQuatToBytes(buffer, value); int writtenToBuffer = packOrientationQuatToBytes(buffer, value);
stream.writeRawData(reinterpret_cast<char*>(buffer), writtenToBuffer); stream.writeRawData(reinterpret_cast<char*>(buffer), writtenToBuffer);
@ -135,7 +135,7 @@ bool readFloat(QDataStream& stream, float& value, int radix) {
return true; return true;
} }
void writeRecordingToFile(RecordingPointer recording, QString& filename) { void writeRecordingToFile(RecordingPointer recording, const QString& filename) {
if (!recording || recording->getFrameNumber() < 1) { if (!recording || recording->getFrameNumber() < 1) {
qDebug() << "Can't save empty recording"; qDebug() << "Can't save empty recording";
return; return;
@ -376,7 +376,7 @@ void writeRecordingToFile(RecordingPointer recording, QString& filename) {
qDebug() << "Wrote" << file.size() << "bytes in" << writingTime + 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) { RecordingPointer readRecordingFromFile(RecordingPointer recording, const QString& filename) {
QByteArray byteArray; QByteArray byteArray;
QUrl url(filename); QUrl url(filename);
QElapsedTimer timer; 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; QElapsedTimer timer;
timer.start(); timer.start();

20
libraries/avatars/src/Recording.h
View file

@ -62,7 +62,7 @@ public:
protected: protected:
void addFrame(int timestamp, RecordingFrame& frame); void addFrame(int timestamp, RecordingFrame& frame);
void addAudioPacket(QByteArray& byteArray); void addAudioPacket(const QByteArray& byteArray);
void clear(); void clear();
private: private:
@ -74,9 +74,9 @@ private:
friend class Recorder; friend class Recorder;
friend class Player; friend class Player;
friend void writeRecordingToFile(RecordingPointer recording, QString& file); friend void writeRecordingToFile(RecordingPointer recording, const QString& file);
friend RecordingPointer readRecordingFromFile(RecordingPointer recording, QString& file); friend RecordingPointer readRecordingFromFile(RecordingPointer recording, const QString& file);
friend RecordingPointer readRecordingFromRecFile(RecordingPointer recording, QString& filename, QByteArray& byteArray); friend RecordingPointer readRecordingFromRecFile(RecordingPointer recording, const QString& filename, const QByteArray& byteArray);
}; };
/// Stores the different values associated to one recording frame /// Stores the different values associated to one recording frame
@ -95,13 +95,13 @@ public:
protected: protected:
void setBlendshapeCoefficients(QVector<float> blendshapeCoefficients); void setBlendshapeCoefficients(QVector<float> blendshapeCoefficients);
void setJointRotations(QVector<glm::quat> jointRotations) { _jointRotations = jointRotations; } void setJointRotations(QVector<glm::quat> jointRotations) { _jointRotations = jointRotations; }
void setTranslation(glm::vec3 translation) { _translation = translation; } void setTranslation(const glm::vec3& translation) { _translation = translation; }
void setRotation(glm::quat rotation) { _rotation = rotation; } void setRotation(const glm::quat& rotation) { _rotation = rotation; }
void setScale(float scale) { _scale = scale; } void setScale(float scale) { _scale = scale; }
void setHeadRotation(glm::quat headRotation) { _headRotation = headRotation; } void setHeadRotation(glm::quat headRotation) { _headRotation = headRotation; }
void setLeanSideways(float leanSideways) { _leanSideways = leanSideways; } void setLeanSideways(float leanSideways) { _leanSideways = leanSideways; }
void setLeanForward(float leanForward) { _leanForward = leanForward; } void setLeanForward(float leanForward) { _leanForward = leanForward; }
void setLookAtPosition(glm::vec3& lookAtPosition) { _lookAtPosition = lookAtPosition; } void setLookAtPosition(const glm::vec3& lookAtPosition) { _lookAtPosition = lookAtPosition; }
private: private:
QVector<float> _blendshapeCoefficients; QVector<float> _blendshapeCoefficients;
@ -115,9 +115,9 @@ private:
glm::vec3 _lookAtPosition; glm::vec3 _lookAtPosition;
friend class Recorder; friend class Recorder;
friend void writeRecordingToFile(RecordingPointer recording, QString& file); friend void writeRecordingToFile(RecordingPointer recording, const QString& file);
friend RecordingPointer readRecordingFromFile(RecordingPointer recording, QString& file); friend RecordingPointer readRecordingFromFile(RecordingPointer recording, const QString& file);
friend RecordingPointer readRecordingFromRecFile(RecordingPointer recording, QString& filename, QByteArray& byteArray); friend RecordingPointer readRecordingFromRecFile(RecordingPointer recording, const QString& filename, const QByteArray& byteArray);
}; };
void writeRecordingToFile(RecordingPointer recording, QString& filename); void writeRecordingToFile(RecordingPointer recording, QString& filename);