From 785bb6d86f86268d03c75f54ed3854c7bf0a32c7 Mon Sep 17 00:00:00 2001 From: Sangchul Lee Date: Wed, 10 Aug 2016 16:30:25 +0900 Subject: [PATCH] [UTC][ITC][sound-manager][ACR-728][revised for focus watch callback] Change-Id: I5aa021373ab3bfb7dff6820fcce9d54127d46e04 --- src/itc/sound-manager/ITs-sound-manager-stream.c | 22 +++++++-------- .../tct-sound-manager-native_common_iot.h | 4 +-- .../tct-sound-manager-native_mobile.h | 4 +-- .../tct-sound-manager-native_wearable.h | 4 +-- src/utc/sound-manager/public.list | 4 +-- .../tct-sound-manager-core_common_iot.h | 16 +++++------ .../sound-manager/tct-sound-manager-core_mobile.h | 16 +++++------ src/utc/sound-manager/tct-sound-manager-core_tv.h | 16 +++++------ .../tct-sound-manager-core_wearable.h | 16 +++++------ .../utc-media-sound-manager-callback.c | 33 ++++++++++++---------- src/utc/sound-manager/utc-media-sound-manager.c | 3 -- 11 files changed, 69 insertions(+), 69 deletions(-) diff --git a/src/itc/sound-manager/ITs-sound-manager-stream.c b/src/itc/sound-manager/ITs-sound-manager-stream.c index 441cb64..3a79c15 100755 --- a/src/itc/sound-manager/ITs-sound-manager-stream.c +++ b/src/itc/sound-manager/ITs-sound-manager-stream.c @@ -49,7 +49,7 @@ static void sound_stream_focus_state_changed_callback(sound_stream_info_h stream * @parameter stream focus mask: focus mask, focus state: changed focus state, focus change reason: reason for change additional_info, user_data : user data * @return NA */ -static void sound_stream_focus_state_watch_callback(sound_stream_focus_mask_e changed_focus_mask, sound_stream_focus_state_e changed_focus_state, sound_stream_focus_change_reason_e reason_for_change, const char *additional_info, void *user_data) +static void sound_stream_focus_state_watch_callback(int id, sound_stream_focus_mask_e changed_focus_mask, sound_stream_focus_state_e changed_focus_state, sound_stream_focus_change_reason_e reason_for_change, const char *additional_info, void *user_data) { FPRINTF("[Line : %d][%s] Inside callback \"sound_stream_focus_state_watch_callback\"\\n", __LINE__, API_NAMESPACE); g_bCallbackResult = true; @@ -379,28 +379,28 @@ int ITc_sound_manager_get_focus_state_p(void) return 0; } -//& purpose: To register and unregister the watch callback function to be invoked when the focus state for each sound stream type is changed regardless of the process. +//& purpose: To add and remove the watch callback function to be invoked when the focus state for each sound stream type is changed regardless of the process. //& type : auto /** -* @testcase ITc_sound_manager_set_unset_focus_state_watch_cb_p +* @testcase ITc_sound_manager_add_remove_focus_state_watch_cb_p * @since_tizen 3.0 * @author SRID(shekhar1.s) * @reviewer SRID(gupta.sanjay) * @type auto -* @description register and unregister the watch callback +* @description add and remove the watch callback * @scenario create handle\n * acquire and release focus -* @apicovered sound_manager_set_focus_state_watch_cb, sound_manager_unset_focus_state_watch_cb +* @apicovered sound_manager_add_focus_state_watch_cb, sound_manager_remove_focus_state_watch_cb * @passcase When API return SOUND_MANAGER_ERROR_NONE * @failcase When API not return SOUND_MANAGER_ERROR_NONE * @precondition None * @postcondition None */ -int ITc_sound_manager_set_unset_focus_state_watch_cb_p(void) +int ITc_sound_manager_add_remove_focus_state_watch_cb_p(void) { START_TEST; // Initializing testing variable - int nRet = -1, nEnumLoopCount = 0; + int nRet = -1, nEnumLoopCount = 0, id = 0; sound_stream_focus_mask_e focus_mask[] = { SOUND_STREAM_FOCUS_FOR_PLAYBACK, /**< Mask for playback focus */ @@ -410,11 +410,11 @@ int ITc_sound_manager_set_unset_focus_state_watch_cb_p(void) int nSoundDeviceMaskCount = sizeof(focus_mask) / sizeof(focus_mask[0]); for ( nEnumLoopCount = 0; nEnumLoopCount < nSoundDeviceMaskCount; nEnumLoopCount++ ) { - nRet = sound_manager_set_focus_state_watch_cb(focus_mask[nEnumLoopCount], sound_stream_focus_state_watch_callback, NULL); - PRINT_RESULT(SOUND_MANAGER_ERROR_NONE, nRet, "sound_manager_set_focus_state_watch_cb", SoundManagerGetError(nRet)); + nRet = sound_manager_add_focus_state_watch_cb(focus_mask[nEnumLoopCount], sound_stream_focus_state_watch_callback, NULL, &id); + PRINT_RESULT(SOUND_MANAGER_ERROR_NONE, nRet, "sound_manager_add_focus_state_watch_cb", SoundManagerGetError(nRet)); - nRet = sound_manager_unset_focus_state_watch_cb(); - PRINT_RESULT(SOUND_MANAGER_ERROR_NONE, nRet, "sound_manager_unset_focus_state_watch_cb", SoundManagerGetError(nRet)); + nRet = sound_manager_remove_focus_state_watch_cb(id); + PRINT_RESULT(SOUND_MANAGER_ERROR_NONE, nRet, "sound_manager_remove_focus_state_watch_cb", SoundManagerGetError(nRet)); } return 0; diff --git a/src/itc/sound-manager/tct-sound-manager-native_common_iot.h b/src/itc/sound-manager/tct-sound-manager-native_common_iot.h index de908fa..da27a92 100755 --- a/src/itc/sound-manager/tct-sound-manager-native_common_iot.h +++ b/src/itc/sound-manager/tct-sound-manager-native_common_iot.h @@ -48,7 +48,7 @@ extern int ITc_sound_manager_add_remove_device_for_stream_routing_p(void); extern int ITc_sound_manager_apply_stream_routing_p(void); extern int ITc_sound_manager_acquire_release_focus_p(void); extern int ITc_sound_manager_get_focus_state_p(void); -extern int ITc_sound_manager_set_unset_focus_state_watch_cb_p(void); +extern int ITc_sound_manager_add_remove_focus_state_watch_cb_p(void); extern int ITc_sound_manager_set_get_focus_reacquisition_p(void); extern int ITc_sound_manager_get_sound_type_p(void); extern int ITc_sound_manager_get_max_volume_p(void); @@ -78,7 +78,7 @@ testcase tc_array[] = { {"ITc_sound_manager_apply_stream_routing_p", ITc_sound_manager_apply_stream_routing_p, ITs_sound_manager_stream_startup, ITs_sound_manager_stream_cleanup}, {"ITc_sound_manager_acquire_release_focus_p", ITc_sound_manager_acquire_release_focus_p, ITs_sound_manager_stream_startup, ITs_sound_manager_stream_cleanup}, {"ITc_sound_manager_get_focus_state_p", ITc_sound_manager_get_focus_state_p, ITs_sound_manager_stream_startup, ITs_sound_manager_stream_cleanup}, - {"ITc_sound_manager_set_unset_focus_state_watch_cb_p", ITc_sound_manager_set_unset_focus_state_watch_cb_p, ITs_sound_manager_stream_startup, ITs_sound_manager_stream_cleanup}, + {"ITc_sound_manager_add_remove_focus_state_watch_cb_p", ITc_sound_manager_add_remove_focus_state_watch_cb_p, ITs_sound_manager_stream_startup, ITs_sound_manager_stream_cleanup}, {"ITc_sound_manager_set_get_focus_reacquisition_p", ITc_sound_manager_set_get_focus_reacquisition_p, ITs_sound_manager_stream_startup, ITs_sound_manager_stream_cleanup}, {"ITc_sound_manager_get_sound_type_p", ITc_sound_manager_get_sound_type_p, ITs_sound_manager_stream_startup, ITs_sound_manager_stream_cleanup}, {"ITc_sound_manager_get_max_volume_p", ITc_sound_manager_get_max_volume_p, ITs_sound_manager_volume_startup, ITs_sound_manager_volume_cleanup}, diff --git a/src/itc/sound-manager/tct-sound-manager-native_mobile.h b/src/itc/sound-manager/tct-sound-manager-native_mobile.h index de908fa..da27a92 100755 --- a/src/itc/sound-manager/tct-sound-manager-native_mobile.h +++ b/src/itc/sound-manager/tct-sound-manager-native_mobile.h @@ -48,7 +48,7 @@ extern int ITc_sound_manager_add_remove_device_for_stream_routing_p(void); extern int ITc_sound_manager_apply_stream_routing_p(void); extern int ITc_sound_manager_acquire_release_focus_p(void); extern int ITc_sound_manager_get_focus_state_p(void); -extern int ITc_sound_manager_set_unset_focus_state_watch_cb_p(void); +extern int ITc_sound_manager_add_remove_focus_state_watch_cb_p(void); extern int ITc_sound_manager_set_get_focus_reacquisition_p(void); extern int ITc_sound_manager_get_sound_type_p(void); extern int ITc_sound_manager_get_max_volume_p(void); @@ -78,7 +78,7 @@ testcase tc_array[] = { {"ITc_sound_manager_apply_stream_routing_p", ITc_sound_manager_apply_stream_routing_p, ITs_sound_manager_stream_startup, ITs_sound_manager_stream_cleanup}, {"ITc_sound_manager_acquire_release_focus_p", ITc_sound_manager_acquire_release_focus_p, ITs_sound_manager_stream_startup, ITs_sound_manager_stream_cleanup}, {"ITc_sound_manager_get_focus_state_p", ITc_sound_manager_get_focus_state_p, ITs_sound_manager_stream_startup, ITs_sound_manager_stream_cleanup}, - {"ITc_sound_manager_set_unset_focus_state_watch_cb_p", ITc_sound_manager_set_unset_focus_state_watch_cb_p, ITs_sound_manager_stream_startup, ITs_sound_manager_stream_cleanup}, + {"ITc_sound_manager_add_remove_focus_state_watch_cb_p", ITc_sound_manager_add_remove_focus_state_watch_cb_p, ITs_sound_manager_stream_startup, ITs_sound_manager_stream_cleanup}, {"ITc_sound_manager_set_get_focus_reacquisition_p", ITc_sound_manager_set_get_focus_reacquisition_p, ITs_sound_manager_stream_startup, ITs_sound_manager_stream_cleanup}, {"ITc_sound_manager_get_sound_type_p", ITc_sound_manager_get_sound_type_p, ITs_sound_manager_stream_startup, ITs_sound_manager_stream_cleanup}, {"ITc_sound_manager_get_max_volume_p", ITc_sound_manager_get_max_volume_p, ITs_sound_manager_volume_startup, ITs_sound_manager_volume_cleanup}, diff --git a/src/itc/sound-manager/tct-sound-manager-native_wearable.h b/src/itc/sound-manager/tct-sound-manager-native_wearable.h index de908fa..da27a92 100755 --- a/src/itc/sound-manager/tct-sound-manager-native_wearable.h +++ b/src/itc/sound-manager/tct-sound-manager-native_wearable.h @@ -48,7 +48,7 @@ extern int ITc_sound_manager_add_remove_device_for_stream_routing_p(void); extern int ITc_sound_manager_apply_stream_routing_p(void); extern int ITc_sound_manager_acquire_release_focus_p(void); extern int ITc_sound_manager_get_focus_state_p(void); -extern int ITc_sound_manager_set_unset_focus_state_watch_cb_p(void); +extern int ITc_sound_manager_add_remove_focus_state_watch_cb_p(void); extern int ITc_sound_manager_set_get_focus_reacquisition_p(void); extern int ITc_sound_manager_get_sound_type_p(void); extern int ITc_sound_manager_get_max_volume_p(void); @@ -78,7 +78,7 @@ testcase tc_array[] = { {"ITc_sound_manager_apply_stream_routing_p", ITc_sound_manager_apply_stream_routing_p, ITs_sound_manager_stream_startup, ITs_sound_manager_stream_cleanup}, {"ITc_sound_manager_acquire_release_focus_p", ITc_sound_manager_acquire_release_focus_p, ITs_sound_manager_stream_startup, ITs_sound_manager_stream_cleanup}, {"ITc_sound_manager_get_focus_state_p", ITc_sound_manager_get_focus_state_p, ITs_sound_manager_stream_startup, ITs_sound_manager_stream_cleanup}, - {"ITc_sound_manager_set_unset_focus_state_watch_cb_p", ITc_sound_manager_set_unset_focus_state_watch_cb_p, ITs_sound_manager_stream_startup, ITs_sound_manager_stream_cleanup}, + {"ITc_sound_manager_add_remove_focus_state_watch_cb_p", ITc_sound_manager_add_remove_focus_state_watch_cb_p, ITs_sound_manager_stream_startup, ITs_sound_manager_stream_cleanup}, {"ITc_sound_manager_set_get_focus_reacquisition_p", ITc_sound_manager_set_get_focus_reacquisition_p, ITs_sound_manager_stream_startup, ITs_sound_manager_stream_cleanup}, {"ITc_sound_manager_get_sound_type_p", ITc_sound_manager_get_sound_type_p, ITs_sound_manager_stream_startup, ITs_sound_manager_stream_cleanup}, {"ITc_sound_manager_get_max_volume_p", ITc_sound_manager_get_max_volume_p, ITs_sound_manager_volume_startup, ITs_sound_manager_volume_cleanup}, diff --git a/src/utc/sound-manager/public.list b/src/utc/sound-manager/public.list index d35d322..dde731b 100755 --- a/src/utc/sound-manager/public.list +++ b/src/utc/sound-manager/public.list @@ -37,6 +37,6 @@ sound_manager_apply_stream_routing sound_manager_acquire_focus sound_manager_release_focus sound_manager_get_focus_state -sound_manager_set_focus_state_watch_cb -sound_manager_unset_focus_state_watch_cb +sound_manager_add_focus_state_watch_cb +sound_manager_remove_focus_state_watch_cb diff --git a/src/utc/sound-manager/tct-sound-manager-core_common_iot.h b/src/utc/sound-manager/tct-sound-manager-core_common_iot.h index 241efc3..354ffd7 100755 --- a/src/utc/sound-manager/tct-sound-manager-core_common_iot.h +++ b/src/utc/sound-manager/tct-sound-manager-core_common_iot.h @@ -117,10 +117,10 @@ extern int utc_media_sound_manager_set_device_information_changed_cb_p(void); extern int utc_media_sound_manager_set_device_information_changed_cb_n(void); extern int utc_media_sound_manager_unset_device_information_changed_cb_p(void); extern int utc_media_sound_manager_unset_device_information_changed_cb_n(void); -extern int utc_media_sound_manager_set_focus_state_watch_cb_p(void); -extern int utc_media_sound_manager_set_focus_state_watch_cb_n(void); -extern int utc_media_sound_manager_unset_focus_state_watch_cb_p(void); -extern int utc_media_sound_manager_unset_focus_state_watch_cb_n(void); +extern int utc_media_sound_manager_add_focus_state_watch_cb_p(void); +extern int utc_media_sound_manager_add_focus_state_watch_cb_n(void); +extern int utc_media_sound_manager_remove_focus_state_watch_cb_p(void); +extern int utc_media_sound_manager_remove_focus_state_watch_cb_n(void); testcase tc_array[] = { {"utc_media_sound_manager_get_max_volume_p", utc_media_sound_manager_get_max_volume_p, NULL, NULL}, @@ -220,10 +220,10 @@ testcase tc_array[] = { {"utc_media_sound_manager_set_device_information_changed_cb_n", utc_media_sound_manager_set_device_information_changed_cb_n, NULL, NULL}, {"utc_media_sound_manager_unset_device_information_changed_cb_p", utc_media_sound_manager_unset_device_information_changed_cb_p, NULL, NULL}, {"utc_media_sound_manager_unset_device_information_changed_cb_n", utc_media_sound_manager_unset_device_information_changed_cb_n, NULL, NULL}, - {"utc_media_sound_manager_set_focus_state_watch_cb_p", utc_media_sound_manager_set_focus_state_watch_cb_p, NULL, NULL}, - {"utc_media_sound_manager_set_focus_state_watch_cb_n", utc_media_sound_manager_set_focus_state_watch_cb_n, NULL, NULL}, - {"utc_media_sound_manager_unset_focus_state_watch_cb_p", utc_media_sound_manager_unset_focus_state_watch_cb_p, NULL, NULL}, - {"utc_media_sound_manager_unset_focus_state_watch_cb_n", utc_media_sound_manager_unset_focus_state_watch_cb_n, NULL, NULL}, + {"utc_media_sound_manager_add_focus_state_watch_cb_p", utc_media_sound_manager_add_focus_state_watch_cb_p, NULL, NULL}, + {"utc_media_sound_manager_add_focus_state_watch_cb_n", utc_media_sound_manager_add_focus_state_watch_cb_n, NULL, NULL}, + {"utc_media_sound_manager_remove_focus_state_watch_cb_p", utc_media_sound_manager_remove_focus_state_watch_cb_p, NULL, NULL}, + {"utc_media_sound_manager_remove_focus_state_watch_cb_n", utc_media_sound_manager_remove_focus_state_watch_cb_n, NULL, NULL}, {NULL, NULL} }; diff --git a/src/utc/sound-manager/tct-sound-manager-core_mobile.h b/src/utc/sound-manager/tct-sound-manager-core_mobile.h index 241efc3..354ffd7 100755 --- a/src/utc/sound-manager/tct-sound-manager-core_mobile.h +++ b/src/utc/sound-manager/tct-sound-manager-core_mobile.h @@ -117,10 +117,10 @@ extern int utc_media_sound_manager_set_device_information_changed_cb_p(void); extern int utc_media_sound_manager_set_device_information_changed_cb_n(void); extern int utc_media_sound_manager_unset_device_information_changed_cb_p(void); extern int utc_media_sound_manager_unset_device_information_changed_cb_n(void); -extern int utc_media_sound_manager_set_focus_state_watch_cb_p(void); -extern int utc_media_sound_manager_set_focus_state_watch_cb_n(void); -extern int utc_media_sound_manager_unset_focus_state_watch_cb_p(void); -extern int utc_media_sound_manager_unset_focus_state_watch_cb_n(void); +extern int utc_media_sound_manager_add_focus_state_watch_cb_p(void); +extern int utc_media_sound_manager_add_focus_state_watch_cb_n(void); +extern int utc_media_sound_manager_remove_focus_state_watch_cb_p(void); +extern int utc_media_sound_manager_remove_focus_state_watch_cb_n(void); testcase tc_array[] = { {"utc_media_sound_manager_get_max_volume_p", utc_media_sound_manager_get_max_volume_p, NULL, NULL}, @@ -220,10 +220,10 @@ testcase tc_array[] = { {"utc_media_sound_manager_set_device_information_changed_cb_n", utc_media_sound_manager_set_device_information_changed_cb_n, NULL, NULL}, {"utc_media_sound_manager_unset_device_information_changed_cb_p", utc_media_sound_manager_unset_device_information_changed_cb_p, NULL, NULL}, {"utc_media_sound_manager_unset_device_information_changed_cb_n", utc_media_sound_manager_unset_device_information_changed_cb_n, NULL, NULL}, - {"utc_media_sound_manager_set_focus_state_watch_cb_p", utc_media_sound_manager_set_focus_state_watch_cb_p, NULL, NULL}, - {"utc_media_sound_manager_set_focus_state_watch_cb_n", utc_media_sound_manager_set_focus_state_watch_cb_n, NULL, NULL}, - {"utc_media_sound_manager_unset_focus_state_watch_cb_p", utc_media_sound_manager_unset_focus_state_watch_cb_p, NULL, NULL}, - {"utc_media_sound_manager_unset_focus_state_watch_cb_n", utc_media_sound_manager_unset_focus_state_watch_cb_n, NULL, NULL}, + {"utc_media_sound_manager_add_focus_state_watch_cb_p", utc_media_sound_manager_add_focus_state_watch_cb_p, NULL, NULL}, + {"utc_media_sound_manager_add_focus_state_watch_cb_n", utc_media_sound_manager_add_focus_state_watch_cb_n, NULL, NULL}, + {"utc_media_sound_manager_remove_focus_state_watch_cb_p", utc_media_sound_manager_remove_focus_state_watch_cb_p, NULL, NULL}, + {"utc_media_sound_manager_remove_focus_state_watch_cb_n", utc_media_sound_manager_remove_focus_state_watch_cb_n, NULL, NULL}, {NULL, NULL} }; diff --git a/src/utc/sound-manager/tct-sound-manager-core_tv.h b/src/utc/sound-manager/tct-sound-manager-core_tv.h index 241efc3..354ffd7 100755 --- a/src/utc/sound-manager/tct-sound-manager-core_tv.h +++ b/src/utc/sound-manager/tct-sound-manager-core_tv.h @@ -117,10 +117,10 @@ extern int utc_media_sound_manager_set_device_information_changed_cb_p(void); extern int utc_media_sound_manager_set_device_information_changed_cb_n(void); extern int utc_media_sound_manager_unset_device_information_changed_cb_p(void); extern int utc_media_sound_manager_unset_device_information_changed_cb_n(void); -extern int utc_media_sound_manager_set_focus_state_watch_cb_p(void); -extern int utc_media_sound_manager_set_focus_state_watch_cb_n(void); -extern int utc_media_sound_manager_unset_focus_state_watch_cb_p(void); -extern int utc_media_sound_manager_unset_focus_state_watch_cb_n(void); +extern int utc_media_sound_manager_add_focus_state_watch_cb_p(void); +extern int utc_media_sound_manager_add_focus_state_watch_cb_n(void); +extern int utc_media_sound_manager_remove_focus_state_watch_cb_p(void); +extern int utc_media_sound_manager_remove_focus_state_watch_cb_n(void); testcase tc_array[] = { {"utc_media_sound_manager_get_max_volume_p", utc_media_sound_manager_get_max_volume_p, NULL, NULL}, @@ -220,10 +220,10 @@ testcase tc_array[] = { {"utc_media_sound_manager_set_device_information_changed_cb_n", utc_media_sound_manager_set_device_information_changed_cb_n, NULL, NULL}, {"utc_media_sound_manager_unset_device_information_changed_cb_p", utc_media_sound_manager_unset_device_information_changed_cb_p, NULL, NULL}, {"utc_media_sound_manager_unset_device_information_changed_cb_n", utc_media_sound_manager_unset_device_information_changed_cb_n, NULL, NULL}, - {"utc_media_sound_manager_set_focus_state_watch_cb_p", utc_media_sound_manager_set_focus_state_watch_cb_p, NULL, NULL}, - {"utc_media_sound_manager_set_focus_state_watch_cb_n", utc_media_sound_manager_set_focus_state_watch_cb_n, NULL, NULL}, - {"utc_media_sound_manager_unset_focus_state_watch_cb_p", utc_media_sound_manager_unset_focus_state_watch_cb_p, NULL, NULL}, - {"utc_media_sound_manager_unset_focus_state_watch_cb_n", utc_media_sound_manager_unset_focus_state_watch_cb_n, NULL, NULL}, + {"utc_media_sound_manager_add_focus_state_watch_cb_p", utc_media_sound_manager_add_focus_state_watch_cb_p, NULL, NULL}, + {"utc_media_sound_manager_add_focus_state_watch_cb_n", utc_media_sound_manager_add_focus_state_watch_cb_n, NULL, NULL}, + {"utc_media_sound_manager_remove_focus_state_watch_cb_p", utc_media_sound_manager_remove_focus_state_watch_cb_p, NULL, NULL}, + {"utc_media_sound_manager_remove_focus_state_watch_cb_n", utc_media_sound_manager_remove_focus_state_watch_cb_n, NULL, NULL}, {NULL, NULL} }; diff --git a/src/utc/sound-manager/tct-sound-manager-core_wearable.h b/src/utc/sound-manager/tct-sound-manager-core_wearable.h index 241efc3..354ffd7 100755 --- a/src/utc/sound-manager/tct-sound-manager-core_wearable.h +++ b/src/utc/sound-manager/tct-sound-manager-core_wearable.h @@ -117,10 +117,10 @@ extern int utc_media_sound_manager_set_device_information_changed_cb_p(void); extern int utc_media_sound_manager_set_device_information_changed_cb_n(void); extern int utc_media_sound_manager_unset_device_information_changed_cb_p(void); extern int utc_media_sound_manager_unset_device_information_changed_cb_n(void); -extern int utc_media_sound_manager_set_focus_state_watch_cb_p(void); -extern int utc_media_sound_manager_set_focus_state_watch_cb_n(void); -extern int utc_media_sound_manager_unset_focus_state_watch_cb_p(void); -extern int utc_media_sound_manager_unset_focus_state_watch_cb_n(void); +extern int utc_media_sound_manager_add_focus_state_watch_cb_p(void); +extern int utc_media_sound_manager_add_focus_state_watch_cb_n(void); +extern int utc_media_sound_manager_remove_focus_state_watch_cb_p(void); +extern int utc_media_sound_manager_remove_focus_state_watch_cb_n(void); testcase tc_array[] = { {"utc_media_sound_manager_get_max_volume_p", utc_media_sound_manager_get_max_volume_p, NULL, NULL}, @@ -220,10 +220,10 @@ testcase tc_array[] = { {"utc_media_sound_manager_set_device_information_changed_cb_n", utc_media_sound_manager_set_device_information_changed_cb_n, NULL, NULL}, {"utc_media_sound_manager_unset_device_information_changed_cb_p", utc_media_sound_manager_unset_device_information_changed_cb_p, NULL, NULL}, {"utc_media_sound_manager_unset_device_information_changed_cb_n", utc_media_sound_manager_unset_device_information_changed_cb_n, NULL, NULL}, - {"utc_media_sound_manager_set_focus_state_watch_cb_p", utc_media_sound_manager_set_focus_state_watch_cb_p, NULL, NULL}, - {"utc_media_sound_manager_set_focus_state_watch_cb_n", utc_media_sound_manager_set_focus_state_watch_cb_n, NULL, NULL}, - {"utc_media_sound_manager_unset_focus_state_watch_cb_p", utc_media_sound_manager_unset_focus_state_watch_cb_p, NULL, NULL}, - {"utc_media_sound_manager_unset_focus_state_watch_cb_n", utc_media_sound_manager_unset_focus_state_watch_cb_n, NULL, NULL}, + {"utc_media_sound_manager_add_focus_state_watch_cb_p", utc_media_sound_manager_add_focus_state_watch_cb_p, NULL, NULL}, + {"utc_media_sound_manager_add_focus_state_watch_cb_n", utc_media_sound_manager_add_focus_state_watch_cb_n, NULL, NULL}, + {"utc_media_sound_manager_remove_focus_state_watch_cb_p", utc_media_sound_manager_remove_focus_state_watch_cb_p, NULL, NULL}, + {"utc_media_sound_manager_remove_focus_state_watch_cb_n", utc_media_sound_manager_remove_focus_state_watch_cb_n, NULL, NULL}, {NULL, NULL} }; diff --git a/src/utc/sound-manager/utc-media-sound-manager-callback.c b/src/utc/sound-manager/utc-media-sound-manager-callback.c index f05f824..33afebf 100755 --- a/src/utc/sound-manager/utc-media-sound-manager-callback.c +++ b/src/utc/sound-manager/utc-media-sound-manager-callback.c @@ -38,7 +38,7 @@ static void _sound_device_information_changed_cb(sound_device_h device, sound_de { } -static void _sound_stream_focus_state_watch_cb(sound_stream_focus_mask_e changed_focus_mask, sound_stream_focus_state_e changed_focus_state, sound_stream_focus_change_reason_e reason_for_change, const char *additional_info, void *user_data) +static void _sound_stream_focus_state_watch_cb(int id, sound_stream_focus_mask_e changed_focus_mask, sound_stream_focus_state_e changed_focus_state, sound_stream_focus_change_reason_e reason_for_change, const char *additional_info, void *user_data) { } @@ -281,66 +281,69 @@ int utc_media_sound_manager_unset_device_information_changed_cb_n(void) } /** - * @testcase utc_media_sound_manager_set_focus_state_watch_cb_p + * @testcase utc_media_sound_manager_add_focus_state_watch_cb_p * @since_tizen 3.0 * @description Registers the watch callback function to be invoked when the focus state for each sound stream type is changed regardless of the process */ -int utc_media_sound_manager_set_focus_state_watch_cb_p(void) +int utc_media_sound_manager_add_focus_state_watch_cb_p(void) { int ret; + int id; - ret = sound_manager_set_focus_state_watch_cb(SOUND_STREAM_FOCUS_FOR_PLAYBACK, _sound_stream_focus_state_watch_cb, NULL); + ret = sound_manager_add_focus_state_watch_cb(SOUND_STREAM_FOCUS_FOR_PLAYBACK, _sound_stream_focus_state_watch_cb, NULL, &id); assert_eq (ret, SOUND_MANAGER_ERROR_NONE); + sound_manager_remove_focus_state_watch_cb(id); return 0; } /** - * @testcase utc_media_sound_manager_set_focus_state_watch_cb_n + * @testcase utc_media_sound_manager_add_focus_state_watch_cb_n * @since_tizen 3.0 * @description Registers the watch callback function to be invoked when the focus state for each sound stream type is changed regardless of the process - Pass invalid parameter to get negative result */ -int utc_media_sound_manager_set_focus_state_watch_cb_n(void) +int utc_media_sound_manager_add_focus_state_watch_cb_n(void) { int ret; - ret = sound_manager_set_focus_state_watch_cb(SOUND_STREAM_FOCUS_FOR_PLAYBACK, NULL, NULL); + ret = sound_manager_add_focus_state_watch_cb(SOUND_STREAM_FOCUS_FOR_PLAYBACK, NULL, NULL, NULL); assert_eq (ret, SOUND_MANAGER_ERROR_INVALID_PARAMETER); return 0; } /** - * @testcase utc_media_sound_manager_unset_focus_state_watch_cb_p + * @testcase utc_media_sound_manager_remove_focus_state_watch_cb_p * @since_tizen 3.0 * @description Unregisters the focus state watch callback * - Register the focus state watch callback before unsetting the callback */ -int utc_media_sound_manager_unset_focus_state_watch_cb_p(void) +int utc_media_sound_manager_remove_focus_state_watch_cb_p(void) { int ret; + int id; - ret = sound_manager_set_focus_state_watch_cb(SOUND_STREAM_FOCUS_FOR_PLAYBACK, _sound_stream_focus_state_watch_cb, NULL); + ret = sound_manager_add_focus_state_watch_cb(SOUND_STREAM_FOCUS_FOR_PLAYBACK, _sound_stream_focus_state_watch_cb, NULL, &id); assert_eq (ret, SOUND_MANAGER_ERROR_NONE); - ret = sound_manager_unset_focus_state_watch_cb(); + ret = sound_manager_remove_focus_state_watch_cb(id); assert_eq (ret, SOUND_MANAGER_ERROR_NONE); return 0; } /** - * @testcase utc_media_sound_manager_unset_focus_state_watch_cb_n + * @testcase utc_media_sound_manager_remove_focus_state_watch_cb_n * @since_tizen 3.0 * @description Unregisters the focus state watch callback * - Unset the callback without setting callback to get negative result */ -int utc_media_sound_manager_unset_focus_state_watch_cb_n(void) +int utc_media_sound_manager_remove_focus_state_watch_cb_n(void) { int ret; - ret = sound_manager_unset_focus_state_watch_cb(); - assert_eq (ret, SOUND_MANAGER_ERROR_INTERNAL); + ret = sound_manager_remove_focus_state_watch_cb(-1); + assert_eq (ret, SOUND_MANAGER_ERROR_INVALID_PARAMETER); return 0; } diff --git a/src/utc/sound-manager/utc-media-sound-manager.c b/src/utc/sound-manager/utc-media-sound-manager.c index 61bb4ed..787ec81 100755 --- a/src/utc/sound-manager/utc-media-sound-manager.c +++ b/src/utc/sound-manager/utc-media-sound-manager.c @@ -1365,7 +1365,6 @@ int utc_sound_manager_create_stream_information_p(void) int utc_sound_manager_create_stream_information_n(void) { int ret; - sound_stream_info_h stream_info; ret = sound_manager_create_stream_information(SOUND_STREAM_TYPE_MEDIA, _sound_stream_focus_state_changed_cb, NULL, NULL); assert_eq(ret, SOUND_MANAGER_ERROR_INVALID_PARAMETER); @@ -1777,8 +1776,6 @@ int utc_sound_manager_get_focus_state_n(void) { int ret; sound_stream_info_h stream_info; - sound_stream_focus_state_e state_for_playback; - sound_stream_focus_state_e state_for_recording; ret = sound_manager_create_stream_information(SOUND_STREAM_TYPE_MEDIA, _sound_stream_focus_state_changed_cb, NULL, &stream_info); assert_eq(ret, SOUND_MANAGER_ERROR_NONE); -- 2.7.4