From 46dc5bea0404526d1e487c43d19ee7a325c8ea89 Mon Sep 17 00:00:00 2001 From: David Kelly Date: Mon, 11 Jul 2016 09:31:05 -0700 Subject: [PATCH] cleanup from PR comments --- libraries/audio-client/src/AudioClient.cpp | 6 +++--- libraries/audio/src/AudioInjector.h | 4 ---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/libraries/audio-client/src/AudioClient.cpp b/libraries/audio-client/src/AudioClient.cpp index 190dd1583b..b83165eac6 100644 --- a/libraries/audio-client/src/AudioClient.cpp +++ b/libraries/audio-client/src/AudioClient.cpp @@ -939,11 +939,11 @@ bool AudioClient::outputLocalInjector(bool isStereo, AudioInjector* injector) { // We don't want to stop this localOutput and injector whenever this AudioClient singleton goes idle, // only when the localOutput does. But the connection is to localOutput, so that it happens on the right thread. connect(localOutput, &QAudioOutput::stateChanged, localOutput, [=](QAudio::State state) { - if (state == QAudio::IdleState) { + if (state == QAudio::IdleState) { localOutput->stop(); injector->stop(); - } - }); + } + }); connect(injector->getLocalBuffer(), &QIODevice::aboutToClose, localOutput, &QAudioOutput::stop); diff --git a/libraries/audio/src/AudioInjector.h b/libraries/audio/src/AudioInjector.h index a4cde77377..7560863b03 100644 --- a/libraries/audio/src/AudioInjector.h +++ b/libraries/audio/src/AudioInjector.h @@ -84,9 +84,6 @@ signals: void finished(); void restarting(); -/*private slots: - void finish(); -*/ private: void setupInjection(); int64_t injectNextFrame(); @@ -110,7 +107,6 @@ private: // when the injector is local, we need this AudioHRTF _localHRTF; - // for local injection, friend class AudioInjectorManager; };