summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiyong Min <jiyong.min@samsung.com>2017-03-22 17:54:32 +0900
committerJiyong Min <jiyong.min@samsung.com>2017-03-22 18:50:24 +0900
commit53bff6443af30d7d7f660958302d9a4f8f4ceb02 (patch)
tree933a2df2996e297df7ea94dd676f85971e82ce9d
parentc05d15af4985473288fc68f6d395a3bc73c6e325 (diff)
downloadlibmedia-service-accepted/tizen/tv/20170323.084505.tar.gz
libmedia-service-accepted/tizen/tv/20170323.084505.tar.bz2
libmedia-service-accepted/tizen/tv/20170323.084505.zip
[Problem] The album art in 'album' table was not inserted. - After the default was changed to empty string, the strlen is zero. And 'strncmp' did not compare value and the default. The empty string and value should be compare with 'g_strcmp0'. Change-Id: I44e85bfd428c8058298658f1b5f0c13482c39ff6 Signed-off-by: jiyong.min <jiyong.min@samsung.com>
-rw-r--r--packaging/libmedia-service.spec2
-rwxr-xr-xsrc/common/media-svc-util.c9
-rwxr-xr-xsrc/common/media-svc.c10
3 files changed, 9 insertions, 12 deletions
diff --git a/packaging/libmedia-service.spec b/packaging/libmedia-service.spec
index 325f9ae..2f80acd 100644
--- 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.2.94
+Version: 0.2.95
Release: 0
Group: Multimedia/Libraries
License: Apache-2.0 and public domain
diff --git a/src/common/media-svc-util.c b/src/common/media-svc-util.c
index 7321ccd..95d850b 100755
--- a/src/common/media-svc-util.c
+++ b/src/common/media-svc-util.c
@@ -2024,9 +2024,8 @@ int _media_svc_extract_media_metadata(sqlite3 *handle, media_svc_content_info_s
content_info->album_id = album_id;
append_album = FALSE;
- if ((!strncmp(content_info->media_meta.album, MEDIA_SVC_TAG_UNKNOWN, strlen(MEDIA_SVC_TAG_UNKNOWN))) ||
- (!strncmp(content_info->media_meta.artist, MEDIA_SVC_TAG_UNKNOWN, strlen(MEDIA_SVC_TAG_UNKNOWN)))) {
-
+ if ((!g_strcmp0(content_info->media_meta.album, MEDIA_SVC_TAG_UNKNOWN)) ||
+ (!g_strcmp0(content_info->media_meta.artist, MEDIA_SVC_TAG_UNKNOWN))) {
media_svc_debug("Unknown album or artist already exists. Extract thumbnail for Unknown.");
extract_thumbnail = TRUE;
} else {
@@ -2085,8 +2084,8 @@ int _media_svc_extract_media_metadata(sqlite3 *handle, media_svc_content_info_s
}
if (append_album == TRUE) {
- if ((strncmp(content_info->media_meta.album, MEDIA_SVC_TAG_UNKNOWN, strlen(MEDIA_SVC_TAG_UNKNOWN))) &&
- (strncmp(content_info->media_meta.artist, MEDIA_SVC_TAG_UNKNOWN, strlen(MEDIA_SVC_TAG_UNKNOWN))))
+ if ((g_strcmp0(content_info->media_meta.album, MEDIA_SVC_TAG_UNKNOWN)) &&
+ (g_strcmp0(content_info->media_meta.artist, MEDIA_SVC_TAG_UNKNOWN)))
ret = _media_svc_append_album(handle, content_info->media_meta.album, content_info->media_meta.artist, content_info->thumbnail_path, &album_id, uid);
else
ret = _media_svc_append_album(handle, content_info->media_meta.album, content_info->media_meta.artist, NULL, &album_id, uid);
diff --git a/src/common/media-svc.c b/src/common/media-svc.c
index bc2e554..995932e 100755
--- a/src/common/media-svc.c
+++ b/src/common/media-svc.c
@@ -1748,9 +1748,8 @@ int media_svc_insert_item_immediately_with_data(MediaSvcHandle *handle, media_sv
_new_content_info.album_id = album_id;
append_album = FALSE;
- if ((!strncmp(_new_content_info.media_meta.album, MEDIA_SVC_TAG_UNKNOWN, strlen(MEDIA_SVC_TAG_UNKNOWN))) ||
- (!strncmp(_new_content_info.media_meta.artist, MEDIA_SVC_TAG_UNKNOWN, strlen(MEDIA_SVC_TAG_UNKNOWN)))) {
-
+ if ((!g_strcmp0(_new_content_info.media_meta.album, MEDIA_SVC_TAG_UNKNOWN)) ||
+ (!g_strcmp0(_new_content_info.media_meta.artist, MEDIA_SVC_TAG_UNKNOWN))) {
media_svc_debug("Unknown album or artist already exists. Extract thumbnail for Unknown.");
} else {
@@ -1762,9 +1761,8 @@ int media_svc_insert_item_immediately_with_data(MediaSvcHandle *handle, media_sv
}
if (append_album == TRUE) {
-
- if ((strncmp(_new_content_info.media_meta.album, MEDIA_SVC_TAG_UNKNOWN, strlen(MEDIA_SVC_TAG_UNKNOWN))) &&
- (strncmp(_new_content_info.media_meta.artist, MEDIA_SVC_TAG_UNKNOWN, strlen(MEDIA_SVC_TAG_UNKNOWN))))
+ if ((g_strcmp0(_new_content_info.media_meta.album, MEDIA_SVC_TAG_UNKNOWN)) &&
+ (g_strcmp0(_new_content_info.media_meta.artist, MEDIA_SVC_TAG_UNKNOWN)))
ret = _media_svc_append_album(handle, _new_content_info.media_meta.album, _new_content_info.media_meta.artist, _new_content_info.thumbnail_path, &album_id, uid);
else
ret = _media_svc_append_album(handle, _new_content_info.media_meta.album, _new_content_info.media_meta.artist, NULL, &album_id, uid);