X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=mm_sound_client.c;h=4ba6246cb1151d79ba9ddcd8809036141e29f7aa;hb=92c5c7f406312a94916abf7e2ec458f0a3277d06;hp=1515874fded17fb38d5556a24208680c4db9a236;hpb=2c6fa8931c9df706be87521e63846beef0ebe7de;p=platform%2Fcore%2Fmultimedia%2Flibmm-sound.git diff --git a/mm_sound_client.c b/mm_sound_client.c index 1515874..4ba6246 100644 --- a/mm_sound_client.c +++ b/mm_sound_client.c @@ -101,7 +101,9 @@ typedef struct { void* user_data; bool unset_watch_callback_requested; - bool is_for_session; /* will be removed when the session concept is completely left out*/ + /* will be removed when the session concept is completely left out*/ + bool is_for_session; + bool is_for_monitor; } focus_sound_info_t; typedef struct { @@ -115,6 +117,7 @@ typedef struct { } focus_cb_data_lib; typedef struct { + int watch_cb_id; mm_sound_focus_session_interrupt_cb user_cb; void* user_data; } focus_session_interrupt_info_t; @@ -122,7 +125,7 @@ typedef struct { typedef gboolean (*focus_callback_handler_t)(gpointer user_data); focus_sound_info_t g_focus_sound_handle[FOCUS_HANDLE_MAX]; -focus_session_interrupt_info_t g_focus_session_interrupt_info = {NULL, NULL}; +focus_session_interrupt_info_t g_focus_session_interrupt_info = {-1, NULL, NULL}; static pthread_mutex_t g_index_mutex = PTHREAD_MUTEX_INITIALIZER; static pthread_mutex_t g_event_mutex = PTHREAD_MUTEX_INITIALIZER; guint g_focus_signal_handle; @@ -143,7 +146,7 @@ typedef struct _focus_idle_event { int data; } focus_idle_event_t; -void _system_signal_handler(int signo) +void _system_signal_handler(int signo, siginfo_t *siginfo, void *context) { int ret = MM_ERROR_NONE; sigset_t old_mask, all_mask; @@ -158,9 +161,9 @@ void _system_signal_handler(int signo) if (g_need_emergent_exit) { ret = mm_sound_proxy_emergent_exit(getpid()); if (ret == MM_ERROR_NONE) - debug_msg("[Client] Success to emergnet_exit\n"); + debug_msg("Success to emergnet_exit"); else - debug_error("[Client] Error occurred : 0x%x \n",ret); + debug_error("Error occurred : 0x%x", ret); } sigprocmask(SIG_SETMASK, &old_mask, NULL); @@ -168,28 +171,40 @@ void _system_signal_handler(int signo) switch (signo) { case SIGINT: - sigaction(SIGINT, &system_int_old_action, NULL); - raise( signo); + if (system_int_old_action.sa_sigaction) + system_int_old_action.sa_sigaction(signo, siginfo, context); + else + sigaction(signo, &system_int_old_action, NULL); break; case SIGABRT: - sigaction(SIGABRT, &system_abrt_old_action, NULL); - raise( signo); + if (system_abrt_old_action.sa_sigaction) + system_abrt_old_action.sa_sigaction(signo, siginfo, context); + else + sigaction(signo, &system_abrt_old_action, NULL); break; case SIGSEGV: - sigaction(SIGSEGV, &system_segv_old_action, NULL); - raise( signo); + if (system_segv_old_action.sa_sigaction) + system_segv_old_action.sa_sigaction(signo, siginfo, context); + else + sigaction(signo, &system_segv_old_action, NULL); break; case SIGTERM: - sigaction(SIGTERM, &system_term_old_action, NULL); - raise( signo); + if (system_term_old_action.sa_sigaction) + system_term_old_action.sa_sigaction(signo, siginfo, context); + else + sigaction(signo, &system_term_old_action, NULL); break; case SIGSYS: - sigaction(SIGSYS, &system_sys_old_action, NULL); - raise( signo); + if (system_sys_old_action.sa_sigaction) + system_sys_old_action.sa_sigaction(signo, siginfo, context); + else + sigaction(signo, &system_sys_old_action, NULL); break; case SIGXCPU: - sigaction(SIGXCPU, &system_xcpu_old_action, NULL); - raise( signo); + if (system_xcpu_old_action.sa_sigaction) + system_xcpu_old_action.sa_sigaction(signo, siginfo, context); + else + sigaction(signo, &system_xcpu_old_action, NULL); break; default: break; @@ -208,8 +223,8 @@ int mm_sound_client_initialize(void) struct sigaction system_action; - system_action.sa_handler = _system_signal_handler; - system_action.sa_flags = SA_NOCLDSTOP; + system_action.sa_sigaction = _system_signal_handler; + system_action.sa_flags = SA_NOCLDSTOP | SA_SIGINFO; sigemptyset(&system_action.sa_mask); @@ -233,9 +248,9 @@ int mm_sound_client_finalize(void) if (g_need_emergent_exit) { ret = mm_sound_proxy_emergent_exit(getpid()); if (ret == MM_ERROR_NONE) - debug_msg("[Client] Success to emergnet_exit\n"); + debug_msg("Success to emergent_exit"); else - debug_error("[Client] Error occurred : 0x%x \n",ret); + debug_error("Error occurred : 0x%x", ret); } sigaction(SIGINT, &system_int_old_action, NULL); @@ -263,31 +278,31 @@ void mm_sound_convert_volume_type_to_stream_type(int volume_type, char *stream_t { switch (volume_type) { case VOLUME_TYPE_SYSTEM: - MMSOUND_STRNCPY(stream_type, "system", MM_SOUND_STREAM_TYPE_LEN); + MMSOUND_STRNCPY(stream_type, "system", MAX_STREAM_TYPE_LEN); break; case VOLUME_TYPE_NOTIFICATION: - MMSOUND_STRNCPY(stream_type, "notification", MM_SOUND_STREAM_TYPE_LEN); + MMSOUND_STRNCPY(stream_type, "notification", MAX_STREAM_TYPE_LEN); break; case VOLUME_TYPE_ALARM: - MMSOUND_STRNCPY(stream_type, "alarm", MM_SOUND_STREAM_TYPE_LEN); + MMSOUND_STRNCPY(stream_type, "alarm", MAX_STREAM_TYPE_LEN); break; case VOLUME_TYPE_RINGTONE: - MMSOUND_STRNCPY(stream_type, "ringtone-voip", MM_SOUND_STREAM_TYPE_LEN); + MMSOUND_STRNCPY(stream_type, "ringtone-voip", MAX_STREAM_TYPE_LEN); break; case VOLUME_TYPE_MEDIA: - MMSOUND_STRNCPY(stream_type, "media", MM_SOUND_STREAM_TYPE_LEN); + MMSOUND_STRNCPY(stream_type, "media", MAX_STREAM_TYPE_LEN); break; case VOLUME_TYPE_CALL: - MMSOUND_STRNCPY(stream_type, "call-voice", MM_SOUND_STREAM_TYPE_LEN); + MMSOUND_STRNCPY(stream_type, "call-voice", MAX_STREAM_TYPE_LEN); break; case VOLUME_TYPE_VOIP: - MMSOUND_STRNCPY(stream_type, "voip", MM_SOUND_STREAM_TYPE_LEN); + MMSOUND_STRNCPY(stream_type, "voip", MAX_STREAM_TYPE_LEN); break; case VOLUME_TYPE_VOICE: - MMSOUND_STRNCPY(stream_type, "voice-information", MM_SOUND_STREAM_TYPE_LEN); + MMSOUND_STRNCPY(stream_type, "voice-information", MAX_STREAM_TYPE_LEN); break; default: - MMSOUND_STRNCPY(stream_type, "media", MM_SOUND_STREAM_TYPE_LEN); + MMSOUND_STRNCPY(stream_type, "media", MAX_STREAM_TYPE_LEN); break; } @@ -322,7 +337,7 @@ int mm_sound_client_play_tone(int number, int volume_config, double volume, int ret = MM_ERROR_NONE; // int instance = -1; /* instance is unique to communicate with server : client message queue filter type */ int volume_type = MM_SOUND_VOLUME_CONFIG_TYPE(volume_config); - char stream_type[MM_SOUND_STREAM_TYPE_LEN] = {0, }; + char stream_type[MAX_STREAM_TYPE_LEN] = {0, }; debug_fenter(); @@ -342,21 +357,21 @@ int mm_sound_client_play_tone(int number, int volume_config, double volume, if (enable_session) { if (MM_ERROR_NONE != _mm_session_util_read_information(-1, &session_type, &session_options)) { - debug_warning("[Client] Read Session Information failed. use default \"media\" type\n"); + debug_warning("Read Session Information failed. use default \"media\" type"); session_type = MM_SESSION_TYPE_MEDIA; if(MM_ERROR_NONE != mm_session_init(session_type)) { - debug_critical("[Client] MMSessionInit() failed\n"); + debug_critical("MMSessionInit() failed"); return MM_ERROR_POLICY_INTERNAL; } } } // instance = getpid(); - //debug_log("[Client] pid for client ::: [%d]\n", instance); + //debug_log("pid for client ::: [%d]", instance); /* Send msg */ - debug_msg("[Client] Input number : %d\n", number); + debug_msg("Input number : %d", number); /* Send req memory */ mm_sound_convert_volume_type_to_stream_type(volume_type, stream_type); @@ -395,7 +410,7 @@ static void _mm_sound_stop_callback_wrapper_func(int ended_handle, void *userdat struct callback_data *cb_data = (struct callback_data*) userdata; play_sound_end_callback_data_t *end_cb_data; - debug_log("[Wrapper CB][Play Stop] ended_handle : %d", ended_handle); + debug_log("ended_handle : %d", ended_handle); if (cb_data == NULL) { debug_warning("stop callback data null"); @@ -432,7 +447,7 @@ int mm_sound_client_play_sound(MMSoundPlayParam *param, int tone, int *handle) int is_focus_registered = 0; // int instance = -1; /* instance is unique to communicate with server : client message queue filter type */ int volume_type = MM_SOUND_VOLUME_CONFIG_TYPE(param->volume_config); - char stream_type[MM_SOUND_STREAM_TYPE_LEN] = {0, }; + char stream_type[MAX_STREAM_TYPE_LEN] = {0, }; struct callback_data *cb_data = NULL; play_sound_end_callback_data_t *end_cb_data; @@ -451,11 +466,11 @@ int mm_sound_client_play_sound(MMSoundPlayParam *param, int tone, int *handle) if (param->skip_session == false) { if(MM_ERROR_NONE != _mm_session_util_read_information(-1, &session_type, &session_options)) { - debug_warning("[Client] Read MMSession Type failed. use default \"media\" type\n"); + debug_warning("Read MMSession Type failed. use default \"media\" type"); session_type = MM_SESSION_TYPE_MEDIA; if(MM_ERROR_NONE != mm_session_init(session_type)) { - debug_critical("[Client] MMSessionInit() failed\n"); + debug_critical("MMSessionInit() failed"); return MM_ERROR_POLICY_INTERNAL; } } @@ -560,16 +575,16 @@ static int _mm_sound_client_device_list_dump (GList *device_list) return MM_ERROR_SOUND_INTERNAL; } - debug_log("======================== device list : start ==========================\n"); + debug_log("======================== device list : start =========================="); for (list = device_list; list != NULL; list = list->next) { device_node = (mm_sound_device_t *)list->data; if (device_node) { - debug_log(" list idx[%d]: type[%17s], id[%02d], io_direction[%d], state[%d], name[%s]\n", + debug_log(" list idx[%d]: type[%17s], id[%02d], io_direction[%d], state[%d], name[%s]", count++, device_node->type, device_node->id, device_node->io_direction, device_node->state, device_node->name); } } - debug_log("======================== device list : end ============================\n"); + debug_log("======================== device list : end ============================"); return ret; } @@ -586,7 +601,7 @@ int mm_sound_client_get_current_connected_device_list(int device_flags, mm_sound } if ((ret = mm_sound_proxy_get_current_connected_device_list(device_flags, &device_list->list)) != MM_ERROR_NONE) { - debug_error("[Client] failed to get current connected device list with dbus, ret[0x%x]", ret); + debug_error("failed to get current connected device list with dbus, ret[0x%x]", ret); goto failed; } if (!device_list->list) { @@ -601,6 +616,20 @@ failed: return ret; } +int mm_sound_client_get_device_by_id(int device_id, mm_sound_device_t **device) +{ + int ret = MM_ERROR_NONE; + + debug_fenter(); + + if ((ret = mm_sound_proxy_get_device_by_id(device_id, device)) != MM_ERROR_NONE) + debug_error("failed to get device by id"); + + debug_fleave(); + + return ret; +} + static bool device_is_match_direction(int direction, int mask) { if (mask == DEVICE_IO_DIRECTION_FLAGS || mask == 0) @@ -658,7 +687,8 @@ static bool device_is_match_with_mask(const char *type, int direction, int state } static int _fill_sound_device(mm_sound_device_t *device_h, int device_id, const char *device_type, - int direction, int state, const char *name, int *stream_id, int stream_num) + int direction, int state, const char *name, int vendor_id, int product_id, + int *stream_id, int stream_num) { int i; @@ -677,6 +707,8 @@ static int _fill_sound_device(mm_sound_device_t *device_h, int device_id, const device_h->state = state; MMSOUND_STRNCPY(device_h->name, name, MAX_DEVICE_NAME_NUM); MMSOUND_STRNCPY(device_h->type, device_type, MAX_DEVICE_TYPE_STR_LEN); + device_h->vendor_id = vendor_id; + device_h->product_id = product_id; if (stream_num > 0) { device_h->stream_num = stream_num; @@ -694,16 +726,16 @@ static int _fill_sound_device(mm_sound_device_t *device_h, int device_id, const } static void _mm_sound_device_connected_callback_wrapper_func(int device_id, const char *device_type, int io_direction, - int state, const char *name, int *stream_id, int stream_num, - gboolean is_connected, void *userdata) + int state, const char *name, int vendor_id, int product_id, int *stream_id, int stream_num, + gboolean is_connected, void *userdata) { mm_sound_device_t device_h; struct callback_data *cb_data = (struct callback_data*) userdata; int device_flags; - debug_log("[Device %s] id(%d) type(%s) direction(%d) state(%d) name(%s)", + debug_log("[Device %s] id(%d) type(%s) direction(%d) state(%d) name(%s) vendor-id(%04x) product-id(%04x)", is_connected ? "Connected" : "Disconnected", device_id, device_type, io_direction, - state, name, is_connected); + state, name, vendor_id, product_id, is_connected); if (cb_data == NULL) { debug_warning("device connected changed callback data null"); @@ -714,7 +746,8 @@ static void _mm_sound_device_connected_callback_wrapper_func(int device_id, cons if (!device_is_match_with_mask(device_type, io_direction, state, device_flags)) return; - if (_fill_sound_device(&device_h, device_id, device_type, io_direction, state, name, stream_id, stream_num) < 0) { + if (_fill_sound_device(&device_h, device_id, device_type, io_direction, state, name, + vendor_id, product_id, stream_id, stream_num) < 0) { debug_error("Failed to fill sound device"); return; } @@ -754,15 +787,16 @@ int mm_sound_client_remove_device_connected_callback(unsigned int subs_id) } static void _mm_sound_device_info_changed_callback_wrapper_func(int device_id, const char *device_type, int io_direction, - int state, const char *name, int *stream_id, int stream_num, - int changed_device_info_type, void *userdata) + int state, const char *name, int vendor_id, int product_id, int *stream_id, int stream_num, + int changed_device_info_type, void *userdata) { mm_sound_device_t device_h; struct callback_data *cb_data = (struct callback_data*) userdata; int device_flags; - debug_log("[Device Info Changed] id(%d) type(%s) direction(%d) state(%d) name(%s) changed_info_type(%d)", - device_id, device_type, io_direction, state, name, changed_device_info_type); + debug_log("[Device Info Changed] id(%d) type(%s) direction(%d) state(%d) name(%s) " + "vendor-id(%04x) product-id(%04x) changed_info_type(%d)", + device_id, device_type, io_direction, state, name, vendor_id, product_id, changed_device_info_type); if (cb_data == NULL) { debug_warning("device info changed callback data null"); @@ -773,7 +807,8 @@ static void _mm_sound_device_info_changed_callback_wrapper_func(int device_id, c if (!device_is_match_with_mask(device_type, io_direction, state, device_flags)) return; - if (_fill_sound_device(&device_h, device_id, device_type, io_direction, state, name, stream_id, stream_num) < 0) { + if (_fill_sound_device(&device_h, device_id, device_type, io_direction, state, name, + vendor_id, product_id, stream_id, stream_num) < 0) { debug_error("Failed to fill sound device"); return; } @@ -812,15 +847,16 @@ int mm_sound_client_remove_device_info_changed_callback(unsigned int subs_id) } static void _mm_sound_device_state_changed_callback_wrapper_func(int device_id, const char *device_type, - int io_direction, int state, const char *name, - int *stream_id, int stream_num, void *userdata) + int io_direction, int state, const char *name, int vendor_id, int product_id, + int *stream_id, int stream_num, void *userdata) { mm_sound_device_t device_h; struct callback_data *cb_data = (struct callback_data*) userdata; int device_flags; - debug_log("[Device State Changed] id(%d) type(%s) direction(%d) state(%d) name(%s)", - device_id, device_type, io_direction, state, name); + debug_log("[Device State Changed] id(%d) type(%s) direction(%d) state(%d) name(%s)" + "vendor-id(%04x), product-id(%04x)", + device_id, device_type, io_direction, state, name, vendor_id, product_id); if (cb_data == NULL) { debug_warning("device state changed callback data null"); @@ -832,7 +868,8 @@ static void _mm_sound_device_state_changed_callback_wrapper_func(int device_id, if (!device_is_match_with_mask(device_type, io_direction, state, device_flags)) return; - if (_fill_sound_device(&device_h, device_id, device_type, io_direction, state, name, stream_id, stream_num) < 0) { + if (_fill_sound_device(&device_h, device_id, device_type, io_direction, state, name, + vendor_id, product_id, stream_id, stream_num) < 0) { debug_error("Failed to fill sound device"); return; } @@ -881,7 +918,7 @@ int mm_sound_client_is_stream_on_device(int stream_id, int device_id, bool *is_o } if ((ret = mm_sound_proxy_is_stream_on_device(stream_id, device_id, is_on)) != MM_ERROR_NONE) { - debug_error("[Client] failed to query is stream on device, ret[0x%x]", ret); + debug_error("failed to query is stream on device, ret[0x%x]", ret); goto failed; } @@ -989,7 +1026,7 @@ static void _mm_sound_volume_changed_callback_wrapper_func(const char *direction volume_type_t volume_type = 0; struct callback_data *cb_data = (struct callback_data *) userdata; - debug_log("[Wrapper CB][Volume Changed] direction : %s, volume_type : %s, volume_level : %d", + debug_log("direction : %s, volume_type : %s, volume_level : %d", direction, volume_type_str, volume_level); if (cb_data == NULL) { @@ -1033,7 +1070,85 @@ int mm_sound_client_remove_volume_changed_callback(unsigned int subs_id) return ret; } +int mm_sound_client_set_filter_by_type(const char *stream_type, const char *filter_name, const char *filter_parameters, const char *filter_group) +{ + int ret = MM_ERROR_NONE; + debug_fenter(); + + ret = mm_sound_proxy_set_filter_by_type(stream_type, filter_name, filter_parameters, filter_group); + + debug_fleave(); + return ret; +} + +int mm_sound_client_unset_filter_by_type(const char *stream_type) +{ + int ret = MM_ERROR_NONE; + debug_fenter(); + + ret = mm_sound_proxy_unset_filter_by_type(stream_type); + + debug_fleave(); + return ret; +} + +int mm_sound_client_control_filter_by_type(const char *stream_type, const char *filter_name, const char *filter_controls) +{ + int ret = MM_ERROR_NONE; + debug_fenter(); + + ret = mm_sound_proxy_control_filter_by_type(stream_type, filter_name, filter_controls); + + debug_fleave(); + return ret; +} + #ifdef USE_FOCUS +static gboolean _interrupted_completed(gpointer *data) +{ + if (!data) { + debug_error("data is null"); + return false; + } + if (!g_focus_session_interrupt_info.user_cb) { + debug_error("user_cb is null"); + free(data); + return false; + } + + debug_msg("invoke user_cb(%p)", g_focus_session_interrupt_info.user_cb); + (g_focus_session_interrupt_info.user_cb)(FOCUS_IS_RELEASED, (const char *)data, g_focus_session_interrupt_info.user_data); + debug_msg("invoked"); + + free(data); + return false; +} + +static void _session_interrupted_cb(int id, mm_sound_focus_type_e focus_type, mm_sound_focus_state_e state, + const char *reason_for_change, const char *ext_info, void *user_data) +{ + debug_msg("id(%d), focus_type(%d), state(%d), reason(%s)", id, focus_type, state, reason_for_change); + + if (id != g_focus_session_interrupt_info.watch_cb_id) { + debug_error("id is not valid(param id:%d, g_focus_session_interrupt_watch_cb_id:%d)", + id, g_focus_session_interrupt_info.watch_cb_id); + return; + } + if (!g_focus_session_interrupt_info.user_cb) { + debug_error("user callback is null"); + return; + } + + debug_msg(" >>> invoking session interrupt callback(%p)", g_focus_session_interrupt_info.user_cb); + if (state == FOCUS_IS_RELEASED) + (g_focus_session_interrupt_info.user_cb)(FOCUS_IS_ACQUIRED, reason_for_change, g_focus_session_interrupt_info.user_data); + else { + debug_msg("INTERRUPTED COMPLETED case, append it to idle"); + g_idle_add((GSourceFunc)_interrupted_completed, strdup(reason_for_change)); + } + debug_msg(" <<< session interrupt callback finished"); +} + int mm_sound_client_set_session_interrupt_callback(mm_sound_focus_session_interrupt_cb callback, void* user_data) { int ret = MM_ERROR_NONE; @@ -1043,6 +1158,14 @@ int mm_sound_client_set_session_interrupt_callback(mm_sound_focus_session_interr if (!callback) return MM_ERROR_INVALID_ARGUMENT; + /* add internal focus watch callback */ + if (g_focus_session_interrupt_info.watch_cb_id == -1) { + if ((ret = mm_sound_client_set_focus_watch_callback(getpid(), FOCUS_FOR_BOTH, true, true, _session_interrupted_cb, NULL, + &g_focus_session_interrupt_info.watch_cb_id))) { + debug_error("failed to mm_sound_client_set_focus_watch_callback(), ret(0x%x)", ret); + return ret; + } + } g_focus_session_interrupt_info.user_cb = callback; g_focus_session_interrupt_info.user_data = user_data; @@ -1056,11 +1179,18 @@ int mm_sound_client_unset_session_interrupt_callback(void) debug_fenter(); - if (!g_focus_session_interrupt_info.user_cb) { + if (!g_focus_session_interrupt_info.user_cb || g_focus_session_interrupt_info.watch_cb_id == -1) { debug_error("no callback to unset"); return MM_ERROR_SOUND_INTERNAL; } + /* remove internal focus watch callback */ + if ((ret = mm_sound_client_unset_focus_watch_callback(g_focus_session_interrupt_info.watch_cb_id))) { + debug_error("failed to mm_sound_client_unset_focus_watch_callback(), id(%d), ret(0x%x)", + g_focus_session_interrupt_info.watch_cb_id, ret); + return ret; + } + g_focus_session_interrupt_info.watch_cb_id = -1; g_focus_session_interrupt_info.user_cb = NULL; g_focus_session_interrupt_info.user_data = NULL; @@ -1073,10 +1203,10 @@ static gpointer _focus_thread_func(gpointer data) unsigned int thread_id = (unsigned int)pthread_self(); GMainLoop *focus_loop = (GMainLoop*)data; - debug_warning(">>> thread func : thread id(%u), mainloop[%p]", thread_id, focus_loop); + debug_warning(">>> thread id(%u), mainloop[%p]", thread_id, focus_loop); if (focus_loop) g_main_loop_run(focus_loop); - debug_warning("<<< quit thread func : thread id(%u), mainloop[%p]", thread_id, focus_loop); + debug_warning("<<< quit : thread id(%u), mainloop[%p]", thread_id, focus_loop); return NULL; } @@ -1149,7 +1279,7 @@ static gboolean _focus_callback_handler(gpointer user_data) int tid = 0; focus_cb_data_lib cb_data; - debug_log(">>> _focus_callback_handler(), this thread id(%u)\n", (unsigned int)pthread_self()); + debug_log(">>> thread id(%u)", (unsigned int)pthread_self()); if (!focus_handle) { debug_error("focus_handle is null"); @@ -1188,11 +1318,6 @@ static gboolean _focus_callback_handler(gpointer user_data) (focus_handle->focus_callback)(cb_data.handle, cb_data.type, cb_data.state, cb_data.stream_type, cb_data.option, cb_data.ext_info, focus_handle->user_data); debug_msg("[CALLBACK END]"); - if (g_focus_session_interrupt_info.user_cb) { - debug_msg("sending session interrupt callback(%p)", g_focus_session_interrupt_info.user_cb); - g_focus_session_interrupt_info.user_cb(cb_data.state, cb_data.stream_type, false, - g_focus_session_interrupt_info.user_data); - } } #ifdef CONFIG_ENABLE_RETCB { @@ -1204,7 +1329,7 @@ static gboolean _focus_callback_handler(gpointer user_data) if (tmpfd < 0) { char str_error[256]; strerror_r(errno, str_error, sizeof(str_error)); - debug_warning("[RETCB][Failed(May Server Close First)]tid(%d) fd(%d) %s errno=%d(%s)\n", + debug_warning("[RETCB][Failed(May Server Close First)]tid(%d) fd(%d) %s errno=%d(%s)", tid, tmpfd, filename2, errno, str_error); g_free(filename2); g_mutex_unlock(&focus_handle->focus_lock); @@ -1216,7 +1341,7 @@ static gboolean _focus_callback_handler(gpointer user_data) rett = write(tmpfd, &buf, sizeof(buf)); close(tmpfd); g_free(filename2); - debug_msg("[RETCB] tid(%d) finishing CB (write=%d)\n", tid, rett); + debug_msg("[RETCB] tid(%d) finishing CB (write=%d)", tid, rett); } #endif } @@ -1236,7 +1361,7 @@ static gboolean _focus_watch_callback_handler(gpointer user_data) int tid = 0; focus_cb_data_lib cb_data; - debug_log(">>> _focus_watch_callback_handler(), this thread id(%u)\n", (unsigned int)pthread_self()); + debug_log(">>> thread id(%u)", (unsigned int)pthread_self()); if (!focus_handle) { debug_error("focus_handle is null"); @@ -1281,11 +1406,6 @@ static gboolean _focus_watch_callback_handler(gpointer user_data) (focus_handle->watch_callback)(cb_data.handle, cb_data.type, cb_data.state, cb_data.stream_type, cb_data.ext_info, focus_handle->user_data); debug_msg("[CALLBACK END]"); - if (g_focus_session_interrupt_info.user_cb) { - debug_msg("sending session interrupt callback(%p)", g_focus_session_interrupt_info.user_cb); - (g_focus_session_interrupt_info.user_cb)(cb_data.state, cb_data.stream_type, true, - g_focus_session_interrupt_info.user_data); - } SKIP_CB_AND_RET: #ifdef CONFIG_ENABLE_RETCB @@ -1298,7 +1418,7 @@ SKIP_CB_AND_RET: if (tmpfd < 0) { char str_error[256]; strerror_r(errno, str_error, sizeof(str_error)); - debug_warning("[RETCB][Failed(May Server Close First)]tid(%d) fd(%d) %s errno=%d(%s)\n", + debug_warning("[RETCB][Failed(May Server Close First)]tid(%d) fd(%d) %s errno=%d(%s)", tid, tmpfd, filename2, errno, str_error); g_free(filename2); g_mutex_unlock(&focus_handle->focus_lock); @@ -1308,7 +1428,7 @@ SKIP_CB_AND_RET: rett = write(tmpfd, &buf, sizeof(buf)); close(tmpfd); g_free(filename2); - debug_msg("[RETCB] tid(%d) finishing CB (write=%d)\n", tid, rett); + debug_msg("[RETCB] tid(%d) finishing CB (write=%d)", tid, rett); } #endif } @@ -1700,9 +1820,8 @@ int mm_sound_client_is_focus_cb_thread(GThread *mine, bool *result) return ret; } -int mm_sound_client_register_focus(int id, int pid, const char *stream_type, - mm_sound_focus_changed_cb callback, - bool is_for_session, void* user_data) +int mm_sound_client_register_focus(int id, int pid, const char *stream_type, bool is_for_session, + mm_sound_focus_changed_cb callback, void* user_data) { int ret = MM_ERROR_NONE; int instance; @@ -1729,14 +1848,14 @@ int mm_sound_client_register_focus(int id, int pid, const char *stream_type, ret = mm_sound_proxy_register_focus(id, pid, stream_type, callback, is_for_session, user_data); if (ret == MM_ERROR_NONE) { - debug_msg("[Client] Success to register focus\n"); + debug_msg("Success to register focus"); g_need_emergent_exit = TRUE; if (_focus_init_context(index)) { ret = MM_ERROR_SOUND_INTERNAL; goto cleanup; } } else { - debug_error("[Client] Error occurred : 0x%x \n",ret); + debug_error("Error occurred : 0x%x",ret); goto cleanup; } @@ -1780,9 +1899,9 @@ int mm_sound_client_unregister_focus(int id) ret = mm_sound_proxy_unregister_focus(instance, id, g_focus_sound_handle[index].is_for_session); if (ret == MM_ERROR_NONE) - debug_msg("[Client] Success to unregister focus\n"); + debug_msg("Success to unregister focus"); else - debug_error("[Client] Error occurred : 0x%x \n",ret); + debug_error("Error occurred : 0x%x", ret); g_mutex_unlock(&g_focus_sound_handle[index].focus_lock); @@ -1808,7 +1927,11 @@ int mm_sound_client_set_focus_reacquisition(int id, bool reacquisition, bool is_ bool result; debug_fenter(); - MMSOUND_ENTER_CRITICAL_SECTION_WITH_RETURN(&g_index_mutex, MM_ERROR_SOUND_INTERNAL); + + /* Since the muse server which uses this library for multiple handles executes requests from clients serially, + * we can skip locking/unlocking the mutex for this case. */ + if (!is_for_session) + MMSOUND_ENTER_CRITICAL_SECTION_WITH_RETURN(&g_index_mutex, MM_ERROR_SOUND_INTERNAL); index = _focus_find_index_by_handle(id); if (index == -1) { @@ -1820,25 +1943,26 @@ int mm_sound_client_set_focus_reacquisition(int id, bool reacquisition, bool is_ ret = mm_sound_client_is_focus_cb_thread(g_thread_self(), &result); if (ret) { - debug_error("[Client] mm_sound_client_is_focus_cb_thread failed"); + debug_error("mm_sound_client_is_focus_cb_thread failed"); goto cleanup; } else if (!result) { ret = mm_sound_proxy_set_focus_reacquisition(instance, id, reacquisition, is_for_session); if (ret == MM_ERROR_NONE) { - debug_msg("[Client] Success to set focus reacquisition to [%d]\n", reacquisition); + debug_msg("Success to set focus reacquisition to [%d]", reacquisition); } else { - debug_error("[Client] Error occurred : 0x%x \n",ret); + debug_error("Error occurred : 0x%x",ret); goto cleanup; } } else { - debug_warning("[Client] Inside the focus cb thread, set focus reacquisition to [%d]\n", reacquisition); + debug_warning("Inside the focus cb thread, set focus reacquisition to [%d]", reacquisition); } g_focus_sound_handle[index].auto_reacquire = reacquisition; - debug_msg("[Client] set focus reacquisition(%d) for id(%d)\n", reacquisition, id); + debug_msg("set focus reacquisition(%d) for id(%d)", reacquisition, id); cleanup: - MMSOUND_LEAVE_CRITICAL_SECTION(&g_index_mutex); + if (!is_for_session) + MMSOUND_LEAVE_CRITICAL_SECTION(&g_index_mutex); debug_fleave(); return ret; } @@ -1865,7 +1989,7 @@ int mm_sound_client_get_focus_reacquisition(int id, bool *reacquisition) } *reacquisition = g_focus_sound_handle[index].auto_reacquire; - debug_msg("[Client] get focus reacquisition(%d) for id(%d)\n", *reacquisition, id); + debug_msg("get focus reacquisition(%d) for id(%d)", *reacquisition, id); cleanup: MMSOUND_LEAVE_CRITICAL_SECTION(&g_index_mutex); @@ -1876,18 +2000,21 @@ cleanup: int mm_sound_client_get_acquired_focus_stream_type(int focus_type, char **stream_type, int *option, char **ext_info) { int ret = MM_ERROR_NONE; - char *ext_str = NULL; + char *stream_type_str = NULL; + char *ext_info_str = NULL; debug_fenter(); - ret = mm_sound_proxy_get_acquired_focus_stream_type(focus_type, stream_type, option, &ext_str); + ret = mm_sound_proxy_get_acquired_focus_stream_type(focus_type, &stream_type_str, option, &ext_info_str); if (ret == MM_ERROR_NONE) { - debug_msg("[Client] Success to get stream type of acquired focus, stream_type(%s), ext_info(%s)\n", - *stream_type, ext_str); - *ext_info = strdup(ext_str); - g_free(ext_str); + debug_msg("Success to get stream type of acquired focus, stream_type(%s), ext_info(%s)", + stream_type_str, ext_info_str); + *stream_type = strdup(stream_type_str); + *ext_info = strdup(ext_info_str); + g_free(stream_type_str); + g_free(ext_info_str); } else { - debug_error("[Client] Error occurred : 0x%x \n",ret); + debug_error("Error occurred : 0x%x",ret); } debug_fleave(); @@ -1913,9 +2040,9 @@ int mm_sound_client_acquire_focus(int id, mm_sound_focus_type_e type, int option ret = mm_sound_proxy_acquire_focus(instance, id, type, option, ext_info, g_focus_sound_handle[index].is_for_session); if (ret == MM_ERROR_NONE) - debug_msg("[Client] Success to acquire focus\n"); + debug_msg("Success to acquire focus"); else - debug_error("[Client] Error occurred : 0x%x \n",ret); + debug_error("Error occurred : 0x%x", ret); cleanup: MMSOUND_LEAVE_CRITICAL_SECTION(&g_index_mutex); @@ -1942,9 +2069,9 @@ int mm_sound_client_release_focus(int id, mm_sound_focus_type_e type, int option ret = mm_sound_proxy_release_focus(instance, id, type, option, ext_info, g_focus_sound_handle[index].is_for_session); if (ret == MM_ERROR_NONE) - debug_msg("[Client] Success to release focus\n"); + debug_msg("Success to release focus"); else - debug_error("[Client] Error occurred : 0x%x \n",ret); + debug_error("Error occurred : 0x%x",ret); cleanup: MMSOUND_LEAVE_CRITICAL_SECTION(&g_index_mutex); @@ -1958,15 +2085,26 @@ int mm_sound_client_update_stream_focus_status(int id, unsigned int status) debug_fenter(); if ((ret = mm_sound_proxy_update_stream_focus_status(id, status)) != MM_ERROR_NONE) - debug_error("[Client] failed to update stream focus status, ret[0x%x]", ret); + debug_error("failed to update stream focus status, ret[0x%x]", ret); + + debug_fleave(); + return ret; +} + +int mm_sound_client_deliver_focus(int pid, int src_id, int dst_id, mm_sound_focus_type_e focus_type) +{ + int ret = MM_ERROR_NONE; + debug_fenter(); + + if ((ret = mm_sound_proxy_deliver_focus(pid, src_id, dst_id, focus_type)) != MM_ERROR_NONE) + debug_error("failed to deliver focus, ret[0x%x]", ret); debug_fleave(); return ret; } -int mm_sound_client_set_focus_watch_callback(int pid, mm_sound_focus_type_e focus_type, - mm_sound_focus_changed_watch_cb callback, - bool is_for_session, void* user_data, int *id) +int mm_sound_client_set_focus_watch_callback(int pid, mm_sound_focus_type_e focus_type, bool is_for_session, bool is_for_monitor, + mm_sound_focus_changed_watch_cb callback, void* user_data, int *id) { int ret = MM_ERROR_NONE; int instance; @@ -1999,20 +2137,21 @@ int mm_sound_client_set_focus_watch_callback(int pid, mm_sound_focus_type_e focu g_focus_sound_handle[index].watch_callback = callback; g_focus_sound_handle[index].user_data = user_data; g_focus_sound_handle[index].is_for_session = is_for_session; + g_focus_sound_handle[index].is_for_monitor = is_for_monitor; g_focus_sound_handle[index].unset_watch_callback_requested = false; ret = mm_sound_proxy_set_focus_watch_callback(pid, g_focus_sound_handle[index].handle, focus_type, - callback, is_for_session, user_data); + is_for_session, is_for_monitor, callback, user_data); if (ret == MM_ERROR_NONE) { - debug_msg("[Client] Success to watch focus"); + debug_msg("Success to watch focus"); g_need_emergent_exit = TRUE; if (_focus_init_context(index)) { ret = MM_ERROR_SOUND_INTERNAL; goto cleanup; } } else { - debug_error("[Client] Error occurred : 0x%x",ret); + debug_error("Error occurred : 0x%x",ret); goto cleanup; } @@ -2070,13 +2209,13 @@ int mm_sound_client_unset_focus_watch_callback(int id) g_focus_sound_handle[index].is_used = false; ret = mm_sound_proxy_unset_focus_watch_callback(g_focus_sound_handle[index].focus_tid, - g_focus_sound_handle[index].handle, - g_focus_sound_handle[index].is_for_session); + g_focus_sound_handle[index].handle, + g_focus_sound_handle[index].is_for_session); if (ret == MM_ERROR_NONE) - debug_msg("[Client] Success to unwatch focus\n"); + debug_msg("Success to unwatch focus"); else - debug_error("[Client] Error occurred : 0x%x \n",ret); + debug_error("Error occurred : 0x%x",ret); g_mutex_unlock(&g_focus_sound_handle[index].focus_lock); @@ -2109,11 +2248,11 @@ static gboolean _idle_event_callback(void *data) switch (idle_event_data->type) { case IDLE_EVENT_TYPE_UNSET_FOCUS_WATCH_CB: if ((ret = mm_sound_client_unset_focus_watch_callback(idle_event_data->data))) - debug_error("Could not unset focus watch callback, id(%d), ret = %x\n", idle_event_data->data, ret); + debug_error("Could not unset focus watch callback, id(%d), ret = %x", idle_event_data->data, ret); break; case IDLE_EVENT_TYPE_UNREGISTER_FOCUS: if ((ret = mm_sound_client_unregister_focus(idle_event_data->data))) - debug_error("Could not unregister focus, id(%d), ret = %x\n", idle_event_data->data, ret); + debug_error("Could not unregister focus, id(%d), ret = %x", idle_event_data->data, ret); break; default: debug_warning("invalid type(%d)", idle_event_data->type); @@ -2133,7 +2272,7 @@ int mm_sound_client_execute_focus_func_in_main_context(focus_idle_event_type_e t { focus_idle_event_t *idle_event_data = NULL; - if (IDLE_EVENT_TYPE_UNSET_FOCUS_WATCH_CB > type || IDLE_EVENT_TYPE_MAX < type) + if (IDLE_EVENT_TYPE_MAX < type) return MM_ERROR_INVALID_ARGUMENT; MMSOUND_ENTER_CRITICAL_SECTION_WITH_RETURN(&g_event_mutex, MM_ERROR_SOUND_INTERNAL);