Remove deprecated APIs

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

diff --git a/include/data/datamgr.h b/include/data/datamgr.h
index 3399381..a8085df 100644 (file)
--- a/include/data/datamgr.h
+++ b/include/data/datamgr.h
@@ -33,8 +33,8 @@ enum data_type {
 };
 
 enum source_type {
-       E_SOURCE_INTERNAL = MEDIA_CONTENT_STORAGE_INTERNAL,
-       E_SOURCE_EXTERNAL = MEDIA_CONTENT_STORAGE_EXTERNAL_USB,
+       E_SOURCE_INTERNAL = 0,
+       E_SOURCE_EXTERNAL = 2,
        E_SOURCE_ALL
 };
 

diff --git a/include/util/util.h b/include/util/util.h
index 34072d5..5401e81 100644 (file)
--- a/include/util/util.h
+++ b/include/util/util.h
@@ -44,9 +44,7 @@ int util_get_media_index(Eina_List *list, void *info);
 int util_get_media_index_from_id(Eina_List *list, const char *id);
 app_media *util_find_media_info(Eina_List *list, const char *id);
 void util_add_to_recent(Eina_List *list, int index);
-void util_create_thumbnail(Evas_Object *grid, app_media *am,
-                       void (*completed_cb)(media_content_error_e,
-                       const char *, void *));
+void util_create_thumbnail(Evas_Object *grid, app_media *am);
 Elm_Image_Orient util_get_orient(media_content_orientation_e orient);
 
 #endif /* __AIR_MEDIAHUB_UTIL_H__ */

diff --git a/src/grid/grid_gallery.c b/src/grid/grid_gallery.c
index c523251..cf177e6 100644 (file)
--- a/src/grid/grid_gallery.c
+++ b/src/grid/grid_gallery.c
@@ -31,6 +31,7 @@
 
 #define STR_PLACE_NAME "City"
 
+#if 0
 static void _create_thumbnail_completed_cb(media_content_error_e err,
                        const char *path, void *user_data)
 {
@@ -53,6 +54,7 @@ static void _create_thumbnail_completed_cb(media_content_error_e err,
 
        media_content_disconnect();
 }
+#endif
 
 static char *_media_text_get(void *data, Evas_Object *obj, const char *part)
 {
@@ -105,8 +107,7 @@ static Evas_Object *_media_content_get(void *data,
        eo = NULL;
        if (!strcmp(part, PART_ELM_SWALLOW_THUMBNAIL)) {
                if (!info->thumbnail_path) {
-                       util_create_thumbnail(obj, am,
-                               _create_thumbnail_completed_cb);
+                       util_create_thumbnail(obj, am);
                        return NULL;
                }
 

diff --git a/src/grid/grid_movie.c b/src/grid/grid_movie.c
index 520f228..914fb54 100644 (file)
--- a/src/grid/grid_movie.c
+++ b/src/grid/grid_movie.c
@@ -31,6 +31,7 @@
 
 #define STR_GENRE_NAME "Genre"
 
+#if 0
 static void _create_thumbnail_completed_cb(media_content_error_e err,
                        const char *path, void *user_data)
 {
@@ -53,6 +54,7 @@ static void _create_thumbnail_completed_cb(media_content_error_e err,
 
        media_content_disconnect();
 }
+#endif
 
 static char *_media_text_get(void *data, Evas_Object *obj, const char *part)
 {
@@ -95,8 +97,7 @@ static Evas_Object *_media_content_get(void *data, Evas_Object *obj,
        eo = NULL;
        if (!strcmp(part, PART_ELM_SWALLOW_THUMBNAIL)) {
                if (!info->thumbnail_path) {
-                       util_create_thumbnail(obj, am,
-                               _create_thumbnail_completed_cb);
+                       util_create_thumbnail(obj, am);
                        return NULL;
                }
 

diff --git a/src/util/util.c b/src/util/util.c
index 1810f85..0b80819 100644 (file)
--- a/src/util/util.c
+++ b/src/util/util.c
@@ -410,9 +410,7 @@ void util_add_to_recent(Eina_List *list, int index)
        app_media_update(am);
 }
 
-void util_create_thumbnail(Evas_Object *grid, app_media *am,
-                       void (*completed_cb)(media_content_error_e,
-                       const char *, void *))
+void util_create_thumbnail(Evas_Object *grid, app_media *am)
 {
        Eina_List *list;
        Elm_Object_Item *it;
@@ -426,8 +424,7 @@ void util_create_thumbnail(Evas_Object *grid, app_media *am,
        while (index--)
                it = elm_gengrid_item_next_get(it);
 
-       r = media_info_create_thumbnail(app_media_get_media_handle(am),
-                               completed_cb, it);
+       r = media_info_generate_thumbnail(app_media_get_media_handle(am));
        if (r != MEDIA_CONTENT_ERROR_NONE)
                _ERR("failed to create thumbnail");
 }