Fix wrong function name 25/314225/1 accepted/tizen_unified_toolchain accepted/tizen_unified_x_asan accepted/tizen/unified/20240709.165158 accepted/tizen/unified/dev/20240710.032421 accepted/tizen/unified/toolchain/20240812.133344 accepted/tizen/unified/x/20240710.013027 accepted/tizen/unified/x/asan/20240813.231824
authorMinje Ahn <minje.ahn@samsung.com>
Tue, 9 Jul 2024 04:57:39 +0000 (13:57 +0900)
committerMinje Ahn <minje.ahn@samsung.com>
Tue, 9 Jul 2024 04:57:39 +0000 (13:57 +0900)
Change-Id: I413fa7ac16a60fb8332100ad7d9c47f7c81dfc3a
Signed-off-by: Minje Ahn <minje.ahn@samsung.com>
58 files changed:
AUTHORS [changed mode: 0755->0644]
doc/media_content_doc.h [changed mode: 0755->0644]
include/media_audio.h [changed mode: 0755->0644]
include/media_book.h [changed mode: 0755->0644]
include/media_bookmark.h [changed mode: 0755->0644]
include/media_content.h [changed mode: 0755->0644]
include/media_content_internal.h [changed mode: 0755->0644]
include/media_content_type.h [changed mode: 0755->0644]
include/media_face.h [changed mode: 0755->0644]
include/media_filter.h [changed mode: 0755->0644]
include/media_folder.h [changed mode: 0755->0644]
include/media_group.h [changed mode: 0755->0644]
include/media_image.h [changed mode: 0755->0644]
include/media_info.h [changed mode: 0755->0644]
include/media_info_private.h
include/media_playlist.h [changed mode: 0755->0644]
include/media_tag.h [changed mode: 0755->0644]
include/media_util_private.h [changed mode: 0755->0644]
include/media_video.h [changed mode: 0755->0644]
include_product/media_audio.h [changed mode: 0755->0644]
include_product/media_book.h [changed mode: 0755->0644]
include_product/media_bookmark.h [changed mode: 0755->0644]
include_product/media_content.h [changed mode: 0755->0644]
include_product/media_content_internal.h [changed mode: 0755->0644]
include_product/media_content_product.h [changed mode: 0755->0644]
include_product/media_content_type.h [changed mode: 0755->0644]
include_product/media_content_type_product.h [changed mode: 0755->0644]
include_product/media_face.h [changed mode: 0755->0644]
include_product/media_filter.h [changed mode: 0755->0644]
include_product/media_folder.h [changed mode: 0755->0644]
include_product/media_group.h [changed mode: 0755->0644]
include_product/media_image.h [changed mode: 0755->0644]
include_product/media_info.h [changed mode: 0755->0644]
include_product/media_info_private.h
include_product/media_playlist.h [changed mode: 0755->0644]
include_product/media_pvr.h [changed mode: 0755->0644]
include_product/media_tag.h [changed mode: 0755->0644]
include_product/media_uhd.h [changed mode: 0755->0644]
include_product/media_video.h [changed mode: 0755->0644]
packaging/capi-content-media-content.spec
src/media_bookmark.c [changed mode: 0755->0644]
src/media_content.c
src/media_db.c [changed mode: 0755->0644]
src/media_face.c [changed mode: 0755->0644]
src/media_filter.c [changed mode: 0755->0644]
src/media_folder.c [changed mode: 0755->0644]
src/media_group.c [changed mode: 0755->0644]
src/media_image.c [changed mode: 0755->0644]
src/media_info.c
src/media_playlist.c [changed mode: 0755->0644]
src/media_pvr.c [changed mode: 0755->0644]
src/media_storage.c [changed mode: 0755->0644]
src/media_tag.c [changed mode: 0755->0644]
src/media_uhd.c [changed mode: 0755->0644]
src/media_util_private.c [changed mode: 0755->0644]
src/media_video.c [changed mode: 0755->0644]
test/CMakeLists.txt [changed mode: 0755->0644]
test/media-content_test.c [changed mode: 0755->0644]

