From c47a9c7602c5e1f2a889ee2b8edbfba56364f74b Mon Sep 17 00:00:00 2001
From: Seungbae Shin <seungbae.shin@samsung.com>
Date: Mon, 7 Dec 2015 11:42:08 +0900
Subject: [PATCH] Fix SVACE defects

Change-Id: I280bb050ea0dc1f9712a703c6587722017f35637
---
 include/CAudioSessionHandler.h   | 11 +++++------
 src/cpp/CAudioInput.cpp          |  6 ++++--
 src/cpp/CAudioOutput.cpp         |  6 ++++--
 src/cpp/CAudioSessionHandler.cpp |  6 +++++-
 src/cpp/CPulseAudioClient.cpp    |  9 +++++++--
 5 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/include/CAudioSessionHandler.h b/include/CAudioSessionHandler.h
index 9351ba7..8c07c44 100644
--- a/include/CAudioSessionHandler.h
+++ b/include/CAudioSessionHandler.h
@@ -124,19 +124,18 @@ namespace tizen_media_audio {
         EAudioSessionType           __mAudioSession;
         MMSessionType               __mMultimediaSession;
 
-        mm_sound_focus_type_e       __mFocusType;        /* For audio focus */
-        mm_sound_focus_state_e      __mState;            /* For audio focus */
-        char*                       __mReasonForChange;  /* For audio focus */
-        char*                       __mAdditionalInfo;   /* For audio focus */
-
         CAudioInfo                  __mAudioInfo;        /* Referenced from CAudioIO */
 
         IAudioSessionEventListener* __mpEventListener;
 
         bool                        __mIsInit;
+        int                         __mSubscribeId;
 
         bool                        __mUseFocus;
-        int                         __mSubscribeId;
+        mm_sound_focus_type_e       __mFocusType;        /* For audio focus */
+        mm_sound_focus_state_e      __mState;            /* For audio focus */
+        char*                       __mReasonForChange;  /* For audio focus */
+        char*                       __mAdditionalInfo;   /* For audio focus */
     };
 
 
diff --git a/src/cpp/CAudioInput.cpp b/src/cpp/CAudioInput.cpp
index 5b68a9d..828cdda 100644
--- a/src/cpp/CAudioInput.cpp
+++ b/src/cpp/CAudioInput.cpp
@@ -27,7 +27,8 @@ using namespace tizen_media_audio;
  */
 CAudioInput::CAudioInput(CAudioInfo& info) :
     CAudioIO(info),
-    __mIsUsedSyncRead(true) {
+    __mIsUsedSyncRead(true),
+    __mIsInit(false) {
 }
 
 CAudioInput::CAudioInput(
@@ -35,7 +36,8 @@ CAudioInput::CAudioInput(
         CAudioInfo::EChannel    channel,
         CAudioInfo::ESampleType type,
         CAudioInfo::EAudioType  audioType) :
-    __mIsUsedSyncRead(true) {
+    __mIsUsedSyncRead(true),
+    __mIsInit(false) {
     mAudioInfo = CAudioInfo(sampleRate, channel, type, audioType, -1);
 }
 
diff --git a/src/cpp/CAudioOutput.cpp b/src/cpp/CAudioOutput.cpp
index e5fc08b..c1498dd 100644
--- a/src/cpp/CAudioOutput.cpp
+++ b/src/cpp/CAudioOutput.cpp
@@ -27,7 +27,8 @@ using namespace tizen_media_audio;
  */
 CAudioOutput::CAudioOutput(CAudioInfo& info) :
     CAudioIO(info),
-    __mIsUsedSyncWrite(false) {
+    __mIsUsedSyncWrite(false),
+    __mIsInit(false) {
 }
 
 CAudioOutput::CAudioOutput(
@@ -35,7 +36,8 @@ CAudioOutput::CAudioOutput(
         CAudioInfo::EChannel    channel,
         CAudioInfo::ESampleType sampleType,
         CAudioInfo::EAudioType  audioType) :
-    __mIsUsedSyncWrite(false) {
+    __mIsUsedSyncWrite(false),
+    __mIsInit(false) {
     mAudioInfo = CAudioInfo(sampleRate, channel, sampleType, audioType, -1);
 }
 
diff --git a/src/cpp/CAudioSessionHandler.cpp b/src/cpp/CAudioSessionHandler.cpp
index 4ab4060..07d3690 100644
--- a/src/cpp/CAudioSessionHandler.cpp
+++ b/src/cpp/CAudioSessionHandler.cpp
@@ -88,8 +88,12 @@ CAudioSessionHandler::CAudioSessionHandler(EAudioSessionType sessionType, CAudio
     __mMultimediaSession(MM_SESSION_TYPE_MEDIA),
     __mpEventListener(listener),
     __mIsInit(false),
+    __mSubscribeId(-1),
     __mUseFocus(false),
-    __mSubscribeId(-1) {
+    __mFocusType(FOCUS_NONE),
+    __mState(FOCUS_IS_RELEASED),
+    __mReasonForChange(NULL),
+    __mAdditionalInfo(NULL) {
     __mAudioInfo = audioInfo;
 }
 
diff --git a/src/cpp/CPulseAudioClient.cpp b/src/cpp/CPulseAudioClient.cpp
index e11977a..97be638 100644
--- a/src/cpp/CPulseAudioClient.cpp
+++ b/src/cpp/CPulseAudioClient.cpp
@@ -59,6 +59,9 @@ void CPulseAudioClient::__contextStateChangeCb(pa_context* c, void* user_data) {
     switch (pa_context_get_state(c)) {
     case PA_CONTEXT_READY:
         AUDIO_IO_LOGD("The context is ready!");
+        pa_threaded_mainloop_signal(pClient->__mpMainloop, 0);
+        break;
+
     case PA_CONTEXT_FAILED:
     case PA_CONTEXT_TERMINATED:
         pa_threaded_mainloop_signal(pClient->__mpMainloop, 0);
@@ -93,13 +96,15 @@ void CPulseAudioClient::__streamStateChangeCb(pa_stream* s, void* user_data) {
     case PA_STREAM_READY:
         AUDIO_IO_LOGD("The stream is ready!");
         pClient->__mpListener->onStateChanged(CAudioInfo::EAudioIOState::AUDIO_IO_STATE_RUNNING);
+        pa_threaded_mainloop_signal(pClient->__mpMainloop, 0);
+        break;
+
     case PA_STREAM_FAILED:
     case PA_STREAM_TERMINATED:
         pa_threaded_mainloop_signal(pClient->__mpMainloop, 0);
         break;
 
     case PA_STREAM_UNCONNECTED:
-        break;
     case PA_STREAM_CREATING:
         break;
     }
@@ -516,7 +521,7 @@ int CPulseAudioClient::write(const void* data, size_t length) throw (CAudioError
 
     checkRunningState();
 
-    if (data == NULL || length < 0) {
+    if (data == NULL) {
         THROW_ERROR_MSG(CAudioError::EError::ERROR_INVALID_ARGUMENT, "The parameter is invalid");
     }
 
-- 
2.7.4