Remove unused db handle

Change-Id: Ia739bcd2b8ecc25c2d0309e341782024a4fff1db

diff --git a/include/media_controller_db.h b/include/media_controller_db.h
index c2a4f98..589aed8 100755 (executable)
--- a/include/media_controller_db.h
+++ b/include/media_controller_db.h
@@ -21,20 +21,19 @@
 
 int mc_db_connect(void **db_handle);
 int mc_db_disconnect(void *db_handle);
-int mc_db_create_server_table(void *handle, const char *server_name);
-int mc_db_delete_server_table(void *handle, const char *server_name);
+int mc_db_create_server_table(const char *server_name);
+int mc_db_delete_server_table(const char *server_name);
 int mc_db_check_server_table_exist(void *handle, const char *server_name, bool *exist);
 int mc_db_check_client_table_exist(void *handle, const char *client_name, bool *exist);
 
-int mc_db_update_playback_info(void *handle, const char *table_name, const media_controller_playback_s playback);
-int mc_db_update_whole_metadata(void *handle, const char *server_name,
+int mc_db_update_playback_info(const char *table_name, const media_controller_playback_s playback);
+int mc_db_update_whole_metadata(const char *server_name,
                                                const char *title, const char *artist, const char *album, const char *author, const char *genre, const char *duration, const char *date,
                                                const char *copyright, const char *description, const char *track_num, const char *picture);
-int mc_db_update_shuffle_mode(void *handle, const char *table_name, int shuffle_mode);
-int mc_db_update_repeat_mode(void *handle, const char *table_name, int repeat_mode);
-int mc_db_update_icon_uri(void *handle, const char *server_name, const char *uri);
-int mc_db_update_ability_supported(void *handle, const char *server_name, const media_controller_ability_s ability);
-int mc_db_update_extra_info(void *handle, const char *server_name, const char *event_name, const char *extras);
+int mc_db_update_shuffle_mode(const char *table_name, int shuffle_mode);
+int mc_db_update_repeat_mode(const char *table_name, int repeat_mode);
+int mc_db_update_icon_uri(const char *server_name, const char *uri);
+int mc_db_update_ability_supported(const char *server_name, const media_controller_ability_s ability);
 
 int mc_db_get_latest_server_name(void *handle, char **latest_server_name);
 int mc_db_get_server_state(void *handle, const char *server_name, mc_server_state_e *state);
@@ -48,17 +47,17 @@ int mc_db_get_pb_action_ability(void *handle, const char *server_name, mc_playba
 int mc_db_get_foreach_playlist(void *handle, const char *server_name, mc_playlist_cb callback, void *user_data);
 int mc_db_get_playlist_by_name(void *handle, mc_priv_type_e type, const char *controller_name, const char *playlist_name, mc_playlist_h *playlist);
 int mc_db_get_playlist_item(void *handle, const char *server_name, char *playlist_name, mc_playlist_item_cb callback, void *user_data);
-int mc_db_insert_server_address_into_server_list(void *db_handle, const char *address);
-int mc_db_delete_server_address_from_server_list(void *db_handle, const char *address);
-int mc_db_insert_client_address_into_client_list(void *db_handle, const char *address);
-int mc_db_delete_client_address_from_client_list(void *db_handle, const char *address);
+int mc_db_insert_server_address_into_server_list(const char *address);
+int mc_db_delete_server_address_from_server_list(const char *address);
+int mc_db_insert_client_address_into_client_list(const char *address);
+int mc_db_delete_client_address_from_client_list(const char *address);
 
 int mc_db_foreach_server_list(void *handle, mc_activated_server_cb callback, void *user_data);
 int mc_db_foreach_client_list(void *handle, mc_activated_client_cb callback, void *user_data);
-int mc_db_update_server_and_playback_state(void *handle, const char *server_name, mc_server_state_e server_state, mc_playback_states_e playback_state);
-int mc_db_update_latest_server_table(void *handle, const char *server_name);
-int mc_db_remove_playlist(void *handle, const char *server_name, const char *playlist_name);
-int mc_db_update_playlist(void *handle, const char *server_name, const char *playlist_name, GList *query_list);
+int mc_db_update_server_and_playback_state(const char *server_name, mc_server_state_e server_state, mc_playback_states_e playback_state);
+int mc_db_update_latest_server_table(const char *server_name);
+int mc_db_remove_playlist(const char *server_name, const char *playlist_name);
+int mc_db_update_playlist(const char *server_name, const char *playlist_name, GList *query_list);
 
 
 #endif /*__TIZEN_MULTIMEDIA_MEDIA_CONTROLLER_DB_H__*/

diff --git a/include/media_controller_private.h b/include/media_controller_private.h
index ac0f681..63da134 100755 (executable)
--- a/include/media_controller_private.h
+++ b/include/media_controller_private.h
@@ -424,7 +424,7 @@ int mc_ipc_send_reply(GDBusConnection *connection, const char *dbus_name, const
 int mc_ipc_send_message_to_server(mc_msg_type_e msg_type, mc_priv_type_e priv_type, const char *request_msg);
 int mc_ipc_service_connect(mc_priv_type_e type);
 
-int _mc_playlist_update(mc_priv_type_e type, void *handle, const char *controller_name, mc_playlist_h playlist);
+int _mc_playlist_update(mc_priv_type_e type, const char *controller_name, mc_playlist_h playlist);
 
 #ifdef __cplusplus
 }

diff --git a/packaging/capi-media-controller.spec b/packaging/capi-media-controller.spec
index fcb5c2d..a513a31 100755 (executable)
--- a/packaging/capi-media-controller.spec
+++ b/packaging/capi-media-controller.spec
@@ -1,6 +1,6 @@
 Name:       capi-media-controller
 Summary:    A media controller library in Tizen Native API
-Version:    0.1.74
+Version:    0.1.75
 Release:    1
 Group:      Multimedia/API
 License:    Apache-2.0

diff --git a/src/media_controller_client.c b/src/media_controller_client.c
index 69f4c40..4639dc0 100755 (executable)
--- a/src/media_controller_client.c
+++ b/src/media_controller_client.c
@@ -601,11 +601,11 @@ int mc_client_create(mc_client_h *client)
                return ret;
        }
 
-       ret = mc_db_delete_client_address_from_client_list(mc_client->db_handle, mc_client->client_name);
+       ret = mc_db_delete_client_address_from_client_list(mc_client->client_name);
        if (ret != MEDIA_CONTROLLER_ERROR_NONE)
                mc_error("mc_db_delete_client_address_from_client_list failed [%d]", ret);
 
-       ret = mc_db_insert_client_address_into_client_list(mc_client->db_handle, mc_client->client_name);
+       ret = mc_db_insert_client_address_into_client_list(mc_client->client_name);
        if (ret != MEDIA_CONTROLLER_ERROR_NONE) {
                mc_error("fail mc_db_insert_server_address_into_table [%d]", ret);
                __mc_client_destroy(mc_client);
@@ -1588,7 +1588,7 @@ int mc_client_destroy(mc_client_h client)
        if (ret != MEDIA_CONTROLLER_ERROR_NONE)
                mc_error("Error mc_ipc_unregister_all_listener [%d]", ret);
 
-       ret = mc_db_delete_client_address_from_client_list(mc_client->db_handle, mc_client->client_name);
+       ret = mc_db_delete_client_address_from_client_list(mc_client->client_name);
        if (ret != MEDIA_CONTROLLER_ERROR_NONE)
                mc_error("fail mc_db_delete_client_address_from_client_list [%d]", ret);
 

diff --git a/src/media_controller_db.c b/src/media_controller_db.c
index bdcbef5..42dc576 100755 (executable)
--- a/src/media_controller_db.c
+++ b/src/media_controller_db.c
@@ -60,7 +60,7 @@ static int __mc_db_busy_handler(void *pData, int count)
        return 100 - count;
 }
 
-static int __mc_db_update_db(void *handle, mc_priv_type_e priv_type, const char *sql_str)
+static int __mc_db_update_db(mc_priv_type_e priv_type, const char *sql_str)
 {
        return mc_ipc_send_message_to_server(MC_MSG_DB_UPDATE, priv_type, sql_str);
 }
@@ -263,12 +263,11 @@ int mc_db_connect(void **handle)
        return MEDIA_CONTROLLER_ERROR_NONE;
 }
 
