Remove unnecessary parameter

Removed 'favourite' from 'media_svc_content_info_s' struct.
This field is only updated by media-content.
And media.db set this field to 0 by default.

Change-Id: I1acbbb8278250e6e32beda190ef636f0e8e6825a
Signed-off-by: Minje Ahn <minje.ahn@samsung.com>

diff --git a/src/common/media-svc-media.c b/src/common/media-svc-media.c
index 702cf0a..87b576e 100755 (executable)
--- a/src/common/media-svc-media.c
+++ b/src/common/media-svc-media.c
@@ -76,12 +76,12 @@ int _media_svc_insert_item_with_data(bool is_direct, media_svc_content_info_s *c
 
        const char *db_fields = "media_id, media_path, media_display_name, media_type, media_mime_type, media_size, media_added_time, media_modified_time, folder_id, media_thumbnail_path, \
                media_title, album_id, media_album, media_artist, media_album_artist, media_genre, media_composer, media_year, media_recorded_date, media_copyright, media_track_num, media_description, \
-               media_favourite, media_bitrate, media_bitpersample, media_samplerate, media_channel, media_duration, \
+               media_bitrate, media_bitpersample, media_samplerate, media_channel, media_duration, \
                media_longitude, media_latitude, media_altitude, exposure_time, fnumber, iso, model, media_width, media_height, media_datetaken, media_orientation, media_rating, media_is_drm, media_storage_type, media_timeline, \
                media_file_name_pinyin, media_title_pinyin, media_album_pinyin, media_artist_pinyin, media_album_artist_pinyin, media_genre_pinyin, media_composer_pinyin, media_copyright_pinyin, media_description_pinyin, storage_uuid, media_360";
 
        const char *db_fields_basic = "media_id, media_path, media_display_name, media_type, media_mime_type, media_size, media_added_time, media_modified_time, folder_id, media_thumbnail_path, \
-               album_id, media_favourite, media_is_drm, media_storage_type, media_timeline, media_file_name_pinyin, storage_uuid, media_360";
+               album_id, media_is_drm, media_storage_type, media_timeline, media_file_name_pinyin, storage_uuid, media_360";
 
        /* This sql is due to sqlite3_mprintf's wrong operation when using floating point in the text format */
        /* This code will be removed when sqlite3_mprintf works clearly */
@@ -111,7 +111,7 @@ int _media_svc_insert_item_with_data(bool is_direct, media_svc_content_info_s *c
        }
 
        char *sql = sqlite3_mprintf("INSERT INTO %q(%q) VALUES (%Q, %Q, %Q, %d, %Q, %lld, %d, %d, %Q, \
-               %Q, %Q, %d, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %d, \
+               %Q, %Q, %d, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, \
                %d, %d, %d, %d, %d, %.6f, %.6f, %.6f, %Q, %.6f, %d, %Q, %d, %d, %Q, %d, \
                %d, %d, %d, %d, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %d);",
                                DB_TABLE_MEDIA, db_fields,
@@ -136,8 +136,7 @@ int _media_svc_insert_item_with_data(bool is_direct, media_svc_content_info_s *c
                                content_info->media_meta.recorded_date,
                                content_info->media_meta.copyright,
                                content_info->media_meta.track_num,
-                               content_info->media_meta.description,
-                               content_info->favourate,                /* 2nd line */
+                               content_info->media_meta.description,   /* 2nd line */
                                content_info->media_meta.bitrate,
                                content_info->media_meta.bitpersample,
                                content_info->media_meta.samplerate,
@@ -176,7 +175,7 @@ int _media_svc_insert_item_with_data(bool is_direct, media_svc_content_info_s *c
                media_svc_debug("Query length is over %d byte.. So, remake query using only basic information..", MEDIA_SVC_QUERY_LEN_MAX - 1);
                SQLITE3_SAFE_FREE(sql);
 
-               sql = sqlite3_mprintf("INSERT INTO %q(%q) VALUES (%Q, %Q, %Q, %d, %Q, %lld, %d, %d, %Q, %Q, %d, %d, %d, %d, %d, %d, %d, %Q, %Q, %d);",
+               sql = sqlite3_mprintf("INSERT INTO %q(%q) VALUES (%Q, %Q, %Q, %d, %Q, %lld, %d, %d, %Q, %Q, %d, %d, %d, %d, %d, %d, %Q, %Q, %d);",
                                                DB_TABLE_MEDIA, db_fields_basic,
                                                content_info->media_uuid,
                                                content_info->path,
@@ -189,7 +188,6 @@ int _media_svc_insert_item_with_data(bool is_direct, media_svc_content_info_s *c
                                                content_info->folder_uuid,
                                                content_info->thumbnail_path,
                                                content_info->album_id,
-                                               content_info->favourate,
                                                content_info->is_drm,
                                                content_info->storage_type,
                                                content_info->timeline,

diff --git a/src/include/common/media-svc-util.h b/src/include/common/media-svc-util.h
index 987ea21..b56b1a7 100755 (executable)
--- a/src/include/common/media-svc-util.h
+++ b/src/include/common/media-svc-util.h
@@ -107,7 +107,6 @@ typedef struct {
        char            *folder_uuid;                                   /**< Unique ID of folder */
        int             album_id;                                       /**< Unique ID of album */
        char            *thumbnail_path;                                /**< Thumbnail image file path */
-       time_t  favourate;                                      /**< time favourate set */
        int             is_drm;                                         /**< is_drm. o or 1 */
        int             storage_type;                                   /**< Storage of media file : internal/external */
        char            *storage_uuid;                                  /**< Unique ID of storage */