[Tizen] Fix wrongly passed variable to function in audiosystem

js_reply variable was prepared, but instead of it js_message was
passed to PostMessage function. Some other nits were fixed.

Change-Id: Id19978ecd38c516c8e16aea3749796fd9400748f

diff --git a/src/audiosystem/audiosystem_audio_group.cc b/src/audiosystem/audiosystem_audio_group.cc
index d4f6d0f..b1b6617 100644 (file)
--- a/src/audiosystem/audiosystem_audio_group.cc
+++ b/src/audiosystem/audiosystem_audio_group.cc
@@ -50,7 +50,6 @@ void AudioGroup::UpdateInfo(
 
 picojson::value::object AudioGroup::ToJsonObject() const {
   picojson::value::object reply;
-  picojson::array array;
 
   reply["id"] = picojson::value(static_cast<double>(index_));
   reply["label"] = picojson::value(label_);

diff --git a/src/audiosystem/audiosystem_context.cc b/src/audiosystem/audiosystem_context.cc
index 12b6d4e..c4e26d9 100644 (file)
--- a/src/audiosystem/audiosystem_context.cc
+++ b/src/audiosystem/audiosystem_context.cc
@@ -179,8 +179,8 @@ bool AudioSystemContext::Disconnect() {
   audio_streams_.clear();
 
   is_ready_ = false;
-  main_output_mute_control_ = main_input_mute_control_ = PA_INVALID_INDEX;
-  main_output_mute_control_ = main_input_mute_control_ = PA_INVALID_INDEX;
+  main_input_mute_control_ = PA_INVALID_INDEX;
+  main_output_mute_control_ = PA_INVALID_INDEX;
   return true;
 }
 

diff --git a/src/audiosystem/audiosystem_instance.cc b/src/audiosystem/audiosystem_instance.cc
index c5dae5e..b75a67b 100644 (file)
--- a/src/audiosystem/audiosystem_instance.cc
+++ b/src/audiosystem/audiosystem_instance.cc
@@ -94,7 +94,7 @@ void AudioSystemInstance::HandleMessage(const char* message) {
     js_reply["error"] = picojson::value(true);
     js_reply["errorMsg"] = picojson::value(err);
 
-    PostMessage(js_message);
+    PostMessage(js_reply);
     return;
   }
 
@@ -105,7 +105,6 @@ void AudioSystemInstance::HandleMessage(const char* message) {
 
 void AudioSystemInstance::HandleSyncMessage(const char* message) {
   picojson::value js_message;
-  picojson::value::object js_reply;
   std::string err;
 
   picojson::parse(js_message, message, message + strlen(message), &err);
@@ -116,17 +115,16 @@ void AudioSystemInstance::HandleSyncMessage(const char* message) {
     ERR("%s", err.c_str());
   }
 
+  picojson::value::object js_reply;
   if (!err.empty()) {
     js_reply["error"] = picojson::value(true);
     js_reply["errorMsg"] = picojson::value(err);
-
-    SendSyncReply(js_reply);
-    return;
+  } else {
+    AudioSystemInstance::mtx_.lock();
+    js_reply = context_->HandleSyncMessage(js_message);
+    AudioSystemInstance::mtx_.unlock();
   }
 
-  AudioSystemInstance::mtx_.lock();
-  js_reply = context_->HandleSyncMessage(js_message);
-  AudioSystemInstance::mtx_.unlock();
   SendSyncReply(js_reply);
 }