-int mc_db_update_playback_info(void *handle, const char *server_name, const media_controller_playback_s playback)
+int mc_db_update_playback_info(const char *server_name, const media_controller_playback_s playback)
 {
        int ret = MEDIA_CONTROLLER_ERROR_NONE;
        char *sql_str = NULL;
 
-       mc_retvm_if(handle == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Handle is NULL");
        mc_retvm_if(server_name == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "server_name is NULL");
 
        sql_str = g_strdup_printf("%s%s%s%s%d%s%llu%s%s%s%s%s%d%s%d", MC_DB_CMD_UPDATE_PLAYBACK, MC_STRING_DELIMITER,
@@ -281,21 +280,20 @@ int mc_db_update_playback_info(void *handle, const char *server_name, const medi
                        playback.age_rating);
        mc_retvm_if(sql_str == NULL, MEDIA_CONTROLLER_ERROR_INVALID_OPERATION, "fail making sql_str");
 
-       ret = __mc_db_update_db(handle, MC_PRIV_TYPE_SERVER, sql_str);
+       ret = __mc_db_update_db(MC_PRIV_TYPE_SERVER, sql_str);
 
        MC_SAFE_FREE(sql_str);
 
        return ret;
 }
 
-int mc_db_update_whole_metadata(void *handle, const char *server_name,
+int mc_db_update_whole_metadata(const char *server_name,
                                        const char *title, const char *artist, const char *album, const char *author, const char *genre, const char *duration, const char *date,
                                        const char *copyright, const char *description, const char *track_num, const char *picture)
 {
        int ret = MEDIA_CONTROLLER_ERROR_NONE;
        char *sql_str = NULL;
 
-       mc_retvm_if(handle == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Handle is NULL");
        mc_retvm_if(server_name == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "server_name is NULL");
 
        sql_str = g_strdup_printf("%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s", MC_DB_CMD_UPDATE_META, MC_STRING_DELIMITER, server_name,  MC_STRING_DELIMITER,
@@ -312,76 +310,72 @@ int mc_db_update_whole_metadata(void *handle, const char *server_name,
                                        picture);
 
 
-       ret = __mc_db_update_db(handle, MC_PRIV_TYPE_SERVER, sql_str);
+       ret = __mc_db_update_db(MC_PRIV_TYPE_SERVER, sql_str);
 
        MC_SAFE_FREE(sql_str);
 
        return ret;
 }
 
-int mc_db_update_shuffle_mode(void *handle, const char *server_name, int shuffle_mode)
+int mc_db_update_shuffle_mode(const char *server_name, int shuffle_mode)
 {
        int ret = MEDIA_CONTROLLER_ERROR_NONE;
        char *sql_str = NULL;
 
-       mc_retvm_if(handle == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Handle is NULL");
        mc_retvm_if(server_name == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "server_name is NULL");
 
        sql_str = g_strdup_printf("%s%s%s%s%d", MC_DB_CMD_UPDATE_SHUFFLE, MC_STRING_DELIMITER, server_name,  MC_STRING_DELIMITER, shuffle_mode);
 
-       ret = __mc_db_update_db(handle, MC_PRIV_TYPE_SERVER, sql_str);
+       ret = __mc_db_update_db(MC_PRIV_TYPE_SERVER, sql_str);
 
        MC_SAFE_FREE(sql_str);
 
        return ret;
 }
 
-int mc_db_update_repeat_mode(void *handle, const char *server_name, int repeat_mode)
+int mc_db_update_repeat_mode(const char *server_name, int repeat_mode)
 {
        int ret = MEDIA_CONTROLLER_ERROR_NONE;
        char *sql_str = NULL;
 
-       mc_retvm_if(handle == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Handle is NULL");
        mc_retvm_if(server_name == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "server_name is NULL");
 
        sql_str = g_strdup_printf("%s%s%s%s%d", MC_DB_CMD_UPDATE_REPEAT, MC_STRING_DELIMITER, server_name,  MC_STRING_DELIMITER, repeat_mode);
 
-       ret = __mc_db_update_db(handle, MC_PRIV_TYPE_SERVER, sql_str);
+       ret = __mc_db_update_db(MC_PRIV_TYPE_SERVER, sql_str);
 
        MC_SAFE_FREE(sql_str);
 
        return ret;
 }
 
-int mc_db_update_icon_uri(void *handle, const char *server_name, const char *uri)
+int mc_db_update_icon_uri(const char *server_name, const char *uri)
 {
        int ret = MEDIA_CONTROLLER_ERROR_NONE;
        char *sql_str = NULL;
 
-       mc_retvm_if(handle == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Handle is NULL");
        mc_retvm_if(server_name == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "server_name is NULL");
        mc_retvm_if(uri == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "uri is NULL");
 
        sql_str = g_strdup_printf("%s%s%s%s%s", MC_DB_CMD_UPDATE_ICON, MC_STRING_DELIMITER, server_name,  MC_STRING_DELIMITER, uri);
 
-       ret = __mc_db_update_db(handle, MC_PRIV_TYPE_SERVER, sql_str);
+       ret = __mc_db_update_db(MC_PRIV_TYPE_SERVER, sql_str);
 
        MC_SAFE_FREE(sql_str);
 
        return ret;
 }
 
-int mc_db_update_ability_supported(void *handle, const char *server_name, const media_controller_ability_s ability_supported)
+int mc_db_update_ability_supported(const char *server_name, const media_controller_ability_s ability_supported)
 {
        int ret = MEDIA_CONTROLLER_ERROR_NONE;
        char *sql_str = NULL;
 
-       mc_retvm_if(handle == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Handle is NULL");
        mc_retvm_if(server_name == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "server_name is NULL");
 
        sql_str = g_strdup_printf("%s%s%s%s%llu%s%llu", MC_DB_CMD_UPDATE_ABILITY, MC_STRING_DELIMITER, server_name, MC_STRING_DELIMITER, (unsigned long long)ability_supported.decided, MC_STRING_DELIMITER, (unsigned long long)ability_supported.supported);
 
-       ret = __mc_db_update_db(handle, MC_PRIV_TYPE_SERVER, sql_str);
+       ret = __mc_db_update_db(MC_PRIV_TYPE_SERVER, sql_str);
 
        MC_SAFE_FREE(sql_str);
 
@@ -859,68 +853,64 @@ int mc_db_get_playlist_item(void *handle, const char *server_name, char *playlis
        return MEDIA_CONTROLLER_ERROR_NONE;
 }
 
-int mc_db_insert_server_address_into_server_list(void *handle, const char *address)
+int mc_db_insert_server_address_into_server_list(const char *address)
 {
        int ret = MEDIA_CONTROLLER_ERROR_NONE;
        char *sql_str = NULL;
 
-       mc_retvm_if(handle == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Handle is NULL");
        mc_retvm_if(!MC_STRING_VALID(address), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "invalid address");
 
        sql_str = g_strdup_printf("%s%s%s", MC_DB_CMD_UPDATE_SERVER_LIST, MC_STRING_DELIMITER, address);
 
-       ret = __mc_db_update_db(handle, MC_PRIV_TYPE_SERVER, sql_str);
+       ret = __mc_db_update_db(MC_PRIV_TYPE_SERVER, sql_str);
 
        MC_SAFE_FREE(sql_str);
 
        return ret;
 }
 
-int mc_db_delete_server_address_from_server_list(void *handle, const char *address)
+int mc_db_delete_server_address_from_server_list(const char *address)
 {
        int ret = MEDIA_CONTROLLER_ERROR_NONE;
        char *sql_str = NULL;
 
-       mc_retvm_if(handle == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Handle is NULL");
        mc_retvm_if(!MC_STRING_VALID(address), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "invalid address");
 
        sql_str = g_strdup_printf("%s%s%s", MC_DB_CMD_REMOVE_SERVER_LIST, MC_STRING_DELIMITER, address);
 
-       ret = __mc_db_update_db(handle, MC_PRIV_TYPE_SERVER, sql_str);
+       ret = __mc_db_update_db(MC_PRIV_TYPE_SERVER, sql_str);
 
        MC_SAFE_FREE(sql_str);
 
        return ret;
 }
 
-int mc_db_insert_client_address_into_client_list(void *handle, const char *address)
+int mc_db_insert_client_address_into_client_list(const char *address)
 {
        int ret = MEDIA_CONTROLLER_ERROR_NONE;
        char *sql_str = NULL;
 
-       mc_retvm_if(handle == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Handle is NULL");
        mc_retvm_if(!MC_STRING_VALID(address), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "invalid address");
 
        sql_str = g_strdup_printf("%s%s%s", MC_DB_CMD_UPDATE_CLIENT_LIST, MC_STRING_DELIMITER, address);
 
-       ret = __mc_db_update_db(handle, MC_PRIV_TYPE_CLIENT, sql_str);
+       ret = __mc_db_update_db(MC_PRIV_TYPE_CLIENT, sql_str);
 
        MC_SAFE_FREE(sql_str);
 
        return ret;
 }
 
-int mc_db_delete_client_address_from_client_list(void *handle, const char *address)
+int mc_db_delete_client_address_from_client_list(const char *address)
 {
        int ret = MEDIA_CONTROLLER_ERROR_NONE;
        char *sql_str = NULL;
 
-       mc_retvm_if(handle == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Handle is NULL");
        mc_retvm_if(!MC_STRING_VALID(address), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "invalid address");
 
        sql_str = g_strdup_printf("%s%s%s", MC_DB_CMD_REMOVE_CLIENT_LIST, MC_STRING_DELIMITER, address);
 
-       ret = __mc_db_update_db(handle, MC_PRIV_TYPE_CLIENT, sql_str);
+       ret = __mc_db_update_db(MC_PRIV_TYPE_CLIENT, sql_str);
 
        MC_SAFE_FREE(sql_str);
 
@@ -946,34 +936,32 @@ int mc_db_disconnect(void *handle)
        return MEDIA_CONTROLLER_ERROR_NONE;
 }
 
-int mc_db_create_server_table(void *handle, const char *server_name)
+int mc_db_create_server_table(const char *server_name)
 {
        int ret = MEDIA_CONTROLLER_ERROR_NONE;
        char *sql_str = NULL;
 
-       mc_retvm_if(handle == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Handle is NULL");
        mc_retvm_if(server_name == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "server_name is NULL");
 
        sql_str = g_strdup_printf("%s%s%s", MC_DB_CMD_CREATE_SERVER, MC_STRING_DELIMITER, server_name);
 
-       ret = __mc_db_update_db(handle, MC_PRIV_TYPE_SERVER, sql_str);
+       ret = __mc_db_update_db(MC_PRIV_TYPE_SERVER, sql_str);
 
        MC_SAFE_FREE(sql_str);
 
        return ret;
 }
 
-int mc_db_delete_server_table(void *handle, const char *server_name)
+int mc_db_delete_server_table(const char *server_name)
 {
        int ret = MEDIA_CONTROLLER_ERROR_NONE;
        char *sql_str = NULL;
 
-       mc_retvm_if(handle == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Handle is NULL");
        mc_retvm_if(server_name == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "server_name is NULL");
 
        sql_str = g_strdup_printf("%s%s%s", MC_DB_CMD_REMOVE_SERVER, MC_STRING_DELIMITER, server_name);
 
-       ret = __mc_db_update_db(handle, MC_PRIV_TYPE_SERVER, sql_str);
+       ret = __mc_db_update_db(MC_PRIV_TYPE_SERVER, sql_str);
 
        MC_SAFE_FREE(sql_str);
 
@@ -1156,41 +1144,39 @@ int mc_db_foreach_client_list(void *handle, mc_activated_client_cb callback, voi
        return MEDIA_CONTROLLER_ERROR_NONE;
 }
 
-int mc_db_update_server_and_playback_state(void *handle, const char *server_name, mc_server_state_e server_state, mc_playback_states_e playback_state)
+int mc_db_update_server_and_playback_state(const char *server_name, mc_server_state_e server_state, mc_playback_states_e playback_state)
 {
        int ret = MEDIA_CONTROLLER_ERROR_NONE;
        char *sql_str = NULL;
 
-       mc_retvm_if(handle == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Handle is NULL");
        mc_retvm_if(server_name == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "server_name is NULL");
 
        sql_str = g_strdup_printf("%s%s%s%s%d%s%d", MC_DB_CMD_UPDATE_STATE_PLAYBACK, MC_STRING_DELIMITER, server_name, MC_STRING_DELIMITER, server_state, MC_STRING_DELIMITER, playback_state);
 
-       ret = __mc_db_update_db(handle, MC_PRIV_TYPE_SERVER, sql_str);
+       ret = __mc_db_update_db(MC_PRIV_TYPE_SERVER, sql_str);
 
        MC_SAFE_FREE(sql_str);
 
        return ret;
 }
 
-int mc_db_update_latest_server_table(void *handle, const char *server_name)
+int mc_db_update_latest_server_table(const char *server_name)
 {
        int ret = MEDIA_CONTROLLER_ERROR_NONE;
        char *sql_str = NULL;
 
-       mc_retvm_if(handle == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Handle is NULL");
        mc_retvm_if(server_name == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "server_name is NULL");
 
        sql_str = g_strdup_printf("%s%s%s", MC_DB_CMD_UPDATE_LATEST, MC_STRING_DELIMITER, server_name);
 
-       ret = __mc_db_update_db(handle, MC_PRIV_TYPE_SERVER, sql_str);
+       ret = __mc_db_update_db(MC_PRIV_TYPE_SERVER, sql_str);
 
        MC_SAFE_FREE(sql_str);
 
        return ret;
 }
 
-int mc_db_remove_playlist(void *handle, const char *server_name, const char *playlist_name)
+int mc_db_remove_playlist(const char *server_name, const char *playlist_name)
 {
        int ret = MEDIA_CONTROLLER_ERROR_NONE;
        char *sql_str = NULL;
@@ -1199,14 +1185,14 @@ int mc_db_remove_playlist(void *handle, const char *server_name, const char *pla
 
        sql_str = g_strdup_printf("%s%s%s%s%s", MC_DB_CMD_REMOVE_PLAYLIST, MC_STRING_DELIMITER, server_name, MC_STRING_DELIMITER, playlist_name);
 
-       ret = __mc_db_update_db(handle, MC_PRIV_TYPE_SERVER, sql_str);
+       ret = __mc_db_update_db(MC_PRIV_TYPE_SERVER, sql_str);
 
        MC_SAFE_FREE(sql_str);
 
        return ret;
 }
 
-int mc_db_update_playlist(void *handle, const char *server_name, const char *playlist_name, GList *query_list)
+int mc_db_update_playlist(const char *server_name, const char *playlist_name, GList *query_list)
 {
        int ret = MEDIA_CONTROLLER_ERROR_NONE;
        char *sql_str = NULL;
@@ -1240,7 +1226,7 @@ int mc_db_update_playlist(void *handle, const char *server_name, const char *pla
        sql_str = g_strdup_printf("%s%s%s%s%s%s%s", MC_DB_CMD_UPDATE_PLAYLIST, MC_STRING_DELIMITER, server_name,
                                                MC_STRING_DELIMITER, playlist_name, MC_STRING_DELIMITER, temp_buf);
 
-       ret = __mc_db_update_db(handle, MC_PRIV_TYPE_SERVER, sql_str);
+       ret = __mc_db_update_db(MC_PRIV_TYPE_SERVER, sql_str);
 
        MC_SAFE_FREE(temp_buf);
        MC_SAFE_FREE(sql_str);

diff --git a/src/media_controller_playlist.c b/src/media_controller_playlist.c
index 4fa0f79..2e79a00 100755 (executable)
--- a/src/media_controller_playlist.c
+++ b/src/media_controller_playlist.c
@@ -57,7 +57,7 @@ static int __mc_playlist_item_release(mc_playlist_item_s *playlist_item)
        return ret ;
 }
 
-int _mc_playlist_update(mc_priv_type_e type, void *handle, const char *controller_name, mc_playlist_h playlist)
+int _mc_playlist_update(mc_priv_type_e type, const char *controller_name, mc_playlist_h playlist)
 {
        int ret = MEDIA_CONTROLLER_ERROR_NONE;
        GList *query_list = NULL;
@@ -105,7 +105,7 @@ int _mc_playlist_update(mc_priv_type_e type, void *handle, const char *controlle
                        mc_error("wrong playlist query");
        }
 
-       ret = mc_db_update_playlist(handle, controller_name, _playlist->playlist_name, query_list);
+       ret = mc_db_update_playlist(controller_name, _playlist->playlist_name, query_list);
        if (ret != MEDIA_CONTROLLER_ERROR_NONE) {
                mc_error("fail to mc_db_update_playlist");
                goto RELEASE;

diff --git a/src/media_controller_server.c b/src/media_controller_server.c
index 30bc82d..4f0876d 100755 (executable)
--- a/src/media_controller_server.c
+++ b/src/media_controller_server.c
@@ -806,7 +806,7 @@ int mc_server_update_playback_info(mc_server_h server)
        mc_debug("playback info update: state [%d], position [%llu], playlist_name[%s], index [%s], content_type [%d], age_rating [%d]",
                mc_server->playback.state, mc_server->playback.position, mc_server->playback.playlist_name, mc_server->playback.index, mc_server->playback.content_type, mc_server->playback.age_rating);
 
-       ret = mc_db_update_playback_info(mc_server->db_handle, mc_server->server_name, mc_server->playback);
+       ret = mc_db_update_playback_info(mc_server->server_name, mc_server->playback);
        if (ret != MEDIA_CONTROLLER_ERROR_NONE) {
                mc_error("fail mc_db_update_playback_info [%d]", ret);
                return ret;
@@ -817,7 +817,7 @@ int mc_server_update_playback_info(mc_server_h server)
                mc_error("Error __mc_server_send_message [%d]", ret);
 
        if (mc_server->playback.state == MC_PLAYBACK_STATE_PLAYING) {
-               ret = mc_db_update_latest_server_table(mc_server->db_handle, mc_server->server_name);
+               ret = mc_db_update_latest_server_table(mc_server->server_name);
                mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "fail mc_db_update_latest_server_table [%d]", ret);
        }
 
@@ -838,7 +838,7 @@ int mc_server_update_shuffle_mode(mc_server_h server, mc_shuffle_mode_e mode)
 
        mc_debug("shuffle mode %d", mode);
 
-       ret = mc_db_update_shuffle_mode(mc_server->db_handle, mc_server->server_name, mode);
+       ret = mc_db_update_shuffle_mode(mc_server->server_name, mode);
        mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "fail to mc_db_update_shuffle_mode");
 
        ret = __mc_server_send_message(mc_server, MC_DBUS_UPDATE_INTERFACE, MC_DBUS_SIGNAL_NAME_PLAYBACK_SHUFFLE, mode, 0, NULL);
@@ -857,7 +857,7 @@ int mc_server_update_repeat_mode(mc_server_h server, mc_repeat_mode_e mode)
 
        mc_debug("repeat mode %d", mode);
 
-       ret = mc_db_update_repeat_mode(mc_server->db_handle, mc_server->server_name, mode);
+       ret = mc_db_update_repeat_mode(mc_server->server_name, mode);
        mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "fail to mc_db_update_repeat_mode");
 
        ret = __mc_server_send_message(mc_server, MC_DBUS_UPDATE_INTERFACE, MC_DBUS_SIGNAL_NAME_PLAYBACK_REPEAT, mode, 0, NULL);
@@ -945,7 +945,7 @@ int mc_server_update_metadata(mc_server_h server)
 
        mc_retvm_if(mc_server == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Handle is NULL");
 
-       ret = mc_db_update_whole_metadata(mc_server->db_handle, mc_server->server_name,
+       ret = mc_db_update_whole_metadata(mc_server->server_name,
                                                                        mc_server->metadata->title, mc_server->metadata->artist, mc_server->metadata->album, mc_server->metadata->author,
                                                                        mc_server->metadata->genre, mc_server->metadata->duration, mc_server->metadata->date, mc_server->metadata->copyright,
                                                                        mc_server->metadata->description, mc_server->metadata->track_num, mc_server->metadata->picture);
@@ -984,7 +984,7 @@ int mc_server_update_playlist_done(mc_server_h server, mc_playlist_h playlist)
 
        mc_retvm_if(mc_server == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "invalid server");
 
-       ret = _mc_playlist_update(MC_PRIV_TYPE_SERVER, mc_server->db_handle, mc_server->server_name, playlist);
+       ret = _mc_playlist_update(MC_PRIV_TYPE_SERVER, mc_server->server_name, playlist);
        mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "fail to _mc_playlist_update");
 
        ret = __mc_server_send_message(mc_server, MC_DBUS_UPDATE_INTERFACE, MC_DBUS_SIGNAL_NAME_PLAYLIST, MC_PLAYLIST_UPDATED, 0, _playlist->playlist_name);
@@ -1003,7 +1003,7 @@ int mc_server_delete_playlist(mc_server_h server, mc_playlist_h playlist)
        mc_retvm_if(mc_server == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "invalid server");
        mc_retvm_if(_playlist == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "invalid playlist");
 
-       ret = mc_db_remove_playlist(mc_server->db_handle, mc_server->server_name, _playlist->playlist_name);
+       ret = mc_db_remove_playlist(mc_server->server_name, _playlist->playlist_name);
        mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "fail to mc_db_remove_playlist");
 
        ret = __mc_server_send_message(mc_server, MC_DBUS_UPDATE_INTERFACE, MC_DBUS_SIGNAL_NAME_PLAYLIST, MC_PLAYLIST_REMOVED, 0, _playlist->playlist_name);
@@ -1281,7 +1281,7 @@ int mc_server_set_icon(mc_server_h server, const char *uri)
 
        mc_debug("uri %s", uri);
 
-       ret = mc_db_update_icon_uri(mc_server->db_handle, mc_server->server_name, uri);
+       ret = mc_db_update_icon_uri(mc_server->server_name, uri);
        mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "fail to mc_db_update_icon_uri");
 
        return ret;
@@ -1304,7 +1304,7 @@ static int __mc_server_update_ability(mc_server_h server, int support_item, mc_a
                MC_BIT64_UNSET_BIT(mc_server->basic_ability.supported, support_item);
 
        if (immediate_update)
-               return mc_db_update_ability_supported(mc_server->db_handle, mc_server->server_name, mc_server->basic_ability);
+               return mc_db_update_ability_supported(mc_server->server_name, mc_server->basic_ability);
 
        return MEDIA_CONTROLLER_ERROR_NONE;
 }
@@ -1323,7 +1323,7 @@ int mc_server_update_playback_ability(mc_server_h server)
 
        mc_retvm_if(mc_server == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Handle is NULL");
 
-       ret = mc_db_update_ability_supported(mc_server->db_handle, mc_server->server_name, mc_server->basic_ability);
+       ret = mc_db_update_ability_supported(mc_server->server_name, mc_server->basic_ability);
        mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "fail to mc_db_update_ability_supported");
 
        ret = __mc_server_send_message(mc_server, MC_DBUS_UPDATE_INTERFACE, MC_DBUS_SIGNAL_NAME_PLAYBACK_ABILITY, 0, 0, NULL);
@@ -1393,14 +1393,14 @@ int mc_server_create(mc_server_h *server)
 
        if (table_exist && is_latest) {
                //To keep latest server's metadata
-               ret = mc_db_delete_server_address_from_server_list(mc_server->db_handle, mc_server->server_name);
+               ret = mc_db_delete_server_address_from_server_list(mc_server->server_name);
                if (ret != MEDIA_CONTROLLER_ERROR_NONE) {
                        mc_error("mc_db_delete_server_address_from_server_list failed [%d]", ret);
                        __mc_server_destoy(mc_server);
                        return ret;
                }
 
-               ret = mc_db_update_server_and_playback_state(mc_server->db_handle, mc_server->server_name, MC_SERVER_STATE_ACTIVATE, MC_PLAYBACK_STATE_STOPPED);
+               ret = mc_db_update_server_and_playback_state(mc_server->server_name, MC_SERVER_STATE_ACTIVATE, MC_PLAYBACK_STATE_STOPPED);
                if (ret != MEDIA_CONTROLLER_ERROR_NONE) {
                        mc_error("mc_db_update_server_and_playback_state failed [%d]", ret);
                        __mc_server_destoy(mc_server);
@@ -1408,13 +1408,13 @@ int mc_server_create(mc_server_h *server)
                }
 
        } else if (table_exist) {
-               ret = mc_db_delete_server_table(mc_server->db_handle, mc_server->server_name);
+               ret = mc_db_delete_server_table(mc_server->server_name);
                if (ret != MEDIA_CONTROLLER_ERROR_NONE) {
                        mc_error("mc_db_delete_server_table failed [%d]", ret);
                        __mc_server_destoy(mc_server);
                        return ret;
                }
-               ret = mc_db_delete_server_address_from_server_list(mc_server->db_handle, mc_server->server_name);
+               ret = mc_db_delete_server_address_from_server_list(mc_server->server_name);
                if (ret != MEDIA_CONTROLLER_ERROR_NONE) {
                        mc_error("mc_db_delete_server_address_from_server_list failed [%d]", ret);
                        __mc_server_destoy(mc_server);
@@ -1423,7 +1423,7 @@ int mc_server_create(mc_server_h *server)
        }
 
        if (!(table_exist && is_latest)) {
-               ret = mc_db_create_server_table(mc_server->db_handle, mc_server->server_name);
+               ret = mc_db_create_server_table(mc_server->server_name);
                if (ret != MEDIA_CONTROLLER_ERROR_NONE) {
                        mc_error("fail mc_db_clear_table [%d]", ret);
                        __mc_server_destoy(mc_server);
@@ -1431,7 +1431,7 @@ int mc_server_create(mc_server_h *server)
                }
        }
 
-       ret = mc_db_insert_server_address_into_server_list(mc_server->db_handle, mc_server->server_name);
+       ret = mc_db_insert_server_address_into_server_list(mc_server->server_name);
        if (ret != MEDIA_CONTROLLER_ERROR_NONE) {
                mc_error("fail mc_db_insert_server_address_into_table [%d]", ret);
                __mc_server_destoy(mc_server);
@@ -1463,17 +1463,17 @@ int mc_server_destroy(mc_server_h server)
        if (ret != MEDIA_CONTROLLER_ERROR_NONE)
                mc_error("fail mc_ipc_unregister_all_listener [%d]", ret);
 
-       ret = mc_db_delete_server_address_from_server_list(mc_server->db_handle, mc_server->server_name);
+       ret = mc_db_delete_server_address_from_server_list(mc_server->server_name);
        if (ret != MEDIA_CONTROLLER_ERROR_NONE)
                mc_error("fail mc_db_delete_server_address_from_server_list [%d]", ret);
 
        ret = __mc_server_current_is_latest(mc_server, &is_latest);
        if (is_latest) {
-               ret = mc_db_update_server_and_playback_state(mc_server->db_handle, mc_server->server_name, MC_SERVER_STATE_DEACTIVATE, MC_PLAYBACK_STATE_STOPPED);
+               ret = mc_db_update_server_and_playback_state(mc_server->server_name, MC_SERVER_STATE_DEACTIVATE, MC_PLAYBACK_STATE_STOPPED);
                if (ret != MEDIA_CONTROLLER_ERROR_NONE)
                        mc_error("mc_db_update_server_and_playback_state failed [%d]", ret);
        } else {
-               ret = mc_db_delete_server_table(mc_server->db_handle, mc_server->server_name);
+               ret = mc_db_delete_server_table(mc_server->server_name);
                if (ret != MEDIA_CONTROLLER_ERROR_NONE)
                        mc_error("fail mc_db_delete_server_table [%d]", ret);
        }