[Summary] Removed unnecessary abortion

This commit is contained in:
Greg Zharun 2015-03-02 00:07:15 +02:00 committed by Paul Davis
parent 22d68d14ce
commit 708f4bf12b

View file

@ -950,25 +950,11 @@ void WCMRPortAudioDevice::stopStreaming (bool callerIsWaiting/*=false*/)
} }
else else
{ {
std::cout << "Failed to stop PA stream normaly! Aborting the stream. Error:" << Pa_GetErrorText (paErr) << std::endl; std::cout << "Failed to stop PA stream normaly! Error:" << Pa_GetErrorText (paErr) << std::endl;
DEBUG_MSG( "Failed to stop PA stream normaly! Aborting the stream. Error:" << Pa_GetErrorText (paErr) ); DEBUG_MSG( "Failed to stop PA stream normaly! 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; m_lastErr = eGenericErr;
} }
} }
}
if (callerIsWaiting) if (callerIsWaiting)
SetEvent(m_hStopStreamingDone); SetEvent(m_hStopStreamingDone);