Showing the changes to interface/src/Audio.cpp (1 of 4 files). Show all
Unified · Split
| @@ -136,13 +136,14 @@ inline void Audio::performIO(int16_t* inputLeft, int16_t* outputLeft, int16_t* o · 135 unmodified lines | |||
| 136 | currentPacketPtr += (sizeof(_listenRadius)); | 136 | currentPacketPtr += (sizeof(_listenRadius)); |
| 137 | leadingBytes += (sizeof(_listenRadius)); | 137 | leadingBytes += (sizeof(_listenRadius)); |
| 138 | } else if (_listenMode == AudioRingBuffer::SELECTED_SOURCES) { | 138 | } else if (_listenMode == AudioRingBuffer::SELECTED_SOURCES) { |
| 139 | memcpy(currentPacketPtr, &_listenSourceCount, sizeof(_listenSourceCount)); | 139 | int listenSourceCount = _listenSources.size(); |
| 140 | currentPacketPtr += (sizeof(_listenSourceCount)); | 140 | memcpy(currentPacketPtr, &listenSourceCount, sizeof(listenSourceCount)); |
| 141 | leadingBytes += (sizeof(_listenSourceCount)); | 141 | currentPacketPtr += (sizeof(listenSourceCount)); |
| 142 | if (_listenSources) { | 142 | leadingBytes += (sizeof(listenSourceCount)); |
| 143 | memcpy(currentPacketPtr, _listenSources, sizeof(int) * _listenSourceCount); | 143 | for (int i = 0; i < listenSourceCount; i++) { |
| 144 | currentPacketPtr += (sizeof(int) * _listenSourceCount); | 144 | memcpy(currentPacketPtr, &_listenSources[i], sizeof(_listenSources[i])); |
| 145 | leadingBytes += (sizeof(int) * _listenSourceCount); | 145 | currentPacketPtr += sizeof(_listenSources[i]); |
| 146 | leadingBytes += sizeof(_listenSources[i]); | ||
| 146 | } | 147 | } |
| 147 | } | 148 | } |
| 148 | 149 | ||
| @@ -336,49 +337,18 @@ void Audio::reset() { · 187 unmodified lines | |||
| 336 | } | 337 | } |
| 337 | 338 | ||
| 338 | void Audio::addListenSource(int sourceID) { | 339 | void Audio::addListenSource(int sourceID) { |
| 339 | 340 | _listenSources.push_back(sourceID); | |
| 340 | // If we don't yet have a list of listen sources, make one | ||
| 341 | if (!_listenSources) { | ||
| 342 | _listenSources = new int[AudioRingBuffer::DEFAULT_LISTEN_LIST_SIZE]; | ||
| 343 | } | ||
| 344 | |||
| 345 | // First check to see if the source is already in our list | ||
| 346 | for (int i = 0; i < _listenSourceCount; i++) { | ||
| 347 | if (_listenSources[i] == sourceID) { | ||
| 348 | return; // already in list | ||
| 349 | } | ||
| 350 | } | ||
| 351 | |||
| 352 | // we know it's not in the list, check to see if we have room to add our source | ||
| 353 | if (_listenSourceCount + 1 < _listenSourcesArraySize) { | ||
| 354 | int* newList = new int[_listenSourcesArraySize + AudioRingBuffer::DEFAULT_LISTEN_LIST_SIZE]; | ||
| 355 | memmove(newList, _listenSources, _listenSourcesArraySize); | ||
| 356 | delete[] _listenSources; | ||
| 357 | _listenSources = newList; | ||
| 358 | _listenSourcesArraySize += AudioRingBuffer::DEFAULT_LISTEN_LIST_SIZE; | ||
| 359 | } | ||
| 360 | _listenSources[_listenSourceCount] = sourceID; | ||
| 361 | _listenSourceCount++; | ||
| 362 | } | 341 | } |
| 363 | 342 | ||
| 364 | void Audio::clearListenSources() { | 343 | void Audio::clearListenSources() { |
| 365 | delete[] _listenSources; | 344 | _listenSources.clear(); |
| 366 | _listenSources = NULL; | ||
| 367 | _listenSourceCount = 0; | ||
| 368 | } | 345 | } |
| 369 | 346 | ||
| 370 | void Audio::removeListenSource(int sourceID) { | 347 | void Audio::removeListenSource(int sourceID) { |
| 371 | // If we don't yet have a list of listen sources, make one | 348 | for (int i = 0; i < _listenSources.size(); i++) { |
| 372 | if (_listenSources) { | 349 | if (_listenSources[i] == sourceID) { |
| 373 | // First check to see if the source is already in our list | 350 | _listenSources.erase(_listenSources.begin() + i); |
| 374 | for (int i = 0; i < _listenSourceCount; i++) { | 351 | return; |
| 375 | if (_listenSources[i] == sourceID) { | ||
| 376 | |||
| 377 | // found it, so, move the items forward in list | ||
| 378 | memmove(&_listenSources[i], &_listenSources[i+1], _listenSourceCount - i); | ||
| 379 | _listenSourceCount--; | ||
| 380 | return; | ||
| 381 | } | ||
| 382 | } | 352 | } |
| 383 | } | 353 | } |
| 384 | } | 354 | } |
| @@ -415,10 +385,7 @@ Audio::Audio(Oscilloscope* scope, int16_t initialJitterBufferSamples) : · 30 unmodified lines | |||
| 415 | _proceduralEffectSample(0), | 385 | _proceduralEffectSample(0), |
| 416 | _heartbeatMagnitude(0.0f), | 386 | _heartbeatMagnitude(0.0f), |
| 417 | _listenMode(AudioRingBuffer::NORMAL), | 387 | _listenMode(AudioRingBuffer::NORMAL), |
| 418 | _listenRadius(0.0f), | 388 | _listenRadius(0.0f) |
| 419 | _listenSourceCount(0), | ||
| 420 | _listenSourcesArraySize(0), | ||
| 421 | _listenSources(NULL) | ||
| 422 | { | 389 | { |
| 423 | outputPortAudioError(Pa_Initialize()); | 390 | outputPortAudioError(Pa_Initialize()); |
| 424 | 391 | ||
| @@ -487,10 +454,6 @@ Audio::~Audio() { · 62 unmodified lines | |||
| 487 | outputPortAudioError(Pa_Terminate()); | 454 | outputPortAudioError(Pa_Terminate()); |
| 488 | } | 455 | } |
| 489 | delete[] _echoSamplesLeft; | 456 | delete[] _echoSamplesLeft; |
| 490 | |||
| 491 | if (_listenSources) { | ||
| 492 | delete[] _listenSources; | ||
| 493 | } | ||
| 494 | } | 457 | } |
| 495 | 458 | ||
| 496 | void Audio::addReceivedAudioToBuffer(unsigned char* receivedData, int receivedBytes) { | 459 | void Audio::addReceivedAudioToBuffer(unsigned char* receivedData, int receivedBytes) { |