From ead9247d4294af190be170c5591a72cec2a92206 Mon Sep 17 00:00:00 2001 From: Hyunjun Ko Date: Fri, 31 Aug 2012 14:07:41 +0900 Subject: [PATCH] Update to the latest --- packaging/libmedia-service.spec | 4 ++-- src/common/media-svc-util.c | 41 ++++++++++++++++++++++---------------- src/include/common/media-svc-env.h | 6 +++--- 3 files changed, 29 insertions(+), 22 deletions(-) diff --git a/packaging/libmedia-service.spec b/packaging/libmedia-service.spec index 5675ae8..662b75b 100644 --- a/packaging/libmedia-service.spec +++ b/packaging/libmedia-service.spec @@ -1,7 +1,7 @@ Name: libmedia-service Summary: Media information service library for multimedia applications. -Version: 0.1.121 -Release: 2 +Version: 0.1.122 +Release: 1 Group: System/Libraries License: Apache-2.0 Source0: %{name}-%{version}.tar.gz diff --git a/src/common/media-svc-util.c b/src/common/media-svc-util.c index cc56645..e1caf11 100755 --- a/src/common/media-svc-util.c +++ b/src/common/media-svc-util.c @@ -394,7 +394,7 @@ char *_media_svc_get_title_from_filepath (const char *path) } filename = g_path_get_basename(path); - if ((filename == NULL) || (strlen(filename) < 1)) { + if (!STRING_VALID(filename)) { media_svc_error("wrong file name"); SAFE_FREE(filename); return NULL; @@ -606,6 +606,7 @@ int _media_svc_set_media_info(media_svc_content_info_s *content_info, media_svc_ content_info->last_played_time= 0; content_info->last_played_position= 0; content_info->favourate= 0; + content_info->media_meta.rating = 0; return MEDIA_INFO_ERROR_NONE; } @@ -878,12 +879,12 @@ int _media_svc_extract_media_metadata(sqlite3 *handle, media_svc_content_info_s if (!(extracted_field & MEDIA_SVC_EXTRACTED_FIELD_TITLE)) { title = _media_svc_get_title_from_filepath(path); if (title) { - __media_svc_malloc_and_strncpy(&content_info->media_meta.title, title); + ret = __media_svc_malloc_and_strncpy(&content_info->media_meta.title, title); SAFE_FREE(title); media_svc_retv_del_if(ret < 0, ret, content_info); } else { - media_svc_error("Can't extract title from filepath"); - __media_svc_malloc_and_strncpy(&content_info->media_meta.title, MEDIA_SVC_TAG_UNKNOWN); + media_svc_error("Can't extract title from filepath [%s]", content_info->path); + ret = __media_svc_malloc_and_strncpy(&content_info->media_meta.title, MEDIA_SVC_TAG_UNKNOWN); media_svc_retv_del_if(ret < 0, ret, content_info); } } @@ -936,8 +937,9 @@ int _media_svc_extract_media_metadata(sqlite3 *handle, media_svc_content_info_s media_svc_retv_del_if(ret < 0, ret, content_info); //_strncpy_safe(content_info->media_meta.title, title, sizeof(content_info->media_meta.title)); } else { - media_svc_error("Can't extract title from filepath"); - return MEDIA_INFO_ERROR_INTERNAL; + media_svc_error("Can't extract title from filepath [%s]", content_info->path); + ret = __media_svc_malloc_and_strncpy(&content_info->media_meta.title, MEDIA_SVC_TAG_UNKNOWN); + media_svc_retv_del_if(ret < 0, ret, content_info); } /* @@ -1126,8 +1128,9 @@ int _media_svc_extract_media_metadata(sqlite3 *handle, media_svc_content_info_s media_svc_retv_del_if(ret < 0, ret, content_info); } else { - media_svc_error("Can't extract title from filepath"); - return MEDIA_INFO_ERROR_INTERNAL; + media_svc_error("Can't extract title from filepath [%s]", content_info->path); + ret = __media_svc_malloc_and_strncpy(&content_info->media_meta.title, MEDIA_SVC_TAG_UNKNOWN); + media_svc_retv_del_if(ret < 0, ret, content_info); } ret = __media_svc_malloc_and_strncpy(&content_info->media_meta.album, MEDIA_SVC_TAG_UNKNOWN); @@ -1199,8 +1202,9 @@ int _media_svc_extract_media_metadata(sqlite3 *handle, media_svc_content_info_s media_svc_retv_del_if(ret < 0, ret, content_info); //_strncpy_safe(content_info->media_meta.title, title, sizeof(content_info->media_meta.title)); } else { - media_svc_error("Can't extract title from filepath"); - return MEDIA_INFO_ERROR_INTERNAL; + media_svc_error("Can't extract title from filepath [%s]", content_info->path); + ret = __media_svc_malloc_and_strncpy(&content_info->media_meta.title, MEDIA_SVC_TAG_UNKNOWN); + media_svc_retv_del_if(ret < 0, ret, content_info); } ret = __media_svc_malloc_and_strncpy(&content_info->media_meta.album, MEDIA_SVC_TAG_UNKNOWN); @@ -1232,8 +1236,9 @@ int _media_svc_extract_media_metadata(sqlite3 *handle, media_svc_content_info_s media_svc_retv_del_if(ret < 0, ret, content_info); //_strncpy_safe(content_info->media_meta.title, title, sizeof(content_info->media_meta.title)); } else { - media_svc_error("Can't extract title from filepath"); - return MEDIA_INFO_ERROR_INTERNAL; + media_svc_error("Can't extract title from filepath [%s]", content_info->path); + ret = __media_svc_malloc_and_strncpy(&content_info->media_meta.title, MEDIA_SVC_TAG_UNKNOWN); + media_svc_retv_del_if(ret < 0, ret, content_info); } ret = __media_svc_malloc_and_strncpy(&content_info->media_meta.album, MEDIA_SVC_TAG_UNKNOWN); @@ -1395,8 +1400,9 @@ int _media_svc_extract_media_metadata(sqlite3 *handle, media_svc_content_info_s SAFE_FREE(title); media_svc_retv_del_if(ret < 0, ret, content_info); } else { - media_svc_error("Can't extract title from filepath"); - return MEDIA_INFO_ERROR_INTERNAL; + media_svc_error("Can't extract title from filepath [%s]", content_info->path); + ret = __media_svc_malloc_and_strncpy(&content_info->media_meta.title, MEDIA_SVC_TAG_UNKNOWN); + media_svc_retv_del_if(ret < 0, ret, content_info); } } @@ -1653,8 +1659,9 @@ int _media_svc_extract_media_metadata(sqlite3 *handle, media_svc_content_info_s SAFE_FREE(title); media_svc_retv_del_if(ret < 0, ret, content_info); } else { - media_svc_error("Can't extract title from filepath"); - return MEDIA_INFO_ERROR_INTERNAL; + media_svc_error("Can't extract title from filepath [%s]", content_info->path); + ret = __media_svc_malloc_and_strncpy(&content_info->media_meta.title, MEDIA_SVC_TAG_UNKNOWN); + media_svc_retv_del_if(ret < 0, ret, content_info); } /* in case of file size 0, MMFW Can't parsting tag info but add it to Music DB. */ @@ -1748,7 +1755,7 @@ void _media_svc_destroy_content_info(media_svc_content_info_s *content_info) int _media_svc_get_store_type_by_path(const char *path, media_svc_storage_type_e *storage_type) { - if(path != NULL && strlen(path) > 0) + if(STRING_VALID(path)) { if(strncmp(path, MEDIA_SVC_PATH_PHONE, strlen(MEDIA_SVC_PATH_PHONE)) == 0) { diff --git a/src/include/common/media-svc-env.h b/src/include/common/media-svc-env.h index a8d03db..1d1ad39 100755 --- a/src/include/common/media-svc-env.h +++ b/src/include/common/media-svc-env.h @@ -62,7 +62,7 @@ extern "C" { #define MEDIA_SVC_THUMB_INTERNAL_PATH MEDIA_SVC_THUMB_PATH_PREFIX"/phone" /**< Phone thumbnail path*/ #define MEDIA_SVC_THUMB_EXTERNAL_PATH MEDIA_SVC_THUMB_PATH_PREFIX"/mmc" /**< MMC thumbnail path*/ -#define MEDIA_SVC_DEFAULT_GPS_VALUE 1000.00 /**< Default GPS Value*/ +#define MEDIA_SVC_DEFAULT_GPS_VALUE -200 /**< Default GPS Value*/ #define THUMB_EXT "jpg" #define MEDIA_SVC_PATH_PHONE "/opt/media" @@ -170,8 +170,8 @@ typedef struct { */ typedef struct { char * media_uuid; /**< Unique ID of item */ - char * path; /**< Full path and file name of media file */ - char * file_name; /**< Full path and file name of media file */ + char * path; /**< Full path of media file */ + char * file_name; /**< File name of media file. Display name */ int media_type; /**< Type of media file : internal/external */ char * mime_type; /**< Full path and file name of media file */ unsigned long long size; /**< size */ -- 2.7.4