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

do not omit local audio when echoing server audio

Browse source
This commit is contained in:
Zach Pomerantz 2017-01-20 17:52:03 -05:00
parent bb247fe8a3
commit 685483b924
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libraries/audio-client/src/AudioClient.cpp
View file

@ -1659,14 +1659,9 @@ qint64 AudioClient::AudioOutputIODevice::readData(char * data, qint64 maxSize) {
int injectorSamplesPopped = 0; int injectorSamplesPopped = 0;
{ {
Lock lock(_audio->_localAudioMutex); Lock lock(_audio->_localAudioMutex);
if (_audio->_shouldEchoToServer) { bool append = networkSamplesPopped > 0;
// omit local audio, it should be echoed if ((injectorSamplesPopped = _localInjectorsStream.appendSamples(mixBuffer, samplesRequested, append)) > 0) {
_localInjectorsStream.skipSamples(samplesRequested); qCDebug(audiostream, "Read %d samples from injectors (%d available, %d requested)", injectorSamplesPopped, _localInjectorsStream.samplesAvailable(), samplesRequested);
} else {
bool append = networkSamplesPopped > 0;
if ((injectorSamplesPopped = _localInjectorsStream.appendSamples(mixBuffer, samplesRequested, append)) > 0) {
qCDebug(audiostream, "Read %d samples from injectors (%d available, %d requested)", injectorSamplesPopped, _localInjectorsStream.samplesAvailable(), samplesRequested);
}
} }
} }