Remove unnecessary code

modified it to leave only the minimum code required for csharp to function properly.

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

diff --git a/include/media_info_private.h b/include/media_info_private.h
index f8912936753ee4a78bc7a6cb1877ac6d893b2905..8188994721742d054c647547a00853bc7454e2bb 100644 (file)
--- a/include/media_info_private.h
+++ b/include/media_info_private.h
@@ -85,10 +85,6 @@ typedef enum {
        MEDIA_INFO_LONGITUDE,
        MEDIA_INFO_LATITUDE,
        MEDIA_INFO_ALTITUDE,
-       MEDIA_INFO_EXPOSURE_TIME,
-       MEDIA_INFO_FNUMBER,
-       MEDIA_INFO_ISO,
-       MEDIA_INFO_MODEL,
        MEDIA_INFO_WIDTH,
        MEDIA_INFO_HEIGHT,
        MEDIA_INFO_DATETAKEN,
@@ -194,10 +190,6 @@ typedef struct {
        int width;
        int height;
        char *date_taken;
-       char *exposure_time;
-       double fnumber;
-       int iso;
-       char *model;
        media_content_orientation_e orientation;
 } image_meta_s;
 
@@ -402,8 +394,8 @@ typedef struct _media_content_cb_data {
 
 /* Get Media list of Group */
 #define MEDIA_INFO_ITEM "media_id, media_path, media_display_name, media_type, media_mime_type, media_size, media_added_time, media_modified_time, media_thumbnail_path, media_description, \
-                                                       media_rating, media_favourite, media_is_drm, media_longitude, media_latitude, media_altitude, exposure_time, fnumber, iso, \
-                                                       model, media_width, media_height, media_datetaken, orientation, media_title, media_album, media_artist, media_album_artist, media_genre, \
+                                                       media_rating, media_favourite, media_is_drm, media_longitude, media_latitude, media_altitude, \
+                                                       media_width, media_height, media_datetaken, orientation, media_title, media_album, media_artist, media_album_artist, media_genre, \
                                                        media_composer, media_year, media_recorded_date, media_copyright, media_track_num, media_bitrate, media_bitpersample, media_duration, media_samplerate, media_channel, \
                                                        media_timeline, storage_uuid, media_360"
 

diff --git a/include_product/media_info_private.h b/include_product/media_info_private.h
index f5e5e4ebfbd13305593f3922aa636ee805501337..042e3783e22635d4ce7733a447ce2b6ea0ee0e18 100644 (file)
--- a/include_product/media_info_private.h
+++ b/include_product/media_info_private.h
@@ -86,10 +86,6 @@ typedef enum {
        MEDIA_INFO_LONGITUDE,
        MEDIA_INFO_LATITUDE,
        MEDIA_INFO_ALTITUDE,
-       MEDIA_INFO_EXPOSURE_TIME,
-       MEDIA_INFO_FNUMBER,
-       MEDIA_INFO_ISO,
-       MEDIA_INFO_MODEL,
        MEDIA_INFO_WIDTH,
        MEDIA_INFO_HEIGHT,
        MEDIA_INFO_DATETAKEN,
@@ -201,10 +197,6 @@ typedef struct {
        int width;
        int height;
        char *date_taken;
-       char *exposure_time;
-       double fnumber;
-       int iso;
-       char *model;
        media_content_orientation_e orientation;
 } image_meta_s;
 
@@ -496,8 +488,8 @@ typedef struct _media_content_scan_cb_data_v2 {
 
 /* Get Media list of Group */
 #define MEDIA_INFO_ITEM "media_id, media_path, media_display_name, media_type, media_mime_type, media_size, media_added_time, media_modified_time, media_thumbnail_path, media_description, \
-                                                       media_rating, media_favourite, media_is_drm, media_longitude, media_latitude, media_altitude, exposure_time, fnumber, iso, \
-                                                       model, media_width, media_height, media_datetaken, orientation, media_title, media_album, media_artist, media_album_artist, media_genre, \
+                                                       media_rating, media_favourite, media_is_drm, media_longitude, media_latitude, media_altitude, \
+                                                       media_width, media_height, media_datetaken, orientation, media_title, media_album, media_artist, media_album_artist, media_genre, \
                                                        media_composer, media_year, media_recorded_date, media_copyright, media_track_num, media_bitrate, media_bitpersample, media_duration, media_samplerate, media_channel, \
                                                        media_timeline, storage_uuid, media_360, played_count, last_played_time, last_played_position, stitched_info, extract_flag, modified_date"
 

diff --git a/packaging/capi-content-media-content.spec b/packaging/capi-content-media-content.spec
index c6387cb7436690e9d0aa9e72e409d96cce94ce5f..aeb91b447b2317af155e87abc2b7a4a9cc827716 100644 (file)
--- a/packaging/capi-content-media-content.spec
+++ b/packaging/capi-content-media-content.spec
@@ -1,6 +1,6 @@
 Name:       capi-content-media-content
 Summary:    A Media content library in Tizen Native API
-Version:    0.6.0
+Version:    0.6.1
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0

diff --git a/src/media_image.c b/src/media_image.c
index 592a2a33a599efd2455c6d58d69c64831e03c5ac..043ab80007c44ee8a0d81126725de75eebf1cb52 100644 (file)
--- a/src/media_image.c
+++ b/src/media_image.c
@@ -25,8 +25,6 @@ int image_meta_destroy(image_meta_h image)
 
        g_free(_image->media_id);
        g_free(_image->date_taken);
-       g_free(_image->exposure_time);
-       g_free(_image->model);
        g_free(_image);
 
        return MEDIA_CONTENT_ERROR_NONE;
@@ -43,10 +41,6 @@ int image_meta_clone(image_meta_h *dst, image_meta_h src)
 
        _dst->media_id = g_strdup(_src->media_id);
        _dst->date_taken = g_strdup(_src->date_taken);
-       _dst->exposure_time = g_strdup(_src->exposure_time);
-       _dst->model = g_strdup(_src->model);
-       _dst->fnumber = _src->fnumber;
-       _dst->iso = _src->iso;
        _dst->width = _src->width;
        _dst->height = _src->height;
        _dst->orientation = _src->orientation;
@@ -118,12 +112,10 @@ int image_meta_get_date_taken(image_meta_h image, char **date_taken)
 int image_meta_get_exposure_time(image_meta_h image, char **exposure_time)
 {
        content_warn("DEPRECATION WARNING: image_meta_get_exposure_time() is deprecated and will be removed from next release.");
-       image_meta_s *_image = (image_meta_s*)image;
-
        content_retip_if_fail(image);
        content_retip_if_fail(exposure_time);
 
-       *exposure_time = g_strdup(_image->exposure_time);
+       *exposure_time = NULL;
 
        return MEDIA_CONTENT_ERROR_NONE;
 }
@@ -131,12 +123,10 @@ int image_meta_get_exposure_time(image_meta_h image, char **exposure_time)
 int image_meta_get_fnumber(image_meta_h image, double *fnumber)
 {
        content_warn("DEPRECATION WARNING: image_meta_get_fnumber() is deprecated and will be removed from next release.");
-       image_meta_s *_image = (image_meta_s*)image;
-
        content_retip_if_fail(image);
        content_retip_if_fail(fnumber);
 
-       *fnumber = _image->fnumber;
+       *fnumber = 0.0;
 
        return MEDIA_CONTENT_ERROR_NONE;
 }
@@ -144,12 +134,10 @@ int image_meta_get_fnumber(image_meta_h image, double *fnumber)
 int image_meta_get_iso(image_meta_h image, int *iso)
 {
        content_warn("DEPRECATION WARNING: image_meta_get_iso() is deprecated and will be removed from next release.");
-       image_meta_s *_image = (image_meta_s*)image;
-
        content_retip_if_fail(image);
        content_retip_if_fail(iso);
 
-       *iso = _image->iso;
+       *iso = 0;
 
        return MEDIA_CONTENT_ERROR_NONE;
 }
@@ -157,12 +145,10 @@ int image_meta_get_iso(image_meta_h image, int *iso)
 int image_meta_get_model(image_meta_h image, char **model)
 {
        content_warn("DEPRECATION WARNING: image_meta_get_model() is deprecated and will be removed from next release.");
-       image_meta_s *_image = (image_meta_s*)image;
-
        content_retip_if_fail(image);
        content_retip_if_fail(model);
 
-       *model = g_strdup(_image->model);
+       *model = NULL;
 
        return MEDIA_CONTENT_ERROR_NONE;
 }

diff --git a/src/media_info.c b/src/media_info.c
index e99d4bce63809aee13bb6500b722f9a529bfbdef..006ed87eb2594707c2ec9f555e101e6f258c1ced 100644 (file)
--- a/src/media_info.c
+++ b/src/media_info.c
@@ -206,12 +206,8 @@ void _media_info_item_get_detail(sqlite3_stmt *stmt, media_info_h media)
                _media->image_meta->media_id = g_strdup(_media->media_id);
                _media->image_meta->width = sqlite3_column_int(stmt, MEDIA_INFO_WIDTH);
                _media->image_meta->height = sqlite3_column_int(stmt, MEDIA_INFO_HEIGHT);
-               _media->image_meta->fnumber = (double)sqlite3_column_double(stmt, MEDIA_INFO_FNUMBER);
-               _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->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));
 
        } else if (_media->media_type == MEDIA_CONTENT_TYPE_VIDEO) {
                _media->video_meta = g_new0(video_meta_s, 1);
@@ -437,8 +433,6 @@ int media_info_destroy(media_info_h media)
        if (_media->image_meta) {
                g_free(_media->image_meta->media_id);
                g_free(_media->image_meta->date_taken);
-               g_free(_media->image_meta->exposure_time);
-               g_free(_media->image_meta->model);
 
                g_free(_media->image_meta);
        }
@@ -531,10 +525,6 @@ int media_info_clone(media_info_h *dst, media_info_h src)
 
                _dst->image_meta->media_id = g_strdup(_src->image_meta->media_id);
                _dst->image_meta->date_taken = g_strdup(_src->image_meta->date_taken);
-               _dst->image_meta->exposure_time = g_strdup(_src->image_meta->exposure_time);
-               _dst->image_meta->model = g_strdup(_src->image_meta->model);
-               _dst->image_meta->fnumber = _src->image_meta->fnumber;
-               _dst->image_meta->iso = _src->image_meta->iso;
                _dst->image_meta->width = _src->image_meta->width;
                _dst->image_meta->height = _src->image_meta->height;
                _dst->image_meta->orientation = _src->image_meta->orientation;
@@ -676,11 +666,7 @@ int media_info_get_image(media_info_h media, image_meta_h *image)
        _image->width = _media->image_meta->width;
        _image->height = _media->image_meta->height;
        _image->orientation = _media->image_meta->orientation;
-       _image->fnumber = _media->image_meta->fnumber;
-       _image->iso = _media->image_meta->iso;
        _image->date_taken = g_strdup(_media->image_meta->date_taken);
-       _image->exposure_time = g_strdup(_media->image_meta->exposure_time);
-       _image->model = g_strdup(_media->image_meta->model);
 
        *image = (image_meta_h)_image;