Remove title from sub handle

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

diff --git a/doc/media_content_doc.h b/doc/media_content_doc.h
index cee3c856bc31adc5cd0c311527545ed38459bd6b..e3c63955a7741d98f39e871d70ec766a3b908588 100755 (executable)
--- a/doc/media_content_doc.h
+++ b/doc/media_content_doc.h
@@ -303,11 +303,6 @@
  * <td>Comments</td>
  * </tr>
  * <tr>
- * <td>title</td>
- * <td>MEDIA_TITLE</td>
- * <td>Get from metadata if exist. if not, base name except file extension.</td>
- * </tr>
- * <tr>
  * <td>album</td>
  * <td>MEDIA_ALBUM</td>
  * <td>Get from metadata if exist.</td>
@@ -629,11 +624,6 @@
  * <td>Comments</td>
  * </tr>
  * <tr>
- * <td>title</td>
- * <td>MEDIA_TITLE</td>
- * <td>Get from metadata if exist. if not, base name except file extension.</td>
- * </tr>
- * <tr>
  * <td>album</td>
  * <td>MEDIA_ALBUM</td>
  * <td>Get from metadata if exist.</td>
@@ -866,7 +856,7 @@
  * <tr>
  *    <td>@ref CAPI_CONTENT_MEDIA_VIDEO_META_MODULE </td>
  *    <td> Provides details about video items present in the device.\n
- * Provide functions to get information (e.g. title, duration, date etc) about the video files.</td>
+ * Provide functions to get information (e.g. duration, date etc) about the video files.</td>
  * </tr>
  * </table>
  * \n

diff --git a/include/media_image.h b/include/media_image.h
index 6666edd9874a7b1c1e99af008a0a9140765c571f..ae49847c6fcd1728c633583c37ef8fde11d95225 100755 (executable)
--- a/include/media_image.h
+++ b/include/media_image.h
@@ -28,7 +28,7 @@ extern "C" {
 /**
  * @brief This file contains the image metadata API and related functions to proceed with them.
  *        Functions include cloning and destroying the image metadata, getting image metadata such as width, height, \n
- *        orientation, date taken, title.
+ *        orientation, date taken.
  */
 
 /**

diff --git a/include/media_info_private.h b/include/media_info_private.h
index f0ad5ee9121895cbc0f4ee5bd32a3aa1a6be852e..2ce5d429a92323910977669a110408a5044183e1 100755 (executable)
--- a/include/media_info_private.h
+++ b/include/media_info_private.h
@@ -204,7 +204,6 @@ typedef struct {
        int width;
        int height;
        char *date_taken;
-       char *title;
        char *exposure_time;
        double fnumber;
        int iso;
@@ -214,7 +213,6 @@ typedef struct {
 
 typedef struct {
        char *media_id;
-       char *title;
        char *album;
        char *artist;
        char *album_artist;
@@ -233,7 +231,6 @@ typedef struct {
 
 typedef struct {
        char *media_id;
-       char *title;
        char *album;
        char *artist;
        char *album_artist;

diff --git a/include_product/media_image.h b/include_product/media_image.h
index 6666edd9874a7b1c1e99af008a0a9140765c571f..ae49847c6fcd1728c633583c37ef8fde11d95225 100755 (executable)
--- a/include_product/media_image.h
+++ b/include_product/media_image.h
@@ -28,7 +28,7 @@ extern "C" {
 /**
  * @brief This file contains the image metadata API and related functions to proceed with them.
  *        Functions include cloning and destroying the image metadata, getting image metadata such as width, height, \n
- *        orientation, date taken, title.
+ *        orientation, date taken.
  */
 
 /**

diff --git a/include_product/media_info_private.h b/include_product/media_info_private.h
index b803b11f5fdb3b8b8a1709564054341e5d545b96..7c3a24912bdea266463f884fdbebd46d1eb5a755 100755 (executable)
--- a/include_product/media_info_private.h
+++ b/include_product/media_info_private.h
@@ -227,7 +227,6 @@ typedef struct {
        int width;
        int height;
        char *date_taken;
-       char *title;
        char *exposure_time;
        double fnumber;
        int iso;
@@ -242,7 +241,6 @@ typedef struct _image_mm_meta_s {
 
 typedef struct {
        char *media_id;
-       char *title;
        char *album;
        char *artist;
        char *album_artist;
@@ -261,7 +259,6 @@ typedef struct {
 
 typedef struct {
        char *media_id;
-       char *title;
        char *album;
        char *artist;
        char *album_artist;

diff --git a/src/media_audio.c b/src/media_audio.c
index b82faac0dbdd8a849ffb6ca8aaf957d1b9f7c5d6..69f746fdf4b2883032939c98ba516376970b0b05 100755 (executable)
--- a/src/media_audio.c
+++ b/src/media_audio.c
@@ -31,7 +31,6 @@ int audio_meta_destroy(audio_meta_h audio)
        media_content_retvm_if(_audio == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Audio handle is null");
 
        SAFE_FREE(_audio->media_id);
-       SAFE_FREE(_audio->title);
        SAFE_FREE(_audio->album);
        SAFE_FREE(_audio->artist);
        SAFE_FREE(_audio->album_artist);
@@ -59,11 +58,6 @@ int audio_meta_clone(audio_meta_h *dst, audio_meta_h src)
                media_content_retv_free_audio_if(_dst->media_id == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, (audio_meta_h)_dst);
        }
 
-       if (_src->title != NULL) {
-               _dst->title = g_strdup(_src->title);
-               media_content_retv_free_audio_if(_dst->title == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, (audio_meta_h)_dst);
-       }
-
        if (_src->album != NULL) {
                _dst->album = g_strdup(_src->album);
                media_content_retv_free_audio_if(_dst->album == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, (audio_meta_h)_dst);

diff --git a/src/media_image.c b/src/media_image.c
index 839fc37c4a0626778e8673cd102c99fe2e2d7098..341c6a4874c4fb7732aaa22ac493df738d7e3d4e 100755 (executable)
--- a/src/media_image.c
+++ b/src/media_image.c
@@ -33,7 +33,6 @@ int image_meta_destroy(image_meta_h image)
 
        SAFE_FREE(_image->media_id);
        SAFE_FREE(_image->date_taken);
-       SAFE_FREE(_image->title);
        SAFE_FREE(_image->exposure_time);
        SAFE_FREE(_image->model);
        SAFE_FREE(_image);
@@ -59,11 +58,6 @@ int image_meta_clone(image_meta_h *dst, image_meta_h src)
                media_content_retv_free_image_if(_dst->date_taken == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, (image_meta_h)_dst);
        }
 
-       if (STRING_VALID(_src->title)) {
-               _dst->title = strdup(_src->title);
-               media_content_retv_free_image_if(_dst->title == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, (image_meta_h)_dst);
-       }
-
        if (STRING_VALID(_src->exposure_time)) {
                _dst->exposure_time = strdup(_src->exposure_time);
                media_content_retv_free_image_if(_dst->exposure_time == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, (image_meta_h)_dst);

diff --git a/src/media_info.c b/src/media_info.c
index 062a25e363ce0f584cdc357aff0b1bc423159582..874ff0b4c10d9c2a4e037b0eb2f1479c89c3a4f9 100755 (executable)
--- a/src/media_info.c
+++ b/src/media_info.c
@@ -314,7 +314,6 @@ void _media_info_item_get_detail(sqlite3_stmt* stmt, media_info_h media)
                        _media->image_meta->iso = sqlite3_column_int(stmt, MEDIA_INFO_ISO);
                        _media->image_meta->date_taken = g_strdup((const char *)sqlite3_column_text(stmt, MEDIA_INFO_DATETAKEN));
                        _media->image_meta->orientation = sqlite3_column_int(stmt, MEDIA_INFO_ORIENTATION);
-                       _media->image_meta->title = g_strdup((const char *)sqlite3_column_text(stmt, MEDIA_INFO_TITLE));
                        _media->image_meta->exposure_time = g_strdup((const char *)sqlite3_column_text(stmt, MEDIA_INFO_EXPOSURE_TIME));
                        _media->image_meta->model = g_strdup((const char *)sqlite3_column_text(stmt, MEDIA_INFO_MODEL));
                }
@@ -324,7 +323,6 @@ void _media_info_item_get_detail(sqlite3_stmt* stmt, media_info_h media)
                        _media->video_meta->media_id = g_strdup(_media->media_id);
                        _media->video_meta->width = sqlite3_column_int(stmt, MEDIA_INFO_WIDTH);
                        _media->video_meta->height = sqlite3_column_int(stmt, MEDIA_INFO_HEIGHT);
-                       _media->video_meta->title = g_strdup((const char *)sqlite3_column_text(stmt, MEDIA_INFO_TITLE));
                        _media->video_meta->album = g_strdup((const char *)sqlite3_column_text(stmt, MEDIA_INFO_ALBUM));
                        _media->video_meta->artist = g_strdup((const char *)sqlite3_column_text(stmt, MEDIA_INFO_ARTIST));
                        _media->video_meta->album_artist = g_strdup((const char *)sqlite3_column_text(stmt, MEDIA_INFO_ALBUM_ARTIST));
@@ -343,7 +341,6 @@ void _media_info_item_get_detail(sqlite3_stmt* stmt, media_info_h media)
                _media->audio_meta = (audio_meta_s *)calloc(1, sizeof(audio_meta_s));
                if (_media->audio_meta) {
                        _media->audio_meta->media_id = g_strdup(_media->media_id);
-                       _media->audio_meta->title = g_strdup((const char *)sqlite3_column_text(stmt, MEDIA_INFO_TITLE));
                        _media->audio_meta->album = g_strdup((const char *)sqlite3_column_text(stmt, MEDIA_INFO_ALBUM));
                        _media->audio_meta->artist = g_strdup((const char *)sqlite3_column_text(stmt, MEDIA_INFO_ARTIST));
                        _media->audio_meta->album_artist = g_strdup((const char *)sqlite3_column_text(stmt, MEDIA_INFO_ALBUM_ARTIST));
@@ -578,14 +575,12 @@ int media_info_destroy(media_info_h media)
                SAFE_FREE(_media->image_meta->date_taken);
                SAFE_FREE(_media->image_meta->exposure_time);
                SAFE_FREE(_media->image_meta->model);
-               SAFE_FREE(_media->image_meta->title);
 
                SAFE_FREE(_media->image_meta);
        }
 
        if (_media->video_meta) {
                SAFE_FREE(_media->video_meta->media_id);
-               SAFE_FREE(_media->video_meta->title);
                SAFE_FREE(_media->video_meta->album);
                SAFE_FREE(_media->video_meta->artist);
                SAFE_FREE(_media->video_meta->album_artist);
@@ -601,7 +596,6 @@ int media_info_destroy(media_info_h media)
 
        if (_media->audio_meta) {
                SAFE_FREE(_media->audio_meta->media_id);
-               SAFE_FREE(_media->audio_meta->title);
                SAFE_FREE(_media->audio_meta->album);
                SAFE_FREE(_media->audio_meta->artist);
                SAFE_FREE(_media->audio_meta->album_artist);
@@ -742,10 +736,6 @@ int media_info_clone(media_info_h *dst, media_info_h src)
                        _dst->video_meta->media_id = g_strdup(_src->video_meta->media_id);
                        media_content_retv_free_info_if(_dst->video_meta->media_id == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, (media_info_h)_dst);
                }
-               if (_src->video_meta->title != NULL) {
-                       _dst->video_meta->title = g_strdup(_src->video_meta->title);
-                       media_content_retv_free_info_if(_dst->video_meta->title == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, (media_info_h)_dst);
-               }
                if (_src->video_meta->album != NULL) {
                        _dst->video_meta->album = g_strdup(_src->video_meta->album);
                        media_content_retv_free_info_if(_dst->video_meta->album == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, (media_info_h)_dst);
@@ -797,10 +787,6 @@ int media_info_clone(media_info_h *dst, media_info_h src)
                        _dst->audio_meta->media_id = g_strdup(_src->audio_meta->media_id);
                        media_content_retv_free_info_if(_dst->audio_meta->media_id == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, (media_info_h)_dst);
                }
-               if (_src->audio_meta->title != NULL) {
-                       _dst->audio_meta->title = g_strdup(_src->audio_meta->title);
-                       media_content_retv_free_info_if(_dst->audio_meta->title == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, (media_info_h)_dst);
-               }
                if (_src->audio_meta->album != NULL) {
                        _dst->audio_meta->album = g_strdup(_src->audio_meta->album);
                        media_content_retv_free_info_if(_dst->audio_meta->album == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, (media_info_h)_dst);
@@ -980,7 +966,6 @@ int media_info_get_image(media_info_h media, image_meta_h *image)
        _image->fnumber = _media->image_meta->fnumber;
        _image->iso = _media->image_meta->iso;
        _image->date_taken = g_strdup(_media->image_meta->date_taken);
-       _image->title = g_strdup(_media->image_meta->title);
        _image->exposure_time = g_strdup(_media->image_meta->exposure_time);
        _image->model = g_strdup(_media->image_meta->model);
 
@@ -1003,7 +988,6 @@ int media_info_get_video(media_info_h media, video_meta_h *video)
        media_content_retvm_if(_video == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
 
        _video->media_id = g_strdup(_media->media_id);
-       _video->title = g_strdup(_media->video_meta->title);
        _video->album = g_strdup(_media->video_meta->album);
        _video->artist = g_strdup(_media->video_meta->artist);
        _video->album_artist = g_strdup(_media->video_meta->album_artist);
@@ -1039,7 +1023,6 @@ int media_info_get_audio(media_info_h media, audio_meta_h *audio)
        media_content_retvm_if(_audio == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
 
        _audio->media_id = g_strdup(_media->media_id);
-       _audio->title = g_strdup(_media->audio_meta->title);
        _audio->album = g_strdup(_media->audio_meta->album);
        _audio->artist = g_strdup(_media->audio_meta->artist);
        _audio->album_artist = g_strdup(_media->audio_meta->album_artist);

diff --git a/src/media_video.c b/src/media_video.c
index 3b1ed3787ae7106497c30c9cfd2e83cb34ec2ab5..cd63cd9bcbcfb231a8602acbf42d1bc567f4ffa3 100755 (executable)
--- a/src/media_video.c
+++ b/src/media_video.c
@@ -32,7 +32,6 @@ int video_meta_destroy(video_meta_h video)
        media_content_retvm_if(_video == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Video handle is null");
 
        SAFE_FREE(_video->media_id);
-       SAFE_FREE(_video->title);
        SAFE_FREE(_video->album);
        SAFE_FREE(_video->artist);
        SAFE_FREE(_video->album_artist);
@@ -60,11 +59,6 @@ int video_meta_clone(video_meta_h *dst, video_meta_h src)
                media_content_retv_free_video_if(_dst->media_id == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, (video_meta_h)_dst);
        }
 
-       if (_src->title != NULL) {
-               _dst->title = g_strdup(_src->title);
-               media_content_retv_free_video_if(_dst->title == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, (video_meta_h)_dst);
-       }
-
        if (_src->album != NULL) {
                _dst->album = g_strdup(_src->album);
                media_content_retv_free_video_if(_dst->album == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, (video_meta_h)_dst);