Sync header to product (fix build error on product branch) 62/133662/1 accepted/tizen/unified/20170613.194431 submit/tizen/20170613.051142
authorJiyong Min <jiyong.min@samsung.com>
Tue, 13 Jun 2017 05:07:03 +0000 (14:07 +0900)
committerJiyong Min <jiyong.min@samsung.com>
Tue, 13 Jun 2017 05:08:41 +0000 (14:08 +0900)
Change-Id: I69a2efd7c4102c92217965c0c79362355965ea3b
Signed-off-by: jiyong min <jiyong.min@samsung.com>
include_product/media_info_private.h
packaging/capi-content-media-content.spec

index 1f6722c..18458b4 100755 (executable)
@@ -176,6 +176,7 @@ typedef enum {
        MEDIA_GROUP_TAG_BY_MEDIA_ID,
        MEDIA_GROUP_BOOKMARK_BY_MEDIA_ID,
        MEDIA_GROUP_STORAGE,
+       MEDIA_GROUP_FACE,
        MEDIA_GROUP_FACE_BY_MEDIA_ID,
        MEDIA_GROUP_PVR,
        MEDIA_GROUP_UHD,
@@ -514,6 +515,7 @@ typedef struct _media_content_scan_cb_data_v2 {
 #define DB_TABLE_ALIAS_TAG                             "t"
 #define DB_TABLE_ALIAS_BOOKMARK                "b"
 #define DB_TABLE_ALIAS_ALBUM                   "a"
+#define DB_TABLE_ALIAS_FACE                            "fa"
 
 /* DB field for media */
 #define DB_FIELD_MEDIA_ID                                      "media_uuid"
@@ -781,6 +783,7 @@ typedef struct _media_content_scan_cb_data_v2 {
 /* Bookmark */
 #define INSERT_BOOKMARK_TO_BOOKMARK                    "INSERT INTO "DB_TABLE_BOOKMARK" (media_uuid, marked_time, thumbnail_path, name) VALUES ('%q', '%d', %Q, %Q)"
 #define SELECT_BOOKMARK_COUNT_BY_MEDIA_ID              "SELECT COUNT(*) FROM "BOOKMARK_MEDIA_JOIN" AND b.media_uuid='%s'"
+#define SELECT_BOOKMARK_LIST                                           "SELECT b.bookmark_id, b.media_uuid, b.marked_time, b.thumbnail_path, b.name FROM "BOOKMARK_MEDIA_JOIN
 #define SELECT_BOOKMARK_LIST_BY_MEDIA_ID                       "SELECT b.bookmark_id, b.media_uuid, b.marked_time, b.thumbnail_path, b.name FROM "BOOKMARK_MEDIA_JOIN" AND b.media_uuid='%s'"
 #define SELECT_BOOKMARK_ID_FROM_BOOKMARK               "SELECT bookmark_id FROM "DB_TABLE_BOOKMARK" WHERE media_uuid='%s' AND marked_time=%d"
 
@@ -826,7 +829,9 @@ typedef struct _media_content_scan_cb_data_v2 {
 #define INSERT_FACE_TO_FACE                            "INSERT INTO "DB_TABLE_FACE" (face_uuid, media_uuid, face_rect_x , face_rect_y, face_rect_w, face_rect_h, orientation, face_tag) VALUES ('%q', '%q', %d, %d, %d, %d, %d, %Q);"
 #define UPDATE_FACE_TO_FACE                    "UPDATE "DB_TABLE_FACE" SET face_rect_x=%d, face_rect_y=%d, face_rect_w=%d, face_rect_h=%d, orientation=%d, face_tag=%Q WHERE face_uuid='%q'"
 #define SELECT_MEDIA_COUNT_FROM_MEDIA_BY_ID            "SELECT COUNT(*) FROM "DB_TABLE_MEDIA_VIEW" WHERE media_uuid='%q' AND validity=1"
+#define SELECT_FACE_COUNT                                      "SELECT COUNT(*) FROM "FACE_MEDIA_JOIN
 #define SELECT_FACE_COUNT_BY_MEDIA_ID          "SELECT COUNT(*) FROM "FACE_MEDIA_JOIN" AND fa.media_uuid='%s'"
+#define SELECT_FACE_LIST                                               "SELECT fa.face_uuid, fa.media_uuid, fa.face_rect_x, fa.face_rect_y, fa.face_rect_w, fa.face_rect_h, fa.orientation, fa.face_tag FROM "FACE_MEDIA_JOIN
 #define SELECT_FACE_LIST_BY_MEDIA_ID           "SELECT fa.face_uuid, fa.media_uuid, fa.face_rect_x, fa.face_rect_y, fa.face_rect_w, fa.face_rect_h, fa.orientation, fa.face_tag FROM "FACE_MEDIA_JOIN" AND fa.media_uuid='%s'"
 #define SELECT_FACE_PATH_FROM_MEDIA            "SELECT path FROM "DB_TABLE_MEDIA_VIEW" media_uuid='%s'"
 
index 0c6d02b..616bdfa 100755 (executable)
@@ -1,6 +1,6 @@
 Name:       capi-content-media-content
 Summary:    A Media content library in Tizen Native API
-Version:    0.3.13
+Version:    0.3.14
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0