diff --git a/AUTHORS b/AUTHORS
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
index 8cd70a2..0d3e23e
@@ -46,7 +46,7 @@ extern "C" {
  *
  * @since_tizen 2.3
  *
- * @remarks The @a filter should be released using media_info_filter_destroy().
+ * @remarks The @a filter should be released using media_filter_destroy().
  *
  * @param[out] filter The handle to the media filter
  *
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
index bf919c3..030884d 100644 (file)
@@ -57,8 +57,6 @@ extern "C" {
 #define LOG_TAG "CAPI_CONTENT_MEDIA_CONTENT"
 
 #define STRING_VALID(str)              (str && strlen(str) > 0)
-#define SQLITE3_FINALIZE(x)    {if (x) sqlite3_finalize(x); }
-#define SQLITE3_SAFE_FREE(x)   {if (x) {sqlite3_free(x); x = NULL; } }
 
 #define MAX_QUERY_SIZE 4096
 #define MAX_PATH_LEN 4096
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
index f4600ac..d307f3d
@@ -55,7 +55,6 @@ typedef enum {
        MEDIA_CONTENT_TYPE_BOOK         = 5,    /**<The type of book (Since 6.5)*/
        MEDIA_CONTENT_TYPE_PVR          = 1001, /**<The type of PVR */
        MEDIA_CONTENT_TYPE_UHD          = 1002, /**<The type of UHD */
-       MEDIA_CONTENT_TYPE_SCSA         = 1003, /**<The type of SCSA */
        MEDIA_CONTENT_TYPE_APK      = 1004,     /**<The type of ARK*/
        MEDIA_CONTENT_TYPE_DOC      = 1005,     /**<The type of DOC*/
 } media_content_type_e;
@@ -178,56 +177,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 {
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
index 2ea0b72..e8ac13b
@@ -46,7 +46,7 @@ extern "C" {
  *
  * @since_tizen 2.3
  *
- * @remarks The @a filter should be released using media_info_filter_destroy().
+ * @remarks The @a filter should be released using media_filter_destroy().
  *
  * @param[out] filter The handle to the media filter
  *
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
index 9c78007..5f03330 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" {
@@ -60,8 +58,6 @@ extern "C" {
 #define LOG_TAG "CAPI_CONTENT_MEDIA_CONTENT"
 
 #define STRING_VALID(str)              (str && strlen(str) > 0)
-#define SQLITE3_FINALIZE(x)    {if (x) sqlite3_finalize(x); }
-#define SQLITE3_SAFE_FREE(x)   {if (x) {sqlite3_free(x); x = NULL; } }
 
 #define MAX_QUERY_SIZE 4096
 #define MAX_PATH_LEN 4096
@@ -414,7 +410,6 @@ typedef struct _media_content_scan_cb_data_v2 {
 /* DB View */
 #define DB_VIEW_PLAYLIST       "playlist_view"
 #define DB_VIEW_TAG                    "tag_view"
-#define DB_VIEW_MEDIA          "media_view"
 
 /* DB field for media */
 #define DB_FIELD_MEDIA_DISPLAY_NAME            "media_display_name"
@@ -439,75 +434,29 @@ 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 "
-#define BOOKMARK_MEDIA_JOIN            DB_TABLE_BOOKMARK" NATURAL JOIN '%s' WHERE validity=1 "
-#define ALBUM_MEDIA_JOIN               DB_TABLE_ALBUM" NATURAL JOIN '%s' WHERE validity=1 "
-#define FACE_MEDIA_JOIN                        DB_TABLE_FACE" NATURAL JOIN '%s' WHERE validity=1 "
+#define FOLDER_MEDIA_JOIN              DB_TABLE_FOLDER" NATURAL LEFT OUTER JOIN "DB_TABLE_MEDIA" WHERE validity=1 "
+#define BOOKMARK_MEDIA_JOIN            DB_TABLE_BOOKMARK" NATURAL JOIN "DB_TABLE_MEDIA" WHERE validity=1 "
+#define ALBUM_MEDIA_JOIN               DB_TABLE_ALBUM" NATURAL JOIN "DB_TABLE_MEDIA" WHERE validity=1 "
+#define FACE_MEDIA_JOIN                        DB_TABLE_FACE" NATURAL JOIN "DB_TABLE_MEDIA" WHERE validity=1 "
 
 /* Get Group info */
-#define SELECT_MEDIA_GROUP_AND_COUNT           "SELECT %s, COUNT(*) FROM '%s' WHERE validity=1 "
+#define SELECT_MEDIA_GROUP_AND_COUNT           "SELECT %s, COUNT(*) FROM "DB_TABLE_MEDIA" WHERE validity=1 "
+#define SELECT_MEDIA_GROUP_AND_COUNT_BY_STORAGE_ID             SELECT_MEDIA_GROUP_AND_COUNT"AND storage_uuid='%s' "
 
 /* Get Group List */
 #define SELECT_ALBUM_LIST                      "SELECT DISTINCT album_id, name, artist, album_art FROM "ALBUM_MEDIA_JOIN
-#define SELECT_MEDIA_GROUP_LIST        "SELECT DISTINCT %s FROM '%s' WHERE validity=1 "
+#define SELECT_ALBUM_LIST_BY_STORAGE_ID                SELECT_ALBUM_LIST"AND storage_uuid='%s' "
+#define SELECT_MEDIA_GROUP_LIST        "SELECT DISTINCT %s FROM "DB_TABLE_MEDIA" WHERE validity=1 "
+#define SELECT_MEDIA_GROUP_LIST_BY_STORAGE_ID  SELECT_MEDIA_GROUP_LIST"AND storage_uuid='%s' "
 
 #define SELECT_FOLDER_LIST                     "SELECT DISTINCT folder_id, folder_path, folder_name, storage_uuid FROM "FOLDER_MEDIA_JOIN
 #define SELECT_FOLDER_LIST_BY_STORAGE_ID       SELECT_FOLDER_LIST"AND storage_uuid='%s' "
@@ -516,21 +465,29 @@ typedef struct _media_content_scan_cb_data_v2 {
 
 /* Get Group Count */
 #define SELECT_ALBUM_COUNT             "SELECT COUNT(DISTINCT album_id) FROM "ALBUM_MEDIA_JOIN
+#define SELECT_ALBUM_COUNT_BY_STORAGE_ID               SELECT_ALBUM_COUNT"AND storage_uuid='%s' "
 #define SELECT_FOLDER_COUNT            "SELECT COUNT(DISTINCT folder_id) FROM "FOLDER_MEDIA_JOIN
 #define SELECT_FOLDER_COUNT_BY_STORAGE_ID              SELECT_FOLDER_COUNT"AND storage_uuid='%s' "
 #define SELECT_TAG_COUNT                       "SELECT COUNT(DISTINCT tag_id) FROM "DB_VIEW_TAG" WHERE 1 "
 #define SELECT_PLAYLIST_COUNT          "SELECT COUNT(DISTINCT playlist_id) FROM "DB_VIEW_PLAYLIST" WHERE 1 "
 #define SELECT_BOOKMARK_COUNT  "SELECT COUNT(*) FROM "BOOKMARK_MEDIA_JOIN
+#define SELECT_BOOKMARK_COUNT_BY_STORAGE_ID            SELECT_BOOKMARK_COUNT"AND storage_uuid='%s' "
 #define SELECT_MEDIA_GROUP_COUNT       "SELECT COUNT(*) FROM ("SELECT_MEDIA_GROUP_LIST
+#define SELECT_MEDIA_GROUP_COUNT_BY_STORAGE_ID SELECT_MEDIA_GROUP_COUNT"AND storage_uuid='%s' "
 /*count(distinct x) count only non-null values, but select distinct X returns include null. so sync the result of count and list, don't use count(distinct x)*/
 
 /* Get Media Count of Group */
-#define SELECT_MEDIA_COUNT_FROM_MEDIA                  "SELECT COUNT(*) FROM (SELECT media_id FROM '%s' WHERE validity=1 "
-#define SELECT_MEDIA_COUNT_FROM_MEDIA_SIMPLE   "SELECT COUNT(*) FROM '%s' WHERE validity=1 "
-#define SELECT_MEDIA_COUNT_FROM_ALBUM                  "SELECT COUNT(*) FROM '%s' WHERE validity=1 AND album_id='%d'"
-#define SELECT_MEDIA_COUNT_FROM_GROUP                  "SELECT COUNT(*) FROM ("SELECT_MEDIA_FROM_GROUP         /*to apply limit condition. */
-#define SELECT_MEDIA_COUNT_FROM_GROUP_NULL             "SELECT COUNT(*) FROM ("SELECT_MEDIA_FROM_GROUP_NULL    /* to apply limit condition. */
-#define SELECT_MEDIA_COUNT_FROM_FOLDER                 "SELECT COUNT(*) FROM '%s' WHERE validity=1 AND folder_id='%s'"
+#define SELECT_MEDIA_COUNT_FROM_MEDIA                  "SELECT COUNT(*) FROM (SELECT media_id FROM "DB_TABLE_MEDIA" WHERE validity=1 "
+#define SELECT_MEDIA_COUNT_FROM_MEDIA_BY_STORAGE_ID            SELECT_MEDIA_COUNT_FROM_MEDIA"AND storage_id='%s' "
+#define SELECT_MEDIA_COUNT_FROM_MEDIA_SIMPLE   "SELECT COUNT(*) FROM "DB_TABLE_MEDIA" WHERE validity=1 "
+#define SELECT_MEDIA_COUNT_FROM_MEDIA_SIMPLE_BY_STORAGE_ID     SELECT_MEDIA_COUNT_FROM_MEDIA_SIMPLE"AND storage_uuid='%s' "
+#define SELECT_MEDIA_COUNT_FROM_ALBUM                  "SELECT COUNT(*) FROM "DB_TABLE_MEDIA" WHERE validity=1 AND album_id='%d'"
+#define SELECT_MEDIA_COUNT_FROM_ALBUM_BY_STORAGE_ID            SELECT_MEDIA_COUNT_FROM_ALBUM" AND storage_uuid='%s'"
+#define SELECT_MEDIA_COUNT_FROM_GROUP                  "SELECT COUNT(*) FROM ("SELECT_MEDIA_FROM_GROUP
+#define SELECT_MEDIA_COUNT_FROM_GROUP_BY_STORAGE_ID            SELECT_MEDIA_COUNT_FROM_GROUP" AND storage_uuid='%s'"
+#define SELECT_MEDIA_COUNT_FROM_GROUP_NULL             "SELECT COUNT(*) FROM ("SELECT_MEDIA_FROM_GROUP_NULL
+#define SELECT_MEDIA_COUNT_FROM_GROUP_NULL_BY_STORAGE_ID       SELECT_MEDIA_COUNT_FROM_GROUP_NULL" AND storage_uuid='%s'"
+#define SELECT_MEDIA_COUNT_FROM_FOLDER                 "SELECT COUNT(*) FROM "DB_TABLE_MEDIA" WHERE validity=1 AND folder_id='%s' "
 #define SELECT_MEDIA_COUNT_FROM_TAG                            "SELECT COUNT(*) FROM "DB_VIEW_TAG" WHERE (tag_id=%d AND tag_media_count>0) "
 #define SELECT_MEDIA_COUNT_FROM_PLAYLIST                       "SELECT COUNT(*) FROM "DB_VIEW_PLAYLIST" WHERE (playlist_id=%d and playlist_media_count>0) "
 
@@ -571,22 +528,30 @@ typedef struct _media_content_scan_cb_data_v2 {
 #define INSERT_BOOKMARK_TO_BOOKMARK                    "INSERT INTO "DB_TABLE_BOOKMARK" (media_id, bookmark_marked_time, bookmark_thumbnail_path, bookmark_name) VALUES ('%q', '%d', %Q, %Q)"
 #define SELECT_BOOKMARK_COUNT_BY_MEDIA_ID              "SELECT COUNT(*) FROM "BOOKMARK_MEDIA_JOIN" AND media_id='%s'"
 #define SELECT_BOOKMARK_LIST                                           "SELECT bookmark_id, media_id, bookmark_marked_time, bookmark_thumbnail_path, bookmark_name FROM "BOOKMARK_MEDIA_JOIN
+#define SELECT_BOOKMARK_LIST_BY_STORAGE_ID     SELECT_BOOKMARK_LIST"AND storage_uuid='%s' "
 #define SELECT_BOOKMARK_LIST_BY_MEDIA_ID                       "SELECT bookmark_id, media_id, bookmark_marked_time, bookmark_thumbnail_path, bookmark_name FROM "BOOKMARK_MEDIA_JOIN" AND media_id='%s'"
 #define SELECT_BOOKMARK_ID_FROM_BOOKMARK               "SELECT bookmark_id FROM "DB_TABLE_BOOKMARK" WHERE media_id='%s' AND bookmark_marked_time=%d"
 
 #define UPDATE_BOOKMARK_FROM_BOOKMARK          "UPDATE "DB_TABLE_BOOKMARK" SET bookmark_name=%Q WHERE bookmark_id=%d;"
 
-#define SELECT_MEDIA_ITEM                                      "SELECT "MEDIA_INFO_ITEM" FROM '%s' WHERE validity=1"
-#define SELECT_MEDIA_FROM_MEDIA                        "SELECT "MEDIA_INFO_ITEM" FROM '%s' WHERE validity=1 AND media_id='%s'"
-#define SELECT_MEDIA_BY_PATH                           "SELECT "MEDIA_INFO_ITEM" FROM '%s' WHERE validity=1 AND media_path='%q'"
-#define SELECT_MEDIA_FROM_ALBUM                        "SELECT "MEDIA_INFO_ITEM" FROM '%s' WHERE validity=1 AND album_id=%d"
-#define SELECT_MEDIA_FROM_GROUP                        "SELECT "MEDIA_INFO_ITEM" FROM '%s' WHERE validity=1 AND %s='%q'"
-#define SELECT_MEDIA_FROM_GROUP_NULL   "SELECT "MEDIA_INFO_ITEM" FROM '%s' WHERE validity=1 AND %s IS NULL"
-#define SELECT_MEDIA_FROM_FOLDER                       "SELECT "MEDIA_INFO_ITEM" FROM '%s' WHERE validity=1 AND folder_id='%s'"
-#define SELECT_MEDIA_FROM_TAG                          "SELECT "MEDIA_INFO_ITEM" FROM '%s' WHERE media_id IN (SELECT media_id FROM "DB_TABLE_TAG_MAP" WHERE tag_id=%d) AND validity=1"
-#define SELECT_MEDIA_FROM_PLAYLIST             "SELECT "MEDIA_INFO_ITEM" FROM '%s' WHERE media_id IN (SELECT media_id FROM "DB_TABLE_PLAYLIST_MAP" WHERE playlist_id=%d) AND validity=1"
-#define SELECT_MEDIA_PATH_BY_ID                        "SELECT media_path FROM "DB_VIEW_MEDIA" WHERE media_id='%q'"
-#define SELECT_MEDIA_STORAGE_ID_BY_ID          "SELECT storage_uuid FROM "DB_VIEW_MEDIA" WHERE media_id='%q'"
+#define SELECT_MEDIA_ITEM                                      "SELECT "MEDIA_INFO_ITEM" FROM "DB_TABLE_MEDIA" WHERE validity=1"
+#define SELECT_MEDIA_ITEM_BY_STORAGE_ID                SELECT_MEDIA_ITEM" AND storage_uuid='%s'"
+#define SELECT_MEDIA_FROM_MEDIA                        "SELECT "MEDIA_INFO_ITEM" FROM "DB_TABLE_MEDIA" WHERE validity=1 AND media_id='%s'"
+#define SELECT_MEDIA_BY_PATH                           "SELECT "MEDIA_INFO_ITEM" FROM "DB_TABLE_MEDIA" WHERE validity=1 AND media_path='%q'"
+#define SELECT_MEDIA_FROM_ALBUM                        "SELECT "MEDIA_INFO_ITEM" FROM "DB_TABLE_MEDIA" WHERE validity=1 AND album_id=%d "
+#define SELECT_MEDIA_FROM_ALBUM_BY_STORAGE_ID  SELECT_MEDIA_FROM_ALBUM" AND storage_uuid='%s' "
+#define SELECT_MEDIA_FROM_GROUP                        "SELECT "MEDIA_INFO_ITEM" FROM "DB_TABLE_MEDIA" WHERE validity=1 AND %s='%q'"
+#define SELECT_MEDIA_FROM_GROUP_BY_STORAGE_ID  SELECT_MEDIA_FROM_GROUP" AND storage_uuid='%s'"
+#define SELECT_MEDIA_FROM_GROUP_NULL   "SELECT "MEDIA_INFO_ITEM" FROM "DB_TABLE_MEDIA" WHERE validity=1 AND %s IS NULL"
+#define SELECT_MEDIA_FROM_GROUP_NULL_BY_STORAGE_ID     SELECT_MEDIA_FROM_GROUP_NULL" AND storage_uuid='%s'"
+#define SELECT_MEDIA_FROM_FOLDER                       "SELECT "MEDIA_INFO_ITEM" FROM "DB_TABLE_MEDIA" WHERE validity=1 AND folder_id='%s'"
+#define SELECT_MEDIA_FROM_STORAGE              "SELECT "MEDIA_INFO_ITEM" FROM '%s' WHERE validity=1 AND storage_uuid='%s'"
+#define SELECT_MEDIA_FROM_TAG                          "SELECT "MEDIA_INFO_ITEM" FROM "DB_TABLE_MEDIA" WHERE media_id IN (SELECT media_id FROM "DB_TABLE_TAG_MAP" WHERE tag_id=%d) AND validity=1"
+#define SELECT_MEDIA_FROM_TAG_BY_STORAGE_ID                    SELECT_MEDIA_FROM_TAG" AND storage_uuid='%s'"
+#define SELECT_MEDIA_FROM_PLAYLIST             "SELECT "MEDIA_INFO_ITEM" FROM "DB_TABLE_MEDIA" WHERE media_id IN (SELECT media_id FROM "DB_TABLE_PLAYLIST_MAP" WHERE playlist_id=%d) AND validity=1"
+#define SELECT_MEDIA_FROM_PLAYLIST_BY_STORAGE_ID       SELECT_MEDIA_FROM_PLAYLIST" AND storage_uuid='%s'"
+#define SELECT_MEDIA_PATH_BY_ID                        "SELECT media_path FROM "DB_TABLE_MEDIA" WHERE media_id='%q'"
+#define SELECT_MEDIA_STORAGE_ID_BY_ID          "SELECT storage_uuid FROM "DB_TABLE_MEDIA" WHERE media_id='%q'"
 
 /* Delete */
 #define DELETE_PLAYLIST_FROM_PLAYLIST          "DELETE FROM "DB_TABLE_PLAYLIST" WHERE playlist_id=%d"
@@ -594,17 +559,21 @@ typedef struct _media_content_scan_cb_data_v2 {
 #define DELETE_BOOKMARK_FROM_BOOKMARK  "DELETE FROM "DB_TABLE_BOOKMARK" WHERE bookmark_id=%d"
 
 /* Storage*/
+#define SELECT_STORAGE_COUNT                           "SELECT COUNT(*) FROM "DB_TABLE_STORAGE" WHERE validity=1"
 #define SELECT_STORAGE_LIST                                    "SELECT storage_id, storage_path FROM "DB_TABLE_STORAGE" WHERE validity=1"
+#define SELECT_STORAGE_INFO_FROM_STORAGE       "SELECT storage_path FROM "DB_TABLE_STORAGE" WHERE validity=1 AND storage_id='%s'"
 
 /* Face */
 #define DELETE_FACE_FROM_FACE                  "DELETE FROM "DB_TABLE_FACE" WHERE media_face_id=%d"
 #define INSERT_FACE_TO_FACE                            "INSERT INTO "DB_TABLE_FACE" (media_id, face_rect_x , face_rect_y, face_rect_w, face_rect_h, face_orientation, media_face_tag) VALUES ('%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, face_orientation=%d, media_face_tag=%Q WHERE media_face_id=%d"
-#define SELECT_MEDIA_COUNT_FROM_MEDIA_BY_ID            "SELECT COUNT(*) FROM "DB_VIEW_MEDIA" WHERE media_id='%q' AND validity=1"
-#define SELECT_IMAGE_COUNT_FROM_MEDIA_BY_ID            "SELECT COUNT(*) FROM "DB_VIEW_MEDIA" WHERE media_id='%q' AND media_type=0 AND validity=1"
+#define SELECT_MEDIA_COUNT_FROM_MEDIA_BY_ID            "SELECT COUNT(*) FROM "DB_TABLE_MEDIA" WHERE media_id='%q' AND validity=1"
+#define SELECT_IMAGE_COUNT_FROM_MEDIA_BY_ID            "SELECT COUNT(*) FROM "DB_TABLE_MEDIA" WHERE media_id='%q' AND media_type=0 AND validity=1"
 #define SELECT_FACE_COUNT                                      "SELECT COUNT(*) FROM "FACE_MEDIA_JOIN
+#define SELECT_FACE_COUNT_BY_STORAGE_ID                SELECT_FACE_COUNT"AND storage_uuid='%s' "
 #define SELECT_FACE_COUNT_BY_MEDIA_ID          "SELECT COUNT(*) FROM "FACE_MEDIA_JOIN" AND media_id='%s'"
 #define SELECT_FACE_LIST                                       "SELECT media_face_id, media_id, face_rect_x, face_rect_y, face_rect_w, face_rect_h, face_orientation, media_face_tag FROM "FACE_MEDIA_JOIN
+#define SELECT_FACE_LIST_BY_STORAGE_ID         SELECT_FACE_LIST"AND storage_uuid='%s' "
 #define SELECT_FACE_LIST_BY_MEDIA_ID           "SELECT media_face_id, media_id, face_rect_x, face_rect_y, face_rect_w, face_rect_h, face_orientation, media_face_tag FROM "FACE_MEDIA_JOIN" AND media_id='%s'"
 #define UPDATE_MEDIA_INFO_IN_FACE_SCAN_LIST    "UPDATE "DB_TABLE_FACE_SCAN_LIST" SET modified_time = 0 WHERE media_id IN (SELECT media_id FROM "DB_TABLE_FACE" WHERE media_face_id=%d)"
 #define SELECT_FACE_ID                 "SELECT media_face_id FROM "DB_TABLE_FACE" WHERE media_id='%q' AND face_rect_x=%d AND face_rect_y=%d AND face_rect_w=%d AND face_rect_h=%d AND face_orientation=%d"
@@ -631,20 +600,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'"
@@ -657,7 +612,7 @@ int _content_error_capi(int internal_error);
 int _content_query_sql(char *query_str);
 sqlite3 * _content_get_db_handle(void);
 uid_t _content_get_uid(void);
-int _media_info_get_media_info_from_db(const char *path, const char *storage_id, media_info_h media);
+int _media_info_get_media_info_from_db(const char *path, 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);
 int _media_db_get_media_group_count(media_group_e group, filter_h filter, int *group_count);
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
index 9e603e4..5140d7c 100644 (file)
@@ -1,6 +1,6 @@
 Name:       capi-content-media-content
 Summary:    A Media content library in Tizen Native API
-Version:    0.5.3
+Version:    0.5.8
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0
old mode 100755 (executable)
new mode 100644 (file)
index fdc16e0..3ba53cd
@@ -29,13 +29,13 @@ static int __media_bookmark_check_media_id(const char *media_id)
 
        query_str = sqlite3_mprintf(SELECT_MEDIA_COUNT_FROM_MEDIA_BY_ID, media_id);
        ret = _content_get_result(query_str, &stmt);
-       SQLITE3_SAFE_FREE(query_str);
+       sqlite3_free(query_str);
        content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
        if (sqlite3_step(stmt) == SQLITE_ROW)
                item_count = (int)sqlite3_column_int(stmt, 0);
 
-       SQLITE3_FINALIZE(stmt);
+       sqlite3_finalize(stmt);
 
        content_retvm_if(item_count == 0, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid media_id");
 
@@ -52,7 +52,7 @@ int media_bookmark_insert_to_db(const char *media_id, time_t time, const char *t
 
        sql = sqlite3_mprintf(INSERT_BOOKMARK_TO_BOOKMARK, media_id, time, thumbnail_path, "");
        ret = _content_query_sql(sql);
-       SQLITE3_SAFE_FREE(sql);
+       sqlite3_free(sql);
 
        return ret;
 }
@@ -67,7 +67,7 @@ int media_bookmark_delete_from_db(int bookmark_id)
 
        query_str = sqlite3_mprintf(DELETE_BOOKMARK_FROM_BOOKMARK, bookmark_id);
        ret = _content_query_sql(query_str);
-       SQLITE3_SAFE_FREE(query_str);
+       sqlite3_free(query_str);
 
        return ret;
 }
@@ -199,7 +199,7 @@ int media_bookmark_update_to_db(media_bookmark_h bookmark)
 
        sql = sqlite3_mprintf(UPDATE_BOOKMARK_FROM_BOOKMARK, _bookmark->name, _bookmark->bookmark_id);
        ret = _content_query_sql(sql);
-       SQLITE3_SAFE_FREE(sql);
+       sqlite3_free(sql);
 
        return ret;
 }
@@ -254,18 +254,18 @@ int media_bookmark_insert_to_db_v2(media_bookmark_h bookmark)
                _bookmark->media_id, _bookmark->marked_time, _bookmark->thumbnail_path, _bookmark->name);
 
        ret = _content_query_sql(sql);
-       SQLITE3_SAFE_FREE(sql);
+       sqlite3_free(sql);
        content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
        sql = sqlite3_mprintf(SELECT_BOOKMARK_ID_FROM_BOOKMARK, _bookmark->media_id, _bookmark->marked_time);
        ret = _content_get_result(sql, &stmt);
-       SQLITE3_SAFE_FREE(sql);
+       sqlite3_free(sql);
        content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
        if (sqlite3_step(stmt) == SQLITE_ROW)
                bookmark_id = sqlite3_column_int(stmt, 0);
 
-       SQLITE3_FINALIZE(stmt);
+       sqlite3_finalize(stmt);
 
        _bookmark->bookmark_id = bookmark_id;
 
index 90c9e27..813989e 100644 (file)
@@ -53,7 +53,7 @@ int _content_query_prepare(const char *select_query, const char *condition_query
        }
 
        ret = _content_get_result(query, stmt);
-       SQLITE3_SAFE_FREE(query);
+       sqlite3_free(query);
 
        return ret;
 }
@@ -203,7 +203,7 @@ int media_content_scan_file(const char *path)
        content_retvm_if(ret == MEDIA_CONTENT_ERROR_PERMISSION_DENIED, ret, "Permission denied");
        if (ret != MEDIA_CONTENT_ERROR_NONE) {
                content_debug("No file. Try to delete from DB");
-               ret = media_svc_delete_item_by_path(_content_get_db_handle(), storage_id, path, _content_get_uid());
+               ret = media_svc_delete_item_by_path(_content_get_db_handle(), path, _content_get_uid());
                content_retvm_if(ret == MS_MEDIA_ERR_DB_NO_RECORD, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid path");
                return _content_error_capi(ret);
        }
@@ -212,10 +212,10 @@ int media_content_scan_file(const char *path)
        content_retv_if(_media_util_is_ignorable_dir(folder_path), MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
        content_retvm_if(!_media_util_check_support_media_type(path), MEDIA_CONTENT_ERROR_NOT_SUPPORTED, "Unsupported type");
 
-       ret = media_svc_check_item_exist_by_path(_content_get_db_handle(), storage_id, path);
+       ret = media_svc_check_item_exist_by_path(_content_get_db_handle(), path);
        if (ret == MS_MEDIA_ERR_NONE) {
                /* Refresh */
-               ret = media_svc_refresh_item(_content_get_db_handle(), false, storage_id, path, _content_get_uid());
+               ret = media_svc_refresh_item(_content_get_db_handle(), false, path, _content_get_uid());
                content_retvm_if(ret != MS_MEDIA_ERR_NONE, _content_error_capi(ret), "Refresh failed");
                return MEDIA_CONTENT_ERROR_NONE;
        }
old mode 100755 (executable)
new mode 100644 (file)
index 62f001f..b0bb304
@@ -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;
@@ -201,16 +115,16 @@ int _media_db_get_group_count(filter_h filter, group_list_e group_type, int *gro
        switch (group_type) {
        case MEDIA_GROUP_ALBUM:
                if (_filter && STRING_VALID(_filter->storage_id))
-                       select_query = g_strdup_printf(SELECT_ALBUM_COUNT, _filter->storage_id);
+                       select_query = g_strdup_printf(SELECT_ALBUM_COUNT_BY_STORAGE_ID, _filter->storage_id);
                else
-                       select_query = g_strdup_printf(SELECT_ALBUM_COUNT, DB_VIEW_MEDIA);
+                       select_query = g_strdup(SELECT_ALBUM_COUNT);
                break;
 
        case MEDIA_GROUP_FOLDER:
                if (_filter && STRING_VALID(_filter->storage_id))
-                       select_query = g_strdup_printf(SELECT_FOLDER_COUNT_BY_STORAGE_ID, _filter->storage_id, _filter->storage_id);
+                       select_query = g_strdup_printf(SELECT_FOLDER_COUNT_BY_STORAGE_ID, _filter->storage_id);
                else
-                       select_query = g_strdup_printf(SELECT_FOLDER_COUNT, DB_VIEW_MEDIA);
+                       select_query = g_strdup(SELECT_FOLDER_COUNT);
                break;
 
        case MEDIA_GROUP_PLAYLIST:
@@ -223,17 +137,17 @@ int _media_db_get_group_count(filter_h filter, group_list_e group_type, int *gro
 
        case MEDIA_GROUP_BOOKMARK:
                if (_filter && STRING_VALID(_filter->storage_id))
-                       select_query = g_strdup_printf(SELECT_BOOKMARK_COUNT, _filter->storage_id);
+                       select_query = g_strdup_printf(SELECT_BOOKMARK_COUNT_BY_STORAGE_ID, _filter->storage_id);
                else
-                       select_query = g_strdup_printf(SELECT_BOOKMARK_COUNT, DB_VIEW_MEDIA);
+                       select_query = g_strdup(SELECT_BOOKMARK_COUNT);
 
                break;
 
        case MEDIA_GROUP_FACE:
                if (_filter && STRING_VALID(_filter->storage_id))
-                       select_query = g_strdup_printf(SELECT_FACE_COUNT, _filter->storage_id);
+                       select_query = g_strdup_printf(SELECT_FACE_COUNT_BY_STORAGE_ID, _filter->storage_id);
                else
-                       select_query = g_strdup_printf(SELECT_FACE_COUNT, DB_VIEW_MEDIA);
+                       select_query = g_strdup(SELECT_FACE_COUNT);
                break;
 
        default:
@@ -256,7 +170,7 @@ int _media_db_get_group_count(filter_h filter, group_list_e group_type, int *gro
        if (sqlite3_step(stmt) == SQLITE_ROW)
                *group_count = sqlite3_column_int(stmt, 0);
 
-       SQLITE3_FINALIZE(stmt);
+       sqlite3_finalize(stmt);
 
        return ret;
 }
@@ -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);
+                       snprintf(select_query, sizeof(select_query), SELECT_MEDIA_GROUP_COUNT_BY_STORAGE_ID, __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*/
+                       snprintf(select_query, sizeof(select_query), SELECT_MEDIA_GROUP_COUNT, __media_db_get_group_name(group));
+       } 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);
@@ -306,7 +217,7 @@ int _media_db_get_media_group_count(media_group_e group, filter_h filter, int *g
        if (sqlite3_step(stmt) == SQLITE_ROW)
                *group_count = sqlite3_column_int(stmt, 0);
 
-       SQLITE3_FINALIZE(stmt);
+       sqlite3_finalize(stmt);
 
        return 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);
+                       snprintf(select_query, sizeof(select_query), SELECT_MEDIA_GROUP_LIST_BY_STORAGE_ID, __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 */
+                       snprintf(select_query, sizeof(select_query), SELECT_MEDIA_GROUP_LIST, __media_db_get_group_name(group));
+       } 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);
@@ -356,7 +264,7 @@ int _media_db_get_media_group(media_group_e group, filter_h filter, media_group_
                g_free(name);
        }
 
-       SQLITE3_FINALIZE(stmt);
+       sqlite3_finalize(stmt);
 
        return 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);
+                       snprintf(select_query, sizeof(select_query), SELECT_MEDIA_GROUP_AND_COUNT_BY_STORAGE_ID, 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*/
+                       snprintf(select_query, sizeof(select_query), SELECT_MEDIA_GROUP_AND_COUNT, group_name);
+       } 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);
@@ -416,7 +319,7 @@ int _media_db_get_media_group_and_count(media_group_e group, filter_h filter, me
                g_free(name);
        }
 
-       SQLITE3_FINALIZE(stmt);
+       sqlite3_finalize(stmt);
 
        return ret;
 }
@@ -474,7 +377,7 @@ int _media_db_get_group_count(filter_h filter, group_list_e group_type, int *gro
        if (sqlite3_step(stmt) == SQLITE_ROW)
                *group_count = sqlite3_column_int(stmt, 0);
 
-       SQLITE3_FINALIZE(stmt);
+       sqlite3_finalize(stmt);
 
        return ret;
 }
@@ -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);
@@ -504,7 +409,7 @@ int _media_db_get_media_group_count(media_group_e group, filter_h filter, int *g
        if (sqlite3_step(stmt) == SQLITE_ROW)
                *group_count = sqlite3_column_int(stmt, 0);
 
-       SQLITE3_FINALIZE(stmt);
+       sqlite3_finalize(stmt);
 
        return ret;
 }
@@ -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);
@@ -543,7 +450,7 @@ int _media_db_get_media_group(media_group_e group, filter_h filter, media_group_
                g_free(name);
        }
 
-       SQLITE3_FINALIZE(stmt);
+       sqlite3_finalize(stmt);
 
        return ret;
 }
@@ -559,9 +466,9 @@ int _media_db_get_album(filter_h filter, media_album_cb callback, void *user_dat
 #ifdef _USE_TVPD_MODE
        filter_s *_filter = (filter_s *)filter;
        if (_filter && STRING_VALID(_filter->storage_id))
-               select_query = g_strdup_printf(SELECT_ALBUM_LIST, _filter->storage_id);
+               select_query = g_strdup_printf(SELECT_ALBUM_LIST_BY_STORAGE_ID, _filter->storage_id);
        else
-               select_query = g_strdup_printf(SELECT_ALBUM_LIST, DB_VIEW_MEDIA);
+               select_query = g_strdup(SELECT_ALBUM_LIST);
 #else
        select_query = g_strdup(SELECT_ALBUM_LIST);
 #endif
@@ -593,7 +500,7 @@ int _media_db_get_album(filter_h filter, media_album_cb callback, void *user_dat
                media_album_destroy((media_album_h)album);
        }
 
-       SQLITE3_FINALIZE(stmt);
+       sqlite3_finalize(stmt);
 
        return ret;
 }
@@ -608,9 +515,9 @@ int _media_db_get_folder(filter_h filter, media_folder_cb callback, void *user_d
 #ifdef _USE_TVPD_MODE
        filter_s *_filter = (filter_s *)filter;
        if (_filter && STRING_VALID(_filter->storage_id))
-               select_query = g_strdup_printf(SELECT_FOLDER_LIST_BY_STORAGE_ID, _filter->storage_id, _filter->storage_id);
+               select_query = g_strdup_printf(SELECT_FOLDER_LIST_BY_STORAGE_ID, _filter->storage_id);
        else
-               select_query = g_strdup_printf(SELECT_FOLDER_LIST, DB_VIEW_MEDIA);
+               select_query = g_strdup(SELECT_FOLDER_LIST);
 #else
        select_query = g_strdup(SELECT_FOLDER_LIST);
 #endif
@@ -641,7 +548,7 @@ int _media_db_get_folder(filter_h filter, media_folder_cb callback, void *user_d
                media_folder_destroy((media_folder_h) _folder);
        }
 
-       SQLITE3_FINALIZE(stmt);
+       sqlite3_finalize(stmt);
 
        return ret;
 }
@@ -675,7 +582,7 @@ int _media_db_get_playlist(filter_h filter, media_playlist_cb callback, void *us
                media_playlist_destroy((media_playlist_h)_playlist);
        }
 
-       SQLITE3_FINALIZE(stmt);
+       sqlite3_finalize(stmt);
 
        return ret;
 }
@@ -718,7 +625,7 @@ int _media_db_get_playlist_item(int playlist_id, filter_h filter, playlist_membe
 
        }
 
-       SQLITE3_FINALIZE(stmt);
+       sqlite3_finalize(stmt);
 
        return ret;
 }
@@ -761,7 +668,7 @@ int _media_db_get_tag(const char *media_id, filter_h filter, media_tag_cb callba
                media_tag_destroy((media_tag_h)_tag);
        }
 
-       SQLITE3_FINALIZE(stmt);
+       sqlite3_finalize(stmt);
 
        return ret;
 }
@@ -776,15 +683,12 @@ int _media_db_get_bookmark(const char *media_id, filter_h filter, media_bookmark
 #ifdef _USE_TVPD_MODE
        filter_s *_filter = (filter_s *)filter;
        if (STRING_VALID(media_id)) {   //get bookmark by media_id
-               if (_filter && STRING_VALID(_filter->storage_id))
-                       select_query = g_strdup_printf(SELECT_BOOKMARK_LIST_BY_MEDIA_ID, _filter->storage_id, media_id);
-               else
-                       select_query = g_strdup_printf(SELECT_BOOKMARK_LIST_BY_MEDIA_ID, DB_VIEW_MEDIA, media_id);
+               select_query = g_strdup_printf(SELECT_BOOKMARK_LIST_BY_MEDIA_ID, media_id);
        } else {
                if (_filter && STRING_VALID(_filter->storage_id))
-                       select_query = g_strdup_printf(SELECT_BOOKMARK_LIST, _filter->storage_id);
+                       select_query = g_strdup_printf(SELECT_BOOKMARK_LIST_BY_STORAGE_ID, _filter->storage_id);
                else
-                       select_query = g_strdup_printf(SELECT_BOOKMARK_LIST, DB_VIEW_MEDIA);
+                       select_query = g_strdup(SELECT_BOOKMARK_LIST);
        }
 #else
        if (STRING_VALID(media_id))
@@ -822,7 +726,7 @@ int _media_db_get_bookmark(const char *media_id, filter_h filter, media_bookmark
                media_bookmark_destroy((media_bookmark_h)bookmark);
        }
 
-       SQLITE3_FINALIZE(stmt);
+       sqlite3_finalize(stmt);
 
        return ret;
 
@@ -838,15 +742,12 @@ int _media_db_get_face(const char *media_id, filter_h filter, media_face_cb call
 #ifdef _USE_TVPD_MODE
        filter_s *_filter = (filter_s *)filter;
        if (STRING_VALID(media_id)) {   //get face by media_id
-               if (_filter && STRING_VALID(_filter->storage_id))
-                       select_query = g_strdup_printf(SELECT_FACE_LIST_BY_MEDIA_ID, _filter->storage_id, media_id);
-               else
-                       select_query = g_strdup_printf(SELECT_FACE_LIST_BY_MEDIA_ID, DB_VIEW_MEDIA, media_id);
+               select_query = g_strdup_printf(SELECT_FACE_LIST_BY_MEDIA_ID, media_id);
        } else {
                if (_filter && STRING_VALID(_filter->storage_id))
-                       select_query = g_strdup_printf(SELECT_FACE_LIST, _filter->storage_id);
+                       select_query = g_strdup_printf(SELECT_FACE_LIST_BY_STORAGE_ID, _filter->storage_id);
                else
-                       select_query = g_strdup_printf(SELECT_FACE_LIST, DB_VIEW_MEDIA);
+                       select_query = g_strdup(SELECT_FACE_LIST);
        }
 #else
        if (STRING_VALID(media_id))
@@ -886,7 +787,7 @@ int _media_db_get_face(const char *media_id, filter_h filter, media_face_cb call
                media_face_destroy((media_face_h)face);
        }
 
-       SQLITE3_FINALIZE(stmt);
+       sqlite3_finalize(stmt);
 
        return ret;
 
@@ -906,9 +807,9 @@ int _media_db_get_group_item_count_by_id(int group_id, filter_h filter, group_li
        case MEDIA_GROUP_ALBUM:
 #ifdef _USE_TVPD_MODE
                if (_filter && STRING_VALID(_filter->storage_id))
-                       select_query = g_strdup_printf(SELECT_MEDIA_COUNT_FROM_ALBUM, _filter->storage_id, group_id);
+                       select_query = g_strdup_printf(SELECT_MEDIA_COUNT_FROM_ALBUM_BY_STORAGE_ID, group_id, _filter->storage_id);
                else
-                       select_query = g_strdup_printf(SELECT_MEDIA_COUNT_FROM_ALBUM, DB_VIEW_MEDIA, group_id);
+                       select_query = g_strdup_printf(SELECT_MEDIA_COUNT_FROM_ALBUM, group_id);
 #else
                select_query = g_strdup_printf(SELECT_MEDIA_COUNT_FROM_ALBUM, group_id);
 #endif
@@ -942,7 +843,7 @@ int _media_db_get_group_item_count_by_id(int group_id, filter_h filter, group_li
        if (sqlite3_step(stmt) == SQLITE_ROW)
                *item_count = sqlite3_column_int(stmt, 0);
 
-       SQLITE3_FINALIZE(stmt);
+       sqlite3_finalize(stmt);
 
        return ret;
 }
@@ -961,29 +862,25 @@ int _media_db_get_group_item_count(const char *group_name, filter_h filter, grou
        switch (group_type) {
        case MEDIA_GROUP_NONE:
                if (!_filter) {
-#ifdef _USE_TVPD_MODE
-                       select_query = g_strdup_printf(SELECT_MEDIA_COUNT_FROM_MEDIA_SIMPLE, DB_VIEW_MEDIA);
-#else
                        select_query = g_strdup(SELECT_MEDIA_COUNT_FROM_MEDIA_SIMPLE);
-#endif
                        break;
                }
 
                if (_filter->offset < 0 && _filter->count < 0) {
 #ifdef _USE_TVPD_MODE
                        if (STRING_VALID(_filter->storage_id))
-                               select_query = g_strdup_printf(SELECT_MEDIA_COUNT_FROM_MEDIA_SIMPLE, _filter->storage_id);
+                               select_query = g_strdup_printf(SELECT_MEDIA_COUNT_FROM_MEDIA_SIMPLE_BY_STORAGE_ID, _filter->storage_id);
                        else
-                               select_query = g_strdup_printf(SELECT_MEDIA_COUNT_FROM_MEDIA_SIMPLE, DB_VIEW_MEDIA);
+                               select_query = g_strdup(SELECT_MEDIA_COUNT_FROM_MEDIA_SIMPLE);
 #else
                        select_query = g_strdup(SELECT_MEDIA_COUNT_FROM_MEDIA_SIMPLE);
 #endif
                } else {
 #ifdef _USE_TVPD_MODE
                        if (STRING_VALID(_filter->storage_id))
-                               select_query = g_strdup_printf(SELECT_MEDIA_COUNT_FROM_MEDIA, _filter->storage_id);
+                               select_query = g_strdup_printf(SELECT_MEDIA_COUNT_FROM_MEDIA_BY_STORAGE_ID, _filter->storage_id);
                        else
-                               select_query = g_strdup_printf(SELECT_MEDIA_COUNT_FROM_MEDIA, DB_VIEW_MEDIA);
+                               select_query = g_strdup(SELECT_MEDIA_COUNT_FROM_MEDIA);
 #else
                        select_query = g_strdup(SELECT_MEDIA_COUNT_FROM_MEDIA);
 #endif
@@ -992,14 +889,7 @@ int _media_db_get_group_item_count(const char *group_name, filter_h filter, grou
                break;
 
        case MEDIA_GROUP_FOLDER:
-#ifdef _USE_TVPD_MODE
-               if (_filter && STRING_VALID(_filter->storage_id))
-                       select_query = g_strdup_printf(SELECT_MEDIA_COUNT_FROM_FOLDER, _filter->storage_id, group_name);
-               else
-                       select_query = g_strdup_printf(SELECT_MEDIA_COUNT_FROM_FOLDER, DB_VIEW_MEDIA, group_name);
-#else
                select_query = g_strdup_printf(SELECT_MEDIA_COUNT_FROM_FOLDER, group_name);
-#endif
                break;
 
        case MEDIA_GROUP_TAG_BY_MEDIA_ID:
@@ -1007,25 +897,11 @@ int _media_db_get_group_item_count(const char *group_name, filter_h filter, grou
                break;
 
        case MEDIA_GROUP_BOOKMARK_BY_MEDIA_ID:
-#ifdef _USE_TVPD_MODE
-               if (_filter && STRING_VALID(_filter->storage_id))
-                       select_query = g_strdup_printf(SELECT_BOOKMARK_COUNT_BY_MEDIA_ID, _filter->storage_id, group_name);
-               else
-                       select_query = g_strdup_printf(SELECT_BOOKMARK_COUNT_BY_MEDIA_ID, DB_VIEW_MEDIA, group_name);
-#else
                select_query = g_strdup_printf(SELECT_BOOKMARK_COUNT_BY_MEDIA_ID, group_name);
-#endif
                break;
 
        case MEDIA_GROUP_FACE_BY_MEDIA_ID:
-#ifdef _USE_TVPD_MODE
-               if (_filter && STRING_VALID(_filter->storage_id))
-                       select_query = g_strdup_printf(SELECT_FACE_COUNT_BY_MEDIA_ID, _filter->storage_id, group_name);
-               else
-                       select_query = g_strdup_printf(SELECT_FACE_COUNT_BY_MEDIA_ID, DB_VIEW_MEDIA, group_name);
-#else
                select_query = g_strdup_printf(SELECT_FACE_COUNT_BY_MEDIA_ID, group_name);
-#endif
                break;
 
        default:
@@ -1054,7 +930,7 @@ int _media_db_get_group_item_count(const char *group_name, filter_h filter, grou
        if (sqlite3_step(stmt) == SQLITE_ROW)
                *item_count = sqlite3_column_int(stmt, 0);
 
-       SQLITE3_FINALIZE(stmt);
+       sqlite3_finalize(stmt);
 
        return ret;
 }
@@ -1074,9 +950,9 @@ int _media_db_get_group_item_by_id(int group_id, filter_h filter, media_info_cb
        case MEDIA_GROUP_ALBUM:
 #ifdef _USE_TVPD_MODE
                if (_filter && STRING_VALID(_filter->storage_id))
-                       select_query = g_strdup_printf(SELECT_MEDIA_FROM_ALBUM, _filter->storage_id, group_id);
+                       select_query = g_strdup_printf(SELECT_MEDIA_FROM_ALBUM_BY_STORAGE_ID, group_id, _filter->storage_id);
                else
-                       select_query = g_strdup_printf(SELECT_MEDIA_FROM_ALBUM, DB_VIEW_MEDIA, group_id);
+                       select_query = g_strdup_printf(SELECT_MEDIA_FROM_ALBUM, group_id);
 #else
                select_query = g_strdup_printf(SELECT_MEDIA_FROM_ALBUM, group_id);
 #endif
@@ -1085,9 +961,9 @@ int _media_db_get_group_item_by_id(int group_id, filter_h filter, media_info_cb
        case MEDIA_GROUP_PLAYLIST:
 #ifdef _USE_TVPD_MODE
                if (_filter && STRING_VALID(_filter->storage_id))
-                       select_query = g_strdup_printf(SELECT_MEDIA_FROM_PLAYLIST, _filter->storage_id, group_id);
+                       select_query = g_strdup_printf(SELECT_MEDIA_FROM_PLAYLIST_BY_STORAGE_ID, group_id, _filter->storage_id);
                else
-                       select_query = g_strdup_printf(SELECT_MEDIA_FROM_PLAYLIST, DB_VIEW_MEDIA, group_id);
+                       select_query = g_strdup_printf(SELECT_MEDIA_FROM_PLAYLIST, group_id);
 #else
                select_query = g_strdup_printf(SELECT_MEDIA_FROM_PLAYLIST, group_id);
 #endif
@@ -1096,9 +972,9 @@ int _media_db_get_group_item_by_id(int group_id, filter_h filter, media_info_cb
        case MEDIA_GROUP_TAG:
 #ifdef _USE_TVPD_MODE
                if (_filter && STRING_VALID(_filter->storage_id))
-                       select_query = g_strdup_printf(SELECT_MEDIA_FROM_TAG, _filter->storage_id, group_id);
+                       select_query = g_strdup_printf(SELECT_MEDIA_FROM_TAG_BY_STORAGE_ID, group_id, _filter->storage_id);
                else
-                       select_query = g_strdup_printf(SELECT_MEDIA_FROM_TAG, DB_VIEW_MEDIA, group_id);
+                       select_query = g_strdup_printf(SELECT_MEDIA_FROM_TAG, group_id);
 #else
                select_query = g_strdup_printf(SELECT_MEDIA_FROM_TAG, group_id);
 #endif
@@ -1134,7 +1010,7 @@ int _media_db_get_group_item_by_id(int group_id, filter_h filter, media_info_cb
                media_info_destroy((media_info_h)item);
        }
 
-       SQLITE3_FINALIZE(stmt);
+       sqlite3_finalize(stmt);
 
        return ret;
 }
@@ -1154,23 +1030,16 @@ int _media_db_get_group_item(const char *group_name, filter_h filter, media_info
        case MEDIA_GROUP_NONE:
 #ifdef _USE_TVPD_MODE
                if (_filter && STRING_VALID(_filter->storage_id))
-                       select_query = g_strdup_printf(SELECT_MEDIA_ITEM, _filter->storage_id);
+                       select_query = g_strdup_printf(SELECT_MEDIA_ITEM_BY_STORAGE_ID, _filter->storage_id);
                else
-                       select_query = g_strdup_printf(SELECT_MEDIA_ITEM, DB_VIEW_MEDIA);
+                       select_query = g_strdup(SELECT_MEDIA_ITEM);
 #else
                select_query = g_strdup(SELECT_MEDIA_ITEM);
 #endif
                break;
 
        case MEDIA_GROUP_FOLDER:
-#ifdef _USE_TVPD_MODE
-               if (_filter && STRING_VALID(_filter->storage_id))
-                       select_query = g_strdup_printf(SELECT_MEDIA_FROM_FOLDER, _filter->storage_id, group_name);
-               else
-                       select_query = g_strdup_printf(SELECT_MEDIA_FROM_FOLDER, DB_VIEW_MEDIA, group_name);
-#else
                select_query = g_strdup_printf(SELECT_MEDIA_FROM_FOLDER, group_name);
-#endif
                break;
 
        default:
@@ -1203,7 +1072,7 @@ int _media_db_get_group_item(const char *group_name, filter_h filter, media_info
                media_info_destroy((media_info_h)item);
        }
 
-       SQLITE3_FINALIZE(stmt);
+       sqlite3_finalize(stmt);
 
        return ret;
 }
@@ -1216,21 +1085,23 @@ 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);
+                               sqlite3_snprintf(sizeof(select_query), select_query, SELECT_MEDIA_COUNT_FROM_GROUP_BY_STORAGE_ID, __media_db_get_group_name(group), group_name, _filter->storage_id);
                        else
-                               sqlite3_snprintf(sizeof(select_query), select_query, SELECT_MEDIA_COUNT_FROM_GROUP, DB_VIEW_MEDIA, __media_db_get_group_name(group), group_name);
+                               sqlite3_snprintf(sizeof(select_query), select_query, SELECT_MEDIA_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_MEDIA_COUNT_FROM_GROUP_NULL, _filter->storage_id, __media_db_get_group_name(group));
+                               snprintf(select_query, sizeof(select_query), SELECT_MEDIA_COUNT_FROM_GROUP_NULL_BY_STORAGE_ID, __media_db_get_group_name(group), _filter->storage_id);
                        else
-                               snprintf(select_query, sizeof(select_query), SELECT_MEDIA_COUNT_FROM_GROUP_NULL, DB_VIEW_MEDIA, __media_db_get_group_name(group));
+                               snprintf(select_query, sizeof(select_query), SELECT_MEDIA_COUNT_FROM_GROUP_NULL, __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 +1113,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)
@@ -1281,7 +1140,7 @@ int _media_db_get_media_group_item_count(const char *group_name, filter_h filter
        if (sqlite3_step(stmt) == SQLITE_ROW)
                *item_count = sqlite3_column_int(stmt, 0);
 
-       SQLITE3_FINALIZE(stmt);
+       sqlite3_finalize(stmt);
 
        return ret;
 }
@@ -1293,18 +1152,20 @@ 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) {
                if (_filter && STRING_VALID(_filter->storage_id))
-                       sqlite3_snprintf(sizeof(select_query), select_query, SELECT_MEDIA_FROM_GROUP, _filter->storage_id, __media_db_get_group_name(group), group_name);
+                       sqlite3_snprintf(sizeof(select_query), select_query, SELECT_MEDIA_FROM_GROUP_BY_STORAGE_ID, __media_db_get_group_name(group), group_name, _filter->storage_id);
                else
-                       sqlite3_snprintf(sizeof(select_query), select_query, SELECT_MEDIA_FROM_GROUP, DB_VIEW_MEDIA, __media_db_get_group_name(group), group_name);
+                       sqlite3_snprintf(sizeof(select_query), select_query, SELECT_MEDIA_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_MEDIA_FROM_GROUP_NULL, _filter->storage_id, __media_db_get_group_name(group));
+                       snprintf(select_query, sizeof(select_query), SELECT_MEDIA_FROM_GROUP_NULL_BY_STORAGE_ID, __media_db_get_group_name(group), _filter->storage_id);
                else
-                       snprintf(select_query, sizeof(select_query), SELECT_MEDIA_FROM_GROUP_NULL, DB_VIEW_MEDIA, __media_db_get_group_name(group));
+                       snprintf(select_query, sizeof(select_query), SELECT_MEDIA_FROM_GROUP_NULL, __media_db_get_group_name(group));
        }
 #else
        if (group_name)
@@ -1333,7 +1194,7 @@ int _media_db_get_media_group_item(const char *group_name, filter_h filter, medi
                media_info_destroy((media_info_h)item);
        }
 
-       SQLITE3_FINALIZE(stmt);
+       sqlite3_finalize(stmt);
 
        return ret;
 }
@@ -1348,7 +1209,7 @@ int _media_db_get_storage_id_by_media_id(const char *media_id, char **storage_id
        select_query = sqlite3_mprintf(SELECT_MEDIA_STORAGE_ID_BY_ID, media_id);
 
        ret = _content_get_result(select_query, &stmt);
-       SQLITE3_SAFE_FREE(select_query);
+       sqlite3_free(select_query);
        content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
        if (sqlite3_step(stmt) == SQLITE_ROW) {
@@ -1358,7 +1219,7 @@ int _media_db_get_storage_id_by_media_id(const char *media_id, char **storage_id
                ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
        }
 
-       SQLITE3_FINALIZE(stmt);
+       sqlite3_finalize(stmt);
 
        return ret;
 }
@@ -1503,7 +1364,7 @@ int _media_db_get_pvr(filter_h filter, media_pvr_cb callback, void *user_data)
                media_pvr_destroy((media_pvr_h) _pvr);
        }
 
-       SQLITE3_FINALIZE(stmt);
+       sqlite3_finalize(stmt);
 
        return ret;
 }
@@ -1575,7 +1436,7 @@ int _media_db_get_uhd(filter_h filter, media_uhd_cb callback, void *user_data)
                media_uhd_destroy((media_uhd_h) _uhd);
        }
 
-       SQLITE3_FINALIZE(stmt);
+       sqlite3_finalize(stmt);
 
        return ret;
 }
@@ -1609,7 +1470,7 @@ int _media_db_get_storage(filter_h filter, media_storage_cb callback, void *user
                media_storage_destroy((media_storage_h) _storage);
        }
 
-       SQLITE3_FINALIZE(stmt);
+       sqlite3_finalize(stmt);
 
        return ret;
 }
old mode 100755 (executable)
new mode 100644 (file)
index fdcbe15..144eee6
@@ -31,13 +31,13 @@ static int __media_face_check_media_id(const char *media_id)
        /* Get image count */
        query_str = sqlite3_mprintf(SELECT_IMAGE_COUNT_FROM_MEDIA_BY_ID, media_id);
        ret = _content_get_result(query_str, &stmt);
-       SQLITE3_SAFE_FREE(query_str);
+       sqlite3_free(query_str);
        content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
        if (sqlite3_step(stmt) == SQLITE_ROW)
                item_count = (int)sqlite3_column_int(stmt, 0);
 
-       SQLITE3_FINALIZE(stmt);
+       sqlite3_finalize(stmt);
 
        content_retvm_if(item_count == 0, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid media_id");
 
@@ -240,17 +240,17 @@ int media_face_insert_to_db(media_face_h face)
        query_str = sqlite3_mprintf(INSERT_FACE_TO_FACE, _face->media_id, _face->face_rect_x, _face->face_rect_y, _face->face_rect_w, _face->face_rect_h, _face->orientation, _face->face_tag);
 
        ret = _content_query_sql(query_str);
-       SQLITE3_SAFE_FREE(query_str);
+       sqlite3_free(query_str);
 
        query_str = sqlite3_mprintf(SELECT_FACE_ID, _face->media_id, _face->face_rect_x, _face->face_rect_y, _face->face_rect_w, _face->face_rect_h, _face->orientation);
        ret = _content_get_result(query_str, &stmt);
-       SQLITE3_SAFE_FREE(query_str);
+       sqlite3_free(query_str);
        content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
        if (sqlite3_step(stmt) == SQLITE_ROW)
                _face->face_id = (int)sqlite3_column_int(stmt, 0);
 
-       SQLITE3_FINALIZE(stmt);
+       sqlite3_finalize(stmt);
 
 
        return ret;
@@ -273,7 +273,7 @@ int media_face_update_to_db(media_face_h face)
        query_str = sqlite3_mprintf(UPDATE_FACE_TO_FACE, _face->face_rect_x, _face->face_rect_y, _face->face_rect_w, _face->face_rect_h, _face->orientation, _face->face_tag, _face->face_id);
 
        ret = _content_query_sql(query_str);
-       SQLITE3_SAFE_FREE(query_str);
+       sqlite3_free(query_str);
 
        return ret;
 }
@@ -312,12 +312,12 @@ int media_face_delete_from_db(const char *face_id)
        /*Update modified_time to 0.. It will restore the deleted face when media_info_start_face_detection() is called */
        query_str = sqlite3_mprintf(UPDATE_MEDIA_INFO_IN_FACE_SCAN_LIST, query_face_id);
        ret = _content_query_sql(query_str);
-       SQLITE3_SAFE_FREE(query_str);
+       sqlite3_free(query_str);
        content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
        query_str = sqlite3_mprintf(DELETE_FACE_FROM_FACE, query_face_id);
        ret = _content_query_sql(query_str);
-       SQLITE3_SAFE_FREE(query_str);
+       sqlite3_free(query_str);
 
        return ret;
 }
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
index 2d51788..bf510c9
@@ -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
 
@@ -199,7 +197,7 @@ int media_folder_get_folder_from_db(const char *folder_id, media_folder_h *folde
                *folder = (media_folder_h)_folder;
        }
 
-       SQLITE3_FINALIZE(stmt);
+       sqlite3_finalize(stmt);
 
        return ret;
 }
@@ -263,7 +261,7 @@ int media_folder_get_scan_status(const char *storage_uuid, char* path, media_fol
        content_retip_if_fail(STRING_VALID(path));
        content_retip_if_fail(scan_status);
 
-       ret = media_svc_get_folder_scan_status(_content_get_db_handle(), storage_uuid, path, &status);
+       ret = media_svc_get_folder_scan_status(_content_get_db_handle(), path, &status);
        if (ret != MS_MEDIA_ERR_NONE) {
                content_error("media_svc_get_folder_scan_status failed");
                ret = _content_error_capi(ret);
@@ -280,7 +278,7 @@ int media_folder_reset_scan_status(const char *storage_uuid, const char* path)
 
        content_retip_if_fail(STRING_VALID(path));
 
-       ret = media_svc_set_folder_validity(FALSE, storage_uuid, path, 0, TRUE, _content_get_uid());
+       ret = media_svc_set_folder_validity(FALSE, path, 0, TRUE, _content_get_uid());
        if (ret != MS_MEDIA_ERR_NONE) {
                content_error("set folder validity failed");
                return _content_error_capi(ret);
old mode 100755 (executable)
new mode 100644 (file)
index 98f1eb5..dfcfc34
@@ -74,7 +74,7 @@ int media_album_get_album_from_db(int album_id, media_album_h *album)
                *album = (media_album_h)_album;
        }
 
-       SQLITE3_FINALIZE(stmt);
+       sqlite3_finalize(stmt);
 
        return ret;
 }
@@ -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);
 }
