Use mc_server_receive_event_e instead of mc_ability_e

Change-Id: Ie0bd3dfb40749983a43f03b64822e95319d652e1

diff --git a/include/media_controller_db.h b/include/media_controller_db.h
index 5b3997d..6bed141 100644 (file)
--- a/include/media_controller_db.h
+++ b/include/media_controller_db.h
@@ -40,7 +40,7 @@ int mc_db_get_metadata_info(void *handle, const char *server_name, mc_metadata_h
 int mc_db_get_shuffle_mode(void *handle, const char *server_name, mc_shuffle_mode_e *mode);
 int mc_db_get_repeat_mode(void *handle, const char *server_name, mc_repeat_mode_e *mode);
 int mc_db_get_icon_uri(void *handle, const char *server_name, char **uri);
-int mc_db_get_ability_supported(void *handle, const char *server_name, mc_ability_e ability, mc_ability_support_e *supported);
+int mc_db_get_ability_supported(void *handle, const char *server_name, mc_server_receive_event_e ability, mc_ability_support_e *supported);
 int mc_db_get_pb_action_ability(void *handle, const char *server_name, mc_playback_ability_h *ability);
 int _mc_db_get_playlist_count(void *handle, const char *server_name);
 int mc_db_get_foreach_playlist(void *handle, const char *server_name, mc_playlist_cb callback, void *user_data);

diff --git a/include/media_controller_private.h b/include/media_controller_private.h
index 5d66f81..1ce451b 100644 (file)
--- a/include/media_controller_private.h
+++ b/include/media_controller_private.h
@@ -303,6 +303,8 @@ typedef enum {
        MC_SERVER_EVENT_MAX,
 } mc_server_receive_event_e;
 
+#define PLAYBACK_ACTION_ABILITY        MC_SERVER_EVENT_PLAYBACK_ACTION + 30
+
 typedef struct {
        char *server_name;
        void* db_handle;
@@ -346,12 +348,6 @@ typedef struct {
        GList *item_list;
 } mc_playlist_s;
 
-typedef enum {
-       MC_ABILITY_ACTION = 0,
-       MC_ABILITY_SHUFFLE = 20,
-       MC_ABILITY_REPEAT,
-} mc_ability_e;
-
 /* formal callback to receive signal */
 typedef void(*mc_signal_received_cb)(const char *interface_name, const char *signal_name, const char *message, const char *request_id, void *user_data);
 

diff --git a/src/media_controller_client.c b/src/media_controller_client.c
index bb85cd1..cfb7c6f 100644 (file)
--- a/src/media_controller_client.c
+++ b/src/media_controller_client.c
@@ -1324,7 +1324,7 @@ int mc_client_get_server_shuffle_ability_support(mc_client_h client, const char
        mc_retvm_if(support == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "supported is NULL");
        mc_retvm_if(mc_db_is_server_table_exist(mc_client->db_handle, server_name) == FALSE, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid server_name");
 
-       ret = mc_db_get_ability_supported(mc_client->db_handle, server_name, MC_ABILITY_SHUFFLE, support);
+       ret = mc_db_get_ability_supported(mc_client->db_handle, server_name, MC_SERVER_EVENT_SHUFFLE, support);
        mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "Error mc_db_get_ability_supported [%d]", ret);
 
        return ret;
@@ -1339,7 +1339,7 @@ int mc_client_get_server_repeat_ability_support(mc_client_h client, const char *
        mc_retvm_if(support == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "supported is NULL");
        mc_retvm_if(mc_db_is_server_table_exist(mc_client->db_handle, server_name) == FALSE, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid server_name");
 
-       ret = mc_db_get_ability_supported(mc_client->db_handle, server_name, MC_ABILITY_REPEAT, support);
+       ret = mc_db_get_ability_supported(mc_client->db_handle, server_name, MC_SERVER_EVENT_REPEAT, support);
        mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "Error mc_db_get_ability_supported [%d]", ret);
 
        return ret;

diff --git a/src/media_controller_db.c b/src/media_controller_db.c
index 7bb4238..1382738 100644 (file)
--- a/src/media_controller_db.c
+++ b/src/media_controller_db.c
@@ -573,14 +573,12 @@ static int __mc_db_get_ability(void *handle, const char *server_name, unsigned l
 
 }
 
-int mc_db_get_ability_supported(void *handle, const char *server_name, mc_ability_e ability, mc_ability_support_e *supported)
+int mc_db_get_ability_supported(void *handle, const char *server_name, mc_server_receive_event_e ability, mc_ability_support_e *supported)
 {
        int ret = MEDIA_CONTROLLER_ERROR_NONE;
        unsigned long long _decided = 0;
        unsigned long long _supported = 0;
 
-       mc_retvm_if((ability < MC_ABILITY_ACTION || ability > MC_ABILITY_REPEAT), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "ability is Invalid");
-
        ret = __mc_db_get_ability(handle, server_name, &_decided, &_supported);
        mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "__mc_db_get_ability failed");
 

diff --git a/src/media_controller_metadata.c b/src/media_controller_metadata.c
index 081ef8a..5b046d2 100755 (executable)
--- a/src/media_controller_metadata.c
+++ b/src/media_controller_metadata.c
@@ -289,11 +289,11 @@ int mc_playback_action_is_supported(mc_playback_ability_h ability, mc_playback_a
        mc_retvm_if(((action < MC_PLAYBACK_ACTION_PLAY) || (action > MC_PLAYBACK_ACTION_TOGGLE_PLAY_PAUSE)), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "action is invalid");
        mc_retvm_if(supported == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "supported is NULL");
 
-       mc_secure_debug("IsDecided: %d", MC_BIT64_IS_TRUE(mc_ability->decided, (MC_ABILITY_ACTION + action)));
-       mc_secure_debug("IsSupported: %d", MC_BIT64_IS_TRUE(mc_ability->supported, (MC_ABILITY_ACTION + action)));
+       mc_secure_debug("IsDecided: %d", MC_BIT64_IS_TRUE(mc_ability->decided, (PLAYBACK_ACTION_ABILITY + action)));
+       mc_secure_debug("IsSupported: %d", MC_BIT64_IS_TRUE(mc_ability->supported, (PLAYBACK_ACTION_ABILITY + action)));
 
-       if (MC_BIT64_IS_TRUE(mc_ability->decided, (MC_ABILITY_ACTION + action))) {
-               if (MC_BIT64_IS_TRUE(mc_ability->supported, (MC_ABILITY_ACTION + action)))
+       if (MC_BIT64_IS_TRUE(mc_ability->decided, (PLAYBACK_ACTION_ABILITY + action))) {
+               if (MC_BIT64_IS_TRUE(mc_ability->supported, (PLAYBACK_ACTION_ABILITY + action)))
                        *supported = MC_ABILITY_SUPPORTED_YES;
                else
                        *supported = MC_ABILITY_SUPPORTED_NO;

diff --git a/src/media_controller_server.c b/src/media_controller_server.c
index 9119bbc..90500cc 100644 (file)
--- a/src/media_controller_server.c
+++ b/src/media_controller_server.c
@@ -1101,7 +1101,7 @@ int mc_server_set_playback_ability(mc_server_h server, mc_playback_action_e acti
 {
        mc_retvm_if(((action < MC_PLAYBACK_ACTION_PLAY) || (action > MC_PLAYBACK_ACTION_TOGGLE_PLAY_PAUSE)), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "action is invalid [%d]", action);
 
-       return __mc_server_update_ability(server, MC_ABILITY_ACTION + action, support, FALSE);
+       return __mc_server_update_ability(server, PLAYBACK_ACTION_ABILITY + action, support, FALSE);
 }
 
 int mc_server_update_playback_ability(mc_server_h server)
@@ -1125,7 +1125,7 @@ int mc_server_set_shuffle_ability(mc_server_h server, mc_ability_support_e suppo
        int ret = MEDIA_CONTROLLER_ERROR_NONE;
        media_controller_server_s *mc_server = (media_controller_server_s *)server;
 
-       ret = __mc_server_update_ability(server, MC_ABILITY_SHUFFLE, support, TRUE);
+       ret = __mc_server_update_ability(server, MC_SERVER_EVENT_SHUFFLE, support, TRUE);
        mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "fail to __mc_server_update_ability");
 
        ret = __mc_server_send_message(mc_server, MC_DBUS_UPDATE_INTERFACE, MC_DBUS_SIGNAL_NAME_SHUFFLE_ABILITY, support, 0, NULL);
@@ -1139,7 +1139,7 @@ int mc_server_set_repeat_ability(mc_server_h server, mc_ability_support_e suppor
        int ret = MEDIA_CONTROLLER_ERROR_NONE;
        media_controller_server_s *mc_server = (media_controller_server_s *)server;
 
-       ret = __mc_server_update_ability(server, MC_ABILITY_REPEAT, support, TRUE);
+       ret = __mc_server_update_ability(server, MC_SERVER_EVENT_REPEAT, support, TRUE);
        mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "fail to __mc_server_update_ability");
 
        ret = __mc_server_send_message(mc_server, MC_DBUS_UPDATE_INTERFACE, MC_DBUS_SIGNAL_NAME_REPEAT_ABILITY, support, 0, NULL);