Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-07 20:06:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove leftover listening mode, fix UUID push in InjectedAudioRingBuffer

Browse source
This commit is contained in:
Stephen Birarda 2013-10-21 15:03:07 -07:00
parent 1b129a43b5
commit fbb097accb
4 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assignment-client/src/audio/AudioMixer.cpp
View file

@ -82,7 +82,7 @@ void AudioMixer::addBufferToMixForListeningNodeWithBuffer(PositionalAudioRingBuf
stk::TwoPole* otherNodeTwoPole = NULL; stk::TwoPole* otherNodeTwoPole = NULL;
if (bufferToAdd != listeningNodeBuffer) { if (bufferToAdd != listeningNodeBuffer) {
// if the two buffer pointers do no match then these are different buffers // if the two buffer pointers do not match then these are different buffers
glm::vec3 listenerPosition = listeningNodeBuffer->getPosition(); glm::vec3 listenerPosition = listeningNodeBuffer->getPosition();
glm::vec3 relativePosition = bufferToAdd->getPosition() - listeningNodeBuffer->getPosition(); glm::vec3 relativePosition = bufferToAdd->getPosition() - listeningNodeBuffer->getPosition();

8
libraries/audio/src/AudioRingBuffer.h
View file

@ -27,14 +27,6 @@ const short RING_BUFFER_LENGTH_SAMPLES = RING_BUFFER_LENGTH_FRAMES * BUFFER_LENG
class AudioRingBuffer : public NodeData { class AudioRingBuffer : public NodeData {
public: public:
static int const DEFAULT_LISTEN_LIST_SIZE = 100;
typedef enum {
NORMAL,
OMNI_DIRECTIONAL_POINT,
SELECTED_SOURCES
} ListenMode;
AudioRingBuffer(bool isStereo); AudioRingBuffer(bool isStereo);
~AudioRingBuffer(); ~AudioRingBuffer();

4
libraries/audio/src/InjectedAudioRingBuffer.cpp
View file

@ -25,8 +25,8 @@ InjectedAudioRingBuffer::InjectedAudioRingBuffer(const QUuid& streamIdentifier)
int InjectedAudioRingBuffer::parseData(unsigned char* sourceBuffer, int numBytes) { int InjectedAudioRingBuffer::parseData(unsigned char* sourceBuffer, int numBytes) {
unsigned char* currentBuffer = sourceBuffer + numBytesForPacketHeader(sourceBuffer); unsigned char* currentBuffer = sourceBuffer + numBytesForPacketHeader(sourceBuffer);
// push past the UUID for this injector // push past the UUID for this node and the stream identifier
currentBuffer += NUM_BYTES_RFC4122_UUID; currentBuffer += (NUM_BYTES_RFC4122_UUID * 2);
// use parsePositionalData in parent PostionalAudioRingBuffer class to pull common positional data // use parsePositionalData in parent PostionalAudioRingBuffer class to pull common positional data
currentBuffer += parsePositionalData(currentBuffer, numBytes - (currentBuffer - sourceBuffer)); currentBuffer += parsePositionalData(currentBuffer, numBytes - (currentBuffer - sourceBuffer));

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

@ -70,6 +70,6 @@ bool PositionalAudioRingBuffer::shouldBeAddedToMix(int numJitterBufferSamples) {
return true; return true;
} }
} }
printf("packet mismatch...\n");
return false; return false;
} }