diff --git a/src/media/audio/portaudio/portaudiolayer.cpp b/src/media/audio/portaudio/portaudiolayer.cpp index 1a05efc1867843095a173fbadf9879df10d07562..94d7cf3e925edc197a03320d34de3ecd15174c39 100644 --- a/src/media/audio/portaudio/portaudiolayer.cpp +++ b/src/media/audio/portaudio/portaudiolayer.cpp @@ -65,7 +65,7 @@ PortAudioLayer::getAudioDeviceIndex(const std::string& name, numDevices = Pa_GetDeviceCount(); if (numDevices < 0) - this->handleError(numDevices); + RING_ERR("PortAudioLayer error : %s", Pa_GetErrorText(numDevices)); else { const PaDeviceInfo *deviceInfo; for (int i = 0; i < numDevices; i++) { @@ -127,11 +127,11 @@ PortAudioLayer::stopStream() for (int i = 0; i < Direction::End; i++) { auto err = Pa_StopStream(streams[i]); if(err != paNoError) - this->handleError(err); + RING_ERR("Pa_StopStream error : %s", Pa_GetErrorText(err)); err = Pa_CloseStream(streams[i]); if (err != paNoError) - this->handleError(err); + RING_ERR("Pa_StopStream error : %s", Pa_GetErrorText(err)); } { @@ -186,7 +186,7 @@ PortAudioLayer::getDeviceByType(const bool& playback) const numDevices = Pa_GetDeviceCount(); if (numDevices < 0) - this->handleError(numDevices); + RING_ERR("PortAudioLayer error : %s", Pa_GetErrorText(numDevices)); else { for (int i = 0; i < numDevices; i++) { const auto deviceInfo = Pa_GetDeviceInfo(i); @@ -338,20 +338,13 @@ PortAudioLayer::paInputCallback(const void *inputBuffer, void *outputBuffer, return paContinue; } -// PRIVATE METHOD -void -PortAudioLayer::handleError(const PaError& err) const -{ - RING_ERR("PortAudioLayer error : %s", Pa_GetErrorText(err)); -} - void PortAudioLayer::init() { RING_DBG("Init PortAudioLayer"); const auto err = Pa_Initialize(); if (err != paNoError) { - this->handleError(err); + RING_ERR("PortAudioLayer error : %s", Pa_GetErrorText(err)); this->terminate(); } @@ -388,7 +381,7 @@ PortAudioLayer::terminate() const RING_DBG("PortAudioLayer terminate."); const auto err = Pa_Terminate(); if (err != paNoError) - this->handleError(err); + RING_ERR("PortAudioLayer error : %s", Pa_GetErrorText(err)); } void @@ -421,7 +414,7 @@ PortAudioLayer::initStream() &PortAudioLayer::paOutputCallback, this); if(err != paNoError) - this->handleError(err); + RING_ERR("PortAudioLayer error : %s", Pa_GetErrorText(err)); } RING_DBG("Open PortAudio Input Stream"); @@ -448,7 +441,7 @@ PortAudioLayer::initStream() &PortAudioLayer::paInputCallback, this); if(err != paNoError) - this->handleError(err); + RING_ERR("PortAudioLayer error : %s", Pa_GetErrorText(err)); } RING_DBG("Start PortAudio Streams"); @@ -456,7 +449,7 @@ PortAudioLayer::initStream() if (streams[i]) { auto err = Pa_StartStream(streams[i]); if (err != paNoError) - this->handleError(err); + RING_ERR("PortAudioLayer error : %s", Pa_GetErrorText(err)); } } diff --git a/src/media/audio/portaudio/portaudiolayer.h b/src/media/audio/portaudio/portaudiolayer.h index cc4873648fac528925896bf0857de26138d77f08..8a417ecbc696c8422884de9e6ae308986a7afd77 100644 --- a/src/media/audio/portaudio/portaudiolayer.h +++ b/src/media/audio/portaudio/portaudiolayer.h @@ -60,7 +60,6 @@ public: private: NON_COPYABLE(PortAudioLayer); - void handleError(const PaError& err) const; void init(void); void terminate(void) const; void initStream(void);