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

use AudioRingMixBuffer as LocalInjectorsStream

Browse source
This commit is contained in:
Zach Pomerantz 2017-01-19 16:37:31 -05:00
parent 02e62938a4
commit 5927c089ac
2 changed files with 3 additions and 12 deletions
libraries/audio-client/src
AudioClient.cppAudioClient.h

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

@ -1636,7 +1636,7 @@ qint64 AudioClient::AudioOutputIODevice::readData(char * data, qint64 maxSize) {
_localInjectorsStream.skipSamples(samplesRequested);
} else {
bool append = networkSamplesPopped > 0;
if ((injectorSamplesPopped = _localInjectorsStream.readSamples(mixBuffer, samplesRequested, append)) > 0) {
if ((injectorSamplesPopped = _localInjectorsStream.appendSamples(mixBuffer, samplesRequested, append)) > 0) {
qCDebug(audiostream, "Read %d samples from injectors (%d available, %d requested)", injectorSamplesPopped, _localInjectorsStream.samplesAvailable(), samplesRequested);
}
}

13
libraries/audio-client/src/AudioClient.h
View file

@ -69,17 +69,6 @@ class QIODevice;
class Transform;
class NLPacket;
class LocalInjectorsStream {
public:
LocalInjectorsStream(int numFrameSamples);
int getSampleCapacity() { return 0; };
int samplesAvailable() { return 0; }
int writeSamples(const float*, int numSamples) { return 0; }
void resizeForFrameSize(int numFrameSamples) {}
int skipSamples(int numSamples) { return 0; }
int readSamples(float* mixBuffer, int numSamples, bool append) { return 0; }
};
class AudioInjectorsThread : public QThread {
Q_OBJECT
@ -96,6 +85,8 @@ private:
class AudioClient : public AbstractAudioInterface, public Dependency {
Q_OBJECT
SINGLETON_DEPENDENCY
using LocalInjectorsStream = AudioRingMixBuffer;
public:
static const int MIN_BUFFER_FRAMES;
static const int MAX_BUFFER_FRAMES;