Remove OMA DRM related code

OMA(Open Mobile Alliance) DRM information is no longer used.
Delete that code.

Change-Id: I9b90e07090d85fb4934b5fc75601923d95c2a121
Signed-off-by: minje.ahn <minje.ahn@samsung.com>

diff --git a/packaging/libmedia-service.spec b/packaging/libmedia-service.spec
index 0ce777e467ee71c9523ac400d849992af88884df..bf660e237dc23f319618a6908eb5e31fdc0ec3d2 100644 (file)
--- a/packaging/libmedia-service.spec
+++ b/packaging/libmedia-service.spec
@@ -1,6 +1,6 @@
 Name:       libmedia-service
 Summary:    Media information service library for multimedia applications
-Version:    0.4.29
+Version:    0.4.30
 Release:    0
 Group:      Multimedia/Libraries
 License:    Apache-2.0 and PD

diff --git a/src/common/media-svc-media.c b/src/common/media-svc-media.c
index 288e4842c9d8abbb856360d1a0a3ab4e737e1829..9e6fe269a889c1726525b741ead32f7f05fe6443 100755 (executable)
--- a/src/common/media-svc-media.c
+++ b/src/common/media-svc-media.c
@@ -74,13 +74,9 @@ int _media_svc_insert_item_with_data(bool is_direct, media_svc_content_info_s *c
 {
        int ret = MS_MEDIA_ERR_NONE;
 
-       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_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, storage_uuid, media_360";
+       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_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_storage_type, media_timeline, 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_is_drm, media_storage_type, media_timeline, 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_storage_type, media_timeline, 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 */
@@ -90,7 +86,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, %lld, \
                %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, %d);",
+               %d, %d, %d, %Q, %d);",
                                DB_TABLE_MEDIA, db_fields,
                                content_info->media_uuid,
                                content_info->path,
@@ -131,7 +127,6 @@ int _media_svc_insert_item_with_data(bool is_direct, media_svc_content_info_s *c
                                content_info->media_meta.datetaken,
                                content_info->media_meta.orientation,           /* 3rd line */
                                content_info->media_meta.rating,
-                               content_info->is_drm,
                                content_info->storage_type,
                                content_info->timeline,
                                content_info->storage_uuid,
@@ -143,7 +138,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, %lld, %Q, %d, %d, %d, %d, %d, %d, %Q, %d);",
+               sql = sqlite3_mprintf("INSERT INTO %q(%q) VALUES (%Q, %Q, %Q, %d, %Q, %lld, %d, %d, %lld, %Q, %d, %d, %d, %d, %d, %Q, %d);",
                                                DB_TABLE_MEDIA, db_fields_basic,
                                                content_info->media_uuid,
                                                content_info->path,
@@ -156,7 +151,6 @@ int _media_svc_insert_item_with_data(bool is_direct, media_svc_content_info_s *c
                                                content_info->folder_id,
                                                content_info->thumbnail_path,
                                                content_info->album_id,
-                                               content_info->is_drm,
                                                content_info->storage_type,
                                                content_info->timeline,
                                                content_info->storage_uuid,

diff --git a/src/common/media-svc-util.c b/src/common/media-svc-util.c
index 33a412fad7db9453fdbfed928c5a9d73b7c96bdf..fb08bc801ffd391946850035dfbcbb4fa4a0521b 100644 (file)
--- a/src/common/media-svc-util.c
+++ b/src/common/media-svc-util.c
@@ -101,7 +101,6 @@ static const char music_mime_table[MUSIC_MIME_NUM][MIME_LENGTH] = {
        "x-ms-wma",
        "x-flac",
        "mp4",
-       /* known mime types of drm files*/
        "mp3",
        "x-mp3", /*alias of audio/mpeg*/
        "x-mpeg", /*alias of audio/mpeg*/
@@ -385,15 +384,10 @@ static int __media_svc_get_media_type(const char *path, const char *mime_type, m
        return MS_MEDIA_ERR_NONE;
 }
 
-/*
-drm_contentifo is not NULL, if the file is OMA DRM.
-If the file is not OMA DRM, drm_contentinfo must be NULL.
-*/
 static int __media_svc_get_mime_type(const char *path, char *mimetype)
 {
        media_svc_retvm_if(path == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "path is NULL");
 
-       /*in case of normal files or failure to get mime in drm */
        if (aul_get_mime_from_file(path, mimetype, 255) < 0) {
                media_svc_error("aul_get_mime_from_file fail");
                return MS_MEDIA_ERR_INTERNAL;
@@ -562,7 +556,6 @@ int _media_svc_get_file_time(const char *full_path)
 int _media_svc_set_media_info(media_svc_content_info_s *content_info, const char *storage_id, ms_user_storage_type_e storage_type, const char *path, bool refresh)
 {
        int ret = MS_MEDIA_ERR_NONE;
-       bool drm_type = false;
        char mime_type[256] = {0, };
        media_svc_media_type_e media_type;
 
@@ -600,13 +593,10 @@ int _media_svc_set_media_info(media_svc_content_info_s *content_info, const char
        content_info->file_name = g_path_get_basename(path);
        media_svc_retv_del_if(content_info->file_name == NULL, MS_MEDIA_ERR_INTERNAL, content_info);
 
-       /* if the file is DRM file, drm_type value is DRM_TRUE(1).
-       if drm_contentinfo is not NULL, the file is OMA DRM.*/
        ret = __media_svc_get_mime_type(path, mime_type);
        media_svc_retv_del_if(ret != MS_MEDIA_ERR_NONE, ret, content_info);
 
        media_svc_debug("mime [%s]", mime_type);
-       content_info->is_drm = drm_type;
 
        ret = __media_svc_get_media_type(path, mime_type, &media_type);
        media_svc_retv_del_if(ret != MS_MEDIA_ERR_NONE, ret, content_info);

diff --git a/src/common/media-svc.c b/src/common/media-svc.c
index 6772fc9b744e20a460669d9440812f353d765e86..ade79b53af2ee0facf2b8cb8a5bf77926575c066 100755 (executable)
--- a/src/common/media-svc.c
+++ b/src/common/media-svc.c
@@ -200,7 +200,6 @@ int media_svc_insert_item_bulk(sqlite3 *handle, const char *storage_id, ms_user_
        memset(&content_info, 0, sizeof(media_svc_content_info_s));
 
        /*Set media info*/
-       /* if drm_contentinfo is not NULL, the file is OMA DRM.*/
        ret = _media_svc_set_media_info(&content_info, storage_id, storage_type, path, false);
        if (ret != MS_MEDIA_ERR_NONE)
                return ret;

diff --git a/src/include/common/media-svc-util.h b/src/include/common/media-svc-util.h
index f2b1ed7636c4e3a6fb2d89d390667c29485cc299..eab4c6e843d70470529f9a5fadca7a9776815413 100755 (executable)
--- a/src/include/common/media-svc-util.h
+++ b/src/include/common/media-svc-util.h
@@ -97,7 +97,6 @@ typedef struct {
        long long int folder_id;                                        /**< Unique ID of folder */
        int             album_id;                                       /**< Unique ID of album */
        char            *thumbnail_path;                                /**< Thumbnail image file path */
-       int             is_drm;                                         /**< is_drm. o or 1 */
        int             storage_type;                                   /**< Storage of media file : internal/external */
        char            *storage_uuid;                                  /**< Unique ID of storage */
        media_svc_content_meta_s        media_meta;     /**< meta data structure for audio files */