Use get_image_info instead

[platform/core/multimedia/libmedia-service.git] / src / common / media-svc.c

diff --git a/src/common/media-svc.c b/src/common/media-svc.c
index a992f6e..a78f53f 100755 (executable)
--- a/src/common/media-svc.c
+++ b/src/common/media-svc.c
@@ -206,21 +206,23 @@ int media_svc_insert_item_bulk(sqlite3 *handle, const char *storage_id, const ch
                ret = _media_svc_extract_image_metadata(&content_info);
                break;
        case MEDIA_SVC_MEDIA_TYPE_VIDEO:
+               ret = _media_svc_extract_video_metadata(&content_info);
+               break;
        case MEDIA_SVC_MEDIA_TYPE_SOUND:
        case MEDIA_SVC_MEDIA_TYPE_MUSIC:
-               ret = _media_svc_extract_media_metadata(handle, true, &content_info, uid);
+               ret = _media_svc_extract_audio_metadata(handle, true, &content_info, uid);
                break;
        case MEDIA_SVC_MEDIA_TYPE_BOOK:
                ret = _media_svc_extract_book_metadata(&content_info);
                /* The 'TITLE' should always be filled in */
                if (!content_info.media_meta.title || strlen(content_info.media_meta.title) == 0) {
                        g_free(content_info.media_meta.title);
-                       content_info.media_meta.title = _media_svc_get_title_by_path(content_info.path);
+                       content_info.media_meta.title = _media_svc_get_title_from_filename(content_info.file_name);
                }
                break;
        default:
                /* The 'TITLE' should always be filled in */
-               content_info.media_meta.title = _media_svc_get_title_by_path(content_info.path);
+               content_info.media_meta.title = _media_svc_get_title_from_filename(content_info.file_name);
                break;
        }
 
@@ -277,21 +279,23 @@ int media_svc_insert_item_immediately(sqlite3 *handle, const char *storage_id, c
                ret = _media_svc_extract_image_metadata(&content_info);
                break;
        case MEDIA_SVC_MEDIA_TYPE_VIDEO:
+               ret = _media_svc_extract_video_metadata(&content_info);
+               break;
        case MEDIA_SVC_MEDIA_TYPE_SOUND:
        case MEDIA_SVC_MEDIA_TYPE_MUSIC:
-               ret = _media_svc_extract_media_metadata(handle, false, &content_info, uid);
+               ret = _media_svc_extract_audio_metadata(handle, false, &content_info, uid);
                break;
        case MEDIA_SVC_MEDIA_TYPE_BOOK:
                ret = _media_svc_extract_book_metadata(&content_info);
                /* The 'TITLE' should always be filled in */
                if (!content_info.media_meta.title || strlen(content_info.media_meta.title) == 0) {
                        g_free(content_info.media_meta.title);
-                       content_info.media_meta.title = _media_svc_get_title_by_path(content_info.path);
+                       content_info.media_meta.title = _media_svc_get_title_from_filename(content_info.file_name);
                }
                break;
        default:
                /* The 'TITLE' should always be filled in */
-               content_info.media_meta.title = _media_svc_get_title_by_path(content_info.path);
+               content_info.media_meta.title = _media_svc_get_title_from_filename(content_info.file_name);
                break;
        }
 
@@ -488,21 +492,23 @@ int media_svc_refresh_item(sqlite3 *handle, bool is_direct, const char *storage_
                ret = _media_svc_extract_image_metadata(&content_info);
                break;
        case MEDIA_SVC_MEDIA_TYPE_VIDEO:
+               ret = _media_svc_extract_video_metadata(&content_info);
+               break;
        case MEDIA_SVC_MEDIA_TYPE_SOUND:
        case MEDIA_SVC_MEDIA_TYPE_MUSIC:
-               ret = _media_svc_extract_media_metadata(handle, is_direct, &content_info, uid);
+               ret = _media_svc_extract_audio_metadata(handle, is_direct, &content_info, uid);
                break;
        case MEDIA_SVC_MEDIA_TYPE_BOOK:
                ret = _media_svc_extract_book_metadata(&content_info);
                /* The 'TITLE' should always be filled in */
                if (!content_info.media_meta.title || strlen(content_info.media_meta.title) == 0) {
                        g_free(content_info.media_meta.title);
-                       content_info.media_meta.title = _media_svc_get_title_by_path(content_info.path);
+                       content_info.media_meta.title = _media_svc_get_title_from_filename(content_info.file_name);
                }
                break;
        default:
                /* The 'TITLE' should always be filled in */
-               content_info.media_meta.title = _media_svc_get_title_by_path(content_info.path);
+               content_info.media_meta.title = _media_svc_get_title_from_filename(content_info.file_name);
                break;
        }
 
@@ -560,16 +566,9 @@ int media_svc_publish_noti(media_item_update_type_e update_type, const char *pat
        return _media_svc_publish_noti(update_type, path, media_type, uuid, mime_type);
 }
 
-int media_svc_set_storage_validity(sqlite3 *handle, const char *storage_id, int validity, uid_t uid)
+int media_svc_set_storage_validity(const char *storage_id, int validity, uid_t uid)
 {
-       int ret = MS_MEDIA_ERR_NONE;
-
-       media_svc_retvm_if(handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Handle is NULL");
-
-       ret = _media_svc_update_storage_validity(storage_id, validity, uid);
-       media_svc_retvm_if(ret != MS_MEDIA_ERR_NONE, ret, "update storage validity failed: %d", ret);
-
-       return ret;
+       return _media_svc_update_storage_validity(storage_id, validity, uid);
 }
 
 int media_svc_get_storage_id(sqlite3 *handle, const char *path, char *storage_id, uid_t uid)