Change the code inside of deprecated APIs

The functions below have been deprecated since 5.0:
 - media_info_create_thumbnail()
 - media_info_cancel_thumbnail()

Before completely removing the internal code, modified some of the code to maintain the behavior.

Change-Id: If3a87a28c98a68f5df2263a5ddce4788cfa68b1d
Signed-off-by: minje.ahn <minje.ahn@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 504ea53..a36aec6 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,7 +12,7 @@ ELSE()
 ENDIF(TIZEN_PRODUCT_TV)
 INCLUDE_DIRECTORIES(${INC_DIR})
 
-SET(dependents "dlog libmedia-service media-thumbnail libmedia-utils capi-base-common capi-system-info vconf storage sqlite3")
+SET(dependents "dlog libmedia-service libmedia-utils capi-base-common capi-system-info vconf storage sqlite3")
 SET(pc_dependents "capi-base-common")
 
 INCLUDE(FindPkgConfig)

diff --git a/packaging/capi-content-media-content.spec b/packaging/capi-content-media-content.spec
index fe05f32..3ef5ee6 100644 (file)
--- 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.18
+Version:    0.4.19
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0
@@ -11,7 +11,6 @@ BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(capi-base-common)
 BuildRequires:  pkgconfig(capi-system-info)
 BuildRequires:  pkgconfig(libmedia-service)
-BuildRequires:  pkgconfig(media-thumbnail)
 BuildRequires:  pkgconfig(libmedia-utils)
 BuildRequires:  pkgconfig(vconf)
 BuildRequires:  pkgconfig(libtzplatform-config)

diff --git a/src/media_info.c b/src/media_info.c
index 1d4b48f..5210aa3 100644 (file)
--- a/src/media_info.c
+++ b/src/media_info.c
@@ -15,14 +15,12 @@
 */
 
 #include <media_info.h>
-#include <media-thumbnail.h>
 #include <media-util-dcm.h>
 #include <media_info_private.h>
 #include <media_util_private.h>
 #include <system_info.h>
 
 static void __media_info_insert_completed_cb(media_request_result_s *result, void *user_data);
-static void __media_info_thumbnail_completed_cb(int error, const char *path, void *user_data);
 static void __media_info_face_completed_cb(int error, const int face_count, void *user_data);
 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);
@@ -80,36 +78,6 @@ static void __media_info_insert_completed_cb(media_request_result_s *result, voi
        return;
 }
 
-static void __media_info_thumbnail_completed_cb(int error, const char *path, void *user_data)
-{
-       int error_value = MEDIA_CONTENT_ERROR_NONE;
-
-       media_thumbnail_cb_s *_thumb_cb = (media_thumbnail_cb_s *)user_data;
-       media_info_s *media = NULL;
-
-       if (_thumb_cb != NULL) {
-               media = _thumb_cb->handle;
-
-               if (media != NULL) {
-                       g_free(media->thumbnail_path);
-
-                       if (STRING_VALID(path))
-                               media->thumbnail_path = g_strdup(path);
-                       else
-                               media->thumbnail_path = g_strdup(MEDIA_CONTENT_EMPTY_STRING);
-               }
-
-               content_debug("error [%d], thumbnail_path [%s]", error, path);
-               error_value = _content_error_capi(error);
-               if (_thumb_cb->thumbnail_completed_cb)
-                       _thumb_cb->thumbnail_completed_cb(error_value, path, _thumb_cb->user_data);
-       }
-
-       g_free(_thumb_cb);
-
-       return;
-}
-
 static bool __media_info_isFaceRecognition_feature_supported(void)
 {
        bool isFaceRecognitionSupported = false;
@@ -1469,27 +1437,17 @@ int media_info_create_thumbnail(media_info_h media, media_thumbnail_completed_cb
 {
        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;
-       static unsigned int req_id = 0;
        media_info_s *_media = (media_info_s*)media;
 
        content_retip_if_fail(media);
        content_retip_if_fail(callback);
-       content_retip_if_fail(STRING_VALID(_media->media_id));
-       content_retip_if_fail(_media->file_path);
-
-       media_thumbnail_cb_s *_thumb_cb = g_new0(media_thumbnail_cb_s, 1);
-
-       req_id++;
-       _media->request_id = req_id;
 
-       _thumb_cb->handle = _media;
-       _thumb_cb->user_data = user_data;
-       _thumb_cb->thumbnail_completed_cb = callback;
+       ret = media_info_generate_thumbnail(media);
+       content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE && ret != MEDIA_CONTENT_ERROR_UNSUPPORTED_CONTENT, ret);
 
-       ret = thumbnail_request_from_db_async(_media->request_id, _media->file_path, (ThumbFunc)__media_info_thumbnail_completed_cb, (void *)_thumb_cb, _content_get_uid());
-       ret = _content_error_capi(ret);
+       callback(ret, _media->thumbnail_path, user_data);
 
-       return ret;
+       return MEDIA_CONTENT_ERROR_NONE;
 }
 
 int media_info_generate_thumbnail(media_info_h media)
@@ -1522,16 +1480,9 @@ int media_info_generate_thumbnail(media_info_h media)
 
 int media_info_cancel_thumbnail(media_info_h media)
 {
-       int ret = MEDIA_CONTENT_ERROR_NONE;
        content_warn("DEPRECATION WARNING: media_info_cancel_thumbnail() 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(STRING_VALID(_media->media_id));
-       content_retip_if_fail(_media->request_id > 0);
-
-       ret = thumbnail_request_cancel_media(_media->request_id);
-       return _content_error_capi(ret);
+       return MEDIA_CONTENT_ERROR_NONE;
 }
 
 int media_info_start_face_detection(media_info_h media, media_face_detection_completed_cb callback, void *user_data)