From bdaa214f5e9641e64315d0582846ac5010ed419f Mon Sep 17 00:00:00 2001 From: Minje Ahn Date: Fri, 25 Aug 2017 10:34:20 +0900 Subject: [PATCH] Update TV feature define Change USE_TV_PROFILE to USE_TVPD_MODE Change-Id: Id52c4ce7bc2fd0c4b59e3320d85a98a537e8db60 Signed-off-by: Minje Ahn --- CMakeLists.txt | 2 +- include_product/media_info_private.h | 2 +- src/media_content.c | 14 +++++++------- src/media_db.c | 20 ++++++++++---------- src/media_folder.c | 6 +++--- src/media_group.c | 10 +++++----- src/media_info.c | 22 +++++++++++----------- src/media_pvr.c | 2 +- src/media_storage.c | 2 +- src/media_uhd.c | 2 +- src/media_util_private.c | 6 +++--- test/media-content_test.c | 4 ++-- 12 files changed, 46 insertions(+), 46 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 79a548e..b040bd6 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,7 +31,7 @@ ENDIF("${ARCH}" STREQUAL "arm") ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"") ADD_DEFINITIONS("-DTIZEN_DEBUG") IF(TIZEN_PRODUCT_TV) - ADD_DEFINITIONS("-D_USE_TV_PROFILE") + ADD_DEFINITIONS("-D_USE_TVPD_MODE") ENDIF(TIZEN_PRODUCT_TV) SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=${LIB_INSTALL_DIR}") diff --git a/include_product/media_info_private.h b/include_product/media_info_private.h index b7d8813..d305c21 100755 --- a/include_product/media_info_private.h +++ b/include_product/media_info_private.h @@ -32,7 +32,7 @@ #include #include #include -#ifdef _USE_TV_PROFILE +#ifdef _USE_TVPD_MODE #include #endif diff --git a/src/media_content.c b/src/media_content.c index 2ee0548..f6ea0c0 100755 --- a/src/media_content.c +++ b/src/media_content.c @@ -153,7 +153,7 @@ static media_content_attribute_info_s g_content_attrs_info[] = { {MEDIA_CONTACT, DB_FIELD_MEDIA_CONTACT, DB_TABLE_ALIAS_MEDIA"."DB_FIELD_MEDIA_CONTACT}, {MEDIA_APP_DATA, DB_FIELD_MEDIA_APP_DATA, DB_TABLE_ALIAS_MEDIA"."DB_FIELD_MEDIA_APP_DATA}, #endif -#ifdef _USE_TV_PROFILE +#ifdef _USE_TVPD_MODE {MEDIA_FOLDER_ID, DB_FIELD_MEDIA_FOLDER_ID, DB_TABLE_ALIAS_MEDIA"."DB_FIELD_MEDIA_FOLDER_ID}, {MEDIA_STITCHED_INFO, DB_FIELD_MEDIA_STITCHED_INFO, NULL}, {MEDIA_MODIFIED_MONTH, DB_FIELD_MEDIA_MODIFIED_MONTH, NULL}, @@ -480,7 +480,7 @@ static int __media_content_create_attr_handle(void) media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); } #endif -#ifdef _USE_TV_PROFILE +#ifdef _USE_TVPD_MODE ret = _media_filter_attribute_add(g_attr_handle, MEDIA_FOLDER_ID, DB_FIELD_MEDIA_FOLDER_ID); media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); @@ -679,7 +679,7 @@ static int __media_content_create_alias_attr_handle(void) ret = _media_filter_attribute_add(g_alias_attr_handle, MEDIA_TIMELINE, DB_TABLE_ALIAS_MEDIA"."DB_FIELD_MEDIA_TIMELINE); media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); -#ifdef _USE_TV_PROFILE +#ifdef _USE_TVPD_MODE ret = _media_filter_attribute_add(g_alias_attr_handle, MEDIA_FOLDER_ID, DB_TABLE_ALIAS_MEDIA"."DB_FIELD_MEDIA_FOLDER_ID); media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); #endif @@ -1400,7 +1400,7 @@ void _media_content_scan_cb(media_request_result_s* result, void *user_data) media_content_scan_cb_data *cb_data = user_data; err = _content_error_capi(MEDIA_REGISTER_TYPE, result->result); -#ifdef _USE_TV_PROFILE +#ifdef _USE_TVPD_MODE if (result->request_type != MEDIA_REQUEST_SCAN_COMPLETE && result->request_type != MEDIA_REQUEST_SCAN_PARTIAL) { if (cb_data && cb_data->callback) { @@ -1423,7 +1423,7 @@ void _media_content_scan_cb(media_request_result_s* result, void *user_data) return; } -#ifdef _USE_TV_PROFILE +#ifdef _USE_TVPD_MODE void _media_content_scan_cb_v2(media_request_result_s* result, void *user_data) { int err = -1; @@ -1530,7 +1530,7 @@ int media_content_scan_folder(const char *path, bool is_recursive, media_scan_co return _content_error_capi(MEDIA_REGISTER_TYPE, ret); } -#ifdef _USE_TV_PROFILE +#ifdef _USE_TVPD_MODE int media_content_scan_folder_v2(const char *path, bool is_recursive, media_scan_completed_cb_v2 callback, void *user_data) { int ret = MEDIA_CONTENT_ERROR_NONE; @@ -1680,7 +1680,7 @@ int media_content_remove_db_updated_cb(media_content_noti_h noti_handle) return _content_error_capi(MEDIA_REGISTER_TYPE, ret); } -#ifdef _USE_TV_PROFILE +#ifdef _USE_TVPD_MODE GMutex* _content_get_db_mutex(void) { return &db_mutex; diff --git a/src/media_db.c b/src/media_db.c index 8bad57f..438ce3b 100755 --- a/src/media_db.c +++ b/src/media_db.c @@ -83,7 +83,7 @@ static char * __media_db_get_group_name(media_group_e group) return (char *) DB_FIELD_MEDIA_KEYWORD; case MEDIA_CONTENT_GROUP_WEATHER: return (char *) DB_FIELD_MEDIA_WEATHER; -#ifdef _USE_TV_PROFILE +#ifdef _USE_TVPD_MODE case MEDIA_CONTENT_GROUP_MODIFIED_MONTH: return (char *) DB_FIELD_MEDIA_MODIFIED_DATE; case MEDIA_CONTENT_GROUP_MODIFIED_DATE: @@ -93,7 +93,7 @@ static char * __media_db_get_group_name(media_group_e group) case MEDIA_CONTENT_GROUP_CONTACT: return (char *) DB_FIELD_MEDIA_CONTACT; #endif -#ifdef _USE_TV_PROFILE +#ifdef _USE_TVPD_MODE case MEDIA_CONTENT_GROUP_ALBUM: return (char *) DB_FIELD_MEDIA_ALBUM; case MEDIA_PVR_GROUP_DURATION: @@ -318,7 +318,7 @@ int _media_db_get_group_count(filter_h filter, group_list_e group_type, int *gro else snprintf(select_query, sizeof(select_query), SELECT_FACE_COUNT, DB_TABLE_MEDIA_VIEW); break; -#ifdef _USE_TV_PROFILE +#ifdef _USE_TVPD_MODE case MEDIA_GROUP_PVR: case MEDIA_GROUP_UHD: #endif @@ -358,7 +358,7 @@ int _media_db_get_media_group_count(media_group_e group, filter_h filter, int *g attr = _content_get_attirbute_handle(); memset(select_query, 0x00, sizeof(select_query)); -#ifdef _USE_TV_PROFILE +#ifdef _USE_TVPD_MODE if (group < MEDIA_PVR_GROUP_DURATION) { /*media content*/ if ((_filter != NULL) && STRING_VALID(_filter->storage_id)) snprintf(select_query, sizeof(select_query), SELECT_MEDIA_GROUP_COUNT, __media_db_get_group_name(group), _filter->storage_id); @@ -420,7 +420,7 @@ int _media_db_get_media_group(media_group_e group, filter_h filter, media_group_ attr = _content_get_attirbute_handle(); memset(select_query, 0x00, sizeof(select_query)); -#ifdef _USE_TV_PROFILE +#ifdef _USE_TVPD_MODE if (group < MEDIA_PVR_GROUP_DURATION) { /*media content */ if ((_filter != NULL) && STRING_VALID(_filter->storage_id)) snprintf(select_query, sizeof(select_query), SELECT_MEDIA_GROUP_LIST, __media_db_get_group_name(group), _filter->storage_id); @@ -466,7 +466,7 @@ int _media_db_get_media_group(media_group_e group, filter_h filter, media_group_ return ret; } -#ifdef _USE_TV_PROFILE +#ifdef _USE_TVPD_MODE int _media_db_get_media_group_and_count(media_group_e group, filter_h filter, media_group_and_count_cb callback, void *user_data) { int ret = MEDIA_CONTENT_ERROR_NONE; @@ -1050,7 +1050,7 @@ int _media_db_get_group_item_count(const char *group_name, filter_h filter, grou tmp_query = sqlite3_mprintf(SELECT_FACE_COUNT_BY_MEDIA_ID, DB_TABLE_MEDIA_VIEW, group_name); SAFE_STRLCAT(select_query, tmp_query, sizeof(select_query)); -#ifdef _USE_TV_PROFILE +#ifdef _USE_TVPD_MODE } else if (group_type == MEDIA_GROUP_PVR) { if ((_filter != NULL) && STRING_VALID(_filter->storage_id)) snprintf(select_query, sizeof(select_query), SELECT_PVR_COUNT_BY_STORAGE_ID, _filter->storage_id); @@ -1321,7 +1321,7 @@ int _media_db_get_media_group_item_count(const char *group_name, filter_h filter attr = _content_get_attirbute_handle(); memset(select_query, 0x00, sizeof(select_query)); -#ifdef _USE_TV_PROFILE +#ifdef _USE_TVPD_MODE if (group < MEDIA_PVR_GROUP_DURATION) { /*media content */ if (group_name != NULL) { if ((_filter != NULL) && STRING_VALID(_filter->storage_id)) @@ -1528,7 +1528,7 @@ int _media_db_get_storage(filter_h filter, media_storage_cb callback, void *user return ret; } -#ifdef _USE_TV_PROFILE +#ifdef _USE_TVPD_MODE 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 ret = MEDIA_CONTENT_ERROR_NONE; @@ -1838,7 +1838,7 @@ int _media_db_get_storage_id_by_media_id(const char *media_id, char *storage_id) return ret; } -#ifdef _USE_TV_PROFILE +#ifdef _USE_TVPD_MODE typedef enum { MEDIA_UHD_MEDIA_ID = 0, MEDIA_UHD_STORAGE_ID, diff --git a/src/media_folder.c b/src/media_folder.c index f528217..3116f2d 100755 --- a/src/media_folder.c +++ b/src/media_folder.c @@ -43,13 +43,13 @@ int media_folder_foreach_folder_from_db(filter_h filter, media_folder_cb callbac return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } -#ifdef _USE_TV_PROFILE +#ifdef _USE_TVPD_MODE g_mutex_lock(_content_get_db_mutex()); #endif ret = _media_db_get_folder(filter, callback, user_data); -#ifdef _USE_TV_PROFILE +#ifdef _USE_TVPD_MODE g_mutex_unlock(_content_get_db_mutex()); #endif @@ -545,7 +545,7 @@ int media_folder_set_order(media_folder_h folder, int order) return ret; } -#ifdef _USE_TV_PROFILE +#ifdef _USE_TVPD_MODE int media_folder_get_scan_status(const char *storage_uuid, char* path, media_folder_scan_status_e *scan_status) { int ret = MEDIA_CONTENT_ERROR_NONE; diff --git a/src/media_group.c b/src/media_group.c index f4dc52d..d6efd95 100755 --- a/src/media_group.c +++ b/src/media_group.c @@ -266,7 +266,7 @@ int media_album_get_album_art(media_album_h album, char **album_art) int media_group_get_group_count_from_db(filter_h filter, media_group_e group, int *group_count) { int ret = MEDIA_CONTENT_ERROR_NONE; -#ifdef _USE_TV_PROFILE +#ifdef _USE_TVPD_MODE if ((group < MEDIA_CONTENT_GROUP_DISPLAY_NAME) || (group >= MEDIA_GROUP_MAX) || (group_count == NULL)) { #else if ((group < MEDIA_CONTENT_GROUP_DISPLAY_NAME) || (group >= MEDIA_CONTENT_GROUP_MAX) || (group_count == NULL)) { @@ -279,7 +279,7 @@ int media_group_get_group_count_from_db(filter_h filter, media_group_e group, in return ret; } -#ifdef _USE_TV_PROFILE +#ifdef _USE_TVPD_MODE int media_group_foreach_group_and_count_from_db(filter_h filter, media_group_e group, media_group_and_count_cb callback, void *user_data) { int ret = MEDIA_CONTENT_ERROR_NONE; @@ -298,7 +298,7 @@ int media_group_foreach_group_and_count_from_db(filter_h filter, media_group_e g int media_group_foreach_group_from_db(filter_h filter, media_group_e group, media_group_cb callback, void *user_data) { int ret = MEDIA_CONTENT_ERROR_NONE; -#ifdef _USE_TV_PROFILE +#ifdef _USE_TVPD_MODE if ((callback == NULL) || (group < MEDIA_CONTENT_GROUP_DISPLAY_NAME) || (group >= MEDIA_GROUP_MAX)) { #else if ((callback == NULL) || (group < MEDIA_CONTENT_GROUP_DISPLAY_NAME) || (group >= MEDIA_CONTENT_GROUP_MAX)) { @@ -315,7 +315,7 @@ int media_group_foreach_group_from_db(filter_h filter, media_group_e group, medi int media_group_get_media_count_from_db(const char *group_name, media_group_e group, filter_h filter, int *media_count) { int ret = MEDIA_CONTENT_ERROR_NONE; -#ifdef _USE_TV_PROFILE +#ifdef _USE_TVPD_MODE if ((media_count == NULL) || (group < MEDIA_CONTENT_GROUP_DISPLAY_NAME) || (group >= MEDIA_GROUP_MAX)) { #else if ((media_count == NULL) || (group < MEDIA_CONTENT_GROUP_DISPLAY_NAME) || (group >= MEDIA_CONTENT_GROUP_MAX)) { @@ -332,7 +332,7 @@ int media_group_get_media_count_from_db(const char *group_name, media_group_e gr int media_group_foreach_media_from_db(const char *group_name, media_group_e group, filter_h filter, media_info_cb callback, void *user_data) { int ret = MEDIA_CONTENT_ERROR_NONE; -#ifdef _USE_TV_PROFILE +#ifdef _USE_TVPD_MODE if ((callback == NULL) || (group < MEDIA_CONTENT_GROUP_DISPLAY_NAME) || (group >= MEDIA_GROUP_MAX)) { #else if ((callback == NULL) || (group < MEDIA_CONTENT_GROUP_DISPLAY_NAME) || (group >= MEDIA_CONTENT_GROUP_MAX)) { diff --git a/src/media_info.c b/src/media_info.c index ce4311f..de94e86 100755 --- a/src/media_info.c +++ b/src/media_info.c @@ -375,7 +375,7 @@ void _media_info_item_get_detail(sqlite3_stmt* stmt, media_info_h media) _media->sync_status = (int)sqlite3_column_int(stmt, MEDIA_INFO_SYNC_STATUS); _media->storage_uuid = g_strdup((const char *)sqlite3_column_text(stmt, MEDIA_INFO_STORAGE_UUID)); _media->is_360 = (int)sqlite3_column_int(stmt, MEDIA_INFO_IS_360); -#ifdef _USE_TV_PROFILE +#ifdef _USE_TVPD_MODE _media->stitched_info = (int)sqlite3_column_int(stmt, MEDIA_INFO_STITCHED_INFO); #endif @@ -601,7 +601,7 @@ int media_info_insert_burst_shot_to_db(const char **path_array, unsigned int arr return ret; } -#ifdef _USE_TV_PROFILE +#ifdef _USE_TVPD_MODE int media_info_get_media_info_by_path_from_db(const char* path, media_info_h* media) { char storage_id[MEDIA_CONTENT_UUID_SIZE+1] = {0,}; @@ -912,7 +912,7 @@ int media_info_destroy(media_info_h media) SAFE_FREE(_media->age_rating); SAFE_FREE(_media->keyword); SAFE_FREE(_media->title); -#ifdef _USE_TV_PROFILE +#ifdef _USE_TVPD_MODE SAFE_FREE(_media->modified_month); #endif SAFE_FREE(_media->weather); @@ -1117,7 +1117,7 @@ int media_info_clone(media_info_h *dst, media_info_h src) return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; } } -#ifdef _USE_TV_PROFILE +#ifdef _USE_TVPD_MODE if (STRING_VALID(_src->modified_month)) { _dst->modified_month = strdup(_src->modified_month); if (_dst->modified_month == NULL) { @@ -1166,7 +1166,7 @@ int media_info_clone(media_info_h *dst, media_info_h src) _dst->request_id = _src->request_id; _dst->face_request_id = _src->face_request_id; _dst->is_360 = _src->is_360; -#ifdef _USE_TV_PROFILE +#ifdef _USE_TVPD_MODE _dst->stitched_info = _src->stitched_info; _dst->extract_flag = _src->extract_flag; #endif @@ -1884,7 +1884,7 @@ int media_info_get_title(media_info_h media, char **title) return ret; } -#ifdef _USE_TV_PROFILE +#ifdef _USE_TVPD_MODE int media_info_get_extract_flag(media_info_h media, int *extract_flag) { int ret = MEDIA_CONTENT_ERROR_NONE; @@ -2227,7 +2227,7 @@ int media_info_is_360_content(media_info_h media, bool *is_360) return ret; } -#ifdef _USE_TV_PROFILE +#ifdef _USE_TVPD_MODE int media_info_get_stitched_state(media_info_h media, int *stitched_info) { int ret = MEDIA_CONTENT_ERROR_NONE; @@ -2277,7 +2277,7 @@ int media_info_get_storage_type(media_info_h media, media_content_storage_e *sto return ret; } -#ifdef _USE_TV_PROFILE +#ifdef _USE_TVPD_MODE int media_info_get_played_position(media_info_h media, int *played_position) { int ret = MEDIA_CONTENT_ERROR_NONE; @@ -2346,7 +2346,7 @@ int media_info_increase_played_count(media_info_h media) return ret; } -#ifdef _USE_TV_PROFILE +#ifdef _USE_TVPD_MODE int media_info_get_modified_month(media_info_h media, char **modified_month) { int ret = MEDIA_CONTENT_ERROR_NONE; @@ -2420,7 +2420,7 @@ int media_info_get_app_data(media_info_h media, char **app_data) return ret; } #endif -#ifdef _USE_TV_PROFILE +#ifdef _USE_TVPD_MODE int media_info_set_played_count(media_info_h media, int played_count) { int ret = MEDIA_CONTENT_ERROR_NONE; @@ -2456,7 +2456,7 @@ int media_info_set_played_time(media_info_h media) return ret; } -#ifdef _USE_TV_PROFILE +#ifdef _USE_TVPD_MODE int media_info_set_played_position(media_info_h media, int played_position) { int ret = MEDIA_CONTENT_ERROR_NONE; diff --git a/src/media_pvr.c b/src/media_pvr.c index e4fed3a..70739f8 100755 --- a/src/media_pvr.c +++ b/src/media_pvr.c @@ -14,7 +14,7 @@ * limitations under the License. */ -#ifdef _USE_TV_PROFILE +#ifdef _USE_TVPD_MODE #include #include #include diff --git a/src/media_storage.c b/src/media_storage.c index 6320b60..076e5b4 100755 --- a/src/media_storage.c +++ b/src/media_storage.c @@ -245,7 +245,7 @@ int media_storage_get_type(media_storage_h storage, media_content_storage_e *sto return ret; } -#ifdef _USE_TV_PROFILE +#ifdef _USE_TVPD_MODE int media_storage_get_scan_status(const char *storage_uuid, media_storage_scan_status_e *scan_status) { int ret = MEDIA_CONTENT_ERROR_NONE; diff --git a/src/media_uhd.c b/src/media_uhd.c index a7b79ec..39d9ef9 100755 --- a/src/media_uhd.c +++ b/src/media_uhd.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifdef _USE_TV_PROFILE +#ifdef _USE_TVPD_MODE #include #include #include diff --git a/src/media_util_private.c b/src/media_util_private.c index f52f1e7..cf7586d 100755 --- a/src/media_util_private.c +++ b/src/media_util_private.c @@ -180,7 +180,7 @@ int _media_content_replace_path_in_condition(const char *condition, char *replac { int ret = MEDIA_CONTENT_ERROR_NONE; -#ifdef _USE_TV_PROFILE +#ifdef _USE_TVPD_MODE snprintf(replace_condition, MAX_QUERY_SIZE, "%s", condition); #else char old_condition[MAX_QUERY_SIZE] = {0, }; @@ -278,7 +278,7 @@ ERROR: int _media_content_replace_path(const char *path, char *replace_path) { -#ifdef _USE_TV_PROFILE +#ifdef _USE_TVPD_MODE snprintf(replace_path, MAX_PATH_LEN, "%s", path); #else @@ -311,7 +311,7 @@ int _media_content_replace_path(const char *path, char *replace_path) int _media_content_rollback_path(const char *path, char *replace_path) { -#ifdef _USE_TV_PROFILE +#ifdef _USE_TVPD_MODE snprintf(replace_path, MAX_PATH_LEN, "%s", path); #else diff --git a/test/media-content_test.c b/test/media-content_test.c index 6b2e2d7..e34b2ad 100755 --- a/test/media-content_test.c +++ b/test/media-content_test.c @@ -3704,7 +3704,7 @@ int test_face_add_del(void) return ret; } -#ifdef _USE_TV_PROFILE +#ifdef _USE_TVPD_MODE filter_h g_tv_filter = NULL; int test_tv_filter_create(void) @@ -4029,7 +4029,7 @@ int main(int argc, char *argv[]) ret = test_connect_database(); if (ret != MEDIA_CONTENT_ERROR_NONE) return MEDIA_CONTENT_ERROR_NONE; -#ifdef _USE_TV_PROFILE +#ifdef _USE_TVPD_MODE test_pvr(); test_pvr_update_db(); -- 2.7.4