From: Sangchul Lee Date: Wed, 27 May 2015 05:42:02 +0000 (+0900) Subject: Fix bug regarding session and change manifest X-Git-Tag: submit/tizen/20150715.092047~3 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5feafda576295226212e33c7bde68b5ecd289c0b;p=platform%2Fcore%2Fapi%2Fsound-manager.git Fix bug regarding session and change manifest [Version] Release 0.3.10 [Profile] Common [Issue Type] bug fix and etc. [Comment] Fix bug regarding call routing Revise flags when getting device list in __set_sessoin_mode() Change location for test program to /usr/bin Fix Typo Change-Id: I3bbc6f1e9e200208cb7d55796e76c8571aa25470 --- diff --git a/include/sound_manager.h b/include/sound_manager.h index 0a127a6..dc5ef60 100644 --- a/include/sound_manager.h +++ b/include/sound_manager.h @@ -339,7 +339,7 @@ typedef enum { * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif */ typedef enum { - SOUND_DEVICE_CAHNGED_INFO_STATE, /**< State of the device was changed */ + SOUND_DEVICE_CHANGED_INFO_STATE, /**< State of the device was changed */ SOUND_DEVICE_CHANGED_INFO_IO_DIRECTION, /**< IO direction of the device was changed */ } sound_device_changed_info_e; diff --git a/packaging/capi-media-sound-manager.manifest b/packaging/capi-media-sound-manager.manifest index 017d22d..788c018 100644 --- a/packaging/capi-media-sound-manager.manifest +++ b/packaging/capi-media-sound-manager.manifest @@ -1,5 +1,8 @@ - - - - + + + + + + + \ No newline at end of file diff --git a/packaging/capi-media-sound-manager.spec b/packaging/capi-media-sound-manager.spec index 323340a..e806b71 100755 --- 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.9 +Version: 0.3.10 Release: 0 Group: Multimedia/API License: Apache-2.0 @@ -43,9 +43,9 @@ MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'` %install rm -rf %{buildroot} mkdir -p %{buildroot}/usr/share/license -mkdir -p %{buildroot}/opt/usr/devel +mkdir -p %{buildroot}/usr/bin cp LICENSE %{buildroot}/usr/share/license/%{name} -cp test/sound_manager_test %{buildroot}/opt/usr/devel +cp test/sound_manager_test %{buildroot}/usr/bin %make_install @@ -60,7 +60,7 @@ cp test/sound_manager_test %{buildroot}/opt/usr/devel %manifest %{name}.manifest %{_libdir}/libcapi-media-sound-manager.so.* %{_datadir}/license/%{name} -/opt/usr/devel/* +/usr/bin/sound_manager_test %files devel %manifest %{name}.manifest diff --git a/src/sound_manager_private.c b/src/sound_manager_private.c index 4dc88a2..2775676 100644 --- a/src/sound_manager_private.c +++ b/src/sound_manager_private.c @@ -889,7 +889,7 @@ int __set_session_mode (_session_mode_e mode) MMSoundDevice_t device; do_subsession = false; - ret = mm_sound_get_current_device_list(MM_SOUND_DEVICE_STATE_DEACTIVATED_FLAG, &device_list); + ret = mm_sound_get_current_device_list(MM_SOUND_DEVICE_ALL_FLAG, &device_list); if (ret != MM_ERROR_NONE) { goto ERROR_CASE; } else { @@ -908,6 +908,8 @@ int __set_session_mode (_session_mode_e mode) goto ERROR_CASE; if (io_direction == MM_SOUND_DEVICE_IO_DIRECTION_BOTH) route = MM_SOUND_ROUTE_INOUT_HEADSET; + else if (io_direction == MM_SOUND_DEVICE_IO_DIRECTION_OUT) + route = MM_SOUND_ROUTE_IN_MIC_OUT_HEADPHONE; do_subsession = true; } break; @@ -917,8 +919,10 @@ int __set_session_mode (_session_mode_e mode) ret = mm_sound_get_device_io_direction(device, &io_direction); if (ret != MM_ERROR_NONE) goto ERROR_CASE; - if (io_direction == MM_SOUND_DEVICE_IO_DIRECTION_BOTH) + if (io_direction == MM_SOUND_DEVICE_IO_DIRECTION_BOTH) { + route = MM_SOUND_ROUTE_INOUT_BLUETOOTH; do_subsession = true; + } } break; default: