From: Seungbae Shin Date: Thu, 18 Oct 2018 07:35:17 +0000 (+0900) Subject: Remove unnecessary input drain code X-Git-Tag: accepted/tizen/unified/20181107.082100~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F47%2F191547%2F1;p=platform%2Fcore%2Fapi%2Faudio-io.git Remove unnecessary input drain code [Version] 0.5.13 [Issue Type] Revise Change-Id: Ia11fbd008af6cedf9856b4dcf6c153a8dbf4e0c8 --- diff --git a/include/CAudioIO.h b/include/CAudioIO.h index 939236f..3068709 100644 --- a/include/CAudioIO.h +++ b/include/CAudioIO.h @@ -63,7 +63,7 @@ namespace tizen_media_audio { virtual void pause() = 0; virtual void resume() = 0; - virtual void drain() = 0; + virtual void drain(); virtual void flush() = 0; virtual int getBufferSize() = 0; diff --git a/include/CAudioInput.h b/include/CAudioInput.h index dad3873..9e64b62 100644 --- a/include/CAudioInput.h +++ b/include/CAudioInput.h @@ -51,7 +51,6 @@ namespace tizen_media_audio { virtual void pause(); virtual void resume(); - virtual void drain(); virtual void flush(); virtual int getBufferSize(); diff --git a/include/cpp_audio_io.h b/include/cpp_audio_io.h index 353508a..9b9e92d 100644 --- a/include/cpp_audio_io.h +++ b/include/cpp_audio_io.h @@ -33,7 +33,6 @@ 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); int cpp_audio_in_resume(audio_in_h input); -int cpp_audio_in_drain(audio_in_h input); int cpp_audio_in_flush(audio_in_h input); int cpp_audio_in_read(audio_in_h input, void *buffer, unsigned int length); int cpp_audio_in_get_buffer_size(audio_in_h input, int *size); diff --git a/packaging/capi-media-audio-io.spec b/packaging/capi-media-audio-io.spec index 3b9dd97..59a599f 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.5.12 +Version: 0.5.13 Release: 0 Group: Multimedia/API License: Apache-2.0 diff --git a/src/cpp/CAudioInput.cpp b/src/cpp/CAudioInput.cpp index 6c365e6..64d2e94 100644 --- a/src/cpp/CAudioInput.cpp +++ b/src/cpp/CAudioInput.cpp @@ -218,10 +218,6 @@ void CAudioInput::resume() { CAudioIO::onStateChanged(CAudioInfo::EAudioIOState::AUDIO_IO_STATE_RUNNING); } -void CAudioInput::drain() { - THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_SUPPORTED, "Did not support drain of CAudioInput"); -} - void CAudioInput::flush() { if (__IsInit() == false || __IsReady() == false) THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, diff --git a/src/cpp/cpp_audio_io.cpp b/src/cpp/cpp_audio_io.cpp index 8df8dde..d1717b8 100644 --- a/src/cpp/cpp_audio_io.cpp +++ b/src/cpp/cpp_audio_io.cpp @@ -530,27 +530,6 @@ int cpp_audio_in_resume(audio_in_h input) { return AUDIO_IO_ERROR_NONE; } -int cpp_audio_in_drain(audio_in_h input) { - audio_io_s* handle = static_cast(input); - - try { - if (handle == NULL) - THROW_ERROR_MSG_FORMAT(CAudioError::EError::ERROR_INVALID_ARGUMENT, - "Parameters are NULL input:%p", input); - assert(handle->audioIoHandle); - AUDIO_IO_LOGD("[%p]", handle); - - handle->audioIoHandle->drain(); - } catch (CAudioError& e) { - AUDIO_IO_LOGE("%s", e.getErrorMsg()); - return __convert_CAudioError(e); - } - - AUDIO_IO_LOGD("[%p] drained", handle); - - return AUDIO_IO_ERROR_NONE; -} - int cpp_audio_in_flush(audio_in_h input) { audio_io_s* handle = static_cast(input);