From 13278d5c8e29f835177d62fed24eed8fb0a45020 Mon Sep 17 00:00:00 2001 From: Seungbae Shin Date: Thu, 22 Sep 2016 11:41:45 +0900 Subject: [PATCH] Apply DEPRECATION macro [Version] 0.3.42 [Profile] Common [Issue Type] Deprecation Change-Id: Ib99bb36d19e8ae750dab3a6c0c310a084074360a --- include/audio_io.h | 16 ++++++++-------- src/audio_io.c | 16 ++++++++++++++++ 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/include/audio_io.h b/include/audio_io.h index f9100e2..7dde09f 100644 --- a/include/audio_io.h +++ b/include/audio_io.h @@ -243,7 +243,7 @@ int audio_in_create(int sample_rate, audio_channel_e channel, audio_sample_type_ * * @see audio_in_destroy() */ -int audio_in_create_loopback(int sample_rate, audio_channel_e channel, audio_sample_type_e type , audio_in_h* input); +int audio_in_create_loopback(int sample_rate, audio_channel_e channel, audio_sample_type_e type , audio_in_h* input) TIZEN_DEPRECATED_API; /** * @brief Releases the audio input handle and all its resources associated with an audio stream. @@ -484,7 +484,7 @@ int audio_in_get_sample_type(audio_in_h input, audio_sample_type_e *type); * @see audio_in_unset_interrupted_cb() * @see audio_io_interrupted_cb() */ -int audio_in_set_interrupted_cb(audio_in_h input, audio_io_interrupted_cb callback, void *user_data); +int audio_in_set_interrupted_cb(audio_in_h input, audio_io_interrupted_cb callback, void *user_data) TIZEN_DEPRECATED_API; /** * @deprecated Deprecated since 3.0 @@ -502,7 +502,7 @@ int audio_in_set_interrupted_cb(audio_in_h input, audio_io_interrupted_cb callba * * @see audio_in_set_interrupted_cb() */ -int audio_in_unset_interrupted_cb(audio_in_h input); +int audio_in_unset_interrupted_cb(audio_in_h input) TIZEN_DEPRECATED_API; /** * @deprecated Deprecated since 3.0 @@ -518,7 +518,7 @@ int audio_in_unset_interrupted_cb(audio_in_h input); * @retval #AUDIO_IO_ERROR_INVALID_OPERATION Invalid operation * @retval #AUDIO_IO_ERROR_NOT_SUPPORTED Not supported */ -int audio_in_ignore_session(audio_in_h input); +int audio_in_ignore_session(audio_in_h input) TIZEN_DEPRECATED_API; /** * @brief Sets an asynchronous(event) callback function to handle recording PCM (pulse-code modulation) data. @@ -713,7 +713,7 @@ typedef void (*audio_out_state_changed_cb)(audio_out_h handle, audio_io_state_e * * @see audio_out_destroy() */ -int audio_out_create(int sample_rate, audio_channel_e channel, audio_sample_type_e type, sound_type_e sound_type, audio_out_h *output); +int audio_out_create(int sample_rate, audio_channel_e channel, audio_sample_type_e type, sound_type_e sound_type, audio_out_h *output) TIZEN_DEPRECATED_API; /** * @brief Creates an audio device instance and returns an output handle to play PCM (pulse-code modulation) data. @@ -1005,7 +1005,7 @@ int audio_out_get_sound_type(audio_out_h output, sound_type_e *type); * @see audio_out_unset_interrupted_cb() * @see audio_io_interrupted_cb() */ -int audio_out_set_interrupted_cb(audio_out_h output, audio_io_interrupted_cb callback, void *user_data); +int audio_out_set_interrupted_cb(audio_out_h output, audio_io_interrupted_cb callback, void *user_data) TIZEN_DEPRECATED_API; /** * @deprecated Deprecated since 3.0 @@ -1022,7 +1022,7 @@ int audio_out_set_interrupted_cb(audio_out_h output, audio_io_interrupted_cb cal * * @see audio_out_set_interrupted_cb() */ -int audio_out_unset_interrupted_cb(audio_out_h output); +int audio_out_unset_interrupted_cb(audio_out_h output) TIZEN_DEPRECATED_API; /** * @deprecated Deprecated since 3.0 @@ -1037,7 +1037,7 @@ int audio_out_unset_interrupted_cb(audio_out_h output); * @retval #AUDIO_IO_ERROR_INVALID_PARAMETER Invalid parameter * @retval #AUDIO_IO_ERROR_INVALID_OPERATION Invalid operation */ -int audio_out_ignore_session(audio_out_h output); +int audio_out_ignore_session(audio_out_h output) TIZEN_DEPRECATED_API; /** * @brief Sets an asynchronous(event) callback function to handle playing PCM (pulse-code modulation) data. diff --git a/src/audio_io.c b/src/audio_io.c index 0945815..15d3a3a 100644 --- a/src/audio_io.c +++ b/src/audio_io.c @@ -17,7 +17,15 @@ #include #include +#include +#define DEPRECATED_WARN() do { \ + LOGW("DEPRECATION WARNING: %s() is deprecated and will be removed from next release.", __func__); \ +} while (0) + +#define DEPRECATED_WARN_INSTEAD(msg) do { \ + LOGW("DEPRECATION WARNING: %s() is deprecated and will be removed from next release. Use %s() instead.", __func__, msg); \ +} while (0) int audio_in_create(int sample_rate, audio_channel_e channel, audio_sample_type_e type , audio_in_h* input) { @@ -26,6 +34,7 @@ int audio_in_create(int sample_rate, audio_channel_e channel, audio_sample_type_ int audio_in_create_loopback(int sample_rate, audio_channel_e channel, audio_sample_type_e type, audio_in_h* input) { + DEPRECATED_WARN(); return cpp_audio_in_create_loopback(sample_rate, channel, type, input); } @@ -91,16 +100,19 @@ int audio_in_get_sample_type(audio_in_h input, audio_sample_type_e *type) int audio_in_set_interrupted_cb(audio_in_h input, audio_io_interrupted_cb callback, void *user_data) { + DEPRECATED_WARN_INSTEAD("sound_manager_create_stream_information"); return cpp_audio_in_set_interrupted_cb(input, callback, user_data); } int audio_in_unset_interrupted_cb(audio_in_h input) { + DEPRECATED_WARN_INSTEAD("sound_manager_create_stream_information"); return cpp_audio_in_unset_interrupted_cb(input); } int audio_in_ignore_session(audio_in_h input) { + DEPRECATED_WARN(); return cpp_audio_in_ignore_session(input); } @@ -138,6 +150,7 @@ int audio_in_unset_state_changed_cb(audio_in_h input) /* Audio Out */ int audio_out_create(int sample_rate, audio_channel_e channel, audio_sample_type_e type, sound_type_e sound_type, audio_out_h* output) { + DEPRECATED_WARN_INSTEAD("audio_out_create_new"); return cpp_audio_out_create(sample_rate, channel, type, sound_type, output); } @@ -218,16 +231,19 @@ int audio_out_get_sound_type(audio_out_h output, sound_type_e *type) int audio_out_set_interrupted_cb(audio_out_h output, audio_io_interrupted_cb callback, void *user_data) { + DEPRECATED_WARN_INSTEAD("sound_manager_create_stream_information"); return cpp_audio_out_set_interrupted_cb(output, callback, user_data); } int audio_out_unset_interrupted_cb(audio_out_h output) { + DEPRECATED_WARN_INSTEAD("sound_manager_create_stream_information"); return cpp_audio_out_unset_interrupted_cb(output); } int audio_out_ignore_session(audio_out_h output) { + DEPRECATED_WARN(); return cpp_audio_out_ignore_session(output); } -- 2.7.4