X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fmedia_info.c;h=f9084ab70225328496c4c580018da938a0ba8fbe;hb=05e80c08c239aebb3032abc9b015c6337dd5d55f;hp=5210aa33c475e35d6affa601910430bc276ff688;hpb=97c1b34b95e2b440ea679f7b474f6207571e10c5;p=platform%2Fcore%2Fapi%2Fmedia-content.git diff --git a/src/media_info.c b/src/media_info.c index 5210aa3..f9084ab 100644 --- a/src/media_info.c +++ b/src/media_info.c @@ -25,33 +25,6 @@ static void __media_info_face_completed_cb(int error, const int face_count, void static int __media_info_insert_batch(const char **path_array, unsigned int array_length, media_insert_completed_cb completed_cb, void *user_data); static int __media_info_check_file_validity(const char *path); -static int __media_info_get_media_path_by_id_from_db(const char *media_id, char **path) -{ - int ret = MEDIA_CONTENT_ERROR_NONE; - sqlite3_stmt *stmt = NULL; - char *select_query = NULL; - - content_retip_if_fail(STRING_VALID(media_id)); - - select_query = sqlite3_mprintf(SELECT_MEDIA_PATH_BY_ID, media_id); - - ret = _content_get_result(select_query, &stmt); - SQLITE3_SAFE_FREE(select_query); - content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); - - if (sqlite3_step(stmt) == SQLITE_ROW) { - *path = g_strdup((const char *)sqlite3_column_text(stmt, 0)); - } else { - content_error("There's no media with this ID : %s", media_id); - *path = NULL; - ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; - } - - SQLITE3_FINALIZE(stmt); - - return ret; -} - static void __media_info_insert_completed_cb(media_request_result_s *result, void *user_data) { int ret = MEDIA_CONTENT_ERROR_NONE; @@ -481,14 +454,39 @@ int media_info_get_media_info_by_path_from_db(const char* path, media_info_h* me return ret; } -#endif + +static int __media_info_get_media_path_by_id_from_db(const char *media_id, char **path) +{ + int ret = MEDIA_CONTENT_ERROR_NONE; + sqlite3_stmt *stmt = NULL; + char *select_query = NULL; + + content_retip_if_fail(STRING_VALID(media_id)); + + select_query = sqlite3_mprintf(SELECT_MEDIA_PATH_BY_ID, media_id); + + ret = _content_get_result(select_query, &stmt); + SQLITE3_SAFE_FREE(select_query); + content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); + + if (sqlite3_step(stmt) == SQLITE_ROW) { + *path = g_strdup((const char *)sqlite3_column_text(stmt, 0)); + } else { + content_error("There's no media with this ID : %s", media_id); + *path = NULL; + ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; + } + + SQLITE3_FINALIZE(stmt); + + return ret; +} int media_info_delete_from_db(const char *media_id) { int ret = MEDIA_CONTENT_ERROR_NONE; char *path = NULL; char *storage_id = NULL; - content_warn("DEPRECATION WARNING: media_info_delete_from_db() is deprecated and will be removed from next release. Use media_content_scan_file() instead."); content_retip_if_fail(STRING_VALID(media_id)); @@ -512,6 +510,7 @@ int media_info_delete_from_db(const char *media_id) return _content_error_capi(ret); } +#endif int media_info_destroy(media_info_h media) { @@ -1079,19 +1078,6 @@ int media_info_get_favorite(media_info_h media, bool* favorite) return MEDIA_CONTENT_ERROR_NONE; } -int media_info_get_storage_id(media_info_h media, char **storage_id) -{ - content_warn("DEPRECATION WARNING: media_info_get_storage_id() is deprecated and will be removed from next release."); - media_info_s *_media = (media_info_s*)media; - - content_retip_if_fail(media); - content_retip_if_fail(storage_id); - - *storage_id = g_strdup(_media->storage_uuid); - - return MEDIA_CONTENT_ERROR_NONE; -} - int media_info_is_drm(media_info_h media, bool *is_drm) { media_info_s *_media = (media_info_s*)media; @@ -1116,19 +1102,6 @@ int media_info_is_360_content(media_info_h media, bool *is_360) return MEDIA_CONTENT_ERROR_NONE; } -int media_info_get_storage_type(media_info_h media, media_content_storage_e *storage_type) -{ - content_warn("DEPRECATION WARNING: media_info_get_storage_type() is deprecated and will be removed from next release. Use storage_get_type_dev() instead."); - media_info_s *_media = (media_info_s*)media; - - content_retip_if_fail(media); - content_retip_if_fail(storage_type); - - *storage_type = _media->storage_type; - - return MEDIA_CONTENT_ERROR_NONE; -} - #ifdef _USE_TVPD_MODE int media_info_get_played_count(media_info_h media, int *played_count) { @@ -1433,23 +1406,6 @@ int media_info_move_to_db(media_info_h media, const char* dst_path) return ret; } -int media_info_create_thumbnail(media_info_h media, media_thumbnail_completed_cb callback, void *user_data) -{ - content_warn("DEPRECATION WARNING: media_info_create_thumbnail() is deprecated and will be removed from next release. Use media_info_generate_thumbnail() instead."); - int ret = MEDIA_CONTENT_ERROR_NONE; - media_info_s *_media = (media_info_s*)media; - - content_retip_if_fail(media); - content_retip_if_fail(callback); - - ret = media_info_generate_thumbnail(media); - content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE && ret != MEDIA_CONTENT_ERROR_UNSUPPORTED_CONTENT, ret); - - callback(ret, _media->thumbnail_path, user_data); - - return MEDIA_CONTENT_ERROR_NONE; -} - int media_info_generate_thumbnail(media_info_h media) { int ret = MEDIA_CONTENT_ERROR_NONE; @@ -1478,13 +1434,6 @@ int media_info_generate_thumbnail(media_info_h media) return ret; } -int media_info_cancel_thumbnail(media_info_h media) -{ - content_warn("DEPRECATION WARNING: media_info_cancel_thumbnail() is deprecated and will be removed from next release."); - content_retip_if_fail(media); - return MEDIA_CONTENT_ERROR_NONE; -} - int media_info_start_face_detection(media_info_h media, media_face_detection_completed_cb callback, void *user_data) { int ret = MEDIA_CONTENT_ERROR_NONE; @@ -1536,4 +1485,4 @@ int media_info_cancel_face_detection(media_info_h media) ret = dcm_request_cancel_face(_media->face_request_id); return _content_error_capi(ret); -} \ No newline at end of file +}