diff --git a/libraries/audio-client/src/AudioClient.cpp b/libraries/audio-client/src/AudioClient.cpp index 491c4e341b..1fa6bd2d41 100644 --- a/libraries/audio-client/src/AudioClient.cpp +++ b/libraries/audio-client/src/AudioClient.cpp @@ -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); } } diff --git a/libraries/audio-client/src/AudioClient.h b/libraries/audio-client/src/AudioClient.h index 8befd86f26..103d8a0892 100644 --- a/libraries/audio-client/src/AudioClient.h +++ b/libraries/audio-client/src/AudioClient.h @@ -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;