From ca7b85115c9c9b52cedefbc683b7c182c12f63dc Mon Sep 17 00:00:00 2001 From: Minje Ahn Date: Thu, 4 Jul 2024 10:18:21 +0900 Subject: [PATCH] Remove unused parameters Change-Id: I8b5967d73f5e66dfceb229c4d529a51ea844d1c8 Signed-off-by: Minje Ahn --- packaging/capi-content-media-content.spec | 2 +- src/media_content.c | 6 +++--- src/media_folder.c | 4 ++-- src/media_info.c | 17 ++++------------- 4 files changed, 10 insertions(+), 19 deletions(-) diff --git a/packaging/capi-content-media-content.spec b/packaging/capi-content-media-content.spec index e6bbcc0..5140d7c 100644 --- 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.5.7 +Version: 0.5.8 Release: 0 Group: Multimedia/API License: Apache-2.0 diff --git a/src/media_content.c b/src/media_content.c index a65bb0b..813989e 100644 --- a/src/media_content.c +++ b/src/media_content.c @@ -203,7 +203,7 @@ int media_content_scan_file(const char *path) content_retvm_if(ret == MEDIA_CONTENT_ERROR_PERMISSION_DENIED, ret, "Permission denied"); if (ret != MEDIA_CONTENT_ERROR_NONE) { content_debug("No file. Try to delete from DB"); - ret = media_svc_delete_item_by_path(_content_get_db_handle(), storage_id, path, _content_get_uid()); + ret = media_svc_delete_item_by_path(_content_get_db_handle(), path, _content_get_uid()); content_retvm_if(ret == MS_MEDIA_ERR_DB_NO_RECORD, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid path"); return _content_error_capi(ret); } @@ -212,10 +212,10 @@ int media_content_scan_file(const char *path) content_retv_if(_media_util_is_ignorable_dir(folder_path), MEDIA_CONTENT_ERROR_INVALID_PARAMETER); content_retvm_if(!_media_util_check_support_media_type(path), MEDIA_CONTENT_ERROR_NOT_SUPPORTED, "Unsupported type"); - ret = media_svc_check_item_exist_by_path(_content_get_db_handle(), storage_id, path); + ret = media_svc_check_item_exist_by_path(_content_get_db_handle(), path); if (ret == MS_MEDIA_ERR_NONE) { /* Refresh */ - ret = media_svc_refresh_item(_content_get_db_handle(), false, storage_id, path, _content_get_uid()); + ret = media_svc_refresh_item(_content_get_db_handle(), false, path, _content_get_uid()); content_retvm_if(ret != MS_MEDIA_ERR_NONE, _content_error_capi(ret), "Refresh failed"); return MEDIA_CONTENT_ERROR_NONE; } diff --git a/src/media_folder.c b/src/media_folder.c index 9ede872..bf510c9 100644 --- a/src/media_folder.c +++ b/src/media_folder.c @@ -261,7 +261,7 @@ int media_folder_get_scan_status(const char *storage_uuid, char* path, media_fol content_retip_if_fail(STRING_VALID(path)); content_retip_if_fail(scan_status); - ret = media_svc_get_folder_scan_status(_content_get_db_handle(), storage_uuid, path, &status); + ret = media_svc_get_folder_scan_status(_content_get_db_handle(), path, &status); if (ret != MS_MEDIA_ERR_NONE) { content_error("media_svc_get_folder_scan_status failed"); ret = _content_error_capi(ret); @@ -278,7 +278,7 @@ int media_folder_reset_scan_status(const char *storage_uuid, const char* path) content_retip_if_fail(STRING_VALID(path)); - ret = media_svc_set_folder_validity(FALSE, storage_uuid, path, 0, TRUE, _content_get_uid()); + ret = media_svc_set_folder_validity(FALSE, path, 0, TRUE, _content_get_uid()); if (ret != MS_MEDIA_ERR_NONE) { content_error("set folder validity failed"); return _content_error_capi(ret); diff --git a/src/media_info.c b/src/media_info.c index a27b1f7..e99d4bc 100644 --- a/src/media_info.c +++ b/src/media_info.c @@ -309,11 +309,11 @@ int media_info_insert_to_db(const char *path, media_info_h *info) } /* Get modified time for check exists */ - ret = media_svc_get_modified_time(_content_get_db_handle(), storage_id, path, &modified_time); + ret = media_svc_get_modified_time(_content_get_db_handle(), path, &modified_time); if (ret == MS_MEDIA_ERR_NONE) { /* Refresh if need */ if (modified_time != _media_util_get_file_time(path)) { - ret = media_svc_refresh_item(_content_get_db_handle(), false, storage_id, path, _content_get_uid()); + ret = media_svc_refresh_item(_content_get_db_handle(), false, path, _content_get_uid()); if (ret != MS_MEDIA_ERR_NONE) { content_error("media_svc_refresh_item failed : %d", ret); return _content_error_capi(ret); @@ -402,7 +402,6 @@ int media_info_delete_from_db(const char *media_id) { int ret = MEDIA_CONTENT_ERROR_NONE; char *path = NULL; - char *storage_id = NULL; content_retip_if_fail(STRING_VALID(media_id)); @@ -413,16 +412,8 @@ int media_info_delete_from_db(const char *media_id) return ret; } - ret = _media_db_get_storage_id_by_media_id(media_id, &storage_id); - if (ret != MEDIA_CONTENT_ERROR_NONE) { - content_error("_media_db_get_storage_id_by_media_id failed : %d", ret); - g_free(path); - return ret; - } - - ret = media_svc_delete_item_by_path(_content_get_db_handle(), storage_id, path, _content_get_uid()); + ret = media_svc_delete_item_by_path(_content_get_db_handle(), path, _content_get_uid()); g_free(path); - g_free(storage_id); return _content_error_capi(ret); } @@ -1204,7 +1195,7 @@ int media_info_update_to_db(media_info_h media) content_retip_if_fail(STRING_VALID(_media->media_id)); #ifdef _USE_TVPD_MODE - sql = sqlite3_mprintf("UPDATE %Q SET played_count=%d, last_played_time=%d, last_played_position=%d, media_favourite=%d WHERE media_id=%Q", _media->storage_uuid, _media->played_count, _media->played_time, _media->played_position, _media->favourite, _media->media_id); + sql = sqlite3_mprintf("UPDATE %q SET played_count=%d, last_played_time=%d, last_played_position=%d, media_favourite=%d WHERE media_id=%Q", DB_TABLE_MEDIA, _media->played_count, _media->played_time, _media->played_position, _media->favourite, _media->media_id); #else sql = sqlite3_mprintf("UPDATE %q SET media_favourite=%d WHERE media_id=%Q", DB_TABLE_MEDIA, _media->favourite, _media->media_id); #endif -- 2.7.4