From 3947ffdb96b338e9a2b5584c506dcf4fc3cc21a1 Mon Sep 17 00:00:00 2001 From: Minje Ahn Date: Mon, 2 Sep 2019 16:42:49 +0900 Subject: [PATCH] Modify the media type classification method if-else to switch-case Change-Id: I290d966434b5272855d93a37555cbffc9d290b12 Signed-off-by: Minje Ahn --- src/common/media-svc-noti.c | 2 -- src/common/media-svc.c | 36 ++++++++++++++++++++++-------------- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/src/common/media-svc-noti.c b/src/common/media-svc-noti.c index 733dc2c..4a2b37d 100755 --- a/src/common/media-svc-noti.c +++ b/src/common/media-svc-noti.c @@ -23,8 +23,6 @@ #include "media-svc-noti.h" #include "media-svc-util.h" -static int __media_svc_publish_noti_by_item(media_svc_noti_item *noti_item); - static __thread media_svc_noti_item *g_inserted_noti_list = NULL; static __thread int g_noti_from_pid = -1; diff --git a/src/common/media-svc.c b/src/common/media-svc.c index 1e81ccc..7f6d928 100755 --- a/src/common/media-svc.c +++ b/src/common/media-svc.c @@ -244,15 +244,20 @@ int media_svc_insert_item_bulk(sqlite3 *handle, const char *storage_id, ms_user_ if (ret != MS_MEDIA_ERR_NONE) return ret; - if (content_info.media_type == MEDIA_SVC_MEDIA_TYPE_OTHER - || (content_info.media_type == MEDIA_SVC_MEDIA_TYPE_PVR) - || (content_info.media_type == MEDIA_SVC_MEDIA_TYPE_UHD) - || (content_info.media_type == MEDIA_SVC_MEDIA_TYPE_SCSA)) - media_svc_debug("Do nothing[%d]", content_info.media_type); - else if (content_info.media_type == MEDIA_SVC_MEDIA_TYPE_IMAGE) + switch (content_info.media_type) { + case MEDIA_SVC_MEDIA_TYPE_IMAGE: ret = _media_svc_extract_image_metadata(&content_info); - else + break; + case MEDIA_SVC_MEDIA_TYPE_VIDEO: + case MEDIA_SVC_MEDIA_TYPE_SOUND: + case MEDIA_SVC_MEDIA_TYPE_MUSIC: ret = _media_svc_extract_media_metadata(handle, true, &content_info, uid); + break; + default: + media_svc_debug("Do nothing[%d]", content_info.media_type); + break; + } + media_svc_retv_del_if(ret != MS_MEDIA_ERR_NONE, ret, &content_info); /*Set or Get folder id*/ @@ -331,15 +336,18 @@ int media_svc_insert_item_immediately(sqlite3 *handle, const char *storage_id, m if (ret != MS_MEDIA_ERR_NONE) return ret; - if (content_info.media_type == MEDIA_SVC_MEDIA_TYPE_OTHER - || (content_info.media_type == MEDIA_SVC_MEDIA_TYPE_PVR) - || (content_info.media_type == MEDIA_SVC_MEDIA_TYPE_UHD) - || (content_info.media_type == MEDIA_SVC_MEDIA_TYPE_SCSA)) { - /*Do nothing.*/ - } else if (content_info.media_type == MEDIA_SVC_MEDIA_TYPE_IMAGE) { + switch (content_info.media_type) { + case MEDIA_SVC_MEDIA_TYPE_IMAGE: ret = _media_svc_extract_image_metadata(&content_info); - } else { + break; + case MEDIA_SVC_MEDIA_TYPE_VIDEO: + case MEDIA_SVC_MEDIA_TYPE_SOUND: + case MEDIA_SVC_MEDIA_TYPE_MUSIC: ret = _media_svc_extract_media_metadata(handle, false, &content_info, uid); + break; + default: + media_svc_debug("Do nothing[%d]", content_info.media_type); + break; } media_svc_retv_del_if(ret != MS_MEDIA_ERR_NONE, ret, &content_info); -- 2.7.4