diff options
| -rw-r--r-- | packaging/libmedia-service.spec | 2 | ||||
| -rwxr-xr-x | src/common/media-svc-util.c | 9 | ||||
| -rwxr-xr-x | src/common/media-svc.c | 10 |
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); |