From d8f34ca9fb4f848d294eec822232413f8bc0b164 Mon Sep 17 00:00:00 2001 From: Seungbae Shin Date: Tue, 6 Dec 2016 21:26:29 +0900 Subject: [PATCH] Change set_stream_info API name for consistency with other pkgs [Version] 0.3.47 [Profile] Common [Issue Type] MPR-857 Change-Id: Ie1ebac39738b091a2c410780797d4303cb2a0ad8 (cherry picked from commit 1d04c93f8e2dcd92641106469dc62c4d65a3869d) --- include/audio_io.h | 12 +++++++++--- include/cpp_audio_io.h | 4 ++-- packaging/capi-media-audio-io.spec | 2 +- src/audio_io.c | 16 ++++++++++++++-- src/cpp/cpp_audio_io.cpp | 4 ++-- test/audio_io_test.c | 8 ++++---- 6 files changed, 32 insertions(+), 14 deletions(-) diff --git a/include/audio_io.h b/include/audio_io.h index 7dde09f..ef82ef6 100644 --- a/include/audio_io.h +++ b/include/audio_io.h @@ -210,7 +210,7 @@ typedef void (*audio_in_state_changed_cb)(audio_in_h handle, audio_io_state_e pr * @retval #AUDIO_IO_ERROR_NOT_SUPPORTED Not supported * * @post The state will be #AUDIO_IO_STATE_IDLE.\n - * audio_in_set_stream_info() is recommended to be called after this API. + * audio_in_set_sound_stream_info() is recommended to be called after this API. * @see audio_in_destroy() */ int audio_in_create(int sample_rate, audio_channel_e channel, audio_sample_type_e type, audio_in_h *input); @@ -287,6 +287,9 @@ int audio_in_destroy(audio_in_h input); * @see sound_manager_create_stream_information() * @see sound_manager_destroy_stream_information() */ +int audio_in_set_sound_stream_info(audio_in_h input, sound_stream_info_h stream_info); + +/* Note : Will be removed after migration to audio_in_set_sound_stream_info */ int audio_in_set_stream_info(audio_in_h input, sound_stream_info_h stream_info); /** @@ -723,7 +726,7 @@ int audio_out_create(int sample_rate, audio_channel_e channel, audio_sample_type * @since_tizen 3.0 * * @remarks @a output must be released by audio_out_destroy(). - * It is recommended to call audio_out_set_stream_info() after this API. + * It is recommended to call audio_out_set_sound_stream_info() after this API. * * @param[in] sample_rate The audio sample rate in 8000[Hz] ~ 48000[Hz] * @param[in] channel The audio channel type (mono or stereo) @@ -738,7 +741,7 @@ int audio_out_create(int sample_rate, audio_channel_e channel, audio_sample_type * @retval #AUDIO_IO_ERROR_SOUND_POLICY Sound policy error * * @post The state will be #AUDIO_IO_STATE_IDLE.\n - * audio_out_set_stream_info() is recommended to be called after this API. + * audio_out_set_sound_stream_info() is recommended to be called after this API. * @see audio_out_destroy() */ int audio_out_create_new(int sample_rate, audio_channel_e channel, audio_sample_type_e type, audio_out_h *output); @@ -785,6 +788,9 @@ int audio_out_destroy(audio_out_h output); * @see sound_manager_create_stream_information() * @see sound_manager_destroy_stream_information() */ +int audio_out_set_sound_stream_info(audio_out_h output, sound_stream_info_h stream_info); + +/* Note : Will be removed after migration to audio_out_set_sound_stream_info */ int audio_out_set_stream_info(audio_out_h output, sound_stream_info_h stream_info); /** diff --git a/include/cpp_audio_io.h b/include/cpp_audio_io.h index 35c8349..34a63a8 100644 --- a/include/cpp_audio_io.h +++ b/include/cpp_audio_io.h @@ -29,7 +29,7 @@ extern "C" { int cpp_audio_in_create(int sample_rate, audio_channel_e channel, audio_sample_type_e type, audio_in_h *input); int cpp_audio_in_create_loopback(int sample_rate, audio_channel_e channel, audio_sample_type_e type , audio_in_h* input); int cpp_audio_in_destroy(audio_in_h input); -int cpp_audio_in_set_stream_info(audio_in_h input, sound_stream_info_h stream_info); +int cpp_audio_in_set_sound_stream_info(audio_in_h input, sound_stream_info_h stream_info); int cpp_audio_in_prepare(audio_in_h input); int cpp_audio_in_unprepare(audio_in_h input); int cpp_audio_in_pause(audio_in_h input); @@ -55,7 +55,7 @@ int cpp_audio_in_unset_state_changed_cb(audio_in_h input); int cpp_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 cpp_audio_out_create_new(int sample_rate, audio_channel_e channel, audio_sample_type_e type, audio_out_h *output); int cpp_audio_out_destroy(audio_out_h output); -int cpp_audio_out_set_stream_info(audio_out_h output, sound_stream_info_h stream_info); +int cpp_audio_out_set_sound_stream_info(audio_out_h output, sound_stream_info_h stream_info); int cpp_audio_out_prepare(audio_out_h output); int cpp_audio_out_unprepare(audio_out_h output); int cpp_audio_out_pause(audio_out_h output); diff --git a/packaging/capi-media-audio-io.spec b/packaging/capi-media-audio-io.spec index 82d0e53..0eb3b25 100644 --- a/packaging/capi-media-audio-io.spec +++ b/packaging/capi-media-audio-io.spec @@ -1,6 +1,6 @@ Name: capi-media-audio-io Summary: An Audio Input & Audio Output library in Tizen Native API -Version: 0.3.46 +Version: 0.3.47 Release: 0 Group: Multimedia/API License: Apache-2.0 diff --git a/src/audio_io.c b/src/audio_io.c index 15d3a3a..8450a4c 100644 --- a/src/audio_io.c +++ b/src/audio_io.c @@ -43,9 +43,15 @@ int audio_in_destroy(audio_in_h input) return cpp_audio_in_destroy(input); } +/* FIXME : This will be removed after migration */ int audio_in_set_stream_info(audio_in_h input, sound_stream_info_h stream_info) { - return cpp_audio_in_set_stream_info(input, stream_info); + return cpp_audio_in_set_sound_stream_info(input, stream_info); +} + +int audio_in_set_sound_stream_info(audio_in_h input, sound_stream_info_h stream_info) +{ + return cpp_audio_in_set_sound_stream_info(input, stream_info); } int audio_in_prepare(audio_in_h input) @@ -164,9 +170,15 @@ int audio_out_destroy(audio_out_h output) return cpp_audio_out_destroy(output); } +/* FIXME : This will be removed after migration */ int audio_out_set_stream_info(audio_out_h output, sound_stream_info_h stream_info) { - return cpp_audio_out_set_stream_info(output, stream_info); + return cpp_audio_out_set_sound_stream_info(output, stream_info); +} + +int audio_out_set_sound_stream_info(audio_out_h output, sound_stream_info_h stream_info) +{ + return cpp_audio_out_set_sound_stream_info(output, stream_info); } int audio_out_prepare(audio_out_h output) diff --git a/src/cpp/cpp_audio_io.cpp b/src/cpp/cpp_audio_io.cpp index 54fcfbe..1f90406 100644 --- a/src/cpp/cpp_audio_io.cpp +++ b/src/cpp/cpp_audio_io.cpp @@ -480,7 +480,7 @@ int cpp_audio_in_destroy(audio_in_h input) { return AUDIO_IO_ERROR_NONE; } -int cpp_audio_in_set_stream_info(audio_in_h input, sound_stream_info_h stream_info) { +int cpp_audio_in_set_sound_stream_info(audio_in_h input, sound_stream_info_h stream_info) { audio_io_s* handle = static_cast(input); try { @@ -1113,7 +1113,7 @@ int cpp_audio_out_destroy(audio_out_h output) { return AUDIO_IO_ERROR_NONE; } -int cpp_audio_out_set_stream_info(audio_out_h output, sound_stream_info_h stream_info) { +int cpp_audio_out_set_sound_stream_info(audio_out_h output, sound_stream_info_h stream_info) { audio_io_s* handle = static_cast(output); try { diff --git a/test/audio_io_test.c b/test/audio_io_test.c index 08c800a..b1926a3 100644 --- a/test/audio_io_test.c +++ b/test/audio_io_test.c @@ -460,9 +460,9 @@ int audio_io_async_test(int mode) printf("fail to sound_manager_create_stream_information(), ret(0x%x)\n", ret); goto EXIT; } - ret = audio_in_set_stream_info(input, g_stream_info_read_h); + ret = audio_in_set_sound_stream_info(input, g_stream_info_read_h); if (ret) - printf("fail to audio_in_set_stream_info(), ret(0x%x)\n", ret); + printf("fail to audio_in_set_sound_stream_info(), ret(0x%x)\n", ret); ret = sound_manager_acquire_focus(g_stream_info_read_h, SOUND_STREAM_FOCUS_FOR_RECORDING, SOUND_BEHAVIOR_NONE, NULL); if (ret) { @@ -504,9 +504,9 @@ int audio_io_async_test(int mode) printf("fail to sound_manager_create_stream_information(), ret(0x%x)\n", ret); goto EXIT; } - ret = audio_out_set_stream_info(output, g_stream_info_write_h); + ret = audio_out_set_sound_stream_info(output, g_stream_info_write_h); if (ret) - printf("fail to audio_out_set_stream_info(), ret(0x%x)\n", ret); + printf("fail to audio_out_set_sound_stream_info(), ret(0x%x)\n", ret); ret = sound_manager_acquire_focus(g_stream_info_write_h, SOUND_STREAM_FOCUS_FOR_PLAYBACK, SOUND_BEHAVIOR_NONE, NULL); if (ret) { -- 2.7.4