Manage focus cb thread and focus watch cb thread separately

[platform/core/multimedia/libmm-sound.git] / mm_sound_focus.c

diff --git a/mm_sound_focus.c b/mm_sound_focus.c
index 70bac61..1b0fd5f 100644 (file)
--- a/mm_sound_focus.c
+++ b/mm_sound_focus.c
@@ -21,7 +21,6 @@
 
 #include <stdlib.h>
 #include <unistd.h>
-
 #include <mm_debug.h>
 
 #include "include/mm_sound.h"
@@ -31,81 +30,33 @@
 { \
        int ret = MM_ERROR_NONE; \
        bool result = false; \
-       ret = mm_sound_client_is_focus_cb_thread(x_thread, &result); \
+       ret = mm_sound_client_is_focus_cb_thread(x_thread, &result, NULL); \
        if (ret) \
                return ret; \
        if (result) { \
-               debug_error("it might be called in the thread of focus callback, it is not allowed\n"); \
+               debug_error("it might be called in the thread of focus callback, it is not allowed"); \
                return MM_ERROR_SOUND_INVALID_OPERATION; \
        } \
 } \
 
 EXPORT_API
-int mm_sound_focus_set_session_interrupt_callback(mm_sound_focus_session_interrupt_cb callback, void *user_data)
-{
-       int ret = MM_ERROR_NONE;
-       debug_fenter();
-
-       RETURN_ERROR_IF_FOCUS_CB_THREAD(g_thread_self());
-
-       if (!callback)
-               return MM_ERROR_INVALID_ARGUMENT;
-
-       ret = mm_sound_client_set_session_interrupt_callback (callback, user_data);
-
-       debug_fleave();
-
-       return ret;
-}
-
-EXPORT_API
-int mm_sound_focus_unset_session_interrupt_callback(void)
-{
-       int ret = MM_ERROR_NONE;
-       debug_fenter();
-
-       RETURN_ERROR_IF_FOCUS_CB_THREAD(g_thread_self());
-
-       ret = mm_sound_client_unset_session_interrupt_callback ();
-       if (ret) {
-               debug_error("Failed to mm_sound_client_unset_session_interrupt_callback(), ret[0x%x]\n", ret);
-       }
-
-       debug_fleave();
-
-       return ret;
-}
-
-EXPORT_API
-int mm_sound_focus_get_id(int *id)
+int mm_sound_focus_is_cb_thread(bool *result, bool *is_for_watching)
 {
        int ret = MM_ERROR_NONE;
 
        debug_fenter();
 
-       RETURN_ERROR_IF_FOCUS_CB_THREAD(g_thread_self());
-
-       ret = mm_sound_client_get_unique_id(id);
-       if (ret) {
-               debug_error("Failed to mm_sound_client_get_unique_id(), ret[0x%x]\n", ret);
+       if (result == NULL) {
+               debug_error("argument is not valid");
+               return MM_ERROR_INVALID_ARGUMENT;
        }
 
-       debug_fleave();
-
-       return ret;
-}
-
-EXPORT_API
-int mm_sound_focus_is_cb_thread(bool *result)
-{
-       int ret = MM_ERROR_NONE;
-
-       debug_fenter();
-
-       ret = mm_sound_client_is_focus_cb_thread(g_thread_self(), result);
+       ret = mm_sound_client_is_focus_cb_thread(g_thread_self(), result, is_for_watching);
        if (!ret) {
                if (*result)
-                       debug_msg("it might be called in the thread of focus callback\n");
+                       debug_msg("it might be called in the thread of focus callback");
+               if (is_for_watching && *is_for_watching)
+                       debug_msg("it's in the focus watch callback");
        }
 
        debug_fleave();
@@ -114,7 +65,7 @@ int mm_sound_focus_is_cb_thread(bool *result)
 }
 
 EXPORT_API
-int mm_sound_register_focus(int id, const char *stream_type, mm_sound_focus_changed_cb callback, void *user_data)
+int mm_sound_register_focus(const char *stream_type, mm_sound_focus_changed_cb callback, void *user_data, int *id)
 {
        int ret = MM_ERROR_NONE;
 
@@ -122,39 +73,14 @@ int mm_sound_register_focus(int id, const char *stream_type, mm_sound_focus_chan
 
        RETURN_ERROR_IF_FOCUS_CB_THREAD(g_thread_self());
 
-       if (id < 0 || callback == NULL) {
-               debug_error("argument is not valid\n");
+       if (id == NULL || callback == NULL) {
+               debug_error("argument is not valid");
                return MM_ERROR_INVALID_ARGUMENT;
        }
 
-       ret = mm_sound_client_register_focus(id, getpid(), stream_type, callback, false, user_data);
-       if (ret) {
-               debug_error("Could not register focus, ret[0x%x]\n", ret);
-       }
-
-       debug_fleave();
-
-       return ret;
-}
-
-EXPORT_API
-int mm_sound_register_focus_for_session(int id, int pid, const char *stream_type, mm_sound_focus_changed_cb callback, void *user_data)
-{
-       int ret = MM_ERROR_NONE;
-
-       debug_fenter();
-
-       RETURN_ERROR_IF_FOCUS_CB_THREAD(g_thread_self());
-
-       if (id < 0 || callback == NULL) {
-               debug_error("argument is not valid\n");
-               return MM_ERROR_INVALID_ARGUMENT;
-       }
-
-       ret = mm_sound_client_register_focus(id, pid, stream_type, callback, true, user_data);
-       if (ret) {
-               debug_error("Could not register focus for session, ret[0x%x]\n", ret);
-       }
+       ret = mm_sound_client_register_focus(getpid(), stream_type, callback, user_data, id);
+       if (ret)
+               debug_error("Could not register focus, ret[0x%x]", ret);
 
        debug_fleave();
 
@@ -169,15 +95,15 @@ int mm_sound_unregister_focus(int id)
 
        debug_fenter();
 
-       if (id < 0) {
-               debug_error("argument is not valid\n");
+       if (id <= 0) {
+               debug_error("argument is not valid");
                return MM_ERROR_INVALID_ARGUMENT;
        }
 
-       mm_sound_client_is_focus_cb_thread(g_thread_self(), &result);
+       mm_sound_client_is_focus_cb_thread(g_thread_self(), &result, NULL);
        if (!result) {
                if ((ret = mm_sound_client_unregister_focus(id)))
-                       debug_error("Could not unregister focus, ret = %x\n", ret);
+                       debug_error("Could not unregister focus, ret = %x", ret);
        } else {
                ret = mm_sound_client_execute_focus_func_in_main_context(IDLE_EVENT_TYPE_UNREGISTER_FOCUS, id);
        }
@@ -195,32 +121,12 @@ int mm_sound_set_focus_reacquisition(int id, bool reacquisition)
        debug_fenter();
 
        if (id < 0) {
-               debug_error("argument is not valid\n");
+               debug_error("argument is not valid");
                return MM_ERROR_INVALID_ARGUMENT;
        }
 
-       if ((ret = mm_sound_client_set_focus_reacquisition(id, reacquisition, false)))
-               debug_error("Could not set focus reacquisition, ret[0x%x]\n", ret);
-
-       debug_fleave();
-
-       return ret;
-}
-
-EXPORT_API
-int mm_sound_set_focus_reacquisition_for_session(int id, bool reacquisition)
-{
-       int ret = MM_ERROR_NONE;
-
-       debug_fenter();
-
-       if (id < 0) {
-               debug_error("argument is not valid\n");
-               return MM_ERROR_INVALID_ARGUMENT;
-       }
-
-       if ((ret = mm_sound_client_set_focus_reacquisition(id, reacquisition, true)))
-               debug_error("Could not set focus reacquisition, ret[0x%x]\n", ret);
+       if ((ret = mm_sound_client_set_focus_reacquisition(id, reacquisition)))
+               debug_error("Could not set focus reacquisition, ret[0x%x]", ret);
 
        debug_fleave();
 
@@ -235,14 +141,13 @@ int mm_sound_get_focus_reacquisition(int id, bool *reacquisition)
        debug_fenter();
 
        if (id < 0 || !reacquisition) {
-               debug_error("argument is not valid\n");
+               debug_error("argument is not valid");
                return MM_ERROR_INVALID_ARGUMENT;
        }
 
        ret = mm_sound_client_get_focus_reacquisition(id, reacquisition);
-       if (ret) {
-               debug_error("Could not get focus reacquisition, ret[0x%x]\n", ret);
-       }
+       if (ret)
+               debug_error("Could not get focus reacquisition, ret[0x%x]", ret);
 
        debug_fleave();
 
@@ -257,14 +162,13 @@ int mm_sound_get_stream_type_of_acquired_focus(int focus_type, char **stream_typ
        debug_fenter();
 
        if (stream_type == NULL) {
-               debug_error("argument is not valid\n");
+               debug_error("argument is not valid");
                return MM_ERROR_INVALID_ARGUMENT;
        }
 
        ret = mm_sound_client_get_acquired_focus_stream_type(focus_type, stream_type, option, ext_info);
-       if (ret) {
-               debug_error("Could not get acquired focus stream type, ret[0x%x]\n", ret);
-       }
+       if (ret)
+               debug_error("Could not get acquired focus stream type, ret[0x%x]", ret);
 
        debug_fleave();
 
@@ -281,18 +185,17 @@ int mm_sound_acquire_focus(int id, mm_sound_focus_type_e focus_type, const char
        RETURN_ERROR_IF_FOCUS_CB_THREAD(g_thread_self());
 
        if (id < 0) {
-               debug_error("argument is not valid\n");
+               debug_error("argument is not valid");
                return MM_ERROR_INVALID_ARGUMENT;
        }
        if (focus_type < FOCUS_FOR_PLAYBACK || focus_type > FOCUS_FOR_BOTH) {
-               debug_error("argument is not valid\n");
+               debug_error("argument is not valid");
                return MM_ERROR_INVALID_ARGUMENT;
        }
 
        ret = mm_sound_client_acquire_focus(id, focus_type, 0, ext_info);
-       if (ret) {
-               debug_error("Could not acquire focus, ret[0x%x]\n", ret);
-       }
+       if (ret)
+               debug_error("Could not acquire focus, ret[0x%x]", ret);
 
        debug_fleave();
 
@@ -309,18 +212,17 @@ int mm_sound_release_focus(int id, mm_sound_focus_type_e focus_type, const char
        RETURN_ERROR_IF_FOCUS_CB_THREAD(g_thread_self());
 
        if (id < 0) {
-               debug_error("argument is not valid\n");
+               debug_error("argument is not valid");
                return MM_ERROR_INVALID_ARGUMENT;
        }
        if (focus_type < FOCUS_FOR_PLAYBACK || focus_type > FOCUS_FOR_BOTH) {
-               debug_error("argument is not valid\n");
+               debug_error("argument is not valid");
                return MM_ERROR_INVALID_ARGUMENT;
        }
 
        ret = mm_sound_client_release_focus(id, focus_type, 0, ext_info);
-       if (ret) {
-               debug_error("Could not release focus, ret[0x%x]\n", ret);
-       }
+       if (ret)
+               debug_error("Could not release focus, ret[0x%x]", ret);
 
        debug_fleave();
 
@@ -334,27 +236,24 @@ int mm_sound_acquire_focus_with_option(int id, mm_sound_focus_type_e focus_type,
 
        debug_fenter();
 
-       RETURN_ERROR_IF_FOCUS_CB_THREAD(g_thread_self());
-
        if (id < 0) {
-               debug_error("id is not valid\n");
+               debug_error("id is not valid");
                return MM_ERROR_INVALID_ARGUMENT;
        }
 
        if (option < 0) {
-               debug_error("option is not valid\n");
+               debug_error("option is not valid");
                return MM_ERROR_INVALID_ARGUMENT;
        }
 
        if (focus_type < FOCUS_FOR_PLAYBACK || focus_type > FOCUS_FOR_BOTH) {
-               debug_error("focus type is not valid\n");
+               debug_error("focus type is not valid");
                return MM_ERROR_INVALID_ARGUMENT;
        }
 
        ret = mm_sound_client_acquire_focus(id, focus_type, option, ext_info);
-       if (ret) {
-               debug_error("Could not acquire focus, ret[0x%x]\n", ret);
-       }
+       if (ret)
+               debug_error("Could not acquire focus, ret[0x%x]", ret);
 
        debug_fleave();
 
@@ -368,27 +267,24 @@ int mm_sound_release_focus_with_option(int id, mm_sound_focus_type_e focus_type,
 
        debug_fenter();
 
-       RETURN_ERROR_IF_FOCUS_CB_THREAD(g_thread_self());
-
        if (id < 0) {
-               debug_error("id is not valid\n");
+               debug_error("id is not valid");
                return MM_ERROR_INVALID_ARGUMENT;
        }
 
        if (option < 0) {
-               debug_error("option is not valid\n");
+               debug_error("option is not valid");
                return MM_ERROR_INVALID_ARGUMENT;
        }
 
        if (focus_type < FOCUS_FOR_PLAYBACK || focus_type > FOCUS_FOR_BOTH) {
-               debug_error("focus type is not valid\n");
+               debug_error("focus type is not valid");
                return MM_ERROR_INVALID_ARGUMENT;
        }
 
        ret = mm_sound_client_release_focus(id, focus_type, option, ext_info);
-       if (ret) {
-               debug_error("Could not release focus, ret[0x%x]\n", ret);
-       }
+       if (ret)
+               debug_error("Could not release focus, ret[0x%x]", ret);
 
        debug_fleave();
 
@@ -401,37 +297,25 @@ int mm_sound_update_focus_status(int id, unsigned int status)
        int ret = MM_ERROR_NONE;
 
        if ((ret = mm_sound_client_update_stream_focus_status(id, status)))
-               debug_error("failed to mm_sound_client_update_stream_focus_status(), id(%d), status(%d, ret[0x%x]\n",
+               debug_error("failed to mm_sound_client_update_stream_focus_status(), id(%d), status(%d, ret[0x%x]",
                                        id, status, ret);
 
        return ret;
 }
 
 EXPORT_API
-int mm_sound_set_focus_watch_callback(mm_sound_focus_type_e focus_type, mm_sound_focus_changed_watch_cb callback, void *user_data, int *id)
+int mm_sound_deliver_focus(int src_id, int dst_id, mm_sound_focus_type_e focus_type)
 {
        int ret = MM_ERROR_NONE;
 
-       debug_fenter();
-
-       RETURN_ERROR_IF_FOCUS_CB_THREAD(g_thread_self());
-
-       if (callback == NULL || id == NULL) {
-               debug_error("argument is not valid\n");
-               return MM_ERROR_INVALID_ARGUMENT;
-       }
-       ret = mm_sound_client_set_focus_watch_callback(getpid(), focus_type, callback, false, user_data, id);
-       if (ret) {
-               debug_error("Could not set focus watch callback, ret[0x%x]\n", ret);
-       }
-
-       debug_fleave();
+       if ((ret = mm_sound_client_deliver_focus(src_id, dst_id, focus_type)))
+               debug_error("failed to mm_sound_client_deliver_focus(), ret[0x%x]", ret);
 
        return ret;
 }
 
 EXPORT_API
-int mm_sound_set_focus_watch_callback_for_session(int pid, mm_sound_focus_type_e focus_type, mm_sound_focus_changed_watch_cb callback, void *user_data, int *id)
+int mm_sound_set_focus_watch_callback(mm_sound_focus_type_e focus_type, mm_sound_focus_changed_watch_cb callback, void *user_data, int *id)
 {
        int ret = MM_ERROR_NONE;
 
@@ -440,13 +324,12 @@ int mm_sound_set_focus_watch_callback_for_session(int pid, mm_sound_focus_type_e
        RETURN_ERROR_IF_FOCUS_CB_THREAD(g_thread_self());
 
        if (callback == NULL || id == NULL) {
-               debug_error("argument is not valid\n");
+               debug_error("argument is not valid");
                return MM_ERROR_INVALID_ARGUMENT;
        }
-       ret = mm_sound_client_set_focus_watch_callback(pid, focus_type, callback, true, user_data, id);
-       if (ret) {
-               debug_error("Could not set focus watch callback, ret[0x%x]\n", ret);
-       }
+       ret = mm_sound_client_set_focus_watch_callback(getpid(), focus_type, callback, user_data, id);
+       if (ret)
+               debug_error("Could not set focus watch callback, ret[0x%x]", ret);
 
        debug_fleave();
 
@@ -462,22 +345,22 @@ int mm_sound_unset_focus_watch_callback(int id)
        debug_fenter();
 
        if (id < 0) {
-               debug_error("argument is not valid\n");
+               debug_error("argument is not valid");
                return MM_ERROR_INVALID_ARGUMENT;
        }
 
        if ((ret = mm_sound_client_request_unset_focus_watch_callback(id))) {
-               debug_error("failed to mm_sound_client_request_unset_focus_watch_callback, ret[0x%x]\n", ret);
+               debug_error("failed to mm_sound_client_request_unset_focus_watch_callback, ret[0x%x]", ret);
                return ret;
        }
 
-       mm_sound_client_is_focus_cb_thread(g_thread_self(), &result);
+       mm_sound_client_is_focus_cb_thread(g_thread_self(), &result, NULL);
        if (!result) {
                if ((ret = mm_sound_client_unset_focus_watch_callback(id)))
-                       debug_error("Could not unset focus watch callback, id(%d), ret[0x%x]\n", id, ret);
+                       debug_error("Could not unset focus watch callback, id(%d), ret[0x%x]", id, ret);
        } else {
                ret = mm_sound_client_execute_focus_func_in_main_context(IDLE_EVENT_TYPE_UNSET_FOCUS_WATCH_CB, id);
-               debug_msg("mm_sound_client_execute_focus_func_in_main_context() is called, id(%d), ret[0x%x]\n", id, ret);
+               debug_msg("mm_sound_client_execute_focus_func_in_main_context() is called, id(%d), ret[0x%x]", id, ret);
        }
 
        debug_fleave();