old mode 100755 (executable)
new mode 100644 (file)
index e61ca34..e99d4bc 100644 (file)
@@ -259,34 +259,7 @@ void _media_info_item_get_detail(sqlite3_stmt *stmt, media_info_h media)
                _media->book_meta->publisher = g_strdup((const char *)sqlite3_column_text(stmt, MEDIA_INFO_COPYRIGHT));
        }
 }
-#ifdef _USE_TVPD_MODE
-int _media_info_get_media_info_from_db(const char *path, const char *storage_id, media_info_h media)
-{
-       int ret = MEDIA_CONTENT_ERROR_NONE;
-       sqlite3_stmt *stmt = NULL;
-       char *select_query = NULL;
-       media_info_s *_media = (media_info_s*)media;
-
-       content_retip_if_fail(media);
-
-       select_query = sqlite3_mprintf(SELECT_MEDIA_BY_PATH, storage_id, path);
-
-       ret = _content_get_result(select_query, &stmt);
-       SQLITE3_SAFE_FREE(select_query);
-       content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
-
-       if (sqlite3_step(stmt) == SQLITE_ROW) {
-               _media_info_item_get_detail(stmt, (media_info_h)_media);
-       } else {
-               content_sec_error("No media : path[%s] storage id[%s]", path, storage_id);
-               ret = MEDIA_CONTENT_ERROR_DB_FAILED;
-       }
 
-       SQLITE3_FINALIZE(stmt);
-
-       return ret;
-}
-#else
 int _media_info_get_media_info_from_db(const char *path, media_info_h media)
 {
        int ret = MEDIA_CONTENT_ERROR_NONE;
@@ -300,7 +273,7 @@ int _media_info_get_media_info_from_db(const char *path, media_info_h media)
        select_query = sqlite3_mprintf(SELECT_MEDIA_BY_PATH, path);
 
        ret = _content_get_result(select_query, &stmt);
-       SQLITE3_SAFE_FREE(select_query);
+       sqlite3_free(select_query);
        content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
        if (sqlite3_step(stmt) == SQLITE_ROW) {
@@ -310,11 +283,10 @@ int _media_info_get_media_info_from_db(const char *path, media_info_h media)
                ret = MEDIA_CONTENT_ERROR_DB_FAILED;
        }
 
-       SQLITE3_FINALIZE(stmt);
+       sqlite3_finalize(stmt);
 
        return ret;
 }
