X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=include_product%2Fmedia_info_private.h;h=939cc9c9b3358c37063e51065e54a9176f7acd37;hb=59af7cc1b17ec5b5d52aec4a274c4d8bd1226045;hp=6abf6db5f6dc70eb1637a70e4a4c0bda916ac79d;hpb=f6e8766bf9da7039fd3b54459420e28bc3d10c75;p=platform%2Fcore%2Fapi%2Fmedia-content.git

diff --git a/include_product/media_info_private.h b/include_product/media_info_private.h
index 6abf6db..939cc9c 100644
--- a/include_product/media_info_private.h
+++ b/include_product/media_info_private.h
@@ -90,7 +90,6 @@ typedef enum {
 	MEDIA_INFO_RATING,
 	MEDIA_INFO_FAVOURITE,
 	MEDIA_INFO_IS_DRM,
-	MEDIA_INFO_STORAGE_TYPE,
 	MEDIA_INFO_LONGITUDE,
 	MEDIA_INFO_LATITUDE,
 	MEDIA_INFO_ALTITUDE,
@@ -175,7 +174,6 @@ typedef struct {
 	char *folder_id;
 	char *path;
 	char *name;
-	ms_user_storage_type_e storage_type;
 	char *storage_uuid;
 } media_folder_s;
 
@@ -282,7 +280,6 @@ typedef struct {
 	time_t favourite;
 	char *title;
 	int is_drm;
-	int storage_type;
 	int played_count;
 	time_t played_time;
 	int played_position;
@@ -392,11 +389,6 @@ typedef struct {
 } media_uhd_s;
 
 typedef struct {
-	void *user_data;
-	media_face_detection_completed_cb face_completed_cb;
-} media_face_cb_s;
-
-typedef struct {
 	media_insert_completed_cb insert_completed_cb;
 	char *insert_list_path;
 	void *user_data;
@@ -532,7 +524,7 @@ typedef struct _media_content_scan_cb_data_v2 {
 #define SELECT_ALBUM_LIST			"SELECT DISTINCT album_id, name, artist, album_art FROM "ALBUM_MEDIA_JOIN
 #define SELECT_MEDIA_GROUP_LIST	"SELECT DISTINCT %s FROM '%s' WHERE validity=1 "
 
-#define SELECT_FOLDER_LIST			"SELECT DISTINCT folder_id, folder_path, folder_name, folder_storage_type, storage_uuid FROM "FOLDER_MEDIA_JOIN
+#define SELECT_FOLDER_LIST			"SELECT DISTINCT folder_id, folder_path, folder_name, storage_uuid FROM "FOLDER_MEDIA_JOIN
 #define SELECT_FOLDER_LIST_BY_STORAGE_ID	SELECT_FOLDER_LIST"AND storage_uuid='%s' "
 #define SELECT_TAG_LIST				"SELECT DISTINCT tag_id, tag_name FROM "DB_VIEW_TAG" WHERE 1 "
 #define SELECT_PLAYLIST_LIST			"SELECT DISTINCT playlist_id, playlist_name, p_thumbnail_path FROM "DB_VIEW_PLAYLIST" WHERE 1 "
@@ -560,7 +552,7 @@ typedef struct _media_content_scan_cb_data_v2 {
 
 /* Get Group Info by Group ID*/
 #define SELECT_ALBUM_FROM_ALBUM		"SELECT name, artist, album_art FROM "DB_TABLE_ALBUM" WHERE album_id=%d"
-#define SELECT_FOLDER_FROM_FOLDER		"SELECT folder_path, folder_name, folder_storage_type, storage_uuid FROM "DB_TABLE_FOLDER" WHERE folder_id='%s'"
+#define SELECT_FOLDER_FROM_FOLDER		"SELECT folder_path, folder_name, storage_uuid FROM "DB_TABLE_FOLDER" WHERE folder_id='%s'"
 #define SELECT_PLAYLIST_FROM_PLAYLIST	"SELECT playlist_name, thumbnail_path FROM "DB_TABLE_PLAYLIST" WHERE playlist_id=%d"
 #define SELECT_TAG_FROM_TAG			"SELECT tag_name FROM "DB_TABLE_TAG" WHERE tag_id=%d"
 #define SELECT_TAG_BY_NAME				"SELECT tag_id FROM "DB_TABLE_TAG" WHERE tag_name='%q'"
@@ -574,7 +566,7 @@ typedef struct _media_content_scan_cb_data_v2 {
 
 /* Get Media list of Group */
 #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, \
+							media_rating, media_favourite, media_is_drm, 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"
@@ -620,8 +612,8 @@ typedef struct _media_content_scan_cb_data_v2 {
 
 /* Storage*/
 #define SELECT_STORAGE_COUNT				"SELECT COUNT(*) FROM "DB_TABLE_STORAGE" WHERE validity=1"
-#define SELECT_STORAGE_LIST					"SELECT storage_id, storage_path, storage_type FROM "DB_TABLE_STORAGE" WHERE validity=1"
-#define SELECT_STORAGE_INFO_FROM_STORAGE	"SELECT storage_path, storage_type FROM "DB_TABLE_STORAGE" WHERE validity=1 AND storage_id='%s'"
+#define SELECT_STORAGE_LIST					"SELECT storage_id, storage_path FROM "DB_TABLE_STORAGE" WHERE validity=1"
+#define SELECT_STORAGE_INFO_FROM_STORAGE	"SELECT storage_path FROM "DB_TABLE_STORAGE" WHERE validity=1 AND storage_id='%s'"
 
 /* Face */
 #define DELETE_FACE_FROM_FACE			"DELETE FROM "DB_TABLE_FACE" WHERE media_face_id=%d"
@@ -714,7 +706,7 @@ void _media_pvr_item_get_detail(sqlite3_stmt* stmt, media_pvr_h pvr);
 int _media_db_get_pvr_group_item(const char *group_name, filter_h filter, media_group_e group, media_pvr_cb callback, void *user_data);
 int _media_db_get_uhd(filter_h filter, media_uhd_cb callback, void *user_data);
 void _media_uhd_item_get_detail(sqlite3_stmt* stmt, media_uhd_h uhd);
-
+int _media_db_get_storage(filter_h filter, media_storage_cb callback, void *user_data);
 int _media_filter_build_condition(bool is_full, const char *condition, media_content_collation_e collate_type, char **result);
 int _media_filter_build_option(filter_h filter, char **result);