Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 13:53:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

removed warnings about parseData() overloading in ringbuffer classes

Browse source
This commit is contained in:
wangyix 2014-07-23 11:20:30 -07:00
parent ba4403b063
commit 849c489b4c
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
assignment-client/src/audio/AudioMixerClientData.cpp
View file

@ -95,7 +95,7 @@ int AudioMixerClientData::parseData(const QByteArray& packet) {
} }
case SequenceNumberStats::OnTime: { case SequenceNumberStats::OnTime: {
// ask the AvatarAudioRingBuffer instance to parse the data // ask the AvatarAudioRingBuffer instance to parse the data
avatarRingBuffer->parseData(packet); avatarRingBuffer->parseData(packet, 0);
break; break;
} }
default: { default: {
@ -139,7 +139,7 @@ int AudioMixerClientData::parseData(const QByteArray& packet) {
} }
case SequenceNumberStats::OnTime: { case SequenceNumberStats::OnTime: {
// ask the AvatarAudioRingBuffer instance to parse the data // ask the AvatarAudioRingBuffer instance to parse the data
matchingInjectedRingBuffer->parseData(packet); matchingInjectedRingBuffer->parseData(packet, 0);
break; break;
} }
default: { default: {

2
assignment-client/src/audio/AvatarAudioRingBuffer.h
View file

@ -20,7 +20,7 @@ class AvatarAudioRingBuffer : public PositionalAudioRingBuffer {
public: public:
AvatarAudioRingBuffer(bool isStereo = false, bool dynamicJitterBuffer = false); AvatarAudioRingBuffer(bool isStereo = false, bool dynamicJitterBuffer = false);
int parseData(const QByteArray& packet, int packetsSkipped = 0); int parseData(const QByteArray& packet, int packetsSkipped);
private: private:
// disallow copying of AvatarAudioRingBuffer objects // disallow copying of AvatarAudioRingBuffer objects
AvatarAudioRingBuffer(const AvatarAudioRingBuffer&); AvatarAudioRingBuffer(const AvatarAudioRingBuffer&);

2
libraries/audio/src/InjectedAudioRingBuffer.h
View file

@ -20,7 +20,7 @@ class InjectedAudioRingBuffer : public PositionalAudioRingBuffer {
public: public:
InjectedAudioRingBuffer(const QUuid& streamIdentifier = QUuid(), bool dynamicJitterBuffer = false); InjectedAudioRingBuffer(const QUuid& streamIdentifier = QUuid(), bool dynamicJitterBuffer = false);
int parseData(const QByteArray& packet, int packetsSkipped = 0); int parseData(const QByteArray& packet, int packetsSkipped);
const QUuid& getStreamIdentifier() const { return _streamIdentifier; } const QUuid& getStreamIdentifier() const { return _streamIdentifier; }
float getRadius() const { return _radius; } float getRadius() const { return _radius; }

2
libraries/audio/src/PositionalAudioRingBuffer.h
View file

@ -45,7 +45,7 @@ public:
PositionalAudioRingBuffer(PositionalAudioRingBuffer::Type type, bool isStereo = false, bool dynamicJitterBuffers = false); PositionalAudioRingBuffer(PositionalAudioRingBuffer::Type type, bool isStereo = false, bool dynamicJitterBuffers = false);
virtual int parseData(const QByteArray& packet, int packetsSkipped = 0) = 0; virtual int parseData(const QByteArray& packet, int packetsSkipped) = 0;
int parsePositionalData(const QByteArray& positionalByteArray); int parsePositionalData(const QByteArray& positionalByteArray);
int parseListenModeData(const QByteArray& listenModeByteArray); int parseListenModeData(const QByteArray& listenModeByteArray);