-#endif
 
 int media_info_insert_to_db(const char *path, media_info_h *info)
 {
@@ -337,11 +309,11 @@ int media_info_insert_to_db(const char *path, media_info_h *info)
        }
 
        /* Get modified time for check exists */
-       ret = media_svc_get_modified_time(_content_get_db_handle(), storage_id, path, &modified_time);
+       ret = media_svc_get_modified_time(_content_get_db_handle(), path, &modified_time);
        if (ret == MS_MEDIA_ERR_NONE) {
                /* Refresh if need */
                if (modified_time != _media_util_get_file_time(path)) {
-                       ret = media_svc_refresh_item(_content_get_db_handle(), false, storage_id, path, _content_get_uid());
+                       ret = media_svc_refresh_item(_content_get_db_handle(), false, path, _content_get_uid());
                        if (ret != MS_MEDIA_ERR_NONE) {
                                content_error("media_svc_refresh_item failed : %d", ret);
                                return _content_error_capi(ret);
@@ -367,19 +339,10 @@ int media_info_insert_to_db(const char *path, media_info_h *info)
        }
 
        media_info_s *_media = g_new0(media_info_s, 1);
-
-#ifdef _USE_TVPD_MODE
-       if (STRING_VALID(storage_id))
-               ret = _media_info_get_media_info_from_db(path, storage_id, (media_info_h)_media);
-       else
-               ret = _media_info_get_media_info_from_db(path, DB_TABLE_MEDIA, (media_info_h)_media);
-
-       *info = (media_info_h)_media;
-#else
        ret = _media_info_get_media_info_from_db(path, (media_info_h)_media);
 
        *info = (media_info_h)_media;
-#endif
+
        return ret;
 }
 
@@ -396,20 +359,13 @@ int media_info_insert_batch_to_db(const char **path_array, unsigned int array_le
 int media_info_get_media_info_by_path_from_db(const char* path, media_info_h* media)
 {
        int ret = MEDIA_CONTENT_ERROR_NONE;
-       char storage_id[MEDIA_CONTENT_UUID_SIZE+1] = {0, };
 
        content_retip_if_fail(STRING_VALID(path));
        content_retip_if_fail(media);
 
-       ret = media_svc_get_storage_id(_content_get_db_handle(), path, storage_id, tzplatform_getuid(TZ_USER_NAME));
-       if (ret != MS_MEDIA_ERR_NONE) {
-               content_error("media_svc_get_storage_id failed : %d", ret);
-               return _content_error_capi(ret);
-       }
-
        media_info_s *_media = g_new0(media_info_s, 1);
 
-       ret =  _media_info_get_media_info_from_db(path, storage_id, (media_info_h)_media);
+       ret =  _media_info_get_media_info_from_db(path, (media_info_h)_media);
        *media = (media_info_h)_media;
 
        return ret;
@@ -426,7 +382,7 @@ static int __media_info_get_media_path_by_id_from_db(const char *media_id, char
        select_query = sqlite3_mprintf(SELECT_MEDIA_PATH_BY_ID, media_id);
 
        ret = _content_get_result(select_query, &stmt);
-       SQLITE3_SAFE_FREE(select_query);
+       sqlite3_free(select_query);
        content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
        if (sqlite3_step(stmt) == SQLITE_ROW) {
@@ -437,7 +393,7 @@ static int __media_info_get_media_path_by_id_from_db(const char *media_id, char
                ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
        }
 
-       SQLITE3_FINALIZE(stmt);
+       sqlite3_finalize(stmt);
 
        return ret;
 }
@@ -446,7 +402,6 @@ int media_info_delete_from_db(const char *media_id)
 {
        int ret = MEDIA_CONTENT_ERROR_NONE;
        char *path = NULL;
-       char *storage_id = NULL;
 
        content_retip_if_fail(STRING_VALID(media_id));
 
@@ -457,16 +412,8 @@ int media_info_delete_from_db(const char *media_id)
                return ret;
        }
 
-       ret = _media_db_get_storage_id_by_media_id(media_id, &storage_id);
-       if (ret != MEDIA_CONTENT_ERROR_NONE) {
-               content_error("_media_db_get_storage_id_by_media_id failed : %d", ret);
-               g_free(path);
-               return ret;
-       }
-
-       ret = media_svc_delete_item_by_path(_content_get_db_handle(), storage_id, path, _content_get_uid());
+       ret = media_svc_delete_item_by_path(_content_get_db_handle(), path, _content_get_uid());
        g_free(path);
-       g_free(storage_id);
 
        return _content_error_capi(ret);
 }
@@ -1178,16 +1125,8 @@ int media_info_get_media_from_db(const char *media_id, media_info_h *media)
        content_retip_if_fail(STRING_VALID(media_id));
        content_retip_if_fail(media);
 
-#ifdef _USE_TVPD_MODE
-       char *storage_id = NULL;
-
-       ret = _media_db_get_storage_id_by_media_id(media_id, &storage_id);
-       content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
-       snprintf(select_query, DEFAULT_QUERY_SIZE, SELECT_MEDIA_FROM_MEDIA, storage_id, media_id);
-       g_free(storage_id);
-#else
        snprintf(select_query, DEFAULT_QUERY_SIZE, SELECT_MEDIA_FROM_MEDIA, media_id);
-#endif
+
        ret = _content_get_result(select_query, &stmt);
        content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
@@ -1203,7 +1142,7 @@ int media_info_get_media_from_db(const char *media_id, media_info_h *media)
                ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
        }
 
-       SQLITE3_FINALIZE(stmt);
+       sqlite3_finalize(stmt);
 
        return ret;
 }
@@ -1218,23 +1157,8 @@ int media_info_get_media_from_db_by_path(const char *path, media_info_h *media)
        ret = _media_util_check_file_exist(path);
        content_retvm_if(ret != MEDIA_CONTENT_ERROR_NONE, ret, "_media_util_check_file_exist failed : %d", ret);
 
-#ifdef _USE_TVPD_MODE
-       char storage_id[MEDIA_CONTENT_UUID_SIZE + 1] = {0, };
-
-       ret = media_svc_get_storage_id(_content_get_db_handle(), path, storage_id, _content_get_uid());
-       if (ret != MS_MEDIA_ERR_NONE) {
-               content_error("media_svc_get_storage_id failed : %d", ret);
-               return _content_error_capi(ret);
-       }
-#endif
-
        _media = g_new0(media_info_s, 1);
-
-#ifdef _USE_TVPD_MODE
-       ret = _media_info_get_media_info_from_db(path, STRING_VALID(storage_id) ? storage_id : DB_TABLE_MEDIA, (media_info_h)_media);
-#else
        ret = _media_info_get_media_info_from_db(path, (media_info_h)_media);
-#endif
        if (ret != MEDIA_CONTENT_ERROR_NONE) {
                g_free(_media);
                _media = NULL;
@@ -1271,12 +1195,12 @@ int media_info_update_to_db(media_info_h media)
        content_retip_if_fail(STRING_VALID(_media->media_id));
 
 #ifdef _USE_TVPD_MODE
-       sql = sqlite3_mprintf("UPDATE %Q SET played_count=%d, last_played_time=%d, last_played_position=%d, media_favourite=%d WHERE media_id=%Q", _media->storage_uuid, _media->played_count, _media->played_time, _media->played_position, _media->favourite, _media->media_id);
+       sql = sqlite3_mprintf("UPDATE %q SET played_count=%d, last_played_time=%d, last_played_position=%d, media_favourite=%d WHERE media_id=%Q", DB_TABLE_MEDIA, _media->played_count, _media->played_time, _media->played_position, _media->favourite, _media->media_id);
 #else
        sql = sqlite3_mprintf("UPDATE %q SET media_favourite=%d WHERE media_id=%Q", DB_TABLE_MEDIA, _media->favourite, _media->media_id);
 #endif
        ret = _content_query_sql(sql);
-       SQLITE3_SAFE_FREE(sql);
+       sqlite3_free(sql);
 
        if (ret == MEDIA_CONTENT_ERROR_NONE) {
                /* Send notification for this update */
@@ -1295,9 +1219,6 @@ int media_info_move_to_db(media_info_h media, const char* dst_path)
        int ret = MEDIA_CONTENT_ERROR_NONE;
        char repl_path[MAX_PATH_LEN] = {0, };
        media_info_s *_info = NULL;
-#ifdef _USE_TVPD_MODE
-       char storage_id[MEDIA_CONTENT_UUID_SIZE + 1] = {0, };
-#endif
 
        content_retip_if_fail(media);
        content_retip_if_fail(STRING_VALID(dst_path));
@@ -1326,16 +1247,7 @@ int media_info_move_to_db(media_info_h media, const char* dst_path)
 
        /* Update media_info handle */
        _info = g_new0(media_info_s, 1);
-
-#ifdef _USE_TVPD_MODE
-       ret = media_svc_get_storage_id(_content_get_db_handle(), repl_path, storage_id, _content_get_uid());
-       content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
-
-       ret = _media_info_get_media_info_from_db(repl_path, storage_id, (media_info_h)_info);
-#else
        ret = _media_info_get_media_info_from_db(repl_path, (media_info_h)_info);
-#endif
-
        g_free(_media->display_name);
        _media->display_name = g_strdup(_info->display_name);
        g_free(_media->file_path);
@@ -1417,4 +1329,4 @@ int media_info_cancel_face_detection(media_info_h media)
 
        return MEDIA_CONTENT_ERROR_NONE;
 }
-// LCOV_EXCL_STOP
\ No newline at end of file
+// LCOV_EXCL_STOP
old mode 100755 (executable)
new mode 100644 (file)
index fce4acc..4d86d37
@@ -49,19 +49,19 @@ static int __media_playlist_insert_playlist_record(const char *playlist_name, in
        query = sqlite3_mprintf(INSERT_PLAYLIST_TO_PLAYLIST, playlist_name);
 
        ret = _content_query_sql(query);
-       SQLITE3_SAFE_FREE(query);
+       sqlite3_free(query);
        content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
        query = sqlite3_mprintf(SELECT_PLAYLIST_ID_FROM_PLAYLIST, playlist_name);
 
        ret = _content_get_result(query, &stmt);
-       SQLITE3_SAFE_FREE(query);
+       sqlite3_free(query);
        content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
        if (sqlite3_step(stmt) == SQLITE_ROW)
                *playlist_id = sqlite3_column_int(stmt, 0);
 
-       SQLITE3_FINALIZE(stmt);
+       sqlite3_finalize(stmt);
 
        return MEDIA_CONTENT_ERROR_NONE;
 }
@@ -77,13 +77,13 @@ static int __media_playlist_insert_item_to_playlist(int playlist_id, const char
 
        /* get the max play_order */
        ret = _content_get_result(query, &stmt);
-       SQLITE3_SAFE_FREE(query);
+       sqlite3_free(query);
        content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
        if (sqlite3_step(stmt) == SQLITE_ROW)
                play_order = sqlite3_column_int(stmt, 0);
 
-       SQLITE3_FINALIZE(stmt);
+       sqlite3_finalize(stmt);
 
        query = sqlite3_mprintf(INSERT_PLAYLIST_ITEM_TO_PLAYLIST_MAP, playlist_id, media_id, ++play_order);
        ret = media_svc_append_query(query, _content_get_uid());
@@ -254,7 +254,7 @@ int media_playlist_delete_from_db(int playlist_id)
        query_str = sqlite3_mprintf(DELETE_PLAYLIST_FROM_PLAYLIST, playlist_id);
 
        ret = _content_query_sql(query_str);
-       SQLITE3_SAFE_FREE(query_str);
+       sqlite3_free(query_str);
 
        return ret;
 }
@@ -340,7 +340,7 @@ int media_playlist_get_playlist_from_db(int playlist_id, media_playlist_h *playl
        query = sqlite3_mprintf(SELECT_PLAYLIST_FROM_PLAYLIST, playlist_id);
 
        ret = _content_get_result(query, &stmt);
-       SQLITE3_SAFE_FREE(query);
+       sqlite3_free(query);
        content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
        media_playlist_s *_playlist = NULL;
@@ -358,7 +358,7 @@ int media_playlist_get_playlist_from_db(int playlist_id, media_playlist_h *playl
                ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
        }
 
-       SQLITE3_FINALIZE(stmt);
+       sqlite3_finalize(stmt);
 
        return ret;
 }
@@ -416,13 +416,13 @@ int media_playlist_get_play_order(media_playlist_h playlist, int playlist_member
 
        query = sqlite3_mprintf(SELECT_PLAY_ORDER_FROM_PLAYLIST_VIEW, _playlist->playlist_id, playlist_member_id);
        ret = _content_get_result(query, &stmt);
-       SQLITE3_SAFE_FREE(query);
+       sqlite3_free(query);
        content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
        if (sqlite3_step(stmt) == SQLITE_ROW)
                *play_order = sqlite3_column_int(stmt, 0);
 
-       SQLITE3_FINALIZE(stmt);
+       sqlite3_finalize(stmt);
 
        return ret;
 }
@@ -595,19 +595,15 @@ static int __media_playlist_get_media_id_by_path(const char *path, char **media_
        content_retip_if_fail(path);
        content_retip_if_fail(media_id);
 
-#ifdef _USE_TVPD_MODE
-       query = sqlite3_mprintf("SELECT media_id FROM '%q' WHERE media_path='%q'", DB_VIEW_MEDIA, path);
-#else
        query = sqlite3_mprintf("SELECT media_id FROM '%q' WHERE media_path='%q'", DB_TABLE_MEDIA, path);
-#endif
        ret = _content_get_result(query, &stmt);
-       SQLITE3_SAFE_FREE(query);
+       sqlite3_free(query);
        content_retvm_if(ret != MEDIA_CONTENT_ERROR_NONE, ret, "Failed to get media_id");
 
        if (sqlite3_step(stmt) == SQLITE_ROW)
                *media_id = g_strdup((const char *)sqlite3_column_text(stmt, 0));
 
-       SQLITE3_FINALIZE(stmt);
+       sqlite3_finalize(stmt);
 
        return ret;
 }
@@ -727,13 +723,13 @@ int media_playlist_get_play_order_v2(int playlist_id, int playlist_member_id, in
        query = sqlite3_mprintf(SELECT_PLAY_ORDER_FROM_PLAYLIST_VIEW, playlist_id, playlist_member_id);
 
        ret = _content_get_result(query, &stmt);
-       SQLITE3_SAFE_FREE(query);
+       sqlite3_free(query);
        content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
        if (sqlite3_step(stmt) == SQLITE_ROW)
                *play_order = sqlite3_column_int(stmt, 0);
 
-       SQLITE3_FINALIZE(stmt);
+       sqlite3_finalize(stmt);
 
        return ret;
 }
old mode 100755 (executable)
new mode 100644 (file)
index 58b1735..b1507e2
@@ -141,7 +141,7 @@ int media_pvr_get_pvr_from_db(const char *media_id, media_pvr_h *pvr)
                ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
        }
 
-       SQLITE3_FINALIZE(stmt);
+       sqlite3_finalize(stmt);
 
        return ret;
 }
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
index 8286b15..6b25565
@@ -81,7 +81,7 @@ static int __media_tag_get_tag_info_from_db(const char *name, media_tag_h tag)
        select_query = sqlite3_mprintf(SELECT_TAG_BY_NAME, name);
 
        ret = _content_get_result(select_query, &stmt);
-       SQLITE3_SAFE_FREE(select_query);
+       sqlite3_free(select_query);
        content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
        if (sqlite3_step(stmt) == SQLITE_ROW) {
@@ -92,7 +92,7 @@ static int __media_tag_get_tag_info_from_db(const char *name, media_tag_h tag)
                ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
        }
 
-       SQLITE3_FINALIZE(stmt);
+       sqlite3_finalize(stmt);
 
        return ret;
 }
@@ -109,7 +109,7 @@ int media_tag_insert_to_db(const char *tag_name, media_tag_h *tag)
 
        query_str = sqlite3_mprintf(INSERT_TAG_TO_TAG, tag_name);
        ret = _content_query_sql(query_str);
-       SQLITE3_SAFE_FREE(query_str);
+       sqlite3_free(query_str);
        content_retvm_if(ret != MEDIA_CONTENT_ERROR_NONE, ret, "fail to insert tag");
 
        _tag = g_new0(media_tag_s, 1);
@@ -131,7 +131,7 @@ int media_tag_delete_from_db(int tag_id)
        query_str = sqlite3_mprintf(DELETE_TAG_FROM_TAG, tag_id);
        ret = _content_query_sql(query_str);
 
-       SQLITE3_SAFE_FREE(query_str);
+       sqlite3_free(query_str);
 
        return ret;
 }
@@ -242,7 +242,7 @@ int media_tag_get_tag_from_db(int tag_id, media_tag_h *tag)
 
        query = sqlite3_mprintf(SELECT_TAG_FROM_TAG, tag_id);
        ret = _content_get_result(query, &stmt);
-       SQLITE3_SAFE_FREE(query);
+       sqlite3_free(query);
        content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
        if (sqlite3_step(stmt) == SQLITE_ROW) {
@@ -257,7 +257,7 @@ int media_tag_get_tag_from_db(int tag_id, media_tag_h *tag)
                ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
        }
 
-       SQLITE3_FINALIZE(stmt);
+       sqlite3_finalize(stmt);
 
        return ret;
 }
old mode 100755 (executable)
new mode 100644 (file)
index 2cdd96c..5a9b282
@@ -79,7 +79,7 @@ int media_uhd_get_uhd_from_db(const char *media_id, media_uhd_h *uhd)
        select_query = sqlite3_mprintf(SELECT_UHD_FROM_UHD, media_id);
 
        ret = _content_get_result(select_query, &stmt);
-       SQLITE3_SAFE_FREE(select_query);
+       sqlite3_free(select_query);
        content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
        media_uhd_s *_uhd = NULL;
@@ -95,7 +95,7 @@ int media_uhd_get_uhd_from_db(const char *media_id, media_uhd_h *uhd)
                ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
        }
 
-       SQLITE3_FINALIZE(stmt);
+       sqlite3_finalize(stmt);
 
        return ret;
 }
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)