From db50dcd4b00525857ad9a0adfca75bb4a72e0dce Mon Sep 17 00:00:00 2001 From: Minje Ahn Date: Mon, 30 May 2022 15:34:55 +0900 Subject: [PATCH] Remove TIZEN_FEATURE_COMPATIBILITY Change-Id: I3656d34b9effe5c0013f569b7c3e9c340d5acc1d Signed-off-by: Minje Ahn --- CMakeLists.txt | 8 ++----- include/media_content_internal.h | 2 -- include_product/media_content_internal.h | 2 -- packaging/capi-content-media-content.spec | 1 - src/media_audio.c | 37 ------------------------------- src/media_content.c | 9 -------- src/media_info.c | 37 ------------------------------- 7 files changed, 2 insertions(+), 94 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3e92751..504ea53 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,9 +33,6 @@ ADD_DEFINITIONS("-DTIZEN_DEBUG") IF(TIZEN_PRODUCT_TV) ADD_DEFINITIONS("-D_USE_TVPD_MODE") ENDIF(TIZEN_PRODUCT_TV) -IF(TIZEN_FEATURE_COMPATIBILITY) - ADD_DEFINITIONS("-DTIZEN_FEATURE_COMPATIBILITY") -ENDIF(TIZEN_FEATURE_COMPATIBILITY) SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=${LIB_INSTALL_DIR}") @@ -81,10 +78,10 @@ IF(UNIX) ADD_CUSTOM_TARGET (distclean @echo cleaning for source distribution) ADD_CUSTOM_COMMAND( - DEPENDS clean + DEPENDS clean COMMENT "distribution clean" COMMAND find - ARGS . + ARGS . -not -name config.cmake -and \( -name tester.c -or -name Testing -or @@ -107,4 +104,3 @@ ADD_CUSTOM_COMMAND( ) ENDIF(UNIX) - diff --git a/include/media_content_internal.h b/include/media_content_internal.h index 55f621c..011ae19 100755 --- a/include/media_content_internal.h +++ b/include/media_content_internal.h @@ -72,8 +72,6 @@ int media_info_set_latitude(media_info_h media, double latitude) TIZEN_DEPRECATE int media_info_set_rating(media_info_h media, int rating) TIZEN_DEPRECATED_API; -int media_info_set_display_name(media_info_h media, const char *display_name) TIZEN_DEPRECATED_API; - #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/include_product/media_content_internal.h b/include_product/media_content_internal.h index 55f621c..011ae19 100755 --- a/include_product/media_content_internal.h +++ b/include_product/media_content_internal.h @@ -72,8 +72,6 @@ int media_info_set_latitude(media_info_h media, double latitude) TIZEN_DEPRECATE int media_info_set_rating(media_info_h media, int rating) TIZEN_DEPRECATED_API; -int media_info_set_display_name(media_info_h media, const char *display_name) TIZEN_DEPRECATED_API; - #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/packaging/capi-content-media-content.spec b/packaging/capi-content-media-content.spec index 223be0e..fe05f32 100644 --- a/packaging/capi-content-media-content.spec +++ b/packaging/capi-content-media-content.spec @@ -57,7 +57,6 @@ MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'` %else -DTIZEN_PRODUCT_TV=NO \ %endif - -DTIZEN_FEATURE_COMPATIBILITY=YES %__make %{?jobs:-j%jobs} diff --git a/src/media_audio.c b/src/media_audio.c index f887b1d..c3bf6a1 100644 --- a/src/media_audio.c +++ b/src/media_audio.c @@ -255,40 +255,3 @@ int audio_meta_get_duration(audio_meta_h audio, int *duration) return MEDIA_CONTENT_ERROR_NONE; } - -#ifdef TIZEN_FEATURE_COMPATIBILITY -int audio_meta_get_played_time(audio_meta_h audio, time_t* played_time) -{ - content_warn("DEPRECATION WARNING: audio_meta_get_played_time() is removed from 5.5."); - - return MEDIA_CONTENT_ERROR_NONE; -} - -int audio_meta_get_played_count(audio_meta_h audio, int *played_count) -{ - content_warn("DEPRECATION WARNING: audio_meta_get_played_count() is removed from 5.5."); - - return MEDIA_CONTENT_ERROR_NONE; -} - -int audio_meta_set_played_count(audio_meta_h audio, int played_count) -{ - content_warn("DEPRECATION WARNING: audio_meta_set_played_count() is removed from 5.5."); - - return MEDIA_CONTENT_ERROR_NONE; -} - -int audio_meta_set_played_time(audio_meta_h audio, time_t played_time) -{ - content_warn("DEPRECATION WARNING: audio_meta_set_played_time() is removed from 5.5."); - - return MEDIA_CONTENT_ERROR_NONE; -} - -int audio_meta_update_to_db(audio_meta_h audio) -{ - content_warn("DEPRECATION WARNING: audio_meta_update_to_db() is removed from 5.5."); - - return MEDIA_CONTENT_ERROR_NONE; -} -#endif diff --git a/src/media_content.c b/src/media_content.c index 8d20d33..ca0429f 100644 --- a/src/media_content.c +++ b/src/media_content.c @@ -479,15 +479,6 @@ int media_content_add_db_updated_cb(media_content_db_update_cb callback, void *u return _content_error_capi(ret); } -#ifdef TIZEN_FEATURE_COMPATIBILITY -int media_content_set_db_updated_cb(media_content_db_update_cb callback, void *user_data) -{ - content_warn("DEPRECATION WARNING: media_content_set_db_updated_cb() is removed from 5.0."); - - return MEDIA_CONTENT_ERROR_NONE; -} -#endif - int media_content_remove_db_updated_cb(media_content_noti_h noti_handle) { int ret = MEDIA_CONTENT_ERROR_NONE; diff --git a/src/media_info.c b/src/media_info.c index 4441e69..69c80d6 100644 --- a/src/media_info.c +++ b/src/media_info.c @@ -1664,40 +1664,3 @@ int media_info_set_rating(media_info_h media, int rating) return MEDIA_CONTENT_ERROR_NONE; } - -#ifdef TIZEN_FEATURE_COMPATIBILITY -int media_info_set_added_time(media_info_h media, time_t added_time) -{ - content_warn("DEPRECATION WARNING: media_info_set_added_time() is removed from 5.5."); - - return MEDIA_CONTENT_ERROR_NONE; -} - -int media_info_delete_batch_from_db(filter_h filter) -{ - content_warn("DEPRECATION WARNING: media_info_delete_batch_from_db() is removed from 5.5."); - - return MEDIA_CONTENT_ERROR_NONE; -} - -int media_info_create(const char *path, media_info_h *media) -{ - content_warn("DEPRECATION WARNING: media_info_create() is removed from 5.5."); - - return MEDIA_CONTENT_ERROR_NONE; -} - -int media_info_refresh_metadata_to_db(const char *media_id) -{ - content_warn("DEPRECATION WARNING: media_info_refresh_metadata_to_db() is removed from 5.5."); - - return MEDIA_CONTENT_ERROR_NONE; -} - -int media_info_set_display_name(media_info_h media, const char *display_name) -{ - content_warn("DEPRECATION WARNING: media_info_set_display_name() is removed from 5.5."); - - return MEDIA_CONTENT_ERROR_NONE; -} -#endif -- 2.7.4