From: hj kim Date: Mon, 13 Jan 2020 08:43:24 +0000 (+0900) Subject: Apply Tizen naming convetion for protected(global) functions in internal header X-Git-Tag: submit/tizen/20200115.071738~8 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F93%2F222293%2F3;p=platform%2Fcore%2Fapi%2Fmedia-controller.git Apply Tizen naming convetion for protected(global) functions in internal header Change-Id: I1b2d3c26a58f2a82c924f5569938b133cf3eaf52 --- diff --git a/include/media_controller_db.h b/include/media_controller_db.h index 5616084..7f80b9d 100644 --- a/include/media_controller_db.h +++ b/include/media_controller_db.h @@ -20,40 +20,39 @@ #include #include -gboolean mc_db_is_exist_server(sqlite3 *handle, const char *server_name); +gboolean _mc_db_is_exist_server(sqlite3 *handle, const char *server_name); gboolean _mc_db_is_activated_client(sqlite3 *handle, const char *client_name); gboolean _mc_db_is_activated_server(sqlite3 *handle, const char *server_name); gboolean _mc_db_is_latest_server(sqlite3 *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, +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, const char *season, const char *episode, const char *resolution); -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_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_info(sqlite3 *handle, char **latest_server_name, mc_server_state_e *state); -int mc_db_get_server_state(sqlite3 *handle, const char *server_name, mc_server_state_e *state); -int mc_db_get_playback_info(sqlite3 *handle, const char *server_name, mc_playback_h *playback); -int mc_db_get_metadata_info(sqlite3 *handle, const char *server_name, mc_metadata_h *metadata); -int mc_db_get_shuffle_mode(sqlite3 *handle, const char *server_name, mc_shuffle_mode_e *mode); -int mc_db_get_repeat_mode(sqlite3 *handle, const char *server_name, mc_repeat_mode_e *mode); -int mc_db_get_icon_uri(sqlite3 *handle, const char *server_name, char **uri); -int mc_db_get_ability_supported(sqlite3 *handle, const char *server_name, int ability, mc_ability_support_e *supported); -int mc_db_get_pb_action_ability(sqlite3 *handle, const char *server_name, mc_playback_ability_h *ability); +int _mc_db_get_latest_server_info(sqlite3 *handle, char **latest_server_name, mc_server_state_e *state); +int _mc_db_get_playback_info(sqlite3 *handle, const char *server_name, mc_playback_h *playback); +int _mc_db_get_metadata_info(sqlite3 *handle, const char *server_name, mc_metadata_h *metadata); +int _mc_db_get_shuffle_mode(sqlite3 *handle, const char *server_name, mc_shuffle_mode_e *mode); +int _mc_db_get_repeat_mode(sqlite3 *handle, const char *server_name, mc_repeat_mode_e *mode); +int _mc_db_get_icon_uri(sqlite3 *handle, const char *server_name, char **uri); +int _mc_db_get_ability_supported(sqlite3 *handle, const char *server_name, int ability, mc_ability_support_e *supported); +int _mc_db_get_pb_action_ability(sqlite3 *handle, const char *server_name, mc_playback_ability_h *ability); int _mc_db_get_display_mode_ability(sqlite3 *handle, const char *server_name, unsigned int *ability); int _mc_db_get_display_rotation_ability(sqlite3 *handle, const char *server_name, unsigned int *ability); int _mc_db_get_playlist_count(sqlite3 *handle, const char *server_name); -int mc_db_get_foreach_playlist(sqlite3 *handle, const char *server_name, mc_playlist_cb callback, void *user_data); +int _mc_db_get_foreach_playlist(sqlite3 *handle, const char *server_name, mc_playlist_cb callback, void *user_data); gboolean _mc_db_is_playlist_exist(sqlite3 *handle, const char *server_name, const char *playlist_name); -int mc_db_get_playlist_by_name(sqlite3 *handle, mc_priv_type_e type, const char *controller_name, const char *playlist_name, mc_playlist_h *playlist); +int _mc_db_get_playlist_by_name(sqlite3 *handle, mc_priv_type_e type, const char *controller_name, const char *playlist_name, mc_playlist_h *playlist); int _mc_db_get_playlist_item_count(sqlite3 *handle, const char *server_name, char *playlist_name); -int mc_db_get_playlist_item(sqlite3 *handle, const char *server_name, char *playlist_name, mc_playlist_item_cb callback, void *user_data); +int _mc_db_get_playlist_item(sqlite3 *handle, const char *server_name, char *playlist_name, mc_playlist_item_cb callback, void *user_data); -int mc_db_foreach_server_list(sqlite3 *handle, mc_activated_server_cb callback, void *user_data); -int mc_db_foreach_client_list(sqlite3 *handle, mc_activated_client_cb callback, void *user_data); -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, bundle_raw *bundle_data, int bundle_size); +int _mc_db_foreach_server_list(sqlite3 *handle, mc_activated_server_cb callback, void *user_data); +int _mc_db_foreach_client_list(sqlite3 *handle, mc_activated_client_cb callback, void *user_data); +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, bundle_raw *bundle_data, int bundle_size); int _mc_db_add_playlist(const char *server_name, const char *playlist_name); int _mc_db_update_server_attribute(const char *server_name, const char *attribute, int value); int _mc_db_get_subtitles_enabled(sqlite3 *handle, const char *server_name, bool *enabled); diff --git a/src/media_controller_client.c b/src/media_controller_client.c index d614757..32d7831 100644 --- a/src/media_controller_client.c +++ b/src/media_controller_client.c @@ -106,9 +106,9 @@ static void __client_playback_cb(const char *interface_name, const char *signal_ playback = (media_controller_playback_s *)calloc(1, sizeof(media_controller_playback_s)); mc_retm_if(playback == NULL, "Error allocation memory"); - ret = mc_db_get_playback_info(mc_client->db_handle, message, &playback); + ret = _mc_db_get_playback_info(mc_client->db_handle, message, &playback); if (ret != MEDIA_CONTROLLER_ERROR_NONE) - mc_error("Fail to mc_db_get_playback_info"); + mc_error("Fail to _mc_db_get_playback_info"); callback(message, playback, mc_client->updated_cb[MC_CLIENT_EVENT_PLAYBACK_INFO].user_data); @@ -129,9 +129,9 @@ static void __client_metadata_cb(const char *interface_name, const char *signal_ mc_secure_debug("__client_metadata_cb(%s, %s, %s, %s, %p)", interface_name, signal_name, message, request_id, user_data); - ret = mc_db_get_metadata_info(mc_client->db_handle, message, &metadata); + ret = _mc_db_get_metadata_info(mc_client->db_handle, message, &metadata); if (ret != MEDIA_CONTROLLER_ERROR_NONE) - mc_error("Fail to mc_db_get_metadata_info"); + mc_error("Fail to _mc_db_get_metadata_info"); callback(message, metadata, mc_client->updated_cb[MC_CLIENT_EVENT_METADATA].user_data); @@ -306,9 +306,9 @@ static void __client_playback_ability_cb(const char *interface_name, const char mc_secure_debug("__client_playback_ability_cb(%s, %s, %s, %s, %p)", interface_name, signal_name, message, request_id, user_data); - ret = mc_db_get_pb_action_ability(mc_client->db_handle, message, &ability); + ret = _mc_db_get_pb_action_ability(mc_client->db_handle, message, &ability); if (ret != MEDIA_CONTROLLER_ERROR_NONE) - mc_error("Fail to mc_db_get_pb_action_ability"); + mc_error("Fail to _mc_db_get_pb_action_ability"); callback(message, ability, mc_client->updated_cb[MC_CLIENT_EVENT_PLAYBACK_ABILITY].user_data); @@ -1090,7 +1090,7 @@ int mc_client_get_latest_server_info(mc_client_h client, char **server_name, mc_ mc_retvm_if(server_name == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "server_name is NULL"); mc_retvm_if(server_state == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "server_state is NULL"); - ret = mc_db_get_latest_server_info(mc_client->db_handle, &latest_server_name, &latest_server_state); + ret = _mc_db_get_latest_server_info(mc_client->db_handle, &latest_server_name, &latest_server_state); if (latest_server_name != NULL) { *server_name = latest_server_name; *server_state = latest_server_state; @@ -1107,7 +1107,7 @@ static gboolean __is_valid_parameter(mc_client_h client, const char *server_name media_controller_client_s *mc_client = (media_controller_client_s *)client; mc_retvm_if(!mc_client, FALSE, "Invalid client"); - mc_retvm_if(!mc_db_is_exist_server(mc_client->db_handle, server_name), FALSE, "Invalid server_name"); + mc_retvm_if(!_mc_db_is_exist_server(mc_client->db_handle, server_name), FALSE, "Invalid server_name"); return TRUE; } @@ -1118,7 +1118,7 @@ int mc_client_get_server_playback_info(mc_client_h client, const char *server_na mc_retvm_if(!__is_valid_parameter(client, server_name), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid parameter"); - return mc_db_get_playback_info(mc_client->db_handle, server_name, playback); + return _mc_db_get_playback_info(mc_client->db_handle, server_name, playback); } int mc_client_get_server_metadata(mc_client_h client, const char *server_name, mc_metadata_h *metadata) @@ -1127,7 +1127,7 @@ int mc_client_get_server_metadata(mc_client_h client, const char *server_name, m mc_retvm_if(!__is_valid_parameter(client, server_name), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid parameter"); - return mc_db_get_metadata_info(mc_client->db_handle, server_name, metadata); + return _mc_db_get_metadata_info(mc_client->db_handle, server_name, metadata); } int mc_client_get_server_shuffle_mode(mc_client_h client, const char *server_name, mc_shuffle_mode_e *mode) @@ -1136,7 +1136,7 @@ int mc_client_get_server_shuffle_mode(mc_client_h client, const char *server_nam mc_retvm_if(!__is_valid_parameter(client, server_name), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid parameter"); - return mc_db_get_shuffle_mode(mc_client->db_handle, server_name, mode); + return _mc_db_get_shuffle_mode(mc_client->db_handle, server_name, mode); } int mc_client_get_server_repeat_mode(mc_client_h client, const char *server_name, mc_repeat_mode_e *mode) @@ -1145,7 +1145,7 @@ int mc_client_get_server_repeat_mode(mc_client_h client, const char *server_name mc_retvm_if(!__is_valid_parameter(client, server_name), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid parameter"); - return mc_db_get_repeat_mode(mc_client->db_handle, server_name, mode); + return _mc_db_get_repeat_mode(mc_client->db_handle, server_name, mode); } int mc_client_get_server_icon(mc_client_h client, const char *server_name, char **uri) @@ -1154,7 +1154,7 @@ int mc_client_get_server_icon(mc_client_h client, const char *server_name, char mc_retvm_if(!__is_valid_parameter(client, server_name), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid parameter"); - return mc_db_get_icon_uri(mc_client->db_handle, server_name, uri); + return _mc_db_get_icon_uri(mc_client->db_handle, server_name, uri); } int mc_client_get_server_subtitles_enabled(mc_client_h client, const char *server_name, bool *enabled) @@ -1204,7 +1204,7 @@ int mc_client_foreach_server_playlist(mc_client_h client, const char *server_nam mc_retvm_if(!MC_STRING_VALID(server_name), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid server_name"); mc_retvm_if(callback == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "invalid callback"); - ret = mc_db_get_foreach_playlist(mc_client->db_handle, server_name, callback, user_data); + ret = _mc_db_get_foreach_playlist(mc_client->db_handle, server_name, callback, user_data); return ret; } @@ -1217,7 +1217,7 @@ int mc_client_foreach_server(mc_client_h client, mc_activated_server_cb callback mc_retvm_if(mc_client == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Handle is NULL"); mc_retvm_if(callback == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "callback is NULL"); - ret = mc_db_foreach_server_list(mc_client->db_handle, callback, user_data); + ret = _mc_db_foreach_server_list(mc_client->db_handle, callback, user_data); return ret; } @@ -1231,7 +1231,7 @@ static int __mc_client_verify_ability(mc_client_h client, const char *server_nam mc_retvm_if(!mc_client, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid handle"); mc_retvm_if(!_mc_db_is_activated_server(mc_client->db_handle, server_name), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid not activated server_name"); - ret = mc_db_get_ability_supported(mc_client->db_handle, server_name, ability, &supported); + ret = _mc_db_get_ability_supported(mc_client->db_handle, server_name, ability, &supported); mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "fail to get ability"); mc_retvm_if(supported == MC_ABILITY_SUPPORTED_NO, MEDIA_CONTROLLER_ERROR_ABILITY_LIMITED_BY_SERVER_APP, "Not Supported ability [%d]", ability); @@ -1605,7 +1605,7 @@ int mc_client_get_server_playback_ability(mc_client_h client, const char *server mc_retvm_if(!__is_valid_parameter(client, server_name), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid parameter"); - return mc_db_get_pb_action_ability(mc_client->db_handle, server_name, ability); + return _mc_db_get_pb_action_ability(mc_client->db_handle, server_name, ability); } static int __mc_client_get_server_ability(mc_client_h client, const char *server_name, mc_ability_e ability, mc_ability_support_e *support) @@ -1615,7 +1615,7 @@ static int __mc_client_get_server_ability(mc_client_h client, const char *server mc_retvm_if(!__is_valid_parameter(client, server_name), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid parameter"); mc_retvm_if(((ability < MC_ABILITY_SHUFFLE) || (ability > MC_ABILITY_360_MODE)) , MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid ability [%d]", ability); - return mc_db_get_ability_supported(mc_client->db_handle, server_name, ability, support); + return _mc_db_get_ability_supported(mc_client->db_handle, server_name, ability, support); } int mc_client_get_server_shuffle_ability_support(mc_client_h client, const char *server_name, mc_ability_support_e *support) diff --git a/src/media_controller_db.c b/src/media_controller_db.c index 6b3a802..ea54cf5 100644 --- a/src/media_controller_db.c +++ b/src/media_controller_db.c @@ -52,7 +52,7 @@ static int __mc_db_get_record(sqlite3 *handle, char *sql_str, sqlite3_stmt **stm return MEDIA_CONTROLLER_ERROR_NONE; } -int mc_db_update_playback_info(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; @@ -92,7 +92,7 @@ int mc_db_update_playback_info(const char *server_name, const media_controller_p return ret; } -int mc_db_update_whole_metadata(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, const char *season, const char *episode, const char *resolution) { @@ -124,7 +124,7 @@ int mc_db_update_whole_metadata(const char *server_name, return ret; } -int mc_db_update_icon_uri(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; @@ -143,7 +143,7 @@ int mc_db_update_icon_uri(const char *server_name, const char *uri) return ret; } -int mc_db_update_ability_supported(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; @@ -159,7 +159,7 @@ int mc_db_update_ability_supported(const char *server_name, const media_controll return ret; } -int mc_db_get_latest_server_info(sqlite3 *handle, char **latest_server_name, mc_server_state_e *state) +int _mc_db_get_latest_server_info(sqlite3 *handle, char **latest_server_name, mc_server_state_e *state) { int ret = MEDIA_CONTROLLER_ERROR_NONE; char *sql_str = NULL; @@ -186,7 +186,7 @@ int mc_db_get_latest_server_info(sqlite3 *handle, char **latest_server_name, mc_ return ret; } -int mc_db_get_playback_info(sqlite3 *handle, const char *server_name, mc_playback_h *playback) +int _mc_db_get_playback_info(sqlite3 *handle, const char *server_name, mc_playback_h *playback) { int ret = MEDIA_CONTROLLER_ERROR_NONE; media_controller_playback_s *_playback = NULL; @@ -256,7 +256,7 @@ static int __mc_db_get_metadata(sqlite3_stmt *stmt, int col, mc_metadata_h *meta return MEDIA_CONTROLLER_ERROR_NONE; } -int mc_db_get_metadata_info(sqlite3 *handle, const char *server_name, mc_metadata_h *metadata) +int _mc_db_get_metadata_info(sqlite3 *handle, const char *server_name, mc_metadata_h *metadata) { int ret = MEDIA_CONTROLLER_ERROR_NONE; char *sql_str = NULL; @@ -277,7 +277,7 @@ int mc_db_get_metadata_info(sqlite3 *handle, const char *server_name, mc_metadat return ret; } -int mc_db_get_shuffle_mode(sqlite3 *handle, const char *server_name, mc_shuffle_mode_e *mode) +int _mc_db_get_shuffle_mode(sqlite3 *handle, const char *server_name, mc_shuffle_mode_e *mode) { int ret = MEDIA_CONTROLLER_ERROR_NONE; char *sql_str = NULL; @@ -298,7 +298,7 @@ int mc_db_get_shuffle_mode(sqlite3 *handle, const char *server_name, mc_shuffle_ return MEDIA_CONTROLLER_ERROR_NONE; } -int mc_db_get_repeat_mode(sqlite3 *handle, const char *server_name, mc_repeat_mode_e *mode) +int _mc_db_get_repeat_mode(sqlite3 *handle, const char *server_name, mc_repeat_mode_e *mode) { int ret = MEDIA_CONTROLLER_ERROR_NONE; char *sql_str = NULL; @@ -319,7 +319,7 @@ int mc_db_get_repeat_mode(sqlite3 *handle, const char *server_name, mc_repeat_mo return MEDIA_CONTROLLER_ERROR_NONE; } -int mc_db_get_icon_uri(sqlite3 *handle, const char *server_name, char **uri) +int _mc_db_get_icon_uri(sqlite3 *handle, const char *server_name, char **uri) { int ret = MEDIA_CONTROLLER_ERROR_NONE; char *sql_str = NULL; @@ -364,7 +364,7 @@ static int __mc_db_get_ability(sqlite3 *handle, const char *server_name, unsigne } -int mc_db_get_ability_supported(sqlite3 *handle, const char *server_name, int ability, mc_ability_support_e *supported) +int _mc_db_get_ability_supported(sqlite3 *handle, const char *server_name, int ability, mc_ability_support_e *supported) { int ret = MEDIA_CONTROLLER_ERROR_NONE; unsigned long long _decided = 0; @@ -392,7 +392,7 @@ int mc_db_get_ability_supported(sqlite3 *handle, const char *server_name, int ab return ret; } -int mc_db_get_pb_action_ability(sqlite3 *handle, const char *server_name, mc_playback_ability_h *ability) +int _mc_db_get_pb_action_ability(sqlite3 *handle, const char *server_name, mc_playback_ability_h *ability) { int ret = MEDIA_CONTROLLER_ERROR_NONE; media_controller_ability_s *basic_ability = NULL; @@ -494,7 +494,7 @@ int _mc_db_get_playlist_count(sqlite3 *handle, const char *server_name) return count; } -int mc_db_get_foreach_playlist(sqlite3 *handle, const char *server_name, mc_playlist_cb callback, void *user_data) +int _mc_db_get_foreach_playlist(sqlite3 *handle, const char *server_name, mc_playlist_cb callback, void *user_data) { int ret = MEDIA_CONTROLLER_ERROR_NONE; char *sql_str = NULL; @@ -556,7 +556,7 @@ gboolean _mc_db_is_playlist_exist(sqlite3 *handle, const char *server_name, cons return (ret == 0) ? FALSE : TRUE; } -int mc_db_get_playlist_by_name(sqlite3 *handle, mc_priv_type_e type, const char *controller_name, const char *playlist_name, mc_playlist_h *playlist) +int _mc_db_get_playlist_by_name(sqlite3 *handle, mc_priv_type_e type, const char *controller_name, const char *playlist_name, mc_playlist_h *playlist) { int ret = MEDIA_CONTROLLER_ERROR_NONE; gboolean is_exist = FALSE; @@ -612,7 +612,7 @@ int _mc_db_get_playlist_item_count(sqlite3 *handle, const char *server_name, cha return count; } -int mc_db_get_playlist_item(sqlite3 *handle, const char *server_name, char *playlist_name, mc_playlist_item_cb callback, void *user_data) +int _mc_db_get_playlist_item(sqlite3 *handle, const char *server_name, char *playlist_name, mc_playlist_item_cb callback, void *user_data) { int ret = MEDIA_CONTROLLER_ERROR_NONE; char *sql_str = NULL; @@ -657,7 +657,7 @@ int mc_db_get_playlist_item(sqlite3 *handle, const char *server_name, char *play return MEDIA_CONTROLLER_ERROR_NONE; } -gboolean mc_db_is_exist_server(sqlite3 *handle, const char *server_name) +gboolean _mc_db_is_exist_server(sqlite3 *handle, const char *server_name) { int ret = MEDIA_CONTROLLER_ERROR_NONE; char *sql_str = NULL; @@ -678,7 +678,7 @@ gboolean mc_db_is_exist_server(sqlite3 *handle, const char *server_name) if (ret == 0) { mc_secure_error("No server info [%s]", server_name); - mc_db_foreach_server_list(handle, NULL, NULL); + _mc_db_foreach_server_list(handle, NULL, NULL); return FALSE; } @@ -706,7 +706,7 @@ gboolean _mc_db_is_activated_client(sqlite3 *handle, const char *client_name) if (ret == 0) { mc_secure_error("[%s] is not activated", client_name); - mc_db_foreach_client_list(handle, NULL, NULL); + _mc_db_foreach_client_list(handle, NULL, NULL); return FALSE; } @@ -734,7 +734,7 @@ gboolean _mc_db_is_activated_server(sqlite3 *handle, const char *server_name) if (ret == 0) { mc_secure_error("[%s] is not activated", server_name); - mc_db_foreach_server_list(handle, NULL, NULL); + _mc_db_foreach_server_list(handle, NULL, NULL); return FALSE; } @@ -763,7 +763,7 @@ gboolean _mc_db_is_latest_server(sqlite3 *handle, const char *server_name) return (ret == 0) ? FALSE : TRUE; } -int mc_db_foreach_server_list(sqlite3 *handle, mc_activated_server_cb callback, void *user_data) +int _mc_db_foreach_server_list(sqlite3 *handle, mc_activated_server_cb callback, void *user_data) { int ret = MEDIA_CONTROLLER_ERROR_NONE; char *sql_str = NULL; @@ -813,7 +813,7 @@ int mc_db_foreach_server_list(sqlite3 *handle, mc_activated_server_cb callback, return MEDIA_CONTROLLER_ERROR_NONE; } -int mc_db_foreach_client_list(sqlite3 *handle, mc_activated_client_cb callback, void *user_data) +int _mc_db_foreach_client_list(sqlite3 *handle, mc_activated_client_cb callback, void *user_data) { int ret = MEDIA_CONTROLLER_ERROR_NONE; char *sql_str = NULL; @@ -862,7 +862,7 @@ int mc_db_foreach_client_list(sqlite3 *handle, mc_activated_client_cb callback, return MEDIA_CONTROLLER_ERROR_NONE; } -int mc_db_update_latest_server_table(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; @@ -878,7 +878,7 @@ int mc_db_update_latest_server_table(const char *server_name) return ret; } -int mc_db_remove_playlist(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; @@ -895,7 +895,7 @@ int mc_db_remove_playlist(const char *server_name, const char *playlist_name) return ret; } -int mc_db_update_playlist(const char *server_name, const char *playlist_name, bundle_raw *bundle_data, int bundle_size) +int _mc_db_update_playlist(const char *server_name, const char *playlist_name, bundle_raw *bundle_data, int bundle_size) { int ret = MEDIA_CONTROLLER_ERROR_NONE; char *sql_str = NULL; diff --git a/src/media_controller_playlist.c b/src/media_controller_playlist.c index 71e4639..c9b3735 100644 --- a/src/media_controller_playlist.c +++ b/src/media_controller_playlist.c @@ -138,7 +138,7 @@ int _mc_playlist_update(mc_priv_type_e type, const char *server_name, mc_playlis mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "__get_bundle_data failed"); - ret = mc_db_update_playlist(server_name, _playlist->playlist_name, bundle_data, bundle_size); + ret = _mc_db_update_playlist(server_name, _playlist->playlist_name, bundle_data, bundle_size); MC_SAFE_FREE(bundle_data); return ret; @@ -261,7 +261,7 @@ int mc_playlist_foreach_playlist(const char *app_id, mc_playlist_cb callback, vo mc_retvm_if(db_handle == NULL, MEDIA_CONTROLLER_ERROR_INVALID_OPERATION, "fail mc_db_connect [%d]", ret); if (_mc_db_is_activated_server(db_handle, app_id) == TRUE) - ret = mc_db_get_foreach_playlist(db_handle, app_id, callback, user_data); + ret = _mc_db_get_foreach_playlist(db_handle, app_id, callback, user_data); else ret = MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER; @@ -305,7 +305,7 @@ int mc_playlist_foreach_item(mc_playlist_h playlist, mc_playlist_item_cb callbac mc_retvm_if(db_handle == NULL, MEDIA_CONTROLLER_ERROR_INVALID_OPERATION, "fail mc_db_connect [%d]", ret); if (_mc_db_is_activated_server(db_handle, _playlist->server_name) == TRUE) - ret = mc_db_get_playlist_item(db_handle, _playlist->server_name, _playlist->playlist_name, callback, user_data); + ret = _mc_db_get_playlist_item(db_handle, _playlist->server_name, _playlist->playlist_name, callback, user_data); else ret = MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER; @@ -327,7 +327,7 @@ int mc_playlist_get_playlist(const char *app_id, const char *playlist_name, mc_p mc_retvm_if(db_handle == NULL, MEDIA_CONTROLLER_ERROR_INVALID_OPERATION, "fail mc_db_connect [%d]", ret); if (_mc_db_is_activated_server(db_handle, app_id) == TRUE) - ret = mc_db_get_playlist_by_name(db_handle, MC_PRIV_TYPE_SERVER, app_id, playlist_name, playlist); + ret = _mc_db_get_playlist_by_name(db_handle, MC_PRIV_TYPE_SERVER, app_id, playlist_name, playlist); else ret = MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER; diff --git a/src/media_controller_server.c b/src/media_controller_server.c index cee96ad..cfc3038 100644 --- a/src/media_controller_server.c +++ b/src/media_controller_server.c @@ -848,16 +848,16 @@ int mc_server_update_playback_info(mc_server_h server) if ((mc_server->playback.playlist_name != NULL) && (mc_server->playback.index != NULL)) mc_debug("playback info update: playlist_name[%s], index [%s]", mc_server->playback.playlist_name, mc_server->playback.index); - ret = mc_db_update_playback_info(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); + mc_error("fail _mc_db_update_playback_info [%d]", ret); return ret; } if (mc_server->playback.state == MC_PLAYBACK_STATE_PLAYING) { if(!_mc_db_is_latest_server(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); + 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); } } @@ -998,12 +998,12 @@ 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->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, mc_server->metadata->season, mc_server->metadata->episode, mc_server->metadata->resolution); - mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "fail to mc_db_update_whole_metadata"); + mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "fail to _mc_db_update_whole_metadata"); ret = __mc_server_send_message(mc_server, MC_DBUS_UPDATE_INTERFACE, MC_DBUS_SIGNAL_NAME_METADATA, 0, 0, NULL); mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "fail to __mc_server_send_message"); @@ -1057,8 +1057,8 @@ 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->server_name, _playlist->playlist_name); - mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "fail to mc_db_remove_playlist"); + 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); mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "fail to __mc_server_send_message"); @@ -1075,7 +1075,7 @@ int mc_server_foreach_playlist(mc_server_h server, mc_playlist_cb callback, void mc_retvm_if(mc_server == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "invalid server"); mc_retvm_if(callback == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "invalid callback"); - return mc_db_get_foreach_playlist(mc_server->db_handle, mc_server->server_name, callback, user_data); + return _mc_db_get_foreach_playlist(mc_server->db_handle, mc_server->server_name, callback, user_data); } static int __mc_server_set_ability(mc_server_h server, mc_ability_e ability, mc_ability_support_e support) @@ -1302,7 +1302,7 @@ int mc_server_foreach_client(mc_server_h server, mc_activated_client_cb callback mc_retvm_if(mc_server == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Handle is NULL"); mc_retvm_if(callback == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "callback is NULL"); - return mc_db_foreach_client_list(mc_server->db_handle, callback, user_data); + return _mc_db_foreach_client_list(mc_server->db_handle, callback, user_data); } int mc_server_send_custom_event(mc_server_h server, const char *client_name, const char *event, bundle *data, char **request_id) @@ -1338,7 +1338,7 @@ int mc_server_set_icon(mc_server_h server, const char *uri) mc_debug("uri %s", uri); - return mc_db_update_icon_uri(mc_server->server_name, uri); + return _mc_db_update_icon_uri(mc_server->server_name, uri); } static int __mc_server_update_ability(mc_server_h server, int support_item, mc_ability_support_e support, gboolean immediate_update) @@ -1358,7 +1358,7 @@ static int __mc_server_update_ability(mc_server_h server, int support_item, mc_a _mc_util_set_bit(support_item, FALSE, &mc_server->basic_ability.supported); if (immediate_update) - return mc_db_update_ability_supported(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; } @@ -1377,8 +1377,8 @@ 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->server_name, mc_server->basic_ability); - mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "fail to mc_db_update_ability_supported"); + 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); mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "fail to __mc_server_send_message"); @@ -1437,8 +1437,8 @@ int mc_server_set_display_mode_ability(mc_server_h server, mc_display_mode_e mod mc_retvm_if(!find, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid mode"); - 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_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_DP_MODE_ABILITY, 0, 0, NULL); mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "fail to __mc_server_send_message"); @@ -1480,8 +1480,8 @@ int mc_server_set_display_rotation_ability(mc_server_h server, mc_display_rotati mc_retvm_if(!find, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid rotation"); - 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_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_DP_ROTATION_ABILITY, 0, 0, NULL); mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "fail to __mc_server_send_message");