From c2a997fbdb118049acb00a3d2f4da498b93028da Mon Sep 17 00:00:00 2001 From: Haejeong Kim Date: Thu, 25 May 2017 19:16:42 +0900 Subject: [PATCH] Sync to Product code Change-Id: I8f137c9b436213bd34c6371f61a9786b07866f34 --- include_product/media_content_internal.h | 11 ++++++++++- include_product/media_content_type.h | 27 ++++++++++++++++++++++++++- include_product/media_info_private.h | 2 ++ include_product/media_tag.h | 2 +- 4 files changed, 39 insertions(+), 3 deletions(-) diff --git a/include_product/media_content_internal.h b/include_product/media_content_internal.h index 5e2e527..a3260ec 100755 --- a/include_product/media_content_internal.h +++ b/include_product/media_content_internal.h @@ -19,7 +19,7 @@ #ifndef __TIZEN_MEDIA_CONTENT_INTERNAL_H__ #define __TIZEN_MEDIA_CONTENT_INTERNAL_H__ -//#include +#include #ifdef __cplusplus extern "C" { @@ -32,6 +32,15 @@ extern "C" { * Operations include: inserting a new storage in media to the media database, removing storage from database, \n */ +/*Bookmark for C#*/ +int media_bookmark_create(const char *media_id, time_t time, media_bookmark_h *bookmark); +int media_bookmark_set_thumbnail_path(media_bookmark_h bookmark, const char *path); +int media_bookmark_insert_to_db_v2(media_bookmark_h bookmark); + +/*Playlist for C#*/ +int media_playlist_create(const char *name, media_playlist_h *playlist); +int media_playlist_insert_to_db_v2(media_playlist_h playlist); + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/include_product/media_content_type.h b/include_product/media_content_type.h index b5d8d7f..4c9ee02 100755 --- a/include_product/media_content_type.h +++ b/include_product/media_content_type.h @@ -1282,6 +1282,12 @@ typedef bool (*media_face_cb)(media_face_h face, void *user_data); /** * @brief You can use above define to set the condition of playlist filter and order keyword. + * @since_tizen 4.0 + */ +#define PLAYLIST_ID "PLAYLIST_ID" /**< Playlist id */ + +/** + * @brief You can use above define to set the condition of playlist filter and order keyword. * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif */ #define PLAYLIST_MEMBER_ORDER "PLAYLIST_MEMBER_ORDER" /**< Playlist name */ @@ -1306,6 +1312,13 @@ typedef bool (*media_face_cb)(media_face_h face, void *user_data); /** * @brief You can use above define to set the condition of tag filter and order keyword. + * @since_tizen 4.0 + */ +#define TAG_ID "TAG_ID" /**< Tag id */ + + +/** + * @brief You can use above define to set the condition of tag filter and order keyword. * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif */ #define TAG_MEDIA_COUNT "TAG_MEDIA_COUNT" /**< Media count in tag view */ @@ -1326,6 +1339,12 @@ typedef bool (*media_face_cb)(media_face_h face, void *user_data); * @brief You can use above define to set the condition of bookmark filter and order keyword. * @since_tizen 4.0 */ +#define BOOKMARK_ID "BOOKMARK_ID" /**< Bookmark id */ + +/** + * @brief You can use above define to set the condition of bookmark filter and order keyword. + * @since_tizen 4.0 + */ #define BOOKMARK_NAME "BOOKMARK_NAME" /**< Bookmark name */ /** @@ -1356,7 +1375,13 @@ typedef bool (*media_face_cb)(media_face_h face, void *user_data); * @brief You can use above define to set the condition of face filter and order keyword. * @since_tizen 3.0 */ -#define MEDIA_FACE_TAG "MEDIA_FACE_TAG" /**< face tag */ +#define MEDIA_FACE_TAG "MEDIA_FACE_TAG" /**< Face tag */ + +/** + * @brief You can use above define to set the condition of face filter and order keyword. + * @since_tizen 4.0 + */ +#define MEDIA_FACE_ID "MEDIA_FACE_ID" /**< Face id */ /** * @} diff --git a/include_product/media_info_private.h b/include_product/media_info_private.h index db59240..1f6722c 100755 --- a/include_product/media_info_private.h +++ b/include_product/media_info_private.h @@ -782,6 +782,8 @@ typedef struct _media_content_scan_cb_data_v2 { #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_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" + #define UPDATE_BOOKMARK_FROM_BOOKMARK "UPDATE "DB_TABLE_BOOKMARK" SET name=%Q WHERE bookmark_id=%d;" /* Update Meta*/ diff --git a/include_product/media_tag.h b/include_product/media_tag.h index bcc28ab..017f1e0 100755 --- a/include_product/media_tag.h +++ b/include_product/media_tag.h @@ -383,7 +383,7 @@ int media_tag_remove_media(media_tag_h tag, const char *media_id); * * @post media_tag_update_to_db() */ -int media_tag_set_name(media_tag_h tag, char *tag_name); +int media_tag_set_name(media_tag_h tag, const char *tag_name); /** * @brief Updates the media tag to the media database. -- 2.7.4