Modify arguments name of some APIs for reducing length 62/63162/2 accepted/tizen/common/20160323.184547 accepted/tizen/ivi/20160323.140456 accepted/tizen/mobile/20160323.134706 accepted/tizen/tv/20160323.135224 accepted/tizen/wearable/20160323.134824 submit/tizen/20160323.041341
authorSangchul Lee <sc11.lee@samsung.com>
Tue, 22 Mar 2016 08:57:12 +0000 (17:57 +0900)
committerSangchul Lee <sc11.lee@samsung.com>
Wed, 23 Mar 2016 02:39:22 +0000 (11:39 +0900)
[Version] Release 0.3.48
[Profile] Common
[Issue Type] Code clean-up

Change-Id: Ic7e61ce1efd443ea2f67a44618bc3c09d0867c25

include/sound_manager.h
include/sound_manager_internal.h
include/sound_manager_private.h
packaging/capi-media-sound-manager.spec
src/sound_manager.c
src/sound_manager_internal.c
src/sound_manager_private.c
test/sound_manager_test.c

index 406f2416980725fe1de74bfe4ec56a95d0b9317a..88ba95f2db396c7a1254d1b64bc9fb644e979eb0 100644 (file)
@@ -336,8 +336,8 @@ typedef void (*sound_manager_volume_changed_cb) (sound_type_e type, unsigned int
  * @brief Called when the state of focus that belongs to the stream_info is changed.
  * @since_tizen 3.0
  * @param[in]   stream_info    The handle of stream information
- * @param[in]   reason_for_change      The reason for state change of the focus
- * @param[in]   additional_info        The additional information
+ * @param[in]   reason         The reason for state change of the focus
+ * @param[in]   extra_info     The extra information
  * @param[in]   user_data      The user data passed from the callback registration function
  *
  * @remarks    This function is issued in the internal thread of the sound manager.\n
@@ -348,15 +348,15 @@ typedef void (*sound_manager_volume_changed_cb) (sound_type_e type, unsigned int
  * @see sound_manager_create_stream_information()
  * @see sound_manager_destroy_stream_information()
  */
-typedef void (*sound_stream_focus_state_changed_cb) (sound_stream_info_h stream_info, sound_stream_focus_change_reason_e reason_for_change, const char *additional_info, void *user_data);
+typedef void (*sound_stream_focus_state_changed_cb) (sound_stream_info_h stream_info, sound_stream_focus_change_reason_e reason, const char *extra_info, void *user_data);
 
 /**
  * @brief Called when the focus state for each sound stream type is changed regardless of the process.
  * @since_tizen 3.0
- * @param[in]   changed_focus_mask     The changed focus mask
- * @param[in]   changed_focus_state    The changed focus state
- * @param[in]   reason_for_change      The reason for state change of the focus
- * @param[in]   additional_info        The additional information
+ * @param[in]   focus_mask     The changed focus mask
+ * @param[in]   focus_state    The changed focus state
+ * @param[in]   reason         The reason for state change of the focus
+ * @param[in]   extra_info     The extra information
  * @param[in]   user_data      The user data passed from the callback registration function
  *
  * @remarks    This function is issued in the internal thread of the sound manager.\n
@@ -366,7 +366,7 @@ typedef void (*sound_stream_focus_state_changed_cb) (sound_stream_info_h stream_
  * @see sound_manager_set_focus_state_watch_cb()
  * @see sound_manager_unset_focus_state_watch_cb()
  */
-typedef 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);
+typedef void (*sound_stream_focus_state_watch_cb) (sound_stream_focus_mask_e focus_mask, sound_stream_focus_state_e focus_state, sound_stream_focus_change_reason_e reason, const char *extra_info, void *user_data);
 
 /**
  * @}
@@ -679,8 +679,8 @@ int sound_manager_apply_stream_routing(sound_stream_info_h stream_info);
  * @brief Acquires the stream focus.
  * @since_tizen 3.0
  * @param[in]  stream_info     The handle of stream information
- * @param[in]  focus_mask              The focus mask that user wants to acquire
- * @param[in]  additional_info Additional information for this request (optional, this can be null)
+ * @param[in]  focus_mask      The focus mask that user wants to acquire
+ * @param[in]  extra_info      The Extra information for this request (optional, this can be null)
  *
  * @remarks    Do not call this API within sound_stream_focus_state_changed_cb() and sound_stream_focus_state_watch_cb(),\n
  *     otherwise SOUND_MANAGER_ERROR_INVALID_OPERATION will be returned.
@@ -699,14 +699,14 @@ int sound_manager_apply_stream_routing(sound_stream_info_h stream_info);
  * @see sound_manager_release_focus()
  * @see sound_manager_get_focus_state()
  */
-int sound_manager_acquire_focus(sound_stream_info_h stream_info, sound_stream_focus_mask_e focus_mask, const char *additional_info);
+int sound_manager_acquire_focus(sound_stream_info_h stream_info, sound_stream_focus_mask_e focus_mask, const char *extra_info);
 
 /**
  * @brief Releases the acquired focus.
  * @since_tizen 3.0
  * @param[in]  stream_info     The handle of stream information
- * @param[in]  focus_mask              The focus mask that user wants to release
- * @param[in]  additional_info Additional information for this request (optional, this can be null)
+ * @param[in]  focus_mask      The focus mask that user wants to release
+ * @param[in]  extra_info      TheExtra information for this request (optional, this can be null)
  *
  * @remarks    Do not call this API within sound_stream_focus_state_changed_cb() and sound_stream_focus_state_watch_cb(),\n
  *     otherwise SOUND_MANAGER_ERROR_INVALID_OPERATION will be returned.
@@ -724,7 +724,7 @@ int sound_manager_acquire_focus(sound_stream_info_h stream_info, sound_stream_fo
  * @see sound_manager_acquire_focus()
  * @see sound_manager_get_focus_state()
  */
-int sound_manager_release_focus(sound_stream_info_h stream_info, sound_stream_focus_mask_e focus_mask, const char *additional_info);
+int sound_manager_release_focus(sound_stream_info_h stream_info, sound_stream_focus_mask_e focus_mask, const char *extra_info);
 
 /**
  * @brief Gets the state of focus.
index edbb4fd6c49fd0bfafdac85d604bdc9c23cebf3f..dd021083b6096a31b04b0113e61d9ce63d67f435 100644 (file)
@@ -222,7 +222,7 @@ int sound_manager_get_index_from_stream_information(sound_stream_info_h stream_i
  * @brief Gets the reason for the current acquired playback focus.
  * @since_tizen 3.0
  * @param[out] acquired_by     The reason for the current acquired playback focus
- * @param[out] additional_info The additional information of the acquired playback focus (this can be null)
+ * @param[out] extra_info The extra information of the acquired playback focus (this can be null)
  *
  * @remarks    If there is no acquired playback focus in this system, it'll return #SOUND_MANAGER_ERROR_NO_DATA.
  *
@@ -233,14 +233,14 @@ int sound_manager_get_index_from_stream_information(sound_stream_info_h stream_i
  * @retval #SOUND_MANAGER_ERROR_NO_DATA No data
  * @see sound_manager_get_reason_for_current_recording_focus()
  */
-int sound_manager_get_reason_for_current_playback_focus(sound_stream_focus_change_reason_e *acquired_by, char **additional_info);
+int sound_manager_get_reason_for_current_playback_focus(sound_stream_focus_change_reason_e *acquired_by, char **extra_info);
 
 /**
  * @internal
  * @brief Gets the reason for the current acquired recording focus.
  * @since_tizen 3.0
  * @param[out] acquired_by     The reason for the current acquired recording focus
- * @param[out] additional_info The additional information of the acquired recording focus (this can be null)
+ * @param[out] extra_info The extra information of the acquired recording focus (this can be null)
  *
  * @remarks    If there is no acquired recording focus in this system, it'll return #SOUND_MANAGER_ERROR_NO_DATA.
  *
@@ -251,7 +251,7 @@ int sound_manager_get_reason_for_current_playback_focus(sound_stream_focus_chang
  * @retval #SOUND_MANAGER_ERROR_NO_DATA No data
  * @see sound_manager_get_reason_for_current_playback_focus()
  */
-int sound_manager_get_reason_for_current_recording_focus(sound_stream_focus_change_reason_e *acquired_by, char **additional_info);
+int sound_manager_get_reason_for_current_recording_focus(sound_stream_focus_change_reason_e *acquired_by, char **extra_info);
 
 /**
  * @internal
index feb3c657bc8562b6e699d813f366d6dc099b6bab..a8bb2a3021223cfc9755ca846a0f84d9feeace67 100644 (file)
@@ -218,15 +218,15 @@ typedef struct {
        sound_device_information_changed_cb user_cb;
 } _device_changed_info_s;
 
-void _focus_session_interrupt_cb(mm_sound_focus_state_e state, const char *reason_for_change, bool is_wcb, void *user_data);
+void _focus_session_interrupt_cb(mm_sound_focus_state_e state, const char *reason, bool is_wcb, void *user_data);
 
-void _voip_focus_state_change_callback(sound_stream_info_h stream_info, sound_stream_focus_change_reason_e reason_for_change, const char *additional_info, void *user_data);
+void _voip_focus_state_change_callback(sound_stream_info_h stream_info, sound_stream_focus_change_reason_e reason, const char *extra_info, void *user_data);
 
 void _device_connected_cb(sound_device_h device, bool is_connected, void *user_data);
 
-void _focus_state_change_callback(int index, 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 _focus_state_change_callback(int index, mm_sound_focus_type_e focus_type, mm_sound_focus_state_e state, const char *reason, const char *extra_info, void *user_data);
 
-void _focus_watch_callback(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 _focus_watch_callback(int id, mm_sound_focus_type_e focus_type, mm_sound_focus_state_e state, const char *reason, const char *extra_info, void *user_data);
 
 int _convert_sound_manager_error_code(const char *func, int code);
 
index 37cb1260cfb8971076ec4ca32defe9ff84f201c2..257d3acf9267eb09cbc7ad03a686b6ad51b3f9ed 100755 (executable)
@@ -1,6 +1,6 @@
 Name:       capi-media-sound-manager
 Summary:    Sound Manager library
-Version:    0.3.47
+Version:    0.3.48
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0
index f9044013cb3dd55dd0f7bac98419ed888673c63b..7c74e7e674b1bf7a216cda3220bcc5b52759bc41 100644 (file)
@@ -305,7 +305,7 @@ int sound_manager_get_focus_reacquisition(sound_stream_info_h stream_info, bool
        return _convert_sound_manager_error_code(__func__, ret);
 }
 
-int sound_manager_acquire_focus(sound_stream_info_h stream_info, sound_stream_focus_mask_e focus_mask, const char *additional_info)
+int sound_manager_acquire_focus(sound_stream_info_h stream_info, sound_stream_focus_mask_e focus_mask, const char *extra_info)
 {
        int ret = MM_ERROR_NONE;
        sound_stream_info_s *stream_h = (sound_stream_info_s*)stream_info;
@@ -317,7 +317,7 @@ int sound_manager_acquire_focus(sound_stream_info_h stream_info, sound_stream_fo
        if (stream_h->is_focus_unavailable)
                return _convert_sound_manager_error_code(__func__, MM_ERROR_POLICY_INTERNAL);
 
-       ret = mm_sound_acquire_focus(stream_h->index, (mm_sound_focus_type_e)focus_mask, additional_info);
+       ret = mm_sound_acquire_focus(stream_h->index, (mm_sound_focus_type_e)focus_mask, extra_info);
        if (ret == MM_ERROR_NONE) {
                stream_h->acquired_focus |= focus_mask;
                _update_focus_status(stream_h->index, (unsigned int)stream_h->acquired_focus);
@@ -326,7 +326,7 @@ int sound_manager_acquire_focus(sound_stream_info_h stream_info, sound_stream_fo
        return _convert_sound_manager_error_code(__func__, ret);
 }
 
-int sound_manager_release_focus(sound_stream_info_h stream_info, sound_stream_focus_mask_e focus_mask, const char *additional_info)
+int sound_manager_release_focus(sound_stream_info_h stream_info, sound_stream_focus_mask_e focus_mask, const char *extra_info)
 {
        int ret = MM_ERROR_NONE;
        sound_stream_info_s *stream_h = (sound_stream_info_s*)stream_info;
@@ -335,7 +335,7 @@ int sound_manager_release_focus(sound_stream_info_h stream_info, sound_stream_fo
 
        SM_INSTANCE_CHECK(stream_h);
 
-       ret = mm_sound_release_focus(stream_h->index, (mm_sound_focus_type_e)focus_mask, additional_info);
+       ret = mm_sound_release_focus(stream_h->index, (mm_sound_focus_type_e)focus_mask, extra_info);
        if (ret == MM_ERROR_NONE) {
                stream_h->acquired_focus &= ~focus_mask;
                _update_focus_status(stream_h->index, (unsigned int)stream_h->acquired_focus);
index c6ae46942adffaf020e25bf1039da31153b406a3..d57964e4442e091f0e2f3b574ac7321de1791956 100644 (file)
@@ -168,46 +168,46 @@ int sound_manager_get_index_from_stream_information(sound_stream_info_h stream_i
        return _convert_sound_manager_error_code(__func__, ret);
 }
 
-int sound_manager_get_reason_for_current_playback_focus(sound_stream_focus_change_reason_e *acquired_by, char **additional_info)
+int sound_manager_get_reason_for_current_playback_focus(sound_stream_focus_change_reason_e *acquired_by, char **extra_info)
 {
        int ret = MM_ERROR_NONE;
        char *stream_type_str = NULL;
-       char *additional_info_str = NULL;
+       char *extra_info_str = NULL;
 
        LOGI(">> enter");
 
        SM_NULL_ARG_CHECK(acquired_by);
 
-       ret = mm_sound_get_stream_type_of_acquired_focus((int)SOUND_STREAM_FOCUS_FOR_PLAYBACK, &stream_type_str, &additional_info_str);
+       ret = mm_sound_get_stream_type_of_acquired_focus((int)SOUND_STREAM_FOCUS_FOR_PLAYBACK, &stream_type_str, &extra_info_str);
        if (ret == MM_ERROR_NONE) {
                LOGI("current acquired [playback] focus: stream_type=%s", stream_type_str);
                ret = _convert_stream_type_to_change_reason(stream_type_str, acquired_by);
-               if ((ret == MM_ERROR_NONE) && additional_info) {
-                       LOGI("                                  : reason=%d, additional_info=%s", *acquired_by, additional_info_str);
-                       *additional_info = additional_info_str;
+               if ((ret == MM_ERROR_NONE) && extra_info) {
+                       LOGI("                                  : reason=%d, extra_info=%s", *acquired_by, extra_info_str);
+                       *extra_info = extra_info_str;
                }
        }
 
        return _convert_sound_manager_error_code(__func__, ret);
 }
 
-int sound_manager_get_reason_for_current_recording_focus(sound_stream_focus_change_reason_e *acquired_by, char **additional_info)
+int sound_manager_get_reason_for_current_recording_focus(sound_stream_focus_change_reason_e *acquired_by, char **extra_info)
 {
        int ret = MM_ERROR_NONE;
        char *stream_type_str = NULL;
-       char *additional_info_str = NULL;
+       char *extra_info_str = NULL;
 
        LOGI(">> enter");
 
        SM_NULL_ARG_CHECK(acquired_by);
 
-       ret = mm_sound_get_stream_type_of_acquired_focus((int)SOUND_STREAM_FOCUS_FOR_RECORDING, &stream_type_str, &additional_info_str);
+       ret = mm_sound_get_stream_type_of_acquired_focus((int)SOUND_STREAM_FOCUS_FOR_RECORDING, &stream_type_str, &extra_info_str);
        if (ret == MM_ERROR_NONE) {
                LOGI("current acquired [recording] focus: stream_type=%s", stream_type_str);
                ret = _convert_stream_type_to_change_reason(stream_type_str, acquired_by);
-               if ((ret == MM_ERROR_NONE) && additional_info) {
-                       LOGI("                                  : reason=%d, additional_info=%s", *acquired_by, additional_info_str);
-                       *additional_info = additional_info_str;
+               if ((ret == MM_ERROR_NONE) && extra_info) {
+                       LOGI("                                  : reason=%d, extra_info=%s", *acquired_by, extra_info_str);
+                       *extra_info = extra_info_str;
                }
        }
 
index 68eea307ed20d1e52d208b7779d70859ed0fd45f..47db921c01f1b40304e8b5f9de9d9a4c7995bd84 100644 (file)
@@ -451,7 +451,7 @@ const char* _convert_api_name(native_api_e api_name)
        return name;
 }
 
-void _focus_state_change_callback(int index, 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 _focus_state_change_callback(int index, mm_sound_focus_type_e focus_type, mm_sound_focus_state_e state, const char *reason, const char *extra_info, void *user_data)
 {
        int ret = MM_ERROR_NONE;
        int i = 0;
@@ -459,9 +459,9 @@ void _focus_state_change_callback(int index, mm_sound_focus_type_e focus_type, m
 
        LOGI(">> enter");
 
-       ret = _convert_stream_type_to_change_reason(reason_for_change, &change_reason);
+       ret = _convert_stream_type_to_change_reason(reason, &change_reason);
        if (ret) {
-               LOGE("failed to _convert_stream_type_to_enum(), reason_for_change(%s), err(0x%08x)", reason_for_change, ret);
+               LOGE("failed to _convert_stream_type_to_enum(), reason(%s), err(0x%08x)", reason, ret);
                goto LEAVE;
        }
 
@@ -473,7 +473,7 @@ void _focus_state_change_callback(int index, mm_sound_focus_type_e focus_type, m
                                sound_stream_info_arr[i]->acquired_focus |= focus_type;
 
                        LOGI("[FOCUS USER CALLBACK(%p) START]", sound_stream_info_arr[i]->user_cb);
-                       sound_stream_info_arr[i]->user_cb((sound_stream_info_h)sound_stream_info_arr[i], change_reason, additional_info, sound_stream_info_arr[i]->user_data);
+                       sound_stream_info_arr[i]->user_cb((sound_stream_info_h)sound_stream_info_arr[i], change_reason, extra_info, sound_stream_info_arr[i]->user_data);
                        LOGI("[FOCUS USER CALLBACK(%p) END]", sound_stream_info_arr[i]->user_cb);
                        break;
                }
@@ -487,17 +487,17 @@ LEAVE:
        return;
 }
 
-void _focus_watch_callback(int index, 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 _focus_watch_callback(int index, mm_sound_focus_type_e focus_type, mm_sound_focus_state_e state, const char *reason, const char *extra_info, void *user_data)
 {
        int ret = MM_ERROR_NONE;
        sound_stream_focus_change_reason_e change_reason = SOUND_STREAM_FOCUS_CHANGED_BY_MEDIA;
 
-       ret = _convert_stream_type_to_change_reason(reason_for_change, &change_reason);
+       ret = _convert_stream_type_to_change_reason(reason, &change_reason);
        if (ret)
-               LOGE("failed to _convert_stream_type_to_enum(), reason_for_change(%s), err(0x%08x)", reason_for_change, ret);
+               LOGE("failed to _convert_stream_type_to_enum(), reason(%s), err(0x%08x)", reason, ret);
 
        if (g_focus_watch_cb_table.user_cb)
-               g_focus_watch_cb_table.user_cb(focus_type, state, change_reason, additional_info, g_focus_watch_cb_table.user_data);
+               g_focus_watch_cb_table.user_cb(focus_type, state, change_reason, extra_info, g_focus_watch_cb_table.user_data);
 
        return;
 }
@@ -1061,21 +1061,21 @@ LEAVE:
        return;
 }
 
-void _focus_session_interrupt_cb(mm_sound_focus_state_e state, const char *reason_for_change, bool is_wcb, void *user_data)
+void _focus_session_interrupt_cb(mm_sound_focus_state_e state, const char *reason, bool is_wcb, void *user_data)
 {
        sound_session_interrupted_code_e e;
-       LOGE("session interrupted by [%s]", reason_for_change);
+       LOGE("session interrupted by [%s]", reason);
        if (g_session_interrupt_cb_table.user_cb) {
                if (is_wcb) {
                        if (state == FOCUS_IS_RELEASED)
                                e = SOUND_SESSION_INTERRUPTED_COMPLETED;
                        else
-                               _convert_stream_type_to_interrupt_reason(reason_for_change, &e);
+                               _convert_stream_type_to_interrupt_reason(reason, &e);
                } else {
                        if (state == FOCUS_IS_ACQUIRED)
                                e = SOUND_SESSION_INTERRUPTED_COMPLETED;
                        else
-                               _convert_stream_type_to_interrupt_reason(reason_for_change, &e);
+                               _convert_stream_type_to_interrupt_reason(reason, &e);
                }
                g_session_interrupt_cb_table.user_cb(e, g_session_interrupt_cb_table.user_data);
        }
@@ -1110,10 +1110,10 @@ void _device_connected_cb(sound_device_h device, bool is_connected, void *user_d
 }
 
 /* This is an internal callback for the VOIP SESSION */
-void _voip_focus_state_change_callback(sound_stream_info_h stream_info, sound_stream_focus_change_reason_e reason_for_change, const char *additional_info, void *user_data)
+void _voip_focus_state_change_callback(sound_stream_info_h stream_info, sound_stream_focus_change_reason_e reason, const char *extra_info, void *user_data)
 {
        sound_stream_info_s *info = (sound_stream_info_s *)stream_info;
-       LOGI(">> enter, stream_info(%p), change_reason(%d), additional_info(%s)", stream_info, reason_for_change, additional_info);
+       LOGI(">> enter, stream_info(%p), change_reason(%d), extra_info(%s)", stream_info, reason, extra_info);
 
        if (!info) {
                LOGE("stream info is null");
@@ -1129,7 +1129,7 @@ void _voip_focus_state_change_callback(sound_stream_info_h stream_info, sound_st
                        /* destroy virtual stream handle */
                        _destroy_virtual_stream(g_voip_vstream_h);
                        g_voip_vstream_h = NULL;
-                       LOGW("internal voip stream is interrupted by (%d)", reason_for_change);
+                       LOGW("internal voip stream is interrupted by (%d)", reason);
                }
        }
 
@@ -1407,7 +1407,7 @@ int _make_pa_connection_and_register_focus(sound_stream_info_s *stream_h, sound_
                pa_threaded_mainloop_wait(stream_h->pa_mainloop);
        }
 
-       /* get uniq id of this context */
+       /* get index of this context */
        stream_h->index = pa_context_get_index(stream_h->pa_context);
 
        pa_threaded_mainloop_unlock(stream_h->pa_mainloop);
index 4afc3ce5281440a80deb42e2fcedff343bd7c704..c7b7930a4d40dabfeddfaf5f3f89529c356c1ee8 100644 (file)
@@ -92,13 +92,13 @@ sound_device_mask_e g_device_mask = SOUND_DEVICE_ALL_MASK;
 sound_stream_info_h g_stream_info_h = NULL;
 virtual_sound_stream_h g_vstream_h = NULL;
 
-void focus_callback(sound_stream_info_h stream_info, sound_stream_focus_change_reason_e reason_for_change, const char *additional_info, void *user_data)
+void focus_callback(sound_stream_info_h stream_info, sound_stream_focus_change_reason_e reason, const char *extra_info, void *user_data)
 {
        int ret = SOUND_MANAGER_ERROR_NONE;
        sound_stream_focus_state_e playback_focus_state;
        sound_stream_focus_state_e recording_focus_state;
        g_print("*** FOCUS callback is called, stream_info(%p) ***\n", stream_info);
-       g_print(" - reason_for_change(%d), additional_info(%s), user_data(%p)\n", reason_for_change, additional_info, user_data);
+       g_print(" - change_reason(%d), extra_info(%s), user_data(%p)\n", reason, extra_info, user_data);
 
        ret = sound_manager_get_focus_state(stream_info, &playback_focus_state, &recording_focus_state);
        if (!ret)
@@ -119,11 +119,11 @@ void focus_callback(sound_stream_info_h stream_info, sound_stream_focus_change_r
        return;
 }
 
-void focus_watch_callback(sound_stream_focus_mask_e  changed_focus_type, sound_stream_focus_state_e changed_focus_state, sound_stream_focus_change_reason_e reason_for_change, const char *additional_info, void *user_data)
+void focus_watch_callback(sound_stream_focus_mask_e  focus_mask, sound_stream_focus_state_e focus_state, sound_stream_focus_change_reason_e reason, const char *extra_info, void *user_data)
 {
        g_print("*** FOCUS WATCH callback is called ***\n");
-       g_print(" - changed_focus_type(%d), changed_focus_state(%d), reason_for_change(%d), additional_info(%s), user_data(%p)\n",
-                               changed_focus_type, changed_focus_state, reason_for_change, additional_info, user_data);
+       g_print(" - changed_focus_mask(%d), changed_focus_state(%d), change_reason(%d), extra_info(%s), user_data(%p)\n",
+                       focus_mask, focus_state, reason, extra_info, user_data);
        return;
 }
 
@@ -1232,7 +1232,7 @@ static void interpret(char *cmd)
                        focus_mask = SOUND_STREAM_FOCUS_FOR_PLAYBACK;
                        break;
                }
-               ret = sound_manager_acquire_focus(g_stream_info_h, focus_mask, "sound_manager_test_ac");
+               ret = sound_manager_acquire_focus(g_stream_info_h, focus_mask, "sound_manager_test(acquire_focus)");
                if (ret)
                        g_print("fail to sound_manager_acquire_focus(), ret(0x%x)\n", ret);
 
@@ -1259,7 +1259,7 @@ static void interpret(char *cmd)
                        focus_mask = SOUND_STREAM_FOCUS_FOR_PLAYBACK;
                        break;
                }
-               ret = sound_manager_release_focus(g_stream_info_h, focus_mask, "sound_manager_test_rel");
+               ret = sound_manager_release_focus(g_stream_info_h, focus_mask, "sound_manager_test(release_focus)");
                if (ret)
                                g_print("fail to sound_manager_acquire_focus(), ret(0x%x)\n", ret);
 
@@ -1382,25 +1382,25 @@ static void interpret(char *cmd)
        }
        case CURRENT_STATUS_GET_REASON_FOR_P_FOCUS: {
                int ret = SOUND_MANAGER_ERROR_NONE;
-               char *additional_info = NULL;
+               char *extra_info = NULL;
                sound_stream_focus_change_reason_e reason;
-               ret = sound_manager_get_reason_for_current_playback_focus(&reason, &additional_info);
+               ret = sound_manager_get_reason_for_current_playback_focus(&reason, &extra_info);
                if (ret)
                        g_print("fail to sound_manager_get_reason_for_current_playback_focus, ret(0x%x)\n", ret);
                else
-                       g_print("reason(%d), additional_info(%s)\n", reason, additional_info);
+                       g_print("reason(%d), extra_info(%s)\n", reason, extra_info);
                reset_menu_state();
                break;
        }
        case CURRENT_STATUS_GET_REASON_FOR_R_FOCUS: {
                int ret = SOUND_MANAGER_ERROR_NONE;
-               char *additional_info = NULL;
+               char *extra_info = NULL;
                sound_stream_focus_change_reason_e reason;
-               ret = sound_manager_get_reason_for_current_recording_focus(&reason, &additional_info);
+               ret = sound_manager_get_reason_for_current_recording_focus(&reason, &extra_info);
                if (ret)
                        g_print("fail to sound_manager_get_reason_for_current_recording_focus, ret(0x%x)\n", ret);
                else
-                       g_print("reason(%d), additional_info(%s)\n", reason, additional_info);
+                       g_print("reason(%d), extra_info(%s)\n", reason, extra_info);
                reset_menu_state();
                break;
        }