From 4cc89cd165fd5ee5e01d627cdabbde06cfe1262f Mon Sep 17 00:00:00 2001 From: Greg Zharun Date: Tue, 3 Mar 2015 00:23:54 +0200 Subject: [PATCH] Revert "[Summary] Added stream abortion in case of unsuccessful stop" This reverts commit ca61d7129af0ca66f2c7d1df58b5f293f063c626. --- .../WCMRPortAudioDeviceManager.cpp | 20 +++---------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRPortAudioDeviceManager.cpp b/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRPortAudioDeviceManager.cpp index 28f1cc531c..8a77441b62 100644 --- a/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRPortAudioDeviceManager.cpp +++ b/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRPortAudioDeviceManager.cpp @@ -951,23 +951,9 @@ void WCMRPortAudioDevice::stopStreaming (bool callerIsWaiting/*=false*/) } else { - std::cout << "Failed to stop PA stream normaly! Aborting the stream. Error:" << Pa_GetErrorText (paErr) << std::endl; - DEBUG_MSG( "Failed to stop PA stream normaly! Aborting the stream. Error:" << Pa_GetErrorText (paErr) ); - Pa_Sleep(PROPERTY_CHANGE_SLEEP_TIME_MILLISECONDS); // sleep some time to make sure the change has place - PaError abortionError = Pa_AbortStream( m_PortAudioStream ); - - if(abortionError == paNoError || abortionError == paStreamIsStopped) - { - // if the stream was stopped successfully - m_IsStreaming = false; - m_pInputData = NULL; - } - else - { - std::cout << "Failed to stop PA stream: " << Pa_GetErrorText (paErr) << std::endl; - DEBUG_MSG( "Failed to stop PA stream " << Pa_GetErrorText (paErr) ); - m_lastErr = eGenericErr; - } + std::cout << "Failed to stop PA stream normaly! Error:" << Pa_GetErrorText (paErr) << std::endl; + DEBUG_MSG( "Failed to stop PA stream normaly! Error:" << Pa_GetErrorText (paErr) ); + m_lastErr = eGenericErr; } }