From 93b33fbe8cb8f49ff8055577a3a54a27c352cb48 Mon Sep 17 00:00:00 2001 From: hjkim Date: Tue, 23 Jan 2024 17:45:26 +0900 Subject: [PATCH] Delete the removed define MEDIA_STORAGE_TYPE Change-Id: I203b795c8284f20860d44a208ce8596b428780ea --- packaging/capi-content-media-content.spec | 2 +- test/media-content_test.c | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/packaging/capi-content-media-content.spec b/packaging/capi-content-media-content.spec index ad95ed0..bb344ac 100644 --- a/packaging/capi-content-media-content.spec +++ b/packaging/capi-content-media-content.spec @@ -1,6 +1,6 @@ Name: capi-content-media-content Summary: A Media content library in Tizen Native API -Version: 0.4.24 +Version: 0.4.25 Release: 0 Group: Multimedia/API License: Apache-2.0 diff --git a/test/media-content_test.c b/test/media-content_test.c index 3f7522b..37cb46b 100755 --- a/test/media-content_test.c +++ b/test/media-content_test.c @@ -1108,7 +1108,7 @@ int test_folder_operation(void) return ret; } - media_filter_set_condition(filter, "(MEDIA_TYPE = 0 or MEDIA_TYPE = 1) and MEDIA_STORAGE_TYPE=0", MEDIA_CONTENT_COLLATE_DEFAULT); /*MEDIA_TYPE 0-image, 1-video, 2-sound, 3-music, 4-other*/ + media_filter_set_condition(filter, "MEDIA_TYPE = 0 or MEDIA_TYPE = 1", MEDIA_CONTENT_COLLATE_DEFAULT); /*MEDIA_TYPE 0-image, 1-video, 2-sound, 3-music, 4-other*/ media_filter_set_offset(filter, 0, 5); media_filter_set_order(filter, MEDIA_CONTENT_ORDER_DESC, MEDIA_PATH, MEDIA_CONTENT_COLLATE_NOCASE); @@ -1127,7 +1127,7 @@ int test_folder_operation(void) return ret; } - media_filter_set_condition(m_filter, "MEDIA_TYPE=1 and MEDIA_STORAGE_TYPE=0", MEDIA_CONTENT_COLLATE_DEFAULT); /*MEDIA_TYPE 0-image, 1-video, 2-sound, 3-music, 4-other*/ + media_filter_set_condition(m_filter, "MEDIA_TYPE=1", MEDIA_CONTENT_COLLATE_DEFAULT); /*MEDIA_TYPE 0-image, 1-video, 2-sound, 3-music, 4-other*/ media_filter_set_offset(m_filter, 0, 5); media_filter_set_order(m_filter, MEDIA_CONTENT_ORDER_DESC, MEDIA_PATH, MEDIA_CONTENT_COLLATE_NOCASE); @@ -2267,7 +2267,7 @@ int DFT_test(void) /*Internal Memory*/ content_debug("[Internal Memory]\n"); /*1. Photo ============================================================*/ - ret = media_filter_set_condition(filter, "MEDIA_STORAGE_TYPE=0 AND MEDIA_TYPE=0", MEDIA_CONTENT_COLLATE_DEFAULT); + ret = media_filter_set_condition(filter, "MEDIA_TYPE=0", MEDIA_CONTENT_COLLATE_DEFAULT); /*Get Photo Count*/ ret = media_info_get_media_count_from_db(filter, &media_cnt); @@ -2278,7 +2278,7 @@ int DFT_test(void) content_debug("Photo size = [%d]\n", g_total_photo_size); /*2. Video ============================================================*/ - ret = media_filter_set_condition(filter, "MEDIA_STORAGE_TYPE=0 AND MEDIA_TYPE=1", MEDIA_CONTENT_COLLATE_DEFAULT); + ret = media_filter_set_condition(filter, "MEDIA_TYPE=1", MEDIA_CONTENT_COLLATE_DEFAULT); /*Get Video Count*/ ret = media_info_get_media_count_from_db(filter, &media_cnt); @@ -2289,7 +2289,7 @@ int DFT_test(void) content_debug("Video size = [%d]\n", g_total_video_size); /*3. MP3 ============================================================*/ - ret = media_filter_set_condition(filter, "MEDIA_STORAGE_TYPE=0 AND MEDIA_TYPE=3 AND MEDIA_MIME_TYPE=\"audio/mpeg\"", MEDIA_CONTENT_COLLATE_DEFAULT); + ret = media_filter_set_condition(filter, "MEDIA_TYPE=3 AND MEDIA_MIME_TYPE=\"audio/mpeg\"", MEDIA_CONTENT_COLLATE_DEFAULT); /*Get MP3 Count*/ ret = media_info_get_media_count_from_db(filter, &media_cnt); @@ -2300,7 +2300,7 @@ int DFT_test(void) content_debug("MP3 size = [%d]\n", g_total_mp3_size); /*4. Voice Memo ============================================================*/ - ret = media_filter_set_condition(filter, "MEDIA_STORAGE_TYPE=0 AND (MEDIA_MIME_TYPE=\"audio/AMR\" OR MEDIA_MIME_TYPE=\"audio/mp4\")", MEDIA_CONTENT_COLLATE_DEFAULT); + ret = media_filter_set_condition(filter, "(MEDIA_MIME_TYPE=\"audio/AMR\" OR MEDIA_MIME_TYPE=\"audio/mp4\")", MEDIA_CONTENT_COLLATE_DEFAULT); /*Get Voice Memo Count*/ ret = media_info_get_media_count_from_db(filter, &media_cnt); @@ -2318,7 +2318,7 @@ int DFT_test(void) /*External Memory*/ content_debug("\n[External Memory]\n"); /*1. Photo ============================================================*/ - ret = media_filter_set_condition(filter, "MEDIA_STORAGE_TYPE=1 AND MEDIA_TYPE=0", MEDIA_CONTENT_COLLATE_DEFAULT); + ret = media_filter_set_condition(filter, "MEDIA_TYPE=0", MEDIA_CONTENT_COLLATE_DEFAULT); /*Get Photo Count*/ ret = media_info_get_media_count_from_db(filter, &media_cnt); @@ -2329,7 +2329,7 @@ int DFT_test(void) content_debug("Photo size = [%d]\n", g_total_photo_size); /*2. Video ============================================================*/ - ret = media_filter_set_condition(filter, "MEDIA_STORAGE_TYPE=1 AND MEDIA_TYPE=1", MEDIA_CONTENT_COLLATE_DEFAULT); + ret = media_filter_set_condition(filter, "MEDIA_TYPE=1", MEDIA_CONTENT_COLLATE_DEFAULT); /*Get Video Count*/ ret = media_info_get_media_count_from_db(filter, &media_cnt); @@ -2340,7 +2340,7 @@ int DFT_test(void) content_debug("Video size = [%d]\n", g_total_video_size); /*3. MP3 ============================================================*/ - ret = media_filter_set_condition(filter, "MEDIA_STORAGE_TYPE=1 AND MEDIA_TYPE=3 AND MEDIA_MIME_TYPE=\"audio/mpeg\"", MEDIA_CONTENT_COLLATE_DEFAULT); + ret = media_filter_set_condition(filter, "MEDIA_TYPE=3 AND MEDIA_MIME_TYPE=\"audio/mpeg\"", MEDIA_CONTENT_COLLATE_DEFAULT); /*Get MP3 Count*/ ret = media_info_get_media_count_from_db(filter, &media_cnt); @@ -2351,7 +2351,7 @@ int DFT_test(void) content_debug("MP3 size = [%d]\n", g_total_mp3_size); /*4. Voice Memo ============================================================*/ - ret = media_filter_set_condition(filter, "MEDIA_STORAGE_TYPE=1 AND (MEDIA_MIME_TYPE=\"audio/AMR\" OR MEDIA_MIME_TYPE=\"audio/mp4\")", MEDIA_CONTENT_COLLATE_DEFAULT); + ret = media_filter_set_condition(filter, "(MEDIA_MIME_TYPE=\"audio/AMR\" OR MEDIA_MIME_TYPE=\"audio/mp4\")", MEDIA_CONTENT_COLLATE_DEFAULT); /*Get Voice Memo Count*/ ret = media_info_get_media_count_from_db(filter, &media_cnt); -- 2.7.4