From 4cbf2ddc56511db428c55eb5221a3ede9b3bacff Mon Sep 17 00:00:00 2001 From: Minje Ahn Date: Mon, 22 Apr 2019 17:20:55 +0900 Subject: [PATCH] Remove unused parameter Remove parameter to classify error types Change-Id: Ib29508f282c9974c4e6442d9cc59f0895d3e56b8 Signed-off-by: Minje Ahn --- include/media_info_private.h | 10 +------- include_product/media_info_private.h | 2 +- packaging/capi-content-media-content.spec | 2 +- src/media_content.c | 42 +++++++++++++++---------------- src/media_folder.c | 14 +++++------ src/media_info.c | 40 ++++++++++++++--------------- src/media_playlist.c | 12 ++++----- src/media_storage.c | 2 +- src/media_tag.c | 8 +++--- src/media_util_private.c | 2 +- 10 files changed, 63 insertions(+), 71 deletions(-) diff --git a/include/media_info_private.h b/include/media_info_private.h index 2c0c161..d77ec79 100755 --- a/include/media_info_private.h +++ b/include/media_info_private.h @@ -74,8 +74,6 @@ extern "C" { #define MEDIA_CONTENT_UUID_SIZE 36 #define BATCH_REQUEST_MAX 300 -#define EMPTY_STR "" - typedef enum { MEDIA_INFO_UUID = 0, MEDIA_INFO_PATH, @@ -125,12 +123,6 @@ typedef enum { } media_info_item_e; typedef enum { - MEDIA_CONTENT_TYPE = 0, - MEDIA_THUMBNAIL_TYPE, - MEDIA_REGISTER_TYPE -} media_info_error_type_e; - -typedef enum { MEDIA_TAG_ADD, MEDIA_TAG_REMOVE, MEDIA_TAG_UPDATE_TAG_NAME, @@ -518,7 +510,7 @@ typedef struct _media_content_cb_data { #define SELECT_FACE_ID "SELECT media_face_id FROM "DB_TABLE_FACE" WHERE media_id='%q' AND face_rect_x=%d AND face_rect_y=%d AND face_rect_w=%d AND face_rect_h=%d AND face_orientation=%d" int _content_query_prepare(sqlite3_stmt **stmt, char *select_query, char *condition_query, char *option_query); -int _content_error_capi(int type, int cotent_error); +int _content_error_capi(int content_error); int _content_query_sql(char *query_str); sqlite3 * _content_get_db_handle(void); uid_t _content_get_uid(void); diff --git a/include_product/media_info_private.h b/include_product/media_info_private.h index f1b1fb3..b51f128 100755 --- a/include_product/media_info_private.h +++ b/include_product/media_info_private.h @@ -742,7 +742,7 @@ typedef struct _media_content_scan_cb_data_v2 { #define UPDATE_UHD_META_FROM_UHD "UPDATE "DB_TABLE_UHD" SET content_title=%Q, release_date=%Q, played_position=%d, sub_type=%d, played_count=%d WHERE media_id='%q'" int _content_query_prepare(sqlite3_stmt **stmt, char *select_query, char *condition_query, char *option_query); -int _content_error_capi(int type, int cotent_error); +int _content_error_capi(int content_error); int _content_query_sql(char *query_str); sqlite3 * _content_get_db_handle(void); uid_t _content_get_uid(void); diff --git a/packaging/capi-content-media-content.spec b/packaging/capi-content-media-content.spec index 22903ef..2839b01 100755 --- a/packaging/capi-content-media-content.spec +++ b/packaging/capi-content-media-content.spec @@ -1,6 +1,6 @@ Name: capi-content-media-content Summary: A Media content library in Tizen Native API -Version: 0.4.0 +Version: 0.4.1 Release: 0 Group: Multimedia/API License: Apache-2.0 diff --git a/src/media_content.c b/src/media_content.c index a3818ec..143df99 100755 --- a/src/media_content.c +++ b/src/media_content.c @@ -141,10 +141,10 @@ int _content_query_prepare_by_union_select(sqlite3_stmt **stmt, char *select_que } #endif -int _content_error_capi(int type, int content_error) +int _content_error_capi(int content_error) { if (content_error != MEDIA_CONTENT_ERROR_NONE) - media_content_error("[type : %d] content_error : %d ", type, content_error); + media_content_error("MS Error[%d]", content_error); /*Error None*/ if (content_error == MS_MEDIA_ERR_NONE) @@ -189,7 +189,7 @@ int _content_query_sql(char *query_str) /*DB will be updated by Media Server.*/ ret = media_db_request_update_db(query_str, _content_get_uid()); - return _content_error_capi(MEDIA_CONTENT_TYPE, ret); + return _content_error_capi(ret); } int media_content_connect(void) @@ -202,7 +202,7 @@ int media_content_connect(void) if (ref_count == 0) { if (db_handle == NULL) { ret = media_db_connect(&db_handle, _content_get_uid(), false); - ret = _content_error_capi(MEDIA_CONTENT_TYPE, ret); + ret = _content_error_capi(ret); if (ret == MEDIA_CONTENT_ERROR_NONE) ref_count++; } else { @@ -254,7 +254,7 @@ int media_content_disconnect(void) if (ref_count == 0) { if (db_handle != NULL) { ret = media_db_disconnect(db_handle); - ret = _content_error_capi(MEDIA_CONTENT_TYPE, ret); + ret = _content_error_capi(ret); if (ret == MEDIA_CONTENT_ERROR_NONE) { db_handle = NULL; } else { @@ -305,7 +305,7 @@ int media_content_scan_file(const char *path) ret = media_svc_get_storage_id(_content_get_db_handle(), repl_path, storage_id, _content_get_uid()); if (ret != MS_MEDIA_ERR_NONE) { media_content_error("media_svc_get_storage_id failed : %d", ret); - return _content_error_capi(MEDIA_CONTENT_TYPE, ret); + return _content_error_capi(ret); } check_file = _media_util_check_file_exist(repl_path); @@ -324,7 +324,7 @@ int media_content_scan_file(const char *path) ret = ms_user_get_storage_type(_content_get_uid(), repl_path, &storage_type); if (ret != MS_MEDIA_ERR_NONE) { media_content_sec_error("ms_user_get_storage_type failed : %d (%s)", ret, repl_path); - return _content_error_capi(MEDIA_CONTENT_TYPE, ret); + return _content_error_capi(ret); } ret = media_svc_check_item_exist_by_path(_content_get_db_handle(), storage_id, repl_path); if (ret == MS_MEDIA_ERR_NONE) { @@ -332,7 +332,7 @@ int media_content_scan_file(const char *path) ret = media_svc_refresh_item(_content_get_db_handle(), storage_id, storage_type, repl_path, _content_get_uid()); if (ret != MS_MEDIA_ERR_NONE) { media_content_error("media_svc_refresh_item failed : %d", ret); - return _content_error_capi(MEDIA_CONTENT_TYPE, ret); + return _content_error_capi(ret); } } else if (ret == MS_MEDIA_ERR_DB_NO_RECORD) { @@ -346,11 +346,11 @@ int media_content_scan_file(const char *path) media_content_sec_error("media_svc_insert_item_immediately failed : %d (%s)", ret, repl_path); } - return _content_error_capi(MEDIA_CONTENT_TYPE, ret); + return _content_error_capi(ret); } } else { media_content_error("media_svc_check_item_exist_by_path failed : %d", ret); - return _content_error_capi(MEDIA_CONTENT_TYPE, ret); + return _content_error_capi(ret); } } else if (check_file == MEDIA_CONTENT_ERROR_PERMISSION_DENIED) { media_content_error("You have no permission for this file %d", ret); @@ -366,11 +366,11 @@ int media_content_scan_file(const char *path) } media_content_error("media_svc_delete_item_by_path failed : %d", ret); - return _content_error_capi(MEDIA_CONTENT_TYPE, ret); + return _content_error_capi(ret); } } - return _content_error_capi(MEDIA_CONTENT_TYPE, ret); + return _content_error_capi(ret); } void _media_content_scan_cb(media_request_result_s* result, void *user_data) @@ -378,7 +378,7 @@ void _media_content_scan_cb(media_request_result_s* result, void *user_data) int err = -1; media_content_scan_cb_data *cb_data = user_data; - err = _content_error_capi(MEDIA_REGISTER_TYPE, result->result); + err = _content_error_capi(result->result); #ifdef _USE_TVPD_MODE if (result->request_type != MEDIA_REQUEST_SCAN_COMPLETE && result->request_type != MEDIA_REQUEST_SCAN_PARTIAL) { @@ -410,7 +410,7 @@ void _media_content_scan_cb_v2(media_request_result_s* result, void *user_data) media_content_complete_phase_e complete_phase = -1; if (!cb_data) media_content_debug("cb_data is NULL"); - err = _content_error_capi(MEDIA_REGISTER_TYPE, result->result); + err = _content_error_capi(result->result); media_content_debug("result is %d", err); if (result->request_type == MEDIA_REQUEST_SCAN_PARTIAL) @@ -461,7 +461,7 @@ int media_content_scan_folder(const char *path, bool is_recursive, media_scan_co ret = ms_user_get_storage_type(_content_get_uid(), repl_path, &storage_type); if (ret != MS_MEDIA_ERR_NONE) { media_content_sec_error("ms_user_get_storage_type failed : %d (%s)", ret, repl_path); - return _content_error_capi(MEDIA_CONTENT_TYPE, ret); + return _content_error_capi(ret); } media_content_debug("This path doesn't exists in file system... So will be deleted it from DB"); @@ -470,7 +470,7 @@ int media_content_scan_folder(const char *path, bool is_recursive, media_scan_co ret = media_svc_get_storage_id(_content_get_db_handle(), repl_path, storage_id, _content_get_uid()); if (ret != MS_MEDIA_ERR_NONE) { media_content_error("media_svc_get_storage_id failed : %d", ret); - return _content_error_capi(MEDIA_CONTENT_TYPE, ret); + return _content_error_capi(ret); } media_content_scan_cb_data *cb_data = NULL; @@ -486,7 +486,7 @@ int media_content_scan_folder(const char *path, bool is_recursive, media_scan_co SAFE_FREE(cb_data); } - return _content_error_capi(MEDIA_REGISTER_TYPE, ret); + return _content_error_capi(ret); } #ifdef _USE_TVPD_MODE @@ -520,7 +520,7 @@ int media_content_scan_folder_v2(const char *path, bool is_recursive, media_scan if (ret != MS_MEDIA_ERR_NONE) media_content_error("media_directory_scanning_async failed : %d", ret); - return _content_error_capi(MEDIA_REGISTER_TYPE, ret); + return _content_error_capi(ret); } #endif @@ -539,7 +539,7 @@ int media_content_cancel_scan_folder(const char *path) if (ret != MS_MEDIA_ERR_NONE) media_content_error("media_directory_scanning_async failed : %d", ret); - return _content_error_capi(MEDIA_REGISTER_TYPE, ret); + return _content_error_capi(ret); } void _media_content_db_update_noti_cb( @@ -590,7 +590,7 @@ int media_content_add_db_updated_cb(media_content_db_update_cb callback, void *u ret = media_db_update_subscribe_internal((MediaNotiHandle*)noti_handle, _media_content_db_update_noti_cb, (void *)noti_info); - return _content_error_capi(MEDIA_REGISTER_TYPE, ret); + return _content_error_capi(ret); } void __media_content_clear_user_data(void *user_data) @@ -608,7 +608,7 @@ int media_content_remove_db_updated_cb(media_content_noti_h noti_handle) ret = media_db_update_unsubscribe_internal((MediaNotiHandle)noti_handle, __media_content_clear_user_data); - return _content_error_capi(MEDIA_REGISTER_TYPE, ret); + return _content_error_capi(ret); } #ifdef _USE_TVPD_MODE GMutex* _content_get_db_mutex(void) diff --git a/src/media_folder.c b/src/media_folder.c index e331b8f..6195df3 100755 --- a/src/media_folder.c +++ b/src/media_folder.c @@ -374,7 +374,7 @@ int media_folder_update_to_db(media_folder_h folder) ret = media_svc_rename_folder(_content_get_db_handle(), _folder->storage_uuid, g_src_path, repl_path, _content_get_uid()); SAFE_FREE(g_src_path); - return _content_error_capi(MEDIA_CONTENT_TYPE, ret); + return _content_error_capi(ret); } return ret; @@ -446,7 +446,7 @@ int media_folder_insert_to_db(const char *path) ret = media_svc_get_storage_id(_content_get_db_handle(), repl_path, storage_id, _content_get_uid()); if (ret != MS_MEDIA_ERR_NONE) { media_content_error("media_svc_get_storage_id failed : %d", ret); - return _content_error_capi(MEDIA_CONTENT_TYPE, ret); + return _content_error_capi(ret); } ret = media_svc_check_folder_exist_by_path(_content_get_db_handle(), storage_id, repl_path); @@ -457,7 +457,7 @@ int media_folder_insert_to_db(const char *path) ret = ms_user_get_storage_type(_content_get_uid(), repl_path, &storage_type); if (ret != MS_MEDIA_ERR_NONE) { media_content_sec_error("ms_user_get_storage_type failed : %d", ret); - return _content_error_capi(MEDIA_CONTENT_TYPE, ret); + return _content_error_capi(ret); } ret = media_svc_insert_folder(_content_get_db_handle(), storage_id, storage_type, repl_path, _content_get_uid()); @@ -469,17 +469,17 @@ int media_folder_insert_to_db(const char *path) media_content_sec_error("media_svc_insert_folder failed : %d (%s)", ret, repl_path); } - return _content_error_capi(MEDIA_CONTENT_TYPE, ret); + return _content_error_capi(ret); } ret = media_svc_set_folder_scan_status(storage_id, repl_path, MEDIA_DIR_SCAN_DONE, _content_get_uid()); if (ret != MS_MEDIA_ERR_NONE) { media_content_sec_error("ms_set_folder_scan_status failed : %d", ret); - return _content_error_capi(MEDIA_CONTENT_TYPE, ret); + return _content_error_capi(ret); } } else if (ret != MS_MEDIA_ERR_NONE) { media_content_sec_error("media_svc_check_folder_exist_by_path failed : %d (%s)", ret, repl_path); - return _content_error_capi(MEDIA_CONTENT_TYPE, ret); + return _content_error_capi(ret); } return ret; @@ -494,7 +494,7 @@ int media_folder_get_scan_status(const char *storage_uuid, char* path, media_fol ret = media_svc_get_folder_scan_status(_content_get_db_handle(), storage_uuid, path, &status); if (ret != MS_MEDIA_ERR_NONE) { media_content_error("media_svc_get_folder_scan_status failed"); - ret = _content_error_capi(MEDIA_CONTENT_TYPE, ret); + ret = _content_error_capi(ret); } else { *scan_status = status; } diff --git a/src/media_info.c b/src/media_info.c index af7f7b1..3964849 100755 --- a/src/media_info.c +++ b/src/media_info.c @@ -71,7 +71,7 @@ static void __media_info_insert_completed_cb(media_request_result_s *result, voi if (_cb_data) { if (result) - ret = _content_error_capi(MEDIA_CONTENT_TYPE, result->result); + ret = _content_error_capi(result->result); if (_cb_data->insert_completed_cb) { media_content_debug("User callback is being called now"); @@ -107,11 +107,11 @@ static void __media_info_thumbnail_completed_cb(int error, const char *path, voi if (STRING_VALID(path)) media->thumbnail_path = g_strdup(path); else - media->thumbnail_path = g_strdup(EMPTY_STR); + media->thumbnail_path = g_strdup(MEDIA_CONTENT_EMPTY_STRING); } media_content_debug("error [%d], thumbnail_path [%s]", error, path); - error_value = _content_error_capi(MEDIA_THUMBNAIL_TYPE, error); + error_value = _content_error_capi(error); if (_thumb_cb->thumbnail_completed_cb) _thumb_cb->thumbnail_completed_cb(error_value, path, _thumb_cb->user_data); } @@ -143,7 +143,7 @@ static void __media_info_face_completed_cb(int error, const int face_count, void if (_face_cb != NULL) { media_content_debug("error [%d], face_count [%d]", error, face_count); - error_value = _content_error_capi(MEDIA_THUMBNAIL_TYPE, error); + error_value = _content_error_capi(error); if (_face_cb->face_completed_cb) _face_cb->face_completed_cb(error_value, face_count, _face_cb->user_data); } @@ -243,7 +243,7 @@ static int __media_info_insert_batch(const char **path_array, media_content_error("media_files_register failed : %d", ret); if (unlink(list_path) < 0) media_content_stderror("failed to delete"); - return _content_error_capi(MEDIA_CONTENT_TYPE, ret); + return _content_error_capi(ret); } return ret; @@ -410,13 +410,13 @@ int media_info_insert_to_db(const char *path, media_info_h *info) ret = media_svc_get_storage_id(_content_get_db_handle(), repl_path, storage_id, _content_get_uid()); if (ret != MS_MEDIA_ERR_NONE) { media_content_error("media_svc_get_storage_id failed : %d", ret); - return _content_error_capi(MEDIA_CONTENT_TYPE, ret); + return _content_error_capi(ret); } ret = ms_user_get_storage_type(_content_get_uid(), repl_path, &storage_type); if (ret != MS_MEDIA_ERR_NONE) { media_content_sec_error("ms_user_get_storage_type failed : %d", ret); - return _content_error_capi(MEDIA_CONTENT_TYPE, ret); + return _content_error_capi(ret); } /* Get modified time for check exists */ @@ -427,7 +427,7 @@ int media_info_insert_to_db(const char *path, media_info_h *info) ret = media_svc_refresh_item(_content_get_db_handle(), storage_id, storage_type, repl_path, _content_get_uid()); if (ret != MS_MEDIA_ERR_NONE) { media_content_error("media_svc_refresh_item failed : %d", ret); - return _content_error_capi(MEDIA_CONTENT_TYPE, ret); + return _content_error_capi(ret); } } } else if (ret == MS_MEDIA_ERR_DB_NO_RECORD) { @@ -443,11 +443,11 @@ int media_info_insert_to_db(const char *path, media_info_h *info) media_content_sec_error("media_svc_insert_item_immediately failed : %d (%s)", ret, repl_path); } - return _content_error_capi(MEDIA_CONTENT_TYPE, ret); + return _content_error_capi(ret); } } else { media_content_sec_error("media_svc_get_modified_time failed : %d (%s)", ret, repl_path); - return _content_error_capi(MEDIA_CONTENT_TYPE, ret); + return _content_error_capi(ret); } media_info_s *_media = (media_info_s*)calloc(1, sizeof(media_info_s)); @@ -506,7 +506,7 @@ int media_info_get_media_info_by_path_from_db(const char* path, media_info_h* me ret = media_svc_get_storage_id(_content_get_db_handle(), path, storage_id, tzplatform_getuid(TZ_USER_NAME)); if (ret != MS_MEDIA_ERR_NONE) { media_content_error("media_svc_get_storage_id failed : %d", ret); - return _content_error_capi(MEDIA_CONTENT_TYPE, ret); + return _content_error_capi(ret); } media_info_s *_media = (media_info_s*)calloc(1, sizeof(media_info_s)); @@ -550,7 +550,7 @@ int media_info_delete_from_db(const char *media_id) ret = media_svc_delete_item_by_path(_content_get_db_handle(), storage_id, path, _content_get_uid()); SAFE_FREE(path); - return _content_error_capi(MEDIA_CONTENT_TYPE, ret); + return _content_error_capi(ret); } int media_info_destroy(media_info_h media) @@ -1564,7 +1564,7 @@ int media_info_delete_item(const char *media_id) ret = media_svc_remove_file(path); SAFE_FREE(path); - return _content_error_capi(MEDIA_CONTENT_TYPE, ret); + return _content_error_capi(ret); } int media_info_get_contact(media_info_h media, char **contact) @@ -1945,11 +1945,11 @@ int media_info_move_to_db(media_info_h media, const char* dst_path) ret = media_svc_get_storage_id(_content_get_db_handle(), org_repl_path, storage_id, _content_get_uid()); if (ret != MS_MEDIA_ERR_NONE) { media_content_error("media_svc_get_storage_id failed : %d", ret); - return _content_error_capi(MEDIA_CONTENT_TYPE, ret); + return _content_error_capi(ret); } ret = media_svc_move_item(_content_get_db_handle(), org_repl_path, repl_path, _content_get_uid()); - return _content_error_capi(MEDIA_CONTENT_TYPE, ret); + return _content_error_capi(ret); } int media_info_create_thumbnail(media_info_h media, media_thumbnail_completed_cb callback, void *user_data) @@ -1975,7 +1975,7 @@ int media_info_create_thumbnail(media_info_h media, media_thumbnail_completed_cb _thumb_cb->thumbnail_completed_cb = callback; ret = thumbnail_request_from_db_async(_media->request_id, repl_path, (ThumbFunc)__media_info_thumbnail_completed_cb, (void *)_thumb_cb, _content_get_uid()); - ret = _content_error_capi(MEDIA_THUMBNAIL_TYPE, ret); + ret = _content_error_capi(ret); } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; @@ -2001,7 +2001,7 @@ int media_info_generate_thumbnail(media_info_h media) media_content_retvm_if(!STRING_VALID(repl_path), MEDIA_CONTENT_ERROR_INVALID_OPERATION, "path replacement failed"); ret = media_svc_create_thumbnail(_media->storage_uuid, repl_path, _media->media_type, _content_get_uid(), &thumb_path); - ret = _content_error_capi(MEDIA_THUMBNAIL_TYPE, ret); + ret = _content_error_capi(ret); if (ret == MEDIA_CONTENT_ERROR_UNSUPPORTED_CONTENT) { SAFE_FREE(thumb_path); return ret; @@ -2028,7 +2028,7 @@ int media_info_cancel_thumbnail(media_info_h media) if (_media != NULL && STRING_VALID(_media->media_id) && _media->request_id > 0) { ret = thumbnail_request_cancel_media(_media->request_id); - ret = _content_error_capi(MEDIA_THUMBNAIL_TYPE, ret); + ret = _content_error_capi(ret); } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; @@ -2067,7 +2067,7 @@ int media_info_start_face_detection(media_info_h media, media_face_detection_com _face_cb->face_completed_cb = callback; ret = dcm_request_extract_face_async(_media->face_request_id, repl_path, (FaceFunc)__media_info_face_completed_cb, (void *)_face_cb, _content_get_uid()); - ret = _content_error_capi(MEDIA_THUMBNAIL_TYPE, ret); + ret = _content_error_capi(ret); } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; @@ -2088,7 +2088,7 @@ int media_info_cancel_face_detection(media_info_h media) if (_media != NULL && STRING_VALID(_media->media_id) && _media->face_request_id > 0) { ret = dcm_request_cancel_face(_media->face_request_id); - ret = _content_error_capi(MEDIA_THUMBNAIL_TYPE, ret); + ret = _content_error_capi(ret); } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; diff --git a/src/media_playlist.c b/src/media_playlist.c index 74f2dab..6f4c90e 100755 --- a/src/media_playlist.c +++ b/src/media_playlist.c @@ -122,7 +122,7 @@ static int __media_playlist_insert_item_to_playlist(int playlist_id, const char query_str = sqlite3_mprintf(INSERT_PLAYLIST_ITEM_TO_PLAYLIST_MAP, playlist_id, media_id, play_order); ret = media_svc_append_query(query_str, _content_get_uid()); - return _content_error_capi(MEDIA_CONTENT_TYPE, ret); + return _content_error_capi(ret); } static int __media_playlist_remove_item_from_playlist(int playlist_id, int playlist_member_id) @@ -133,7 +133,7 @@ static int __media_playlist_remove_item_from_playlist(int playlist_id, int playl query_str = sqlite3_mprintf(REMOVE_PLAYLIST_ITEM_FROM_PLAYLIST_MAP, playlist_id, playlist_member_id); ret = media_svc_append_query(query_str, _content_get_uid()); - return _content_error_capi(MEDIA_CONTENT_TYPE, ret); + return _content_error_capi(ret); } static int __media_playlist_update_playlist_name(int playlist_id, const char *playlist_name) @@ -144,7 +144,7 @@ static int __media_playlist_update_playlist_name(int playlist_id, const char *pl query_str = sqlite3_mprintf(UPDATE_PLAYLIST_NAME_FROM_PLAYLIST, playlist_name, playlist_id); ret = media_svc_append_query(query_str, _content_get_uid()); - return _content_error_capi(MEDIA_CONTENT_TYPE, ret); + return _content_error_capi(ret); } static int __media_playlist_update_thumbnail_path(int playlist_id, const char *path) @@ -155,7 +155,7 @@ static int __media_playlist_update_thumbnail_path(int playlist_id, const char *p query_str = sqlite3_mprintf(UPDATE_PLAYLIST_THUMBNAIL_FROM_PLAYLIST, path, playlist_id); ret = media_svc_append_query(query_str, _content_get_uid()); - return _content_error_capi(MEDIA_CONTENT_TYPE, ret); + return _content_error_capi(ret); } static int __media_playlist_update_play_order(int playlist_id, int playlist_member_id, int play_order) @@ -166,7 +166,7 @@ static int __media_playlist_update_play_order(int playlist_id, int playlist_memb query_str = sqlite3_mprintf(UPDATE_PLAYLIST_ORDER_FROM_PLAYLIST_MAP, play_order, playlist_id, playlist_member_id); ret = media_svc_append_query(query_str, _content_get_uid()); - return _content_error_capi(MEDIA_CONTENT_TYPE, ret); + return _content_error_capi(ret); } static bool __media_playlist_media_info_cb(media_info_h media, void *user_data) @@ -836,7 +836,7 @@ int media_playlist_update_to_db(media_playlist_h playlist) __media_playlist_item_release(_playlist); - return _content_error_capi(MEDIA_CONTENT_TYPE, ret); + return _content_error_capi(ret); } int media_playlist_import_from_file(const char *path, const char *playlist_name, media_playlist_h *playlist) diff --git a/src/media_storage.c b/src/media_storage.c index 2b44ca6..4198965 100755 --- a/src/media_storage.c +++ b/src/media_storage.c @@ -261,7 +261,7 @@ int media_storage_get_scan_status(const char *storage_uuid, media_storage_scan_s ret = media_svc_get_storage_scan_status(_content_get_db_handle(), storage_uuid, &status); if (ret != MS_MEDIA_ERR_NONE) { media_content_error("media_svc_get_storage_scan_status failed"); - ret = _content_error_capi(MEDIA_CONTENT_TYPE, ret); + ret = _content_error_capi(ret); } else { *scan_status = status; } diff --git a/src/media_tag.c b/src/media_tag.c index fc35ece..0a7de21 100755 --- a/src/media_tag.c +++ b/src/media_tag.c @@ -61,7 +61,7 @@ static int __media_tag_insert_item_to_tag(int tag_id, const char *media_id) query_str = sqlite3_mprintf("INSERT INTO %q (tag_id, media_id) values (%d, '%q');", DB_TABLE_TAG_MAP, tag_id, media_id); ret = media_svc_append_query(query_str, _content_get_uid()); - return _content_error_capi(MEDIA_CONTENT_TYPE, ret); + return _content_error_capi(ret); } static int __media_tag_remove_item_from_tag(int tag_id, const char *media_id) @@ -72,7 +72,7 @@ static int __media_tag_remove_item_from_tag(int tag_id, const char *media_id) query_str = sqlite3_mprintf(REMOVE_TAG_ITEM_FROM_TAG_MAP, tag_id, media_id); ret = media_svc_append_query(query_str, _content_get_uid()); - return _content_error_capi(MEDIA_CONTENT_TYPE, ret); + return _content_error_capi(ret); } static int __media_tag_update_tag_name(int tag_id, const char *tag_name) @@ -83,7 +83,7 @@ static int __media_tag_update_tag_name(int tag_id, const char *tag_name) query_str = sqlite3_mprintf(UPDATE_TAG_NAME_FROM_TAG, tag_name, tag_id); ret = media_svc_append_query(query_str, _content_get_uid()); - return _content_error_capi(MEDIA_CONTENT_TYPE, ret); + return _content_error_capi(ret); } static int __media_tag_get_tag_info_from_db(const char *name, media_tag_h tag) @@ -485,7 +485,7 @@ int media_tag_update_to_db(media_tag_h tag) __media_tag_item_release(_tag); - return _content_error_capi(MEDIA_CONTENT_TYPE, ret); + return _content_error_capi(ret); } int media_tag_create(media_tag_h *tag) diff --git a/src/media_util_private.c b/src/media_util_private.c index d4ffd58..46c4d07 100755 --- a/src/media_util_private.c +++ b/src/media_util_private.c @@ -227,7 +227,7 @@ int _media_util_check_ignore_dir(const char *dir_path, bool *ignore) ret = ms_user_get_storage_type(_content_get_uid(), dir_path, &storage_type); if (ret != MS_MEDIA_ERR_NONE) { media_content_error("ms_user_get_storage_type failed : %d", ret); - return _content_error_capi(MEDIA_CONTENT_TYPE, ret); + return _content_error_capi(ret); } char *leaf_path = NULL; -- 2.7.4