From f4c9e267aa6f476682546f283bcbad834c5e46ae Mon Sep 17 00:00:00 2001 From: Minje Ahn Date: Thu, 12 Oct 2017 15:32:21 +0900 Subject: [PATCH] Remove weather in image struct Change-Id: I1f8357839256b8fe6e540a3649b26653d909465a Signed-off-by: Minje Ahn --- include/media_info_private.h | 3 +-- include_product/media_info_private.h | 3 +-- packaging/capi-content-media-content.spec | 2 +- src/media_image.c | 12 +----------- src/media_info.c | 13 ------------- 5 files changed, 4 insertions(+), 29 deletions(-) diff --git a/include/media_info_private.h b/include/media_info_private.h index 552a574..d1c4fd6 100755 --- a/include/media_info_private.h +++ b/include/media_info_private.h @@ -233,7 +233,6 @@ typedef struct { char *date_taken; char *title; char *burst_id; - char *weather; char *exposure_time; double fnumber; int iso; @@ -629,7 +628,7 @@ typedef struct _media_content_cb_data { /* Update Meta*/ #define UPDATE_AV_META_FROM_MEDIA "UPDATE '%s' SET played_count=%d, last_played_time=%d, last_played_position=%d WHERE media_uuid='%q'" -#define UPDATE_IMAGE_META_FROM_MEDIA "UPDATE '%s' SET orientation=%d, weather=%Q WHERE media_uuid='%q'" +#define UPDATE_IMAGE_META_FROM_MEDIA "UPDATE '%s' SET orientation=%d WHERE media_uuid='%q'" #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_uuid='%s'" diff --git a/include_product/media_info_private.h b/include_product/media_info_private.h index a9ac795..4676c33 100755 --- a/include_product/media_info_private.h +++ b/include_product/media_info_private.h @@ -245,7 +245,6 @@ typedef struct { char *date_taken; char *title; char *burst_id; - char *weather; char *exposure_time; double fnumber; int iso; @@ -792,7 +791,7 @@ typedef struct _media_content_scan_cb_data_v2 { /* Update Meta*/ #define UPDATE_AV_META_FROM_MEDIA "UPDATE '%s' SET played_count=%d, last_played_time=%d, last_played_position=%d WHERE media_uuid='%q'" -#define UPDATE_IMAGE_META_FROM_MEDIA "UPDATE '%s' SET orientation=%d, weather=%Q WHERE media_uuid='%q'" +#define UPDATE_IMAGE_META_FROM_MEDIA "UPDATE '%s' SET orientation=%d WHERE media_uuid='%q'" #define UPDATE_VIDEO_MM_DATA_FROM_MEDIA "UPDATE '%s' SET bitrate=%d, duration=%d, width=%d, height=%d WHERE media_uuid='%q'" #define UPDATE_AUDIO_MM_DATA_FROM_MEDIA "UPDATE '%s' SET duration=%d, bitrate=%d, bitpersample=%d, samplerate=%d, channel=%d WHERE media_uuid='%q'" diff --git a/packaging/capi-content-media-content.spec b/packaging/capi-content-media-content.spec index 23dd507..2ddd8c3 100755 --- 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.3.29 +Version: 0.3.30 Release: 0 Group: Multimedia/API License: Apache-2.0 diff --git a/src/media_image.c b/src/media_image.c index 9852905..f22f5e3 100755 --- a/src/media_image.c +++ b/src/media_image.c @@ -27,7 +27,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->weather); SAFE_FREE(_image->burst_id); SAFE_FREE(_image->exposure_time); SAFE_FREE(_image->model); @@ -78,15 +77,6 @@ int image_meta_clone(image_meta_h *dst, image_meta_h src) } } - if (STRING_VALID(_src->weather)) { - _dst->weather = strdup(_src->weather); - if (_dst->weather == NULL) { - media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); - image_meta_destroy((image_meta_h)_dst); - return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; - } - } - if (STRING_VALID(_src->burst_id)) { _dst->burst_id = strdup(_src->burst_id); if (_dst->burst_id == NULL) { @@ -379,7 +369,7 @@ int image_meta_update_to_db(image_meta_h image) ret = _media_db_get_storage_id_by_media_id(_image->media_id, storage_id); media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); - sql = sqlite3_mprintf(UPDATE_IMAGE_META_FROM_MEDIA, storage_id, _image->orientation, _image->weather, _image->media_id); + sql = sqlite3_mprintf(UPDATE_IMAGE_META_FROM_MEDIA, storage_id, _image->orientation, _image->media_id); ret = _content_query_sql(sql); SQLITE3_SAFE_FREE(sql); } else { diff --git a/src/media_info.c b/src/media_info.c index 3c6029f..f8c0541 100755 --- a/src/media_info.c +++ b/src/media_info.c @@ -392,7 +392,6 @@ void _media_info_item_get_detail(sqlite3_stmt* stmt, media_info_h media) _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->burst_id = g_strdup((const char *)sqlite3_column_text(stmt, MEDIA_INFO_BURST_ID)); - _media->image_meta->weather = g_strdup((const char *)sqlite3_column_text(stmt, MEDIA_INFO_WEATHER)); _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)); } @@ -934,7 +933,6 @@ int media_info_destroy(media_info_h media) SAFE_FREE(_media->image_meta->exposure_time); SAFE_FREE(_media->image_meta->model); SAFE_FREE(_media->image_meta->title); - SAFE_FREE(_media->image_meta->weather); SAFE_FREE(_media->image_meta); } @@ -1211,15 +1209,6 @@ int media_info_clone(media_info_h *dst, media_info_h src) } } - if (_src->image_meta->weather != NULL) { - _dst->image_meta->weather = g_strdup(_src->image_meta->weather); - if (_dst->image_meta->weather == NULL) { - media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); - media_info_destroy((media_info_h)_dst); - return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; - } - } - if (_src->image_meta->exposure_time != NULL) { _dst->image_meta->exposure_time = g_strdup(_src->image_meta->exposure_time); if (_dst->image_meta->exposure_time == NULL) { @@ -1600,7 +1589,6 @@ int media_info_get_image(media_info_h media, image_meta_h *image) _image->date_taken = g_strdup(_media->image_meta->date_taken); _image->title = g_strdup(_media->image_meta->title); _image->burst_id = g_strdup(_media->image_meta->burst_id); - _image->weather = g_strdup(_media->image_meta->weather); _image->exposure_time = g_strdup(_media->image_meta->exposure_time); _image->model = g_strdup(_media->image_meta->model); @@ -3491,7 +3479,6 @@ static int __media_info_destroy(media_info_h media) SAFE_FREE(_media->image_meta->exposure_time); SAFE_FREE(_media->image_meta->model); SAFE_FREE(_media->image_meta->title); - SAFE_FREE(_media->image_meta->weather); SAFE_FREE(_media->image_meta); } -- 2.7.4