Fixed system volume code

Change-Id: I45f881d10ae13fd6c0e19a6772d66f5376c7a1fb
Signed-off-by: sungrae jo <seongrae.jo@samsung.com>

diff --git a/server/vcd_recorder.c b/server/vcd_recorder.c
index a024942ddd8c06c02de90b6a862ddbc3cae603b4..8151e0047ade325458767808151fa281755e76d4 100644 (file)
--- a/server/vcd_recorder.c
+++ b/server/vcd_recorder.c
@@ -902,33 +902,39 @@ int vcd_recorder_stop_streaming()
 
 int vcd_recorder_change_system_volume()
 {
+       int ret = VCD_ERROR_NONE;
+
        if (!g_stream_for_volume_h) {
-               int ret = sound_manager_create_stream_information_internal(SOUND_STREAM_TYPE_VOICE_RECOGNITION_SERVICE, NULL, NULL, &g_stream_for_volume_h);
+               ret = sound_manager_create_stream_information_internal(SOUND_STREAM_TYPE_VOICE_RECOGNITION_SERVICE, NULL, NULL, &g_stream_for_volume_h);
                if (0 != ret) {
                        SLOG(LOG_DEBUG, TAG_VCD, "[Recorder] Fail to create stream information, ret(%d)", ret);
                        return VCD_ERROR_OPERATION_FAILED;
                }
-               if (!g_virtual_sound_stream_h) {
-                       ret = sound_manager_create_virtual_stream(g_stream_for_volume_h, &g_virtual_sound_stream_h);
-                       if (0 != ret) {
-                               SLOG(LOG_ERROR, TAG_VCD, "[Recorder ERROR] Fail to create virtual stream, ret(%d)", ret);
-                               return VCD_ERROR_OPERATION_FAILED;
-                       }
-                       ret = sound_manager_start_virtual_stream(g_virtual_sound_stream_h);
-                       if (0 != ret) {
-                               SLOG(LOG_ERROR, TAG_VCD, "[Recorder ERROR] Fail to start virtual stream, ret(%d)", ret);
-                               return VCD_ERROR_OPERATION_FAILED;
-                       }
+       }
+
+       if (!g_virtual_sound_stream_h) {
+               ret = sound_manager_create_virtual_stream(g_stream_for_volume_h, &g_virtual_sound_stream_h);
+               if (0 != ret) {
+                       SLOG(LOG_ERROR, TAG_VCD, "[Recorder ERROR] Fail to create virtual stream, ret(%d)", ret);
+                       return VCD_ERROR_OPERATION_FAILED;
                }
        }
 
+       ret = sound_manager_start_virtual_stream(g_virtual_sound_stream_h);
+       if (0 != ret) {
+               SLOG(LOG_ERROR, TAG_VCD, "[Recorder ERROR] Fail to start virtual stream, ret(%d)", ret);
+               return VCD_ERROR_OPERATION_FAILED;
+       }
+
        return 0;
 }
 
 int vcd_recorder_recover_system_volume()
 {
+       int ret = VCD_ERROR_NONE;
+
        if (g_virtual_sound_stream_h) {
-               int ret = sound_manager_stop_virtual_stream(g_virtual_sound_stream_h);
+               ret = sound_manager_stop_virtual_stream(g_virtual_sound_stream_h);
                if (0 != ret) {
                        SLOG(LOG_ERROR, TAG_VCD, "[Recorder ERROR] Fail to stop virtual stream, ret(%d)", ret);
                        return VCD_ERROR_OPERATION_FAILED;
@@ -939,15 +945,15 @@ int vcd_recorder_recover_system_volume()
                        return VCD_ERROR_OPERATION_FAILED;
                }
                g_virtual_sound_stream_h = NULL;
+       }
 
-               if (g_stream_for_volume_h) {
-                       ret = sound_manager_destroy_stream_information(g_stream_for_volume_h);
-                       if (0 != ret) {
-                               SLOG(LOG_ERROR, TAG_VCD, "[Recorder ERROR] Fail to destroy stream information, ret(%d)", ret);
-                               return VCD_ERROR_OPERATION_FAILED;
-                       }
-                       g_stream_for_volume_h = NULL;
+       if (g_stream_for_volume_h) {
+               ret = sound_manager_destroy_stream_information(g_stream_for_volume_h);
+               if (0 != ret) {
+                       SLOG(LOG_ERROR, TAG_VCD, "[Recorder ERROR] Fail to destroy stream information, ret(%d)", ret);
+                       return VCD_ERROR_OPERATION_FAILED;
                }
+               g_stream_for_volume_h = NULL;
        }
 
        return 0;