From 5afce20ab3a1f574d97945d577ceef6ec896ecc2 Mon Sep 17 00:00:00 2001 From: Minje Ahn Date: Thu, 4 Apr 2019 11:43:59 +0900 Subject: [PATCH] Remove alias related function Change-Id: I73be73a11c11ff9e8fd0382f0ace72b0eb08b577 Signed-off-by: Minje Ahn --- include/media_info_private.h | 1 - include_product/media_info_private.h | 1 - src/media_content.c | 257 +++++++++++++++-------------------- 3 files changed, 111 insertions(+), 148 deletions(-) diff --git a/include/media_info_private.h b/include/media_info_private.h index da290b5..f81d3d9 100755 --- a/include/media_info_private.h +++ b/include/media_info_private.h @@ -572,7 +572,6 @@ int _content_query_sql(char *query_str); sqlite3 * _content_get_db_handle(void); uid_t _content_get_uid(void); attribute_h _content_get_attirbute_handle(void); -attribute_h _content_get_alias_attirbute_handle(void); int _media_info_get_media_info_from_db(const char *path, const char *storage_id, media_info_h media); void _media_info_item_get_detail(sqlite3_stmt *stmt, media_info_h media); int _media_db_get_group_count(filter_h filter, group_list_e group_type, int *group_count); diff --git a/include_product/media_info_private.h b/include_product/media_info_private.h index 91946eb..86b8bfe 100755 --- a/include_product/media_info_private.h +++ b/include_product/media_info_private.h @@ -796,7 +796,6 @@ int _content_query_sql(char *query_str); sqlite3 * _content_get_db_handle(void); uid_t _content_get_uid(void); attribute_h _content_get_attirbute_handle(void); -attribute_h _content_get_alias_attirbute_handle(void); int _media_info_get_media_info_from_db(const char *path, const char *storage_id, media_info_h media); void _media_info_item_get_detail(sqlite3_stmt *stmt, media_info_h media); int _media_db_get_group_count(filter_h filter, group_list_e group_type, int *group_count); diff --git a/src/media_content.c b/src/media_content.c index 8dd36c6..c8dac0d 100755 --- a/src/media_content.c +++ b/src/media_content.c @@ -20,7 +20,6 @@ static attribute_h g_attr_handle = NULL; -static attribute_h g_alias_attr_handle = NULL; static sqlite3 *db_handle = NULL; static int ref_count = 0; static GMutex db_mutex; @@ -32,136 +31,135 @@ static int __media_content_destroy_attribute_handle(void); typedef struct { char *user_attr; char *platform_attr; - char *platform_alias_attr; } media_content_attribute_info_s; static media_content_attribute_info_s g_content_attrs_info[] = { /* Media Info */ - {MEDIA_ID, DB_FIELD_MEDIA_ID, NULL}, - {MEDIA_PATH, DB_FIELD_MEDIA_PATH, NULL}, - {MEDIA_DISPLAY_NAME, DB_FIELD_MEDIA_DISPLAY_NAME, NULL}, - {MEDIA_TYPE, DB_FIELD_MEDIA_TYPE, NULL}, - {MEDIA_MIME_TYPE, DB_FIELD_MEDIA_MIME_TYPE, NULL}, - {MEDIA_SIZE, DB_FIELD_MEDIA_SIZE, NULL}, - {MEDIA_ADDED_TIME, DB_FIELD_MEDIA_ADDED_TIME, NULL}, - {MEDIA_MODIFIED_TIME, DB_FIELD_MEDIA_MODIFIED_TIME, NULL}, - {MEDIA_TIMELINE, DB_FIELD_MEDIA_TIMELINE, NULL}, - {MEDIA_THUMBNAIL_PATH, DB_FIELD_MEDIA_THUMBNAIL_PATH, NULL}, - {MEDIA_TITLE, DB_FIELD_MEDIA_TITLE, NULL}, - {MEDIA_ALBUM, DB_FIELD_MEDIA_ALBUM, NULL}, - {MEDIA_ARTIST, DB_FIELD_MEDIA_ARTIST, NULL}, - {MEDIA_ALBUM_ARTIST, DB_FIELD_MEDIA_ALBUM_ARTIST, NULL}, - {MEDIA_GENRE, DB_FIELD_MEDIA_GENRE, NULL}, - {MEDIA_COMPOSER, DB_FIELD_MEDIA_COMPOSER, NULL}, - {MEDIA_YEAR, DB_FIELD_MEDIA_YEAR, NULL}, - {MEDIA_RECORDED_DATE, DB_FIELD_MEDIA_RECORDED_DATE, NULL}, - {MEDIA_COPYRIGHT, DB_FIELD_MEDIA_COPYRIGHT, NULL}, - {MEDIA_TRACK_NUM, DB_FIELD_MEDIA_TRACK_NUM, NULL}, - {MEDIA_DESCRIPTION, DB_FIELD_MEDIA_DESCRIPTION, NULL}, - {MEDIA_BITRATE, DB_FIELD_MEDIA_BITRATE, NULL}, - {MEDIA_BITPERSAMPLE, DB_FIELD_MEDIA_BITPERSAMPLE, NULL}, - {MEDIA_SAMPLERATE, DB_FIELD_MEDIA_SAMPLERATE, NULL}, - {MEDIA_CHANNEL, DB_FIELD_MEDIA_CHANNEL, NULL}, - {MEDIA_DURATION, DB_FIELD_MEDIA_DURATION, NULL}, - {MEDIA_LONGITUDE, DB_FIELD_MEDIA_LONGITUDE, NULL}, - {MEDIA_LATITUDE, DB_FIELD_MEDIA_LATITUDE, NULL}, - {MEDIA_ALTITUDE, DB_FIELD_MEDIA_ALTITUDE, NULL}, - {MEDIA_WIDTH, DB_FIELD_MEDIA_WIDTH, NULL}, - {MEDIA_HEIGHT, DB_FIELD_MEDIA_HEIGHT, NULL}, - {MEDIA_DATETAKEN, DB_FIELD_MEDIA_DATETAKEN, NULL}, - {MEDIA_ORIENTATION, DB_FIELD_MEDIA_ORIENTATION, NULL}, - {MEDIA_RATING, DB_FIELD_MEDIA_RATING, NULL}, - {MEDIA_FAVOURITE, DB_FIELD_MEDIA_FAVOURITE, NULL}, - {MEDIA_IS_DRM, DB_FIELD_MEDIA_IS_DRM, NULL}, - {MEDIA_STORAGE_TYPE, DB_FIELD_MEDIA_STORAGE_TYPE, NULL}, - {MEDIA_360, DB_FIELD_MEDIA_360, NULL}, + {MEDIA_ID, DB_FIELD_MEDIA_ID}, + {MEDIA_PATH, DB_FIELD_MEDIA_PATH}, + {MEDIA_DISPLAY_NAME, DB_FIELD_MEDIA_DISPLAY_NAME}, + {MEDIA_TYPE, DB_FIELD_MEDIA_TYPE}, + {MEDIA_MIME_TYPE, DB_FIELD_MEDIA_MIME_TYPE}, + {MEDIA_SIZE, DB_FIELD_MEDIA_SIZE}, + {MEDIA_ADDED_TIME, DB_FIELD_MEDIA_ADDED_TIME}, + {MEDIA_MODIFIED_TIME, DB_FIELD_MEDIA_MODIFIED_TIME}, + {MEDIA_TIMELINE, DB_FIELD_MEDIA_TIMELINE}, + {MEDIA_THUMBNAIL_PATH, DB_FIELD_MEDIA_THUMBNAIL_PATH}, + {MEDIA_TITLE, DB_FIELD_MEDIA_TITLE}, + {MEDIA_ALBUM, DB_FIELD_MEDIA_ALBUM}, + {MEDIA_ARTIST, DB_FIELD_MEDIA_ARTIST}, + {MEDIA_ALBUM_ARTIST, DB_FIELD_MEDIA_ALBUM_ARTIST}, + {MEDIA_GENRE, DB_FIELD_MEDIA_GENRE}, + {MEDIA_COMPOSER, DB_FIELD_MEDIA_COMPOSER}, + {MEDIA_YEAR, DB_FIELD_MEDIA_YEAR}, + {MEDIA_RECORDED_DATE, DB_FIELD_MEDIA_RECORDED_DATE}, + {MEDIA_COPYRIGHT, DB_FIELD_MEDIA_COPYRIGHT}, + {MEDIA_TRACK_NUM, DB_FIELD_MEDIA_TRACK_NUM}, + {MEDIA_DESCRIPTION, DB_FIELD_MEDIA_DESCRIPTION}, + {MEDIA_BITRATE, DB_FIELD_MEDIA_BITRATE}, + {MEDIA_BITPERSAMPLE, DB_FIELD_MEDIA_BITPERSAMPLE}, + {MEDIA_SAMPLERATE, DB_FIELD_MEDIA_SAMPLERATE}, + {MEDIA_CHANNEL, DB_FIELD_MEDIA_CHANNEL}, + {MEDIA_DURATION, DB_FIELD_MEDIA_DURATION}, + {MEDIA_LONGITUDE, DB_FIELD_MEDIA_LONGITUDE}, + {MEDIA_LATITUDE, DB_FIELD_MEDIA_LATITUDE}, + {MEDIA_ALTITUDE, DB_FIELD_MEDIA_ALTITUDE}, + {MEDIA_WIDTH, DB_FIELD_MEDIA_WIDTH}, + {MEDIA_HEIGHT, DB_FIELD_MEDIA_HEIGHT}, + {MEDIA_DATETAKEN, DB_FIELD_MEDIA_DATETAKEN}, + {MEDIA_ORIENTATION, DB_FIELD_MEDIA_ORIENTATION}, + {MEDIA_RATING, DB_FIELD_MEDIA_RATING}, + {MEDIA_FAVOURITE, DB_FIELD_MEDIA_FAVOURITE}, + {MEDIA_IS_DRM, DB_FIELD_MEDIA_IS_DRM}, + {MEDIA_STORAGE_TYPE, DB_FIELD_MEDIA_STORAGE_TYPE}, + {MEDIA_360, DB_FIELD_MEDIA_360}, /* Pinyin */ - {MEDIA_FILE_NAME_PINYIN, DB_FIELD_MEDIA_FILE_NAME_PINYIN, NULL}, - {MEDIA_TITLE_PINYIN, DB_FIELD_MEDIA_TITLE_PINYIN, NULL}, - {MEDIA_ALBUM_PINYIN, DB_FIELD_MEDIA_ALBUM_PINYIN, NULL}, - {MEDIA_ARTIST_PINYIN, DB_FIELD_MEDIA_ARTIST_PINYIN, NULL}, - {MEDIA_ALBUM_ARTIST_PINYIN, DB_FIELD_MEDIA_ALBUM_ARTIST_PINYIN, NULL}, - {MEDIA_GENRE_PINYIN, DB_FIELD_MEDIA_GENRE_PINYIN, NULL}, - {MEDIA_COMPOSER_PINYIN, DB_FIELD_MEDIA_COMPOSER_PINYIN, NULL}, - {MEDIA_COPYRIGHT_PINYIN, DB_FIELD_MEDIA_COPYRIGHT_PINYIN, NULL}, - {MEDIA_DESCRIPTION_PINYIN, DB_FIELD_MEDIA_DESCRIPTION_PINYIN, NULL}, + {MEDIA_FILE_NAME_PINYIN, DB_FIELD_MEDIA_FILE_NAME_PINYIN}, + {MEDIA_TITLE_PINYIN, DB_FIELD_MEDIA_TITLE_PINYIN}, + {MEDIA_ALBUM_PINYIN, DB_FIELD_MEDIA_ALBUM_PINYIN}, + {MEDIA_ARTIST_PINYIN, DB_FIELD_MEDIA_ARTIST_PINYIN}, + {MEDIA_ALBUM_ARTIST_PINYIN, DB_FIELD_MEDIA_ALBUM_ARTIST_PINYIN}, + {MEDIA_GENRE_PINYIN, DB_FIELD_MEDIA_GENRE_PINYIN}, + {MEDIA_COMPOSER_PINYIN, DB_FIELD_MEDIA_COMPOSER_PINYIN}, + {MEDIA_COPYRIGHT_PINYIN, DB_FIELD_MEDIA_COPYRIGHT_PINYIN}, + {MEDIA_DESCRIPTION_PINYIN, DB_FIELD_MEDIA_DESCRIPTION_PINYIN}, /* Folder */ - {FOLDER_ID, DB_FIELD_FOLDER_ID, NULL}, - {FOLDER_NAME, DB_FIELD_FOLDER_NAME, NULL}, - {FOLDER_STORAGE_TYPE, DB_FIELD_FOLDER_STORAGE_TYPE, NULL}, - {FOLDER_NAME_PINYIN, DB_FIELD_FOLDER_NAME_PINYIN, NULL}, + {FOLDER_ID, DB_FIELD_FOLDER_ID}, + {FOLDER_NAME, DB_FIELD_FOLDER_NAME}, + {FOLDER_STORAGE_TYPE, DB_FIELD_FOLDER_STORAGE_TYPE}, + {FOLDER_NAME_PINYIN, DB_FIELD_FOLDER_NAME_PINYIN}, /* Storage */ - {MEDIA_STORAGE_ID, DB_FIELD_STORAGE_ID, NULL}, - {MEDIA_STORAGE_PATH, DB_FIELD_STORAGE_PATH, NULL}, + {MEDIA_STORAGE_ID, DB_FIELD_STORAGE_ID}, + {MEDIA_STORAGE_PATH, DB_FIELD_STORAGE_PATH}, #ifdef _USE_SENIOR_MODE - {MEDIA_CONTACT, DB_FIELD_MEDIA_CONTACT, NULL}, - {MEDIA_APP_DATA, DB_FIELD_MEDIA_APP_DATA, NULL}, + {MEDIA_CONTACT, DB_FIELD_MEDIA_CONTACT}, + {MEDIA_APP_DATA, DB_FIELD_MEDIA_APP_DATA}, #endif #ifdef _USE_TVPD_MODE - {MEDIA_PLAYED_COUNT, DB_FIELD_MEDIA_PLAYED_COUNT, NULL}, - {MEDIA_LAST_PLAYED_TIME, DB_FIELD_MEDIA_LAST_PLAYED_TIME, NULL}, - {MEDIA_LAST_PLAYED_POSITION, DB_FIELD_MEDIA_LAST_PLAYED_POSITION, NULL}, - {MEDIA_FOLDER_ID, DB_FIELD_MEDIA_FOLDER_ID, NULL}, - {MEDIA_STITCHED_INFO, DB_FIELD_MEDIA_STITCHED_INFO, NULL}, - {MEDIA_MODIFIED_MONTH, DB_FIELD_MEDIA_MODIFIED_MONTH, NULL}, - {MEDIA_MODIFIED_DATE, DB_FIELD_MEDIA_MODIFIED_DATE, NULL}, + {MEDIA_PLAYED_COUNT, DB_FIELD_MEDIA_PLAYED_COUNT}, + {MEDIA_LAST_PLAYED_TIME, DB_FIELD_MEDIA_LAST_PLAYED_TIME}, + {MEDIA_LAST_PLAYED_POSITION, DB_FIELD_MEDIA_LAST_PLAYED_POSITION}, + {MEDIA_FOLDER_ID, DB_FIELD_MEDIA_FOLDER_ID}, + {MEDIA_STITCHED_INFO, DB_FIELD_MEDIA_STITCHED_INFO}, + {MEDIA_MODIFIED_MONTH, DB_FIELD_MEDIA_MODIFIED_MONTH}, + {MEDIA_MODIFIED_DATE, DB_FIELD_MEDIA_MODIFIED_DATE}, /* PVR */ - {PVR_DURATION, DB_FIELD_PVR_DURATION, NULL}, - {PVR_TIME_ZONE, DB_FIELD_PVR_TIME_ZONE, NULL}, - {PVR_PTC, DB_FIELD_PVR_PTC, NULL}, - {PVR_MAJOR, DB_FIELD_PVR_MAJOR, NULL}, - {PVR_MINOR, DB_FIELD_PVR_MINOR, NULL}, - {PVR_CHANNEL_TYPE, DB_FIELD_PVR_CHANNEL_TYPE, NULL}, - {PVR_CHANNEL_NAME, DB_FIELD_PVR_CHANNEL_NAME, NULL}, - {PVR_CHANNEL_NUM, DB_FIELD_PVR_CHANNEL_NUM, NULL}, - {PVR_PROGRAM_TITLE, DB_FIELD_PVR_PROGRAM_TITLE, NULL}, - {PVR_PROGRAM_NUM, DB_FIELD_PVR_PROGRAM_NUM, NULL}, - {PVR_PROGRAM_CRID, DB_FIELD_PVR_PROGRAM_CRID, NULL}, - {PVR_GUIDANCE, DB_FIELD_PVR_GUIDANCE, NULL}, - {PVR_SYNOPSIS, DB_FIELD_PVR_SYNOPSIS, NULL}, - {PVR_GENRE, DB_FIELD_PVR_GENRE, NULL}, - {PVR_LANGUAGE, DB_FIELD_PVR_LANGUAGE, NULL}, - {PVR_EMBARGO_TIME, DB_FIELD_PVR_EMBARGO_TIME, NULL}, - {PVR_EXPIRY_TIME, DB_FIELD_PVR_EXPIRY_TIME, NULL}, - {PVR_START_TIME, DB_FIELD_PVR_START_TIME, NULL}, - {PVR_PROGRAM_START_TIME, DB_FIELD_PVR_PROGRAM_START_TIME, NULL}, - {PVR_PROGRAM_END_TIME, DB_FIELD_PVR_PROGRAM_END_TIME, NULL}, - {PVR_PROGRAM_DATE, DB_FIELD_PVR_PROGRAM_DATE, NULL}, - {PVR_PARENTAL_RATING, DB_FIELD_PVR_PARENTAL_RATING, NULL}, - {PVR_TIMER_RECORD, DB_FIELD_PVR_TIMER_RECORD, NULL}, - {PVR_SERIES_RECORD, DB_FIELD_PVR_SERIES_RECORD, NULL}, - {PVR_HD, DB_FIELD_PVR_HD, NULL}, - {PVR_SUBTITLE, DB_FIELD_PVR_SUBTITLE, NULL}, - {PVR_TTX, DB_FIELD_PVR_TTX, NULL}, - {PVR_AD, DB_FIELD_PVR_AD, NULL}, - {PVR_TTX, DB_FIELD_PVR_TTX, NULL}, - {PVR_DATA_SERVICE, DB_FIELD_PVR_DATA_SERVICE, NULL}, - {PVR_CONTENT_LOCK, DB_FIELD_PVR_CONTENT_LOCK, NULL}, - {PVR_CONTENT_WATCH, DB_FIELD_PVR_CONTENT_WATCH, NULL}, - {PVR_CONTENT_HAS_AUDIO_ONLY, DB_FIELD_PVR_HAS_AUDIO_ONLY, NULL}, - {PVR_CONTENT_IS_LOCAL_RECORD, DB_FIELD_PVR_IS_LOCAL_RECORD, NULL}, - {PVR_CONTENT_RESOLUTION, DB_FIELD_PVR_RESOLUTION, NULL}, - {PVR_CONTENT_ASPECTRATIO, DB_FIELD_PVR_ASPECTRATIO, NULL}, - {PVR_MODIFIED_MONTH, DB_FIELD_PVR_MODIFIED_DATE, NULL}, - {PVR_MODIFIED_DATE, DB_FIELD_PVR_MODIFIED_DATE, NULL}, - {PVR_SPORTS_TYPE, DB_FIELD_PVR_SPORTS_TYPE, NULL}, - {PVR_GUIDANCE_LENGTH, DB_FIELD_PVR_GUIDANCE_LENGTH, NULL}, - {PVR_TVMODE, DB_FIELD_PVR_TVMODE, NULL}, - {PVR_PLAY_COUNT, DB_FIELD_PVR_PLAY_COUNT, NULL}, - {PVR_PRIVATE_DATA, DB_FIELD_PVR_PRIVATE_DATA, NULL}, + {PVR_DURATION, DB_FIELD_PVR_DURATION}, + {PVR_TIME_ZONE, DB_FIELD_PVR_TIME_ZONE}, + {PVR_PTC, DB_FIELD_PVR_PTC}, + {PVR_MAJOR, DB_FIELD_PVR_MAJOR}, + {PVR_MINOR, DB_FIELD_PVR_MINOR}, + {PVR_CHANNEL_TYPE, DB_FIELD_PVR_CHANNEL_TYPE}, + {PVR_CHANNEL_NAME, DB_FIELD_PVR_CHANNEL_NAME}, + {PVR_CHANNEL_NUM, DB_FIELD_PVR_CHANNEL_NUM}, + {PVR_PROGRAM_TITLE, DB_FIELD_PVR_PROGRAM_TITLE}, + {PVR_PROGRAM_NUM, DB_FIELD_PVR_PROGRAM_NUM}, + {PVR_PROGRAM_CRID, DB_FIELD_PVR_PROGRAM_CRID}, + {PVR_GUIDANCE, DB_FIELD_PVR_GUIDANCE}, + {PVR_SYNOPSIS, DB_FIELD_PVR_SYNOPSIS}, + {PVR_GENRE, DB_FIELD_PVR_GENRE}, + {PVR_LANGUAGE, DB_FIELD_PVR_LANGUAGE}, + {PVR_EMBARGO_TIME, DB_FIELD_PVR_EMBARGO_TIME}, + {PVR_EXPIRY_TIME, DB_FIELD_PVR_EXPIRY_TIME}, + {PVR_START_TIME, DB_FIELD_PVR_START_TIME}, + {PVR_PROGRAM_START_TIME, DB_FIELD_PVR_PROGRAM_START_TIME}, + {PVR_PROGRAM_END_TIME, DB_FIELD_PVR_PROGRAM_END_TIME}, + {PVR_PROGRAM_DATE, DB_FIELD_PVR_PROGRAM_DATE}, + {PVR_PARENTAL_RATING, DB_FIELD_PVR_PARENTAL_RATING}, + {PVR_TIMER_RECORD, DB_FIELD_PVR_TIMER_RECORD}, + {PVR_SERIES_RECORD, DB_FIELD_PVR_SERIES_RECORD}, + {PVR_HD, DB_FIELD_PVR_HD}, + {PVR_SUBTITLE, DB_FIELD_PVR_SUBTITLE}, + {PVR_TTX, DB_FIELD_PVR_TTX}, + {PVR_AD, DB_FIELD_PVR_AD}, + {PVR_TTX, DB_FIELD_PVR_TTX}, + {PVR_DATA_SERVICE, DB_FIELD_PVR_DATA_SERVICE}, + {PVR_CONTENT_LOCK, DB_FIELD_PVR_CONTENT_LOCK}, + {PVR_CONTENT_WATCH, DB_FIELD_PVR_CONTENT_WATCH}, + {PVR_CONTENT_HAS_AUDIO_ONLY, DB_FIELD_PVR_HAS_AUDIO_ONLY}, + {PVR_CONTENT_IS_LOCAL_RECORD, DB_FIELD_PVR_IS_LOCAL_RECORD}, + {PVR_CONTENT_RESOLUTION, DB_FIELD_PVR_RESOLUTION}, + {PVR_CONTENT_ASPECTRATIO, DB_FIELD_PVR_ASPECTRATIO}, + {PVR_MODIFIED_MONTH, DB_FIELD_PVR_MODIFIED_DATE}, + {PVR_MODIFIED_DATE, DB_FIELD_PVR_MODIFIED_DATE}, + {PVR_SPORTS_TYPE, DB_FIELD_PVR_SPORTS_TYPE}, + {PVR_GUIDANCE_LENGTH, DB_FIELD_PVR_GUIDANCE_LENGTH}, + {PVR_TVMODE, DB_FIELD_PVR_TVMODE}, + {PVR_PLAY_COUNT, DB_FIELD_PVR_PLAY_COUNT}, + {PVR_PRIVATE_DATA, DB_FIELD_PVR_PRIVATE_DATA}, /* UHD */ - {UHD_CONTENT_TITLE, DB_FIELD_UHD_CONTENT_TITLE, NULL}, - {UHD_RELEASE_DATE, DB_FIELD_UHD_RELEASE_DATE, NULL}, - {UHD_SUB_TYPE, DB_FIELD_UHD_SUB_TYPE, NULL}, - {UHD_FILE_NAME, DB_FIELD_UHD_FILE_NAME, NULL}, - {UHD_FOLDER_ID, DB_FIELD_FOLDER_ID, NULL}, - {UHD_PLAYED_COUNT, DB_FIELD_UHD_PLAYED_COUNT, NULL}, + {UHD_CONTENT_TITLE, DB_FIELD_UHD_CONTENT_TITLE}, + {UHD_RELEASE_DATE, DB_FIELD_UHD_RELEASE_DATE}, + {UHD_SUB_TYPE, DB_FIELD_UHD_SUB_TYPE}, + {UHD_FILE_NAME, DB_FIELD_UHD_FILE_NAME}, + {UHD_FOLDER_ID, DB_FIELD_FOLDER_ID}, + {UHD_PLAYED_COUNT, DB_FIELD_UHD_PLAYED_COUNT}, #endif }; @@ -172,28 +170,18 @@ static int __media_content_create_attribute_handles(void) int count = 0; char *_attr_user = NULL; char *_attr_platform = NULL; - char *_alias_attr_user = NULL; - char *_alias_attr_platform = NULL; attribute_s *_attr = NULL; - attribute_s *_alias_attr = NULL; ret = _media_filter_attribute_create(&g_attr_handle); media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); - ret = _media_filter_attribute_create(&g_alias_attr_handle); - if (ret != MEDIA_CONTENT_ERROR_NONE) - goto ERROR; - _attr = (attribute_s*)g_attr_handle; - _alias_attr = (attribute_s*)g_alias_attr_handle; count = sizeof(g_content_attrs_info) / sizeof((g_content_attrs_info)[0]); for (idx = 0; idx < count; idx++) { _attr_user = NULL; _attr_platform = NULL; - _alias_attr_user = NULL; - _alias_attr_platform = NULL; if (STRING_VALID(g_content_attrs_info[idx].user_attr)) { /*attribute*/ @@ -212,22 +200,6 @@ static int __media_content_create_attribute_handles(void) g_hash_table_insert(_attr->attr_map, _attr_user, _attr_platform); } - - /*alias attribute*/ - if (STRING_VALID(g_content_attrs_info[idx].platform_alias_attr)) { - _alias_attr_user = g_strdup(g_content_attrs_info[idx].user_attr); - _alias_attr_platform = g_strdup(g_content_attrs_info[idx].platform_alias_attr); - - if (_alias_attr_user == NULL || _alias_attr_platform == NULL) { - SAFE_G_FREE(_alias_attr_user); - SAFE_G_FREE(_alias_attr_platform); - media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); - ret = MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; - goto ERROR; - } - - g_hash_table_insert(_alias_attr->attr_map, _alias_attr_user, _alias_attr_platform); - } } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; @@ -249,10 +221,8 @@ static int __media_content_destroy_attribute_handle(void) int ret = MEDIA_CONTENT_ERROR_NONE; ret = _media_filter_attribute_destory(g_attr_handle); - ret = _media_filter_attribute_destory(g_alias_attr_handle); g_attr_handle = NULL; - g_alias_attr_handle = NULL; return ret; } @@ -262,11 +232,6 @@ attribute_h _content_get_attirbute_handle(void) return g_attr_handle; } -attribute_h _content_get_alias_attirbute_handle(void) -{ - return g_alias_attr_handle; -} - sqlite3 * _content_get_db_handle(void) { return db_handle; -- 2.7.4