Merge "Fix bug when use media_info_move_to_db()" into tizen

[platform/core/api/media-content.git] / include_product / media_info_private.h

diff --git a/include_product/media_info_private.h b/include_product/media_info_private.h
old mode 100755 (executable)
new mode 100644 (file)
index 88bedc3..f874dc8
--- a/include_product/media_info_private.h
+++ b/include_product/media_info_private.h
@@ -75,8 +75,6 @@ extern "C" {
 #define MEDIA_CONTENT_UUID_SIZE        36
 #define BATCH_REQUEST_MAX 300
 
-#define EMPTY_STR ""
-
 typedef enum {
        MEDIA_INFO_UUID = 0,
        MEDIA_INFO_PATH,
@@ -127,20 +125,10 @@ typedef enum {
        MEDIA_INFO_STITCHED_INFO,
        MEDIA_INFO_EXTRACT_FLAG,
        MEDIA_INFO_MODIFIED_MONTH,
-#ifdef _USE_SENIOR_MODE
-       MEDIA_INFO_CONTACT,
-       MEDIA_INFO_APP_DATA,
-#endif
        MEDIA_INFO_ITEM_MAX,
 } media_info_item_e;
 
 typedef enum {
-       MEDIA_CONTENT_TYPE = 0,
-       MEDIA_THUMBNAIL_TYPE,
-       MEDIA_REGISTER_TYPE
-} media_info_error_type_e;
-
-typedef enum {
        MEDIA_TAG_ADD,
        MEDIA_TAG_REMOVE,
        MEDIA_TAG_UPDATE_TAG_NAME,
@@ -231,11 +219,6 @@ typedef struct {
        media_content_orientation_e orientation;
 } image_meta_s;
 
-typedef struct _image_mm_meta_s {
-       int width;
-       int height;
-} image_mm_meta_s;
-
 typedef struct {
        char *media_id;
        char *album;
@@ -302,10 +285,6 @@ typedef struct {
        int is_360;
        int stitched_info;
        int extract_flag;
-#ifdef _USE_SENIOR_MODE
-       char* contact;
-       char* app_data;
-#endif
        image_meta_s *image_meta;
        video_meta_s *video_meta;
        audio_meta_s *audio_meta;
@@ -490,10 +469,6 @@ typedef struct _media_content_scan_cb_data_v2 {
 #define DB_FIELD_MEDIA_MODIFIED_MONTH  "modified_month"
 #define DB_FIELD_MEDIA_MODIFIED_DATE   "modified_date"
 #define DB_FIELD_MEDIA_STITCHED_INFO                           "stitched_info"
-#ifdef _USE_SENIOR_MODE
-#define DB_FIELD_MEDIA_CONTACT                 "contact"
-#define DB_FIELD_MEDIA_APP_DATA                        "app_data"
-#endif
 
 /* DB field for PVR*/
 #define DB_FIELD_PVR_DURATION                                  "duration"
@@ -581,8 +556,8 @@ typedef struct _media_content_scan_cb_data_v2 {
 #define SELECT_MEDIA_COUNT_FROM_ALBUM                  "SELECT COUNT(*) FROM '%s' WHERE validity=1 AND album_id='%d'"
 #define SELECT_MEDIA_COUNT_FROM_GROUP                  "SELECT COUNT(*) FROM ("SELECT_MEDIA_FROM_GROUP         /*to apply limit condition. */
 #define SELECT_MEDIA_COUNT_FROM_GROUP_NULL             "SELECT COUNT(*) FROM ("SELECT_MEDIA_FROM_GROUP_NULL    /* to apply limit condition. */
-#define SELECT_MEDIA_COUNT_FROM_FOLDER                 "SELECT COUNT(*) FROM '%s' WHERE validity=1 AND folder_id='%q'"
-#define SELECT_MEDIA_COUNT_FROM_STORAGE                        "SELECT COUNT(*) FROM '%s' WHERE validity=1 AND storage_uuid='%q'"
+#define SELECT_MEDIA_COUNT_FROM_FOLDER                 "SELECT COUNT(*) FROM '%s' WHERE validity=1 AND folder_id='%s'"
+#define SELECT_MEDIA_COUNT_FROM_STORAGE                        "SELECT COUNT(*) FROM '%s' WHERE validity=1 AND storage_uuid='%s'"
 #define SELECT_MEDIA_COUNT_FROM_TAG                            "SELECT COUNT(*) FROM "DB_VIEW_TAG" WHERE (tag_id=%d AND tag_media_count>0) "
 #define SELECT_MEDIA_COUNT_FROM_PLAYLIST                       "SELECT COUNT(*) FROM "DB_VIEW_PLAYLIST" WHERE (playlist_id=%d and playlist_media_count>0) "
 
@@ -601,20 +576,11 @@ typedef struct _media_content_scan_cb_data_v2 {
 #define SELECT_TAG_LIST_BY_MEDIA_ID                            "SELECT tag_id, tag_name FROM "DB_VIEW_TAG" WHERE media_id = '%s' "
 
 /* Get Media list of Group */
-#ifdef _USE_SENIOR_MODE
-#define MEDIA_INFO_ITEM "media_id, media_path, media_display_name, media_type, media_mime_type, media_size, media_added_time, media_modified_time, media_thumbnail_path, media_description, \
-                                                       media_rating, media_favourite, media_is_drm, media_storage_type, media_longitude, media_latitude, media_altitude, exposure_time, fnumber, iso, \
-                                                       model, media_width, media_height, media_datetaken, media_orientation, media_title, media_album, media_artist, media_album_artist, media_genre, \
-                                                       media_composer, media_year, media_recorded_date, media_copyright, media_track_num, media_bitrate, media_bitpersample, media_duration, media_samplerate, media_channel, \
-                                                       media_timeline, storage_uuid, media_360, played_count, last_played_time, last_played_position, stitched_info, extract_flag, modified_date, contact, \
-                                                       app_data"
-#else
 #define MEDIA_INFO_ITEM "media_id, media_path, media_display_name, media_type, media_mime_type, media_size, media_added_time, media_modified_time, media_thumbnail_path, media_description, \
                                                        media_rating, media_favourite, media_is_drm, media_storage_type, media_longitude, media_latitude, media_altitude, exposure_time, fnumber, iso, \
                                                        model, media_width, media_height, media_datetaken, media_orientation, media_title, media_album, media_artist, media_album_artist, media_genre, \
                                                        media_composer, media_year, media_recorded_date, media_copyright, media_track_num, media_bitrate, media_bitpersample, media_duration, media_samplerate, media_channel, \
                                                        media_timeline, storage_uuid, media_360, played_count, last_played_time, last_played_position, stitched_info, extract_flag, modified_date"
-#endif
 
 /* Playlist Info */
 #define INSERT_PLAYLIST_TO_PLAYLIST                                            "INSERT INTO "DB_TABLE_PLAYLIST" (playlist_name) VALUES (%Q)"
@@ -746,10 +712,6 @@ int _media_db_get_group_item_count_by_id(int group_id, filter_h filter, group_li
 int _media_db_get_group_item_count(const char *group_name, filter_h filter, group_list_e group_type, int *item_count);
 int _media_db_get_group_item_by_id(int group_id, filter_h filter, media_info_cb callback, void *user_data, group_list_e group_type);
 int _media_db_get_group_item(const char *group_name, filter_h filter, media_info_cb callback, void *user_data, group_list_e group_type);
-#ifdef _USE_SENIOR_MODE
-int _content_query_prepare_by_union_select(sqlite3_stmt **stmt, char *select_query1, char *condition_query1, char *option_query1, char *select_query2, char *condition_query2, char *option_query2);
-int _media_db_get_group_item_by_union_select(const char *group_name, filter_h filter1, filter_h filter2, media_info_cb callback, void *user_data);
-#endif
 int _media_db_get_media_group_item_count(const char *group_name, filter_h filter, media_group_e group, int *item_count);
 int _media_db_get_media_group_item(const char *group_name, filter_h filter, media_group_e group, media_info_cb callback, void *user_data);
 int _media_db_get_storage(filter_h filter, media_storage_cb callback, void *user_data);
@@ -821,18 +783,10 @@ GMutex* _content_get_db_mutex(void);
                        LOGE(FONT_COLOR_RED"[%ld]"fmt""FONT_COLOR_RESET, media_content_gettid(), ##arg);     \
                } while (0)
 
-#define content_debug_func() do { \
-                       LOGD(FONT_COLOR_RESET"[%ld]", media_content_gettid());     \
-               } while (0)
-
 #define content_sec_debug(fmt, arg...) do { \
                        SECURE_LOGD(FONT_COLOR_CYAN"[%ld]"fmt""FONT_COLOR_RESET, media_content_gettid(), ##arg);     \
                } while (0)
 
-#define content_sec_warn(fmt, arg...) do { \
-                       SECURE_LOGW(FONT_COLOR_RED"[%ld]"fmt""FONT_COLOR_RESET, media_content_gettid(), ##arg);     \
-               } while (0)
-
 #define content_sec_error(fmt, arg...) do { \
                        SECURE_LOGE(FONT_COLOR_RED"[%ld]"fmt""FONT_COLOR_RESET, media_content_gettid(), ##arg);     \
                } while (0)