diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-11-14 15:43:41 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-11-14 15:43:41 -0800 |
| commit | 6d92e415c6551d881429151c1902d301a7bf7cf0 (patch) | |
| tree | f75659dfc79addf5165a5c46e7d68555fb7438dd | |
| parent | acc8706f91f799ea63c10ecad4959c55e0873d93 (diff) | |
| parent | a552d6049ccf674b083d011ce7b8a443a9cd68a4 (diff) | |
| download | frameworks_av-6d92e415c6551d881429151c1902d301a7bf7cf0.zip frameworks_av-6d92e415c6551d881429151c1902d301a7bf7cf0.tar.gz frameworks_av-6d92e415c6551d881429151c1902d301a7bf7cf0.tar.bz2 | |
Merge "Remove deprecated AudioSystem methods"
| -rw-r--r-- | include/media/AudioSystem.h | 6 | ||||
| -rw-r--r-- | media/libmedia/AudioSystem.cpp | 10 |
2 files changed, 0 insertions, 16 deletions
diff --git a/include/media/AudioSystem.h b/include/media/AudioSystem.h index 2218fad..d64ecd4 100644 --- a/include/media/AudioSystem.h +++ b/include/media/AudioSystem.h @@ -107,12 +107,6 @@ public: audio_stream_type_t stream, uint32_t* latency); - // DEPRECATED - static status_t getOutputSamplingRate(int* samplingRate, int stream = AUDIO_STREAM_DEFAULT); - - // DEPRECATED - static status_t getOutputFrameCount(int* frameCount, int stream = AUDIO_STREAM_DEFAULT); - static bool routedToA2dpOutput(audio_stream_type_t streamType); static status_t getInputBufferSize(uint32_t sampleRate, audio_format_t format, diff --git a/media/libmedia/AudioSystem.cpp b/media/libmedia/AudioSystem.cpp index 767c452..488edac 100644 --- a/media/libmedia/AudioSystem.cpp +++ b/media/libmedia/AudioSystem.cpp @@ -205,11 +205,6 @@ int AudioSystem::logToLinear(float volume) return volume ? 100 - int(dBConvertInverse * log(volume) + 0.5) : 0; } -// DEPRECATED -status_t AudioSystem::getOutputSamplingRate(int* samplingRate, int streamType) { - return getOutputSamplingRate(samplingRate, (audio_stream_type_t)streamType); -} - status_t AudioSystem::getOutputSamplingRate(int* samplingRate, audio_stream_type_t streamType) { audio_io_handle_t output; @@ -252,11 +247,6 @@ status_t AudioSystem::getSamplingRate(audio_io_handle_t output, return NO_ERROR; } -// DEPRECATED -status_t AudioSystem::getOutputFrameCount(int* frameCount, int streamType) { - return getOutputFrameCount(frameCount, (audio_stream_type_t)streamType); -} - status_t AudioSystem::getOutputFrameCount(int* frameCount, audio_stream_type_t streamType) { audio_io_handle_t output; |