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

have QAudioOutput cleaned up with injector thread

Browse source
This commit is contained in:
Stephen Birarda 2014-11-20 13:48:29 -08:00
parent 0a6ffe3dbd
commit 47f86fac68
2 changed files with 7 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
interface/src/Audio.cpp
View file

@ -1378,10 +1378,14 @@ bool Audio::outputLocalInjector(bool isStereo, qreal volume, AudioInjector* inje
localFormat, this); localFormat, this);
localOutput->setVolume(volume); localOutput->setVolume(volume);
// add this to our list of local injected outputs, we will need to clean it up when the injector says it is done // move the localOutput to the same thread as the local injector buffer
_injectedOutputInterfaces.insert(injector, localOutput); localOutput->moveToThread(injector->getLocalBuffer()->thread());
connect(injector, &AudioInjector::finished, this, &Audio::cleanupLocalOutputInterface); // have it be cleaned up when that thread is done
connect(injector->thread(), &QThread::finished, localOutput, &QAudioOutput::stop);
connect(injector->thread(), &QThread::finished, localOutput, &QAudioOutput::deleteLater);
qDebug() << "Starting QAudioOutput for local injector" << localOutput;
localOutput->start(injector->getLocalBuffer()); localOutput->start(injector->getLocalBuffer());
return localOutput->state() == QAudio::ActiveState; return localOutput->state() == QAudio::ActiveState;
@ -1390,16 +1394,6 @@ bool Audio::outputLocalInjector(bool isStereo, qreal volume, AudioInjector* inje
return false; return false;
} }
void Audio::cleanupLocalOutputInterface() {
QAudioOutput* outputInterface = _injectedOutputInterfaces.value(sender());
if (outputInterface) {
qDebug() << "Stopping a QAudioOutput interface since injector" << sender() << "is finished";
outputInterface->stop();
outputInterface->deleteLater();
}
}
void Audio::renderToolBox(int x, int y, bool boxed) { void Audio::renderToolBox(int x, int y, bool boxed) {
glEnable(GL_TEXTURE_2D); glEnable(GL_TEXTURE_2D);

5
interface/src/Audio.h
View file

@ -179,9 +179,6 @@ signals:
void preProcessOriginalInboundAudio(unsigned int sampleTime, QByteArray& samples, const QAudioFormat& format); void preProcessOriginalInboundAudio(unsigned int sampleTime, QByteArray& samples, const QAudioFormat& format);
void processInboundAudio(unsigned int sampleTime, const QByteArray& samples, const QAudioFormat& format); void processInboundAudio(unsigned int sampleTime, const QByteArray& samples, const QAudioFormat& format);
void processLocalAudio(unsigned int sampleTime, const QByteArray& samples, const QAudioFormat& format); void processLocalAudio(unsigned int sampleTime, const QByteArray& samples, const QAudioFormat& format);
private slots:
void cleanupLocalOutputInterface();
private: private:
void outputFormatChanged(); void outputFormatChanged();
@ -369,8 +366,6 @@ private:
AudioOutputIODevice _audioOutputIODevice; AudioOutputIODevice _audioOutputIODevice;
WeakRecorderPointer _recorder; WeakRecorderPointer _recorder;
QHash<QObject*, QAudioOutput*> _injectedOutputInterfaces;
}; };