Revise cpp codes (mutex/cond)

[platform/core/api/audio-io.git] / src / cpp / CAudioInput.cpp

diff --git a/src/cpp/CAudioInput.cpp b/src/cpp/CAudioInput.cpp
index 69cbd67..ee5f3b6 100644 (file)
--- a/src/cpp/CAudioInput.cpp
+++ b/src/cpp/CAudioInput.cpp
@@ -102,7 +102,6 @@ void CAudioInput::finalize() {
     }
 
     CAudioIO::finalize();
-
     __setInit(false);
     __mVolume = 1.0;
 }
@@ -134,7 +133,7 @@ void CAudioInput::prepare() {
 
         CPulseStreamSpec spec(streamSpec, mAudioInfo);
 
-        internalLock();
+        std::unique_lock<std::mutex> mutex(mMutex);
         mpPulseAudioClient = new CPulseAudioClient(CPulseAudioClient::EStreamDirection::STREAM_DIRECTION_RECORD, spec, this);
         mpPulseAudioClient->initialize();
         mpPulseAudioClient->applyRecordVolume(__mVolume);
@@ -142,21 +141,17 @@ void CAudioInput::prepare() {
         /* Uncork stream which is created with CORKED flag */
         mpPulseAudioClient->cork(false);
 #endif
-        internalUnlock();
+        mutex.unlock();
 
         CAudioIO::prepare();
     } catch (const CAudioError& e) {
 //LCOV_EXCL_START
         SAFE_FINALIZE(mpPulseAudioClient);
         SAFE_DELETE(mpPulseAudioClient);
-        internalUnlock();
         throw;
 //LCOV_EXCL_STOP
     } catch (const std::bad_alloc&) {
-//LCOV_EXCL_START
-        internalUnlock();
         THROW_ERROR_MSG(CAudioError::EError::ERROR_OUT_OF_MEMORY, "Failed to allocate CPulseAudioClient object");
-//LCOV_EXCL_STOP
     }
 }
 
@@ -172,19 +167,12 @@ void CAudioInput::unprepare() {
 
     CAudioIO::unprepare();
 
-    try {
-        internalLock();
-        if (mpPulseAudioClient && mpPulseAudioClient->isInThread())
-            THROW_ERROR_MSG(CAudioError::EError::ERROR_INVALID_OPERATION, "Can't unprepare inside pulseaudio thread");
-        SAFE_FINALIZE(mpPulseAudioClient);
-        SAFE_DELETE(mpPulseAudioClient);
-        internalUnlock();
-    } catch (const CAudioError& e) {
-//LCOV_EXCL_START
-        internalUnlock();
-        throw;
-//LCOV_EXCL_STOP
-    }
+    std::unique_lock<std::mutex> mutex(mMutex);
+    if (mpPulseAudioClient && mpPulseAudioClient->isInThread())
+        THROW_ERROR_MSG(CAudioError::EError::ERROR_INVALID_OPERATION, "Can't unprepare inside pulseaudio thread");
+    SAFE_FINALIZE(mpPulseAudioClient);
+    SAFE_DELETE(mpPulseAudioClient);
+    mutex.unlock();
 
     CAudioIO::onStateChanged(CAudioInfo::EAudioIOState::AUDIO_IO_STATE_IDLE);
 }
@@ -268,25 +256,17 @@ size_t CAudioInput::read(void* buffer, size_t length) {
 
     int ret = 0;
 
-    try {
-        internalLock();
-
-        // If another thread did call unprepare, do not read
-        if (!mpPulseAudioClient)
-            THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, //LCOV_EXCL_LINE
-                            "Did not initialize CPulseAudioClient");    //LCOV_EXCL_LINE
+    std::unique_lock<std::mutex> mutex(mMutex);
+    // If another thread did call unprepare, do not read
+    if (!mpPulseAudioClient)
+        THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, //LCOV_EXCL_LINE
+                        "Did not initialize CPulseAudioClient");    //LCOV_EXCL_LINE
 
-        // Block until read done
-        ret = mpPulseAudioClient->read(buffer, length);
-        internalUnlock();
+    // Block until read done
+    ret = mpPulseAudioClient->read(buffer, length);
+    mutex.unlock();
 
-        sched_yield();
-    } catch (const CAudioError& e) {
-//LCOV_EXCL_START
-        internalUnlock();
-        throw;
-//LCOV_EXCL_STOP
-    }
+    sched_yield();
 
     return ret;
 }
@@ -325,21 +305,12 @@ void CAudioInput::setVolume(double volume) {
     if (!__IsInit())
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Not initialized"); //LCOV_EXCL_LINE
 
-    AUDIO_IO_LOGE("%d, %p", __IsInit(), mpPulseAudioClient);
-    try {
-        if (__IsReady()) {
-            if (mpPulseAudioClient->isInThread()) {
-                mpPulseAudioClient->applyRecordVolume(volume);
-            } else {
-                internalLock();
-                mpPulseAudioClient->applyRecordVolume(volume);
-                internalUnlock();
-            }
-        }
-    } catch (const CAudioError& e) {
+    if (__IsReady()) {
+        std::unique_lock<std::mutex> defer_mutex(mMutex, std::defer_lock);
         if (!mpPulseAudioClient->isInThread())
-            internalUnlock();
-        throw;
+            defer_mutex.lock();
+
+        mpPulseAudioClient->applyRecordVolume(volume);
     }
 
     __mVolume = volume;