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 939236f73495f89f038193b2ea3afc454f2e1123..306870970e54d320399aa8bda4e50566f2ac558d 100644 (file)
--- 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 dad3873040d62758d8553bfb31cc099aa875b0a2..9e64b62cdcb849b2edc414c7df9355d991e1987d 100644 (file)
--- 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 353508ab7005d7e385179b2eff8cdabdd5a03bc7..9b9e92d9d0dde1aaa1d22601164e44204bc8f1f3 100644 (file)
--- 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 3b9dd975f427243f80a44b62493a99c6e48ee6f3..59a599ffeabe44f8b5d060a64ec458f29320a037 100644 (file)
--- 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 6c365e62584d072849084eca27dbfc0568f0dbb9..64d2e943f74e71f59bb246131b6d2649b124b54d 100644 (file)
--- 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 8df8dde4e0f7f82ee23563fa7b52aeee35fbcc8e..d1717b8a4a58b6380734b3487942fef081816e31 100644 (file)
--- 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<audio_io_s*>(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<audio_io_s*>(input);