From 021f44d78a3335e9f2ed2bf7e04387b52ea0d18c Mon Sep 17 00:00:00 2001 From: Minje Ahn Date: Wed, 5 Mar 2025 08:54:09 +0900 Subject: [PATCH] Remove unused parameter Change-Id: I1742928096e1549b4c6c37a725d4afa3cb453931 Signed-off-by: Minje Ahn --- src/media_book.c | 2 +- src/media_content.c | 195 +++++++++++++++++++++----------------------- 2 files changed, 96 insertions(+), 101 deletions(-) diff --git a/src/media_book.c b/src/media_book.c index 9fab1c9..e0d0e91 100644 --- a/src/media_book.c +++ b/src/media_book.c @@ -128,7 +128,7 @@ int book_meta_get_path_with_keyword(const char *keyword, char ***path_list, unsi content_retip_if_fail(path_list); content_retip_if_fail(len); - ret = media_svc_get_book_by_keyword(_content_get_db_handle(), keyword, _content_get_uid(), &book_list); + ret = media_svc_get_book_by_keyword(_content_get_db_handle(), keyword, &book_list); content_retv_if(ret != MS_MEDIA_ERR_NONE, _content_error_capi(ret)); result_len = g_list_length(book_list); diff --git a/src/media_content.c b/src/media_content.c index 4352b62..c1db035 100644 --- a/src/media_content.c +++ b/src/media_content.c @@ -261,38 +261,6 @@ static void __media_content_scan_cb(media_request_result_s *result, void *user_d #endif } -#ifdef _USE_TVPD_MODE -static void __media_content_scan_cb_v2(media_request_result_s* result, void *user_data) -{ - int err = _content_error_capi(result->result); - media_content_scan_cb_data_v2 *cb_data = user_data; - media_content_complete_phase_e complete_phase = -1; - if (!cb_data) - content_debug("cb_data is NULL"); - - content_debug("result is %d", err); - - if (result->request_type == MEDIA_REQUEST_SCAN_PARTIAL) - complete_phase = MEDIA_CONTENT_SCAN_PARTIAL_COMPLETE; - else if (result->request_type == MEDIA_REQUEST_SCAN_COMPLETE) - complete_phase = MEDIA_CONTENT_SCAN_COMPLETE; - else if (result->request_type == MEDIA_REQUEST_EXTRACT_COMPLETE) - complete_phase = MEDIA_CONTENT_EXTRACT_COMPLETE; - else if (result->request_type == MEDIA_RECURSIVE_START) - complete_phase = MEDIA_CONTENT_RECURSIVE_START; - - if (cb_data && cb_data->callback) - cb_data->callback(err, complete_phase, cb_data->user_data); - else - content_debug("run error"); - - if ((result->request_type != MEDIA_REQUEST_SCAN_COMPLETE) && - (result->request_type != MEDIA_REQUEST_SCAN_PARTIAL) && - (result->request_type != MEDIA_RECURSIVE_START)) - g_free(cb_data); -} -#endif - int media_content_scan_folder(const char *path, bool is_recursive, media_scan_completed_cb callback, void *user_data) { int ret = MEDIA_CONTENT_ERROR_NONE; @@ -334,7 +302,102 @@ int media_content_scan_folder(const char *path, bool is_recursive, media_scan_co return _content_error_capi(ret); } +int media_content_cancel_scan_folder(const char *path) +{ + int ret = MEDIA_CONTENT_ERROR_NONE; + + content_retip_if_fail(STRING_VALID(path)); + + ret = media_directory_scanning_cancel(path, _content_get_uid()); + if (ret != MS_MEDIA_ERR_NONE) + content_error("media_directory_scanning_cancel failed : %d", ret); + + return _content_error_capi(ret); +} + +void _media_content_db_update_noti_cb(int pid, + media_item_type_e item, + media_item_update_type_e update_type, + char* path, + char* uuid, + int content_type, + char *mime_type, + void *user_data) +{ + media_noti_cb_s *_noti_info = (media_noti_cb_s *)user_data; + + if (_noti_info && _noti_info->update_noti_cb) + _noti_info->update_noti_cb( + MEDIA_CONTENT_ERROR_NONE, + pid, + item, + update_type, + content_type, + uuid, + path, + mime_type, + _noti_info->user_data); +} + +int media_content_add_db_updated_cb(media_content_db_update_cb callback, void *user_data, media_content_noti_h *noti_handle) +{ + int ret = MEDIA_CONTENT_ERROR_NONE; + media_noti_cb_s *noti_info = NULL; + + content_retip_if_fail(callback); + content_retip_if_fail(noti_handle); + + noti_info = g_new0(media_noti_cb_s, 1); + + noti_info->update_noti_cb = callback; + noti_info->user_data = user_data; + + ret = media_db_update_subscribe((MediaNotiHandle*)noti_handle, _media_content_db_update_noti_cb, (void *)noti_info); + if (ret != MS_MEDIA_ERR_NONE) + g_free(noti_info); + + return _content_error_capi(ret); +} + +int media_content_remove_db_updated_cb(media_content_noti_h noti_handle) +{ + int ret = MEDIA_CONTENT_ERROR_NONE; + + ret = media_db_update_unsubscribe((MediaNotiHandle)noti_handle); + + return _content_error_capi(ret); +} #ifdef _USE_TVPD_MODE +static void __media_content_scan_cb_v2(media_request_result_s* result, void *user_data) +{ + int err = _content_error_capi(result->result); + media_content_scan_cb_data_v2 *cb_data = user_data; + media_content_complete_phase_e complete_phase = -1; + if (!cb_data) + content_debug("cb_data is NULL"); + + content_debug("result is %d", err); + + if (result->request_type == MEDIA_REQUEST_SCAN_PARTIAL) + complete_phase = MEDIA_CONTENT_SCAN_PARTIAL_COMPLETE; + else if (result->request_type == MEDIA_REQUEST_SCAN_COMPLETE) + complete_phase = MEDIA_CONTENT_SCAN_COMPLETE; + else if (result->request_type == MEDIA_REQUEST_EXTRACT_COMPLETE) + complete_phase = MEDIA_CONTENT_EXTRACT_COMPLETE; + else if (result->request_type == MEDIA_RECURSIVE_START) + complete_phase = MEDIA_CONTENT_RECURSIVE_START; + + if (cb_data && cb_data->callback) + cb_data->callback(err, complete_phase, cb_data->user_data); + else + content_debug("run error"); + + if ((result->request_type != MEDIA_REQUEST_SCAN_COMPLETE) && + (result->request_type != MEDIA_REQUEST_SCAN_PARTIAL) && + (result->request_type != MEDIA_RECURSIVE_START)) + g_free(cb_data); +} + bool _is_mounted(const char *dir_path) { bool ret = false; @@ -405,75 +468,7 @@ int media_content_scan_folder_v2(const char *path, bool is_recursive, media_scan return _content_error_capi(ret); } -#endif - -int media_content_cancel_scan_folder(const char *path) -{ - int ret = MEDIA_CONTENT_ERROR_NONE; - - content_retip_if_fail(STRING_VALID(path)); - - ret = media_directory_scanning_cancel(path, _content_get_uid()); - if (ret != MS_MEDIA_ERR_NONE) - content_error("media_directory_scanning_cancel failed : %d", ret); - - return _content_error_capi(ret); -} -void _media_content_db_update_noti_cb(int pid, - media_item_type_e item, - media_item_update_type_e update_type, - char* path, - char* uuid, - int content_type, - char *mime_type, - void *user_data) -{ - media_noti_cb_s *_noti_info = (media_noti_cb_s *)user_data; - - if (_noti_info && _noti_info->update_noti_cb) - _noti_info->update_noti_cb( - MEDIA_CONTENT_ERROR_NONE, - pid, - item, - update_type, - content_type, - uuid, - path, - mime_type, - _noti_info->user_data); -} - -int media_content_add_db_updated_cb(media_content_db_update_cb callback, void *user_data, media_content_noti_h *noti_handle) -{ - int ret = MEDIA_CONTENT_ERROR_NONE; - media_noti_cb_s *noti_info = NULL; - - content_retip_if_fail(callback); - content_retip_if_fail(noti_handle); - - noti_info = g_new0(media_noti_cb_s, 1); - - noti_info->update_noti_cb = callback; - noti_info->user_data = user_data; - - ret = media_db_update_subscribe((MediaNotiHandle*)noti_handle, _media_content_db_update_noti_cb, (void *)noti_info); - if (ret != MS_MEDIA_ERR_NONE) - g_free(noti_info); - - return _content_error_capi(ret); -} - -int media_content_remove_db_updated_cb(media_content_noti_h noti_handle) -{ - int ret = MEDIA_CONTENT_ERROR_NONE; - - ret = media_db_update_unsubscribe((MediaNotiHandle)noti_handle); - - return _content_error_capi(ret); -} - -#ifdef _USE_TVPD_MODE GMutex* _content_get_db_mutex(void) { return &db_mutex; -- 2.34.1