Initialize g_cached_voip_device_id properly in _set_manual_route_info() and add more...

Also sound_manager_test is modified to use new tizen 3.0 API.

[Version] 0.3.106
[Profile] Common
[Issue Type] Bug fix

Change-Id: Ic8cdcb7151573ca5dd74e61a7ad4825018d5f576
Signed-off-by: Sangchul Lee <sc11.lee@samsung.com>

diff --git a/packaging/capi-media-sound-manager.spec b/packaging/capi-media-sound-manager.spec
index 1d19576..77f034c 100755 (executable)
--- a/packaging/capi-media-sound-manager.spec
+++ b/packaging/capi-media-sound-manager.spec
@@ -1,6 +1,6 @@
 Name:       capi-media-sound-manager
 Summary:    Sound Manager library
-Version:    0.3.105
+Version:    0.3.106
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0

diff --git a/src/sound_manager.c b/src/sound_manager.c
index 8af2878..47e8133 100644 (file)
--- a/src/sound_manager.c
+++ b/src/sound_manager.c
@@ -344,6 +344,8 @@ int sound_manager_set_focus_reacquisition(sound_stream_info_h stream_info, bool
 
        ret = mm_sound_set_focus_reacquisition(stream_h->index, enable);
 
+       LOGI("enable(%d)", enable);
+
        return _convert_sound_manager_error_code(__func__, ret);
 }
 
@@ -359,6 +361,8 @@ int sound_manager_get_focus_reacquisition(sound_stream_info_h stream_info, bool
 
        ret = mm_sound_get_focus_reacquisition(stream_h->index, enabled);
 
+       LOGI("enabled(%d)", *enabled);
+
        return _convert_sound_manager_error_code(__func__, ret);
 }
 

diff --git a/src/sound_manager_private.c b/src/sound_manager_private.c
index bf0b868..0bcb611 100644 (file)
--- a/src/sound_manager_private.c
+++ b/src/sound_manager_private.c
@@ -831,7 +831,7 @@ int _set_manual_route_info(unsigned int index, manual_route_info_s *info)
                return MM_ERROR_SOUND_INTERNAL;
        }
 
-       LOGI("index(%u)", index);
+       LOGI("stream info index(%u)", index);
 
        builder_for_in_devices = g_variant_builder_new(G_VARIANT_TYPE("au"));
        builder_for_out_devices = g_variant_builder_new(G_VARIANT_TYPE("au"));
@@ -1527,8 +1527,12 @@ int _set_session_mode(_session_mode_e mode)
 
        if (proper_device)
                mm_sound_get_device_id(proper_device, &g_cached_voip_device_id);
+       else
+               g_cached_voip_device_id = -1;
        if (proper_device2)
                mm_sound_get_device_id(proper_device2, &g_cached_voip_device_id2);
+       else
+               g_cached_voip_device_id2 = -1;
        if (device_list)
                mm_sound_free_device_list(device_list);
 

diff --git a/test/sound_manager_test.c b/test/sound_manager_test.c
index 95d1892..e34fad5 100644 (file)
--- a/test/sound_manager_test.c
+++ b/test/sound_manager_test.c
@@ -993,7 +993,7 @@ static void interpret(char *cmd)
                char *name;
                const char *direc;
                const char *state;
-               if (!(ret = sound_manager_get_current_device_list(g_device_mask, &device_list))) {
+               if (!(ret = sound_manager_get_device_list(g_device_mask, &device_list))) {
                        g_print("success to get current device list\n");
                        while (!sound_manager_get_next_device(device_list, &device)) {
                                _get_device_props_simple(device, &id, &type, &name, &direc, &state);
@@ -1255,7 +1255,6 @@ static void interpret(char *cmd)
                                        break;
                                }
                        }
-                       sound_manager_free_device_list(g_device_list);
                        if (need_to_go) {
                                ret = sound_manager_add_device_for_stream_routing(g_stream_info_h, device);
                                if (ret)
@@ -1263,6 +1262,13 @@ static void interpret(char *cmd)
                        } else
                                g_print("the device is not available now\n");
                        reset_menu_state();
+
+                       if (!(ret = sound_manager_free_device_list(g_device_list))) {
+                               g_print("success to free device list\n");
+                               g_device_list = NULL;
+                       } else {
+                               g_print("fail to free device list, ret[0x%x]\n", ret);
+                       }
                } else {
                        g_print("fail to get current device list, ret(0x%x)\n", ret);
                        reset_menu_state();
@@ -1305,7 +1311,7 @@ static void interpret(char *cmd)
                        reset_menu_state();
                        break;
                }
-               if (!(ret = sound_manager_get_current_device_list(SOUND_DEVICE_ALL_MASK, &g_device_list))) {
+               if (!(ret = sound_manager_get_device_list(SOUND_DEVICE_ALL_MASK, &g_device_list))) {
                        g_print("success to get current device list\n");
                        while (!sound_manager_get_next_device(g_device_list, &device)) {
                                if (!(ret = sound_manager_get_device_type(device, &type))) {
@@ -1330,6 +1336,13 @@ static void interpret(char *cmd)
                                g_print("fail to get current device list, ret(0x%x)\n", ret);
                                reset_menu_state();
                        }
+
+                       if (!(ret = sound_manager_free_device_list(g_device_list))) {
+                               g_print("success to free device list\n");
+                               g_device_list = NULL;
+                       } else {
+                               g_print("fail to free device list, ret[0x%x]\n", ret);
+                       }
                }
                break;
        }