Removing deprecated apis

Change-Id: I4432e042c0125603c1e539b9bfbbbbd883e1243c
Signed-off-by: Shubhojeet <shubhojeet.y@samsung.com>

diff --git a/inc/data/gl-data.h b/inc/data/gl-data.h
index 55a04f3..2908859 100644 (file)
--- a/inc/data/gl-data.h
+++ b/inc/data/gl-data.h
@@ -68,7 +68,6 @@ extern "C" {
        bool _gl_data_is_screenshot_album(const char *match_folder,
                                                                          gl_album_s * album);
        bool _gl_data_is_camera_album(gl_album_s * album);
-       int _gl_data_delete_media(void *data, gl_media_s * media_item);
        int _gl_data_create_thumb(gl_media_s * item,
                                                          media_thumbnail_completed_cb callback,
                                                          void *user_data);

diff --git a/inc/util/gl-util.h b/inc/util/gl-util.h
index f8c6739..12ec125 100644 (file)
--- a/inc/util/gl-util.h
+++ b/inc/util/gl-util.h
@@ -216,7 +216,7 @@ extern "C" {
        char *_gl_get_camera_folder_path_external(void);
        char *_gl_get_downloads_folder_path(void);
        void _gl_get_total_space_required(void *data,
-                                                                         unsigned long long *total_space);
+                                                                         long int *total_space);
        void _gl_set_app_data(void *ad);
        void *_gl_get_app_data();
        int _gl_albums_set_current(void *data, gl_cluster * current);

diff --git a/src/2dview/gl-thumbs.c b/src/2dview/gl-thumbs.c
index 9a02022..db5428a 100644 (file)
--- a/src/2dview/gl-thumbs.c
+++ b/src/2dview/gl-thumbs.c
@@ -635,7 +635,6 @@ static bool __gl_thumbs_create_items(void *data, Evas_Object * parent)
        int i = 0;
        int item_cnt = 0;
        gl_item *gitem = NULL;
-       int ret = -1;
        char *burstshot_id = NULL;
        /* Get all medias count of current album */
        Eina_List *media_elist = NULL;
@@ -669,10 +668,6 @@ static bool __gl_thumbs_create_items(void *data, Evas_Object * parent)
 
                if (!gitem->item->file_url) {
                        gl_dbg("file_url is invalid.");
-                       ret = _gl_data_delete_media(ad, gitem->item);
-                       if (ret != 0) {
-                               continue;
-                       }
                        _gl_data_selected_list_remove(ad, gitem);
                        media_elist = eina_list_remove(media_elist, gitem);
                        _gl_thumbs_set_list(data, media_elist);
@@ -835,7 +830,6 @@ static int __gl_thumbs_idler_append_items(void *data)
 
                if (!gitem->item->file_url) {
                        gl_dbg("file_url is invalid.");
-                       _gl_data_delete_media(ad, gitem->item);
                        _gl_data_selected_list_remove(ad, gitem);
                        media_elist = eina_list_remove(media_elist, gitem);
                        _gl_thumbs_set_list(data, media_elist);

diff --git a/src/2dview/gl-timeline.c b/src/2dview/gl-timeline.c
index 9d11d07..3d72d83 100644 (file)
--- a/src/2dview/gl-timeline.c
+++ b/src/2dview/gl-timeline.c
@@ -2330,9 +2330,9 @@ int __gl_timeline_move_copy(void *data)
                                GL_DEVICE_MEMORY_FULL);
                goto GL_FAILED;
        }
-       unsigned long long total_space = 0;
+       long int total_space = 0;
        _gl_get_total_space_required(ad, &total_space);
-       gl_dbgW("Total space required is : %lld .", total_space);
+       gl_dbgW("Total space required is : %ld .", total_space);
        if (total_space > free_size) {
                gl_dbgW("Low memory.");
                gl_popup_create_popup(ad, GL_POPUP_ALBUM_MEMORY_FULL,

diff --git a/src/data/gl-data.c b/src/data/gl-data.c
index 2e84730..3da9d89 100644 (file)
--- a/src/data/gl-data.c
+++ b/src/data/gl-data.c
@@ -1236,10 +1236,10 @@ int _gl_data_delete_file(char *path, char *uuid, bool is_hide)
        }
 
        /* Delete record from DB then delete media from file system */
-       ret = media_info_delete_from_db(uuid);
+       ret = media_content_scan_file(path);
 
        if (ret != 0) {
-               gl_dbgE("media_info_delete_from_db failed[%d]!", ret);
+               gl_dbgE("media_content_scan_file failed[%d]!", ret);
                return -1;
        }
 
@@ -1727,17 +1727,6 @@ int _gl_data_finalize(void *data)
        return err;
 }
 
-/**
- * Delete the media from media database
- * @param data : App data
- * @param media_item : media item data
- * @return
- */
-int _gl_data_delete_media(void *data, gl_media_s * media_item)
-{
-       GL_CHECK_VAL(media_item, -1);
-       return media_info_delete_from_db(media_item->uuid);
-}
 
 /**
  * Creates a thumbnail image for given the media, asynchronously

diff --git a/src/data/gl-local-data.c b/src/data/gl-local-data.c
index 07a0a55..4daea04 100644 (file)
--- a/src/data/gl-local-data.c
+++ b/src/data/gl-local-data.c
@@ -1096,7 +1096,7 @@ int _gl_local_data_delete_album(gl_album_s * cluster, void *cb, void *data,
                        gl_dbgE("file_unlink failed!");
                }
                if (!is_hide) {
-                       media_info_delete_from_db(item->uuid);
+                       media_content_scan_file(item->file_url);
                        if (cb) {
                                int (*delete_cb) (void *data, char *uuid);
                                delete_cb = cb;

diff --git a/src/util/gl-util.c b/src/util/gl-util.c
index 455ba63..0045e3b 100644 (file)
--- a/src/util/gl-util.c
+++ b/src/util/gl-util.c
@@ -1208,9 +1208,9 @@ int _gl_del_media_by_id(void *data, const char *uuid)
        }
 
        /* Delete record from DB then delete media from file system */
-       ret = media_info_delete_from_db(uuid);
+       ret = media_content_scan_file(path);
        if (ret != MEDIA_CONTENT_ERROR_NONE) {
-               gl_dbgE("media_info_delete_from_db failed[%d]!", ret);
+               gl_dbgE("media_content_scan_file failed[%d]!", ret);
                goto DEL_MEDIA_BY_ID_FAILED;
        }
 
@@ -1621,15 +1621,14 @@ static int __gl_update_move_copy_view(void *data)
  *
  * @param path
  */
-unsigned long long _gl_get_file_storage_space_required(char *path)
+long int _gl_get_file_storage_space_required(char *path)
 {
        struct stat info;
        if (stat(path, &info)) {
                gl_dbgE("Fail to stat item : %s", path);
                return 0;
        }
-       unsigned long long size = (unsigned long long) info.st_size;
-       return size;
+       return info.st_size;
 }
 
 /**
@@ -1638,7 +1637,7 @@ unsigned long long _gl_get_file_storage_space_required(char *path)
  * @param total_space
  */
 void _gl_get_total_space_required(void *data,
-                                                                 unsigned long long *total_space)
+                                                                 long int *total_space)
 {
        gl_appdata *ad = (gl_appdata *) data;
        int cnt = _gl_data_selected_list_count(ad);
@@ -1683,9 +1682,9 @@ int gl_move_copy_to_album(void *data)
                                                                  GL_DEVICE_MEMORY_FULL);
                        goto GL_FAILED;
                }
-               unsigned long long total_space = 0;
+               long int total_space = 0;
                _gl_get_total_space_required(ad, &total_space);
-               gl_dbgW("Total space required is : %lld .", total_space);
+               gl_dbgW("Total space required is : %ld .", total_space);
                if (total_space > free_size) {
                        gl_dbgW("Low memory.");
                        gl_popup_create_popup(ad, GL_POPUP_ALBUM_MEMORY_FULL,