Remove unused product group enum 93/311793/2 accepted/tizen/unified/20240618.010117 accepted/tizen/unified/dev/20240620.004035 accepted/tizen/unified/toolchain/20240624.121602 accepted/tizen/unified/x/20240618.033402 accepted/tizen/unified/x/asan/20240625.092718
authorMinje Ahn <minje.ahn@samsung.com>
Tue, 28 May 2024 03:27:15 +0000 (12:27 +0900)
committerMinje ahn <minje.ahn@samsung.com>
Tue, 11 Jun 2024 23:40:48 +0000 (23:40 +0000)
Change-Id: I1ca3198405f620464b6dd8715ebd7f5ec64704f9
Signed-off-by: Minje Ahn <minje.ahn@samsung.com>
include_product/media_content_type.h
include_product/media_info_private.h
packaging/capi-content-media-content.spec
src/media_db.c
src/media_folder.c
src/media_group.c

index f4600ac1b085aa7fbc6a1038cca4c5c6e6c5afc3..9a43f54f7265d934d030e8980b2461ebd999c612 100644 (file)
@@ -178,56 +178,10 @@ typedef enum {
        MEDIA_CONTENT_GROUP_MODIFIED_DATE = 29,          /**< Media group ID for the modified date*/
        MEDIA_CONTENT_GROUP_ALBUM,
        MEDIA_CONTENT_GROUP_MAX,                /**< @deprecated Invalid media group ID. Deprecated since 9.0*/
-       MEDIA_PVR_GROUP_DURATION,
-       MEDIA_PVR_GROUP_TIME_ZONE,
-       MEDIA_PVR_GROUP_PTC,
-       MEDIA_PVR_GROUP_MAJOR,
-       MEDIA_PVR_GROUP_MINOR,
-       MEDIA_PVR_GROUP_CHANNEL_TYPE,
        MEDIA_PVR_GROUP_CHANNEL_NAME,
        MEDIA_PVR_GROUP_CHANNEL_NUM,
        MEDIA_PVR_GROUP_PROGRAM_TITLE,
-       MEDIA_PVR_GROUP_PROGRAM_NUM,
-       MEDIA_PVR_GROUP_PROGRAM_CRID,
-       MEDIA_PVR_GROUP_GUIDANCE,
-       MEDIA_PVR_GROUP_SYNOPSIS,
-       MEDIA_PVR_GROUP_GENRE,
-       MEDIA_PVR_GROUP_LANGUAGE,
-       MEDIA_PVR_GROUP_EMBARGO_TIME,
-       MEDIA_PVR_GROUP_EXPIRY_TIME,
-       MEDIA_PVR_GROUP_START_TIME,
-       MEDIA_PVR_GROUP_PROGRAM_START_TIME,
-       MEDIA_PVR_GROUP_PROGRAM_END_TIME,
-       MEDIA_PVR_GROUP_PROGRAM_DATE,
-       MEDIA_PVR_GROUP_PARENTAL_RATING,
-       MEDIA_PVR_GROUP_TIMER_RECORD,
-       MEDIA_PVR_GROUP_SERIES_RECORD,
-       MEDIA_PVR_GROUP_HD,
-       MEDIA_PVR_GROUP_SUBTITLE,
-       MEDIA_PVR_GROUP_TTX,
-       MEDIA_PVR_GROUP_AD,
-       MEDIA_PVR_GROUP_HARDOF_HEARINGRADIO,
-       MEDIA_PVR_GROUP_DATA_SERVICE,
-       MEDIA_PVR_GROUP_CONTENT_LOCK,
-       MEDIA_PVR_GROUP_CONTENT_WATCH,
-       MEDIA_PVR_GROUP_HAS_AUDIO_ONLY,
-       MEDIA_PVR_GROUP_IS_LOCAL_RECORDED,
-       MEDIA_PVR_GROUP_RESOLUTION,
-       MEDIA_PVR_GROUP_ASPECTRATIO,
-       MEDIA_PVR_GROUP_MODIFIED_MONTH,
        MEDIA_PVR_GROUP_MODIFIED_DATE,
-       MEDIA_PVR_GROUP_SPORTS_TYPE,
-       MEDIA_PVR_GROUP_GUIDANCE_LENGTH,
-       MEDIA_PVR_GROUP_TVMODE,
-       MEDIA_PVR_GROUP_PLAY_COUNT,
-       MEDIA_PVR_GROUP_PRIVATE_DATA,
-       MEDIA_PVR_GROUP_MAX,
-       MEDIA_UHD_GROUP_CONTENT_TITLE,
-       MEDIA_UHD_GROUP_RELEASE_DATE,
-       MEDIA_UHD_GROUP_FILE_NAME,
-       MEDIA_UHD_GROUP_PLAYED_COUNT,
-       MEDIA_UHD_GROUP_MAX,
-       MEDIA_GROUP_MAX,
 } media_group_e;
 
 typedef struct {
index 7ee1d8ae186b4edbc1b204c26a5a9f04ede3b8b7..b4210e98e7b9748083d145aeb4a1e3b66b5908ca 100644 (file)
@@ -32,9 +32,7 @@
 #include <media-util.h>
 #include <errno.h>
 #include <tzplatform_config.h>
-#ifdef _USE_TVPD_MODE
 #include <media_content_type_product.h>
-#endif
 
 #ifdef __cplusplus
 extern "C" {
@@ -437,62 +435,13 @@ typedef struct _media_content_scan_cb_data_v2 {
 #define DB_FIELD_MEDIA_LATITUDE                "media_latitude"
 #define DB_FIELD_MEDIA_ALTITUDE                "media_altitude"
 
-#define DB_FIELD_MEDIA_PLAYED_COUNT            "played_count"
-#define DB_FIELD_MEDIA_LAST_PLAYED_TIME                "last_played_time"
-#define DB_FIELD_MEDIA_LAST_PLAYED_POSITION    "last_played_position"
 #define DB_FIELD_MEDIA_MODIFIED_DATE   "modified_date"
-#define DB_FIELD_MEDIA_STITCHED_INFO                           "stitched_info"
 
 /* DB field for PVR*/
-#define DB_FIELD_PVR_DURATION                                  "duration"
-#define DB_FIELD_PVR_TIME_ZONE                                 "timezone"
-#define DB_FIELD_PVR_PTC                                               "ptc"
-#define DB_FIELD_PVR_MAJOR                                             "major"
-#define DB_FIELD_PVR_MINOR                                             "minor"
-#define DB_FIELD_PVR_CHANNEL_TYPE                              "channel_type"
 #define DB_FIELD_PVR_CHANNEL_NAME                      "channel_name"
 #define DB_FIELD_PVR_CHANNEL_NUM                       "channel_num"
 #define DB_FIELD_PVR_PROGRAM_TITLE                     "program_title"
-#define DB_FIELD_PVR_PROGRAM_NUM                       "program_num"
-#define DB_FIELD_PVR_PROGRAM_CRID                              "program_crid"
-#define DB_FIELD_PVR_GUIDANCE                                  "guidance"
-#define DB_FIELD_PVR_SYNOPSIS                                  "synopsis"
-#define DB_FIELD_PVR_GENRE                                             "genre"
-#define DB_FIELD_PVR_LANGUAGE                                  "language"
-#define DB_FIELD_PVR_EMBARGO_TIME                              "embargo_time"
-#define DB_FIELD_PVR_EXPIRY_TIME                               "expiry_time"
-#define DB_FIELD_PVR_START_TIME                                "start_time"
-#define DB_FIELD_PVR_PROGRAM_START_TIME                "program_start_time"
-#define DB_FIELD_PVR_PROGRAM_END_TIME          "program_end_time"
-#define DB_FIELD_PVR_PROGRAM_DATE                      "program_date"
-#define DB_FIELD_PVR_PARENTAL_RATING                   "parental_rating"
-#define DB_FIELD_PVR_TIMER_RECORD                              "timer_record"
-#define DB_FIELD_PVR_SERIES_RECORD                             "series_record"
-#define DB_FIELD_PVR_HD                                                        "hd"
-#define DB_FIELD_PVR_SUBTITLE                                  "subtitle"
-#define DB_FIELD_PVR_TTX                                               "ttx"
-#define DB_FIELD_PVR_AD                                                        "ad"
-#define DB_FIELD_PVR_HARDOF_HEARINGRADIO       "hard_of_hearing_radio"
-#define DB_FIELD_PVR_DATA_SERVICE                              "data_service"
-#define DB_FIELD_PVR_CONTENT_LOCK                              "content_lock"
-#define DB_FIELD_PVR_CONTENT_WATCH                     "content_watch"
-#define DB_FIELD_PVR_HAS_AUDIO_ONLY                    "has_audio_only"
-#define DB_FIELD_PVR_IS_LOCAL_RECORD                   "is_local_record"
-#define DB_FIELD_PVR_RESOLUTION                                "resolution"
-#define DB_FIELD_PVR_ASPECTRATIO                               "aspectratio"
-#define DB_FIELD_PVR_MODIFIED_MONTH                    "modified_month"
 #define DB_FIELD_PVR_MODIFIED_DATE                     "modified_date"
-#define DB_FIELD_PVR_SPORTS_TYPE                               "sports_type"
-#define DB_FIELD_PVR_GUIDANCE_LENGTH                   "guidance_length"
-#define DB_FIELD_PVR_TVMODE                                            "tvmode"
-#define DB_FIELD_PVR_PLAY_COUNT                                        "play_count"
-#define DB_FIELD_PVR_PRIVATE_DATA               "private_data"
-
-/* DB fields for UHD */
-#define DB_FIELD_UHD_CONTENT_TITLE             "content_title"
-#define DB_FIELD_UHD_RELEASE_DATE                      "release_date"
-#define DB_FIELD_UHD_FILE_NAME                 "file_name"
-#define DB_FIELD_UHD_PLAYED_COUNT                      "played_count"
 
 /* DB TABLE JOIN */
 #define FOLDER_MEDIA_JOIN              DB_TABLE_FOLDER" NATURAL LEFT OUTER JOIN '%s' WHERE validity=1 "
@@ -629,20 +578,6 @@ typedef struct _media_content_scan_cb_data_v2 {
 #define SELECT_PVR_GROUP_AND_COUNT                                             "SELECT %s, COUNT(*) FROM "DB_TABLE_PVR" "SELECT_VALID_STORAGE_FROM_PVR
 
 #define SELECT_VALID_STORAGE_FROM_UHD  "WHERE storage_uuid IN (SELECT storage_id FROM "DB_TABLE_STORAGE" WHERE validity=1)"
-#define SELECT_UHD_GROUP_LIST                                          "SELECT DISTINCT %s FROM "DB_TABLE_UHD" "SELECT_VALID_STORAGE_FROM_UHD
-#define SELECT_UHD_GROUP_LIST_BY_STORAGE_ID            "SELECT DISTINCT %s FROM "DB_TABLE_UHD" WHERE storage_uuid='%s'"
-#define SELECT_UHD_GROUP_COUNT                                 "SELECT COUNT(*) FROM ("SELECT_UHD_GROUP_LIST
-#define SELECT_UHD_GROUP_COUNT_BY_STORAGE_ID   "SELECT COUNT(*) FROM ("SELECT_UHD_GROUP_LIST_BY_STORAGE_ID
-#define SELECT_UHD_FROM_GROUP                                          "SELECT * FROM "DB_TABLE_UHD" "SELECT_VALID_STORAGE_FROM_UHD" AND %s='%q'"
-#define SELECT_UHD_FROM_GROUP_BY_STORAGE_ID            "SELECT * FROM "DB_TABLE_UHD" WHERE storage_uuid='%s' AND %s='%q'"
-#define SELECT_UHD_COUNT_FROM_GROUP                            "SELECT COUNT(*) FROM ("SELECT_UHD_FROM_GROUP
-#define SELECT_UHD_COUNT_FROM_GROUP_BY_STORAGE_ID      "SELECT COUNT(*) FROM ("SELECT_UHD_FROM_GROUP_BY_STORAGE_ID
-#define SELECT_UHD_FROM_GROUP_NULL                                     "SELECT * FROM "DB_TABLE_UHD" "SELECT_VALID_STORAGE_FROM_UHD" AND %s IS NULL"
-#define SELECT_UHD_FROM_GROUP_NULL_BY_STORAGE_ID       "SELECT * FROM "DB_TABLE_UHD" WHERE storage_uuid='%s' AND %s IS NULL"
-#define SELECT_UHD_COUNT_FROM_GROUP_NULL                       "SELECT COUNT(*) FROM ("SELECT_UHD_FROM_GROUP_NULL
-#define SELECT_UHD_COUNT_FROM_GROUP_NULL_BY_STORAGE_ID "SELECT COUNT(*) FROM ("SELECT_UHD_FROM_GROUP_NULL_BY_STORAGE_ID
-#define SELECT_UHD_GROUP_AND_COUNT_BY_STORAGE_ID               "SELECT %s, COUNT(*) FROM "DB_TABLE_UHD" WHERE storage_uuid='%s'"
-#define SELECT_UHD_GROUP_AND_COUNT                                             "SELECT %s, COUNT(*) FROM "DB_TABLE_UHD" "SELECT_VALID_STORAGE_FROM_UHD
 
 #define SELECT_UHD_LIST                                        "SELECT * FROM "DB_TABLE_UHD" "SELECT_VALID_STORAGE_FROM_UHD
 #define SELECT_UHD_LIST_BY_STORAGE_ID  SELECT_UHD_LIST" AND storage_uuid='%s'"
index e612f7ce98b960700a230742adda963cfdae00ef..bc674f48f57080a729e6cc439cb9cd06fc9d4f4a 100644 (file)
@@ -1,6 +1,6 @@
 Name:       capi-content-media-content
 Summary:    A Media content library in Tizen Native API
-Version:    0.5.5
+Version:    0.5.6
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0
index 66ef81aa3a18c56ef59e0b73d7cb11452c86c104..d62c641afe11f44947445f8bff0e9c8dc0aa9e75 100644 (file)
@@ -67,100 +67,14 @@ static const char * __media_db_get_group_name(media_group_e group)
                return DB_FIELD_MEDIA_MODIFIED_DATE;
        case MEDIA_CONTENT_GROUP_ALBUM:
                return DB_FIELD_MEDIA_ALBUM;
-       case MEDIA_PVR_GROUP_DURATION:
-               return DB_FIELD_PVR_DURATION;
-       case MEDIA_PVR_GROUP_TIME_ZONE:
-               return DB_FIELD_PVR_TIME_ZONE;
-       case MEDIA_PVR_GROUP_PTC:
-               return DB_FIELD_PVR_PTC;
-       case MEDIA_PVR_GROUP_MAJOR:
-               return DB_FIELD_PVR_MAJOR;
-       case MEDIA_PVR_GROUP_MINOR:
-               return DB_FIELD_PVR_MINOR;
-       case MEDIA_PVR_GROUP_CHANNEL_TYPE:
-               return DB_FIELD_PVR_CHANNEL_TYPE;
        case MEDIA_PVR_GROUP_CHANNEL_NAME:
                return DB_FIELD_PVR_CHANNEL_NAME;
        case MEDIA_PVR_GROUP_CHANNEL_NUM:
                return DB_FIELD_PVR_CHANNEL_NUM;
        case MEDIA_PVR_GROUP_PROGRAM_TITLE:
                return DB_FIELD_PVR_PROGRAM_TITLE;
-       case MEDIA_PVR_GROUP_PROGRAM_NUM:
-               return DB_FIELD_PVR_PROGRAM_NUM;
-       case MEDIA_PVR_GROUP_PROGRAM_CRID:
-               return DB_FIELD_PVR_PROGRAM_CRID;
-       case MEDIA_PVR_GROUP_GUIDANCE:
-               return DB_FIELD_PVR_GUIDANCE;
-       case MEDIA_PVR_GROUP_SYNOPSIS:
-               return DB_FIELD_PVR_SYNOPSIS;
-       case MEDIA_PVR_GROUP_GENRE:
-               return DB_FIELD_PVR_GENRE;
-       case MEDIA_PVR_GROUP_LANGUAGE:
-               return DB_FIELD_PVR_LANGUAGE;
-       case MEDIA_PVR_GROUP_EMBARGO_TIME:
-               return DB_FIELD_PVR_EMBARGO_TIME;
-       case MEDIA_PVR_GROUP_EXPIRY_TIME:
-               return DB_FIELD_PVR_EXPIRY_TIME;
-       case MEDIA_PVR_GROUP_START_TIME:
-               return DB_FIELD_PVR_START_TIME;
-       case MEDIA_PVR_GROUP_PROGRAM_START_TIME:
-               return DB_FIELD_PVR_PROGRAM_START_TIME;
-       case MEDIA_PVR_GROUP_PROGRAM_END_TIME:
-               return DB_FIELD_PVR_PROGRAM_END_TIME;
-       case MEDIA_PVR_GROUP_PROGRAM_DATE:
-               return DB_FIELD_PVR_PROGRAM_DATE;
-       case MEDIA_PVR_GROUP_PARENTAL_RATING:
-               return DB_FIELD_PVR_PARENTAL_RATING;
-       case MEDIA_PVR_GROUP_TIMER_RECORD:
-               return DB_FIELD_PVR_TIMER_RECORD;
-       case MEDIA_PVR_GROUP_SERIES_RECORD:
-               return DB_FIELD_PVR_SERIES_RECORD;
-       case MEDIA_PVR_GROUP_HD:
-               return DB_FIELD_PVR_HD;
-       case MEDIA_PVR_GROUP_SUBTITLE:
-               return DB_FIELD_PVR_SUBTITLE;
-       case MEDIA_PVR_GROUP_TTX:
-               return DB_FIELD_PVR_TTX;
-       case MEDIA_PVR_GROUP_AD:
-               return DB_FIELD_PVR_AD;
-       case MEDIA_PVR_GROUP_HARDOF_HEARINGRADIO:
-               return DB_FIELD_PVR_HARDOF_HEARINGRADIO;
-       case MEDIA_PVR_GROUP_DATA_SERVICE:
-               return DB_FIELD_PVR_DATA_SERVICE;
-       case MEDIA_PVR_GROUP_CONTENT_LOCK:
-               return DB_FIELD_PVR_CONTENT_LOCK;
-       case MEDIA_PVR_GROUP_CONTENT_WATCH:
-               return DB_FIELD_PVR_CONTENT_WATCH;
-       case MEDIA_PVR_GROUP_HAS_AUDIO_ONLY:
-               return DB_FIELD_PVR_HAS_AUDIO_ONLY;
-       case MEDIA_PVR_GROUP_IS_LOCAL_RECORDED:
-               return DB_FIELD_PVR_IS_LOCAL_RECORD;
-       case MEDIA_PVR_GROUP_RESOLUTION:
-               return DB_FIELD_PVR_RESOLUTION;
-       case MEDIA_PVR_GROUP_ASPECTRATIO:
-               return DB_FIELD_PVR_ASPECTRATIO;
-       case MEDIA_PVR_GROUP_MODIFIED_MONTH:
-               return DB_FIELD_PVR_MODIFIED_DATE;
        case MEDIA_PVR_GROUP_MODIFIED_DATE:
                return DB_FIELD_PVR_MODIFIED_DATE;
-       case MEDIA_PVR_GROUP_SPORTS_TYPE:
-               return DB_FIELD_PVR_SPORTS_TYPE;
-       case MEDIA_PVR_GROUP_GUIDANCE_LENGTH:
-               return DB_FIELD_PVR_GUIDANCE_LENGTH;
-       case MEDIA_PVR_GROUP_TVMODE:
-               return DB_FIELD_PVR_TVMODE;
-       case MEDIA_PVR_GROUP_PLAY_COUNT:
-               return DB_FIELD_PVR_PLAY_COUNT;
-       case MEDIA_PVR_GROUP_PRIVATE_DATA:
-               return DB_FIELD_PVR_PRIVATE_DATA;
-       case MEDIA_UHD_GROUP_CONTENT_TITLE:
-               return DB_FIELD_UHD_CONTENT_TITLE;
-       case MEDIA_UHD_GROUP_RELEASE_DATE:
-               return DB_FIELD_UHD_RELEASE_DATE;
-       case MEDIA_UHD_GROUP_FILE_NAME:
-               return DB_FIELD_UHD_FILE_NAME;
-       case MEDIA_UHD_GROUP_PLAYED_COUNT:
-               return DB_FIELD_UHD_PLAYED_COUNT;
 #endif
        default:
                return NULL;
@@ -271,21 +185,18 @@ int _media_db_get_media_group_count(media_group_e group, filter_h filter, int *g
        char *tmp_option = NULL;
        filter_s *_filter = (filter_s *)filter;
 
-       if (group < MEDIA_PVR_GROUP_DURATION) { /*media content*/
+       content_retip_if_fail(__media_db_get_group_name(group));
+
+       if (group < MEDIA_CONTENT_GROUP_MAX) {  /*media content*/
                if (_filter && STRING_VALID(_filter->storage_id))
                        snprintf(select_query, sizeof(select_query), SELECT_MEDIA_GROUP_COUNT, __media_db_get_group_name(group), _filter->storage_id);
                else
                        snprintf(select_query, sizeof(select_query), SELECT_MEDIA_GROUP_COUNT, __media_db_get_group_name(group), DB_VIEW_MEDIA);
-       } else if (group < MEDIA_UHD_GROUP_CONTENT_TITLE) { /*pvr content*/
+       } else { /*pvr content*/
                if (_filter && STRING_VALID(_filter->storage_id))
                        snprintf(select_query, sizeof(select_query), SELECT_PVR_GROUP_COUNT_BY_STORAGE_ID, __media_db_get_group_name(group), _filter->storage_id);
                else
                        snprintf(select_query, sizeof(select_query), SELECT_PVR_GROUP_COUNT, __media_db_get_group_name(group));
-       } else { /*uhd content*/
-               if (_filter && STRING_VALID(_filter->storage_id))
-                       snprintf(select_query, sizeof(select_query), SELECT_UHD_GROUP_COUNT_BY_STORAGE_ID, __media_db_get_group_name(group), _filter->storage_id);
-               else
-                       snprintf(select_query, sizeof(select_query), SELECT_UHD_GROUP_COUNT, __media_db_get_group_name(group));
        }
        ret = __media_db_make_query(filter, &condition_query, &option_query);
        content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
@@ -321,21 +232,18 @@ int _media_db_get_media_group(media_group_e group, filter_h filter, media_group_
        sqlite3_stmt *stmt = NULL;
        filter_s *_filter = (filter_s *)filter;
 
-       if (group < MEDIA_PVR_GROUP_DURATION) { /*media content */
+       content_retip_if_fail(__media_db_get_group_name(group));
+
+       if (group < MEDIA_CONTENT_GROUP_MAX) {  /*media content */
                if (_filter && STRING_VALID(_filter->storage_id))
                        snprintf(select_query, sizeof(select_query), SELECT_MEDIA_GROUP_LIST, __media_db_get_group_name(group), _filter->storage_id);
                else
                        snprintf(select_query, sizeof(select_query), SELECT_MEDIA_GROUP_LIST, __media_db_get_group_name(group), DB_VIEW_MEDIA);
-       } else if (group < MEDIA_UHD_GROUP_CONTENT_TITLE) { /*pvr content */
+       } else { /*pvr content */
                if (_filter && STRING_VALID(_filter->storage_id))
                        snprintf(select_query, sizeof(select_query), SELECT_PVR_GROUP_LIST_BY_STORAGE_ID, __media_db_get_group_name(group), _filter->storage_id);
                else
                        snprintf(select_query, sizeof(select_query), SELECT_PVR_GROUP_LIST, __media_db_get_group_name(group));
-       } else { /* uhd content */
-               if (_filter && STRING_VALID(_filter->storage_id))
-                       snprintf(select_query, sizeof(select_query), SELECT_UHD_GROUP_LIST_BY_STORAGE_ID, __media_db_get_group_name(group), _filter->storage_id);
-               else
-                       snprintf(select_query, sizeof(select_query), SELECT_UHD_GROUP_LIST, __media_db_get_group_name(group));
        }
        ret = __media_db_make_query(filter, &condition_query, &option_query);
        content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
@@ -372,24 +280,19 @@ int _media_db_get_media_group_and_count(media_group_e group, filter_h filter, me
        sqlite3_stmt *stmt = NULL;
        filter_s *_filter = (filter_s *)filter;
 
-       const chargroup_name = __media_db_get_group_name(group);
-       content_retip_if_fail(STRING_VALID(group_name));
+       const char *group_name = __media_db_get_group_name(group);
+       content_retip_if_fail(group_name);
 
-       if (group < MEDIA_PVR_GROUP_DURATION) { /*media content*/
+       if (group < MEDIA_CONTENT_GROUP_MAX) {  /*media content*/
                if (_filter && STRING_VALID(_filter->storage_id))
                        snprintf(select_query, sizeof(select_query), SELECT_MEDIA_GROUP_AND_COUNT, group_name, _filter->storage_id);
                else
                        snprintf(select_query, sizeof(select_query), SELECT_MEDIA_GROUP_AND_COUNT, group_name, DB_VIEW_MEDIA);
-       } else if (group < MEDIA_UHD_GROUP_CONTENT_TITLE) {/*pvr content*/
+       } else {/*pvr content*/
                if (_filter && STRING_VALID(_filter->storage_id))
                        snprintf(select_query, sizeof(select_query), SELECT_PVR_GROUP_AND_COUNT_BY_STORAGE_ID, group_name, _filter->storage_id);
                else
                        snprintf(select_query, sizeof(select_query), SELECT_PVR_GROUP_AND_COUNT, group_name);
-       } else {/*uhd content*/
-               if (_filter && STRING_VALID(_filter->storage_id))
-                       snprintf(select_query, sizeof(select_query), SELECT_UHD_GROUP_AND_COUNT_BY_STORAGE_ID, group_name, _filter->storage_id);
-               else
-                       snprintf(select_query, sizeof(select_query), SELECT_UHD_GROUP_AND_COUNT, group_name);
        }
 
        ret = __media_db_make_query(filter, &condition_query, &option_query);
@@ -487,6 +390,8 @@ int _media_db_get_media_group_count(media_group_e group, filter_h filter, int *g
        char *condition_query = NULL;
        char *option_query = NULL;
 
+       content_retip_if_fail(__media_db_get_group_name(group));
+
        select_query = g_strdup_printf(SELECT_MEDIA_GROUP_COUNT, __media_db_get_group_name(group), __media_db_get_group_name(group));
 
        ret = __media_db_make_query(filter, &condition_query, &option_query);
@@ -518,6 +423,8 @@ int _media_db_get_media_group(media_group_e group, filter_h filter, media_group_
        char *name = NULL;
        sqlite3_stmt *stmt = NULL;
 
+       content_retip_if_fail(__media_db_get_group_name(group));
+
        select_query = g_strdup_printf(SELECT_MEDIA_GROUP_LIST, __media_db_get_group_name(group));
 
        ret = __media_db_make_query(filter, &condition_query, &option_query);
@@ -1216,9 +1123,11 @@ int _media_db_get_media_group_item_count(const char *group_name, filter_h filter
        char *tmp_option = NULL;
        char *condition_query = NULL;
        char *option_query = NULL;
+
+       content_retip_if_fail(__media_db_get_group_name(group));
 #ifdef _USE_TVPD_MODE
        filter_s *_filter = (filter_s *)filter;
-       if (group < MEDIA_PVR_GROUP_DURATION) { /*media content */
+       if (group < MEDIA_CONTENT_GROUP_MAX) { /*media content */
                if (group_name) {
                        if (_filter && STRING_VALID(_filter->storage_id))
                                sqlite3_snprintf(sizeof(select_query), select_query, SELECT_MEDIA_COUNT_FROM_GROUP, _filter->storage_id, __media_db_get_group_name(group), group_name);
@@ -1230,7 +1139,7 @@ int _media_db_get_media_group_item_count(const char *group_name, filter_h filter
                        else
                                snprintf(select_query, sizeof(select_query), SELECT_MEDIA_COUNT_FROM_GROUP_NULL, DB_VIEW_MEDIA, __media_db_get_group_name(group));
                }
-       } else if (group < MEDIA_UHD_GROUP_CONTENT_TITLE) {/*pvr content*/
+       } else {/*pvr content*/
                if (group_name) {
                        if (_filter && STRING_VALID(_filter->storage_id))
                                sqlite3_snprintf(sizeof(select_query), select_query, SELECT_PVR_COUNT_FROM_GROUP_BY_STORAGE_ID, _filter->storage_id, __media_db_get_group_name(group), group_name);
@@ -1242,18 +1151,6 @@ int _media_db_get_media_group_item_count(const char *group_name, filter_h filter
                        else
                                snprintf(select_query, sizeof(select_query), SELECT_PVR_COUNT_FROM_GROUP_NULL, __media_db_get_group_name(group));
                }
-       } else {/*uhd content*/
-               if (group_name) {
-                       if (_filter && STRING_VALID(_filter->storage_id))
-                               sqlite3_snprintf(sizeof(select_query), select_query, SELECT_UHD_COUNT_FROM_GROUP_BY_STORAGE_ID, _filter->storage_id, __media_db_get_group_name(group), group_name);
-                       else
-                               sqlite3_snprintf(sizeof(select_query), select_query, SELECT_UHD_COUNT_FROM_GROUP, __media_db_get_group_name(group), group_name);
-               } else {
-                       if (_filter && STRING_VALID(_filter->storage_id))
-                               snprintf(select_query, sizeof(select_query), SELECT_UHD_COUNT_FROM_GROUP_NULL_BY_STORAGE_ID, _filter->storage_id, __media_db_get_group_name(group));
-                       else
-                               snprintf(select_query, sizeof(select_query), SELECT_UHD_COUNT_FROM_GROUP_NULL, __media_db_get_group_name(group));
-               }
        }
 #else
        if (group_name)
@@ -1293,6 +1190,8 @@ int _media_db_get_media_group_item(const char *group_name, filter_h filter, medi
        char *condition_query = NULL;
        char *option_query = NULL;
        sqlite3_stmt *stmt = NULL;
+
+       content_retip_if_fail(__media_db_get_group_name(group));
 #ifdef _USE_TVPD_MODE
        filter_s *_filter = (filter_s *)filter;
        if (group_name) {
index a3df405c2f711fdb7147ee641493895abc951312..9ede8721fb67c30808fb520ae2c10a260264a5ac 100644 (file)
@@ -19,9 +19,7 @@
 #include <media_util_private.h>
 #ifdef _USE_TVPD_MODE
 #include <media_content_type_product.h>
-#endif
 
-#ifdef _USE_TVPD_MODE
 static char *g_src_path = NULL;
 #endif
 
index 1b7e23e9d67bd2d7da0b6f6dfd2a899382476d2e..dfcfc34fd7b3272f5f60c30b41588c2a4bc60906 100644 (file)
@@ -162,83 +162,36 @@ 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_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)) {
-#endif
-               content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-               ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-       } else {
-               ret = _media_db_get_media_group_count(group, filter, group_count);
-       }
+       content_retip_if_fail(group_count);
 
-       return ret;
+       return _media_db_get_media_group_count(group, filter, group_count);
 }
 #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;
-
-       if ((callback == NULL) || (group < MEDIA_CONTENT_GROUP_DISPLAY_NAME) || (group >= MEDIA_GROUP_MAX)) {
-               content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-               ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-       } else {
-               ret = _media_db_get_media_group_and_count(group, filter, callback, user_data);
-       }
+       content_retip_if_fail(callback);
 
-       return ret;
+       return _media_db_get_media_group_and_count(group, filter, callback, user_data);
 }
 #endif
 
 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_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)) {
-#endif
-               content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-               ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-       } else {
-               ret = _media_db_get_media_group(group, filter, callback, user_data);
-       }
+       content_retip_if_fail(callback);
 
-       return ret;
+       return _media_db_get_media_group(group, filter, callback, user_data);
 }
 
 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_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)) {
-#endif
-               content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-               ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-       } else {
-               ret = _media_db_get_media_group_item_count(group_name, filter, group, media_count);
-       }
+       content_retip_if_fail(media_count);
 
-       return ret;
+       return _media_db_get_media_group_item_count(group_name, filter, group, media_count);
 }
 
 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_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)) {
-#endif
-               content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-               ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-       } else {
-               ret = _media_db_get_media_group_item(group_name, filter, group, callback, user_data);
-       }
+       content_retip_if_fail(callback);
 
-       return ret;
+       return _media_db_get_media_group_item(group_name, filter, group, callback, user_data);
 }