From f7019fd3b8291093a8fcd1a8f5de6fdd0919d663 Mon Sep 17 00:00:00 2001 From: Sangchul Lee Date: Thu, 28 Jul 2016 13:35:14 +0900 Subject: [PATCH] Add new parameter to focus changed cb The prototype of the callback function has been changed. - refer to https://review.tizen.org/gerrit/#/c/81707/ (libmm-sound) [Version] 0.3.42 [Profile] Common [Issue Type] API change Change-Id: I1d03a5e9afe344e4f6e379e7a97e1f78a3957fc1 Signed-off-by: Sangchul Lee --- include/CAudioSessionHandler.h | 2 +- packaging/capi-media-audio-io.spec | 2 +- src/cpp/CAudioSessionHandler.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/CAudioSessionHandler.h b/include/CAudioSessionHandler.h index b51e0df..4b6dedc 100644 --- a/include/CAudioSessionHandler.h +++ b/include/CAudioSessionHandler.h @@ -105,7 +105,7 @@ namespace tizen_media_audio { static int __focusIdCountGet(); static void __sound_pcm_signal_cb(mm_sound_signal_name_t signal, int value, void *user_data); - static void __sound_pcm_focus_cb(int id, mm_sound_focus_type_e focus_type, mm_sound_focus_state_e state, const char *reason_for_change, const char *additional_info, void *user_data); + static void __sound_pcm_focus_cb(int id, mm_sound_focus_type_e focus_type, mm_sound_focus_state_e state, const char *reason_for_change, int option, const char *additional_info, void *user_data); static void __sound_pcm_focus_watch_cb(int id, mm_sound_focus_type_e focus_type, mm_sound_focus_state_e state, const char *reason_for_change, const char *additional_info, void *user_data); /* Private Method */ diff --git a/packaging/capi-media-audio-io.spec b/packaging/capi-media-audio-io.spec index e3b1ccd..8d31884 100644 --- a/packaging/capi-media-audio-io.spec +++ b/packaging/capi-media-audio-io.spec @@ -1,6 +1,6 @@ Name: capi-media-audio-io Summary: An Audio Input & Audio Output library in Tizen Native API -Version: 0.3.41 +Version: 0.3.42 Release: 0 Group: Multimedia/API License: Apache-2.0 diff --git a/src/cpp/CAudioSessionHandler.cpp b/src/cpp/CAudioSessionHandler.cpp index 9422051..382a07f 100644 --- a/src/cpp/CAudioSessionHandler.cpp +++ b/src/cpp/CAudioSessionHandler.cpp @@ -313,7 +313,7 @@ bool CAudioSessionHandler::isSkipSessionEvent() throw(CAudioError) { return ret; } -void CAudioSessionHandler::__sound_pcm_focus_cb(int id, mm_sound_focus_type_e focus_type, mm_sound_focus_state_e state, const char *reason_for_change, const char *additional_info, void *user_data) { +void CAudioSessionHandler::__sound_pcm_focus_cb(int id, mm_sound_focus_type_e focus_type, mm_sound_focus_state_e state, const char *reason_for_change, int option, const char *additional_info, void *user_data) { assert(user_data); AUDIO_IO_LOGD("[id:%d], [focus_type:%d], [state:%d], [reason_for_change:%s], [additional_info:%s], [user_data:0x%x]", id, focus_type, state, reason_for_change, additional_info, user_data); @@ -334,7 +334,7 @@ void CAudioSessionHandler::__sound_pcm_focus_cb(int id, mm_sound_focus_type_e fo void CAudioSessionHandler::__sound_pcm_focus_watch_cb(int id, mm_sound_focus_type_e focus_type, mm_sound_focus_state_e state, const char *reason_for_change, const char *additional_info, void *user_data) { AUDIO_IO_LOGD("[id:%d], [focus_type:%d], [state:%d], [reason_for_change:%s], [additional_info:%s], [user_data:0x%x]", id, focus_type, state, reason_for_change, additional_info, user_data); - CAudioSessionHandler::__sound_pcm_focus_cb(-1, focus_type, state, reason_for_change, additional_info, user_data); + CAudioSessionHandler::__sound_pcm_focus_cb(-1, focus_type, state, reason_for_change, 0, additional_info, user_data); return; } -- 2.7.4