diff options
author | 2009-05-19 18:56:13 -0700 | |
---|---|---|
committer | 2009-05-19 18:56:13 -0700 | |
commit | fe9f0722b028675e8b0223c9c85cd65f203f2e03 (patch) | |
tree | 63c78289535c9a0b57fc331ea5040a98e3113889 | |
parent | a5e2ef0af04ac4d2805c1fc840ba81470e8f49f1 (diff) |
Remove deprecated openInputStream factory method
-rw-r--r-- | libs/audioflinger/A2dpAudioInterface.h | 11 | ||||
-rw-r--r-- | libs/audioflinger/AudioDumpInterface.h | 4 | ||||
-rw-r--r-- | libs/audioflinger/AudioHardwareGeneric.cpp | 9 | ||||
-rw-r--r-- | libs/audioflinger/AudioHardwareGeneric.h | 7 | ||||
-rw-r--r-- | libs/audioflinger/AudioHardwareStub.cpp | 9 | ||||
-rw-r--r-- | libs/audioflinger/AudioHardwareStub.h | 7 |
6 files changed, 0 insertions, 47 deletions
diff --git a/libs/audioflinger/A2dpAudioInterface.h b/libs/audioflinger/A2dpAudioInterface.h index 134819748a50..091e775a1f7f 100644 --- a/libs/audioflinger/A2dpAudioInterface.h +++ b/libs/audioflinger/A2dpAudioInterface.h @@ -62,17 +62,6 @@ public: status_t *status, AudioSystem::audio_in_acoustics acoustics); - // DEPRECATED - WILL BE REMOVED - virtual AudioStreamIn* openInputStream( - int format, - int channelCount, - uint32_t sampleRate, - status_t *status, - AudioSystem::audio_in_acoustics acoustics) - { - return openInputStream(-1, format, channelCount, sampleRate, status, acoustics); - } - protected: virtual status_t doRouting(); virtual status_t dump(int fd, const Vector<String16>& args); diff --git a/libs/audioflinger/AudioDumpInterface.h b/libs/audioflinger/AudioDumpInterface.h index 6d94ac820f11..b72c94e0ac8b 100644 --- a/libs/audioflinger/AudioDumpInterface.h +++ b/libs/audioflinger/AudioDumpInterface.h @@ -82,10 +82,6 @@ public: uint32_t sampleRate, status_t *status, AudioSystem::audio_in_acoustics acoustics) { return mFinalInterface->openInputStream(inputSource, format, channelCount, sampleRate, status, acoustics); } - virtual AudioStreamIn* openInputStream(int format, int channelCount, uint32_t sampleRate, - status_t *status, AudioSystem::audio_in_acoustics acoustics) - { return mFinalInterface->openInputStream(-1, format, channelCount, sampleRate, status, acoustics); } - virtual status_t dump(int fd, const Vector<String16>& args) { return mFinalInterface->dumpState(fd, args); } protected: diff --git a/libs/audioflinger/AudioHardwareGeneric.cpp b/libs/audioflinger/AudioHardwareGeneric.cpp index 8b9a5a75e5b7..a97c0bcb9ae7 100644 --- a/libs/audioflinger/AudioHardwareGeneric.cpp +++ b/libs/audioflinger/AudioHardwareGeneric.cpp @@ -127,15 +127,6 @@ AudioStreamIn* AudioHardwareGeneric::openInputStream( return mInput; } -// DEPRECATED -AudioStreamIn* AudioHardwareGeneric::openInputStream( - int format, int channelCount, uint32_t sampleRate, status_t *status, - AudioSystem::audio_in_acoustics acoustic_flags) -{ - return openInputStream(AudioRecord::DEFAULT_INPUT, format, channelCount, - sampleRate, status, acoustic_flags); -} - void AudioHardwareGeneric::closeInputStream(AudioStreamInGeneric* in) { if (in == mInput) mInput = 0; } diff --git a/libs/audioflinger/AudioHardwareGeneric.h b/libs/audioflinger/AudioHardwareGeneric.h index adda38519fda..c89df87f3cdd 100644 --- a/libs/audioflinger/AudioHardwareGeneric.h +++ b/libs/audioflinger/AudioHardwareGeneric.h @@ -119,13 +119,6 @@ public: status_t *status, AudioSystem::audio_in_acoustics acoustics); - virtual AudioStreamIn* openInputStream( - int format, - int channelCount, - uint32_t sampleRate, - status_t *status, - AudioSystem::audio_in_acoustics acoustics); - void closeOutputStream(AudioStreamOutGeneric* out); void closeInputStream(AudioStreamInGeneric* in); protected: diff --git a/libs/audioflinger/AudioHardwareStub.cpp b/libs/audioflinger/AudioHardwareStub.cpp index 7159b0b8e83b..c61e6e654eab 100644 --- a/libs/audioflinger/AudioHardwareStub.cpp +++ b/libs/audioflinger/AudioHardwareStub.cpp @@ -77,15 +77,6 @@ AudioStreamIn* AudioHardwareStub::openInputStream( return 0; } -// DEPRECATED -AudioStreamIn* AudioHardwareStub::openInputStream( - int format, int channelCount, uint32_t sampleRate, status_t *status, - AudioSystem::audio_in_acoustics acoustic_flags) -{ - return openInputStream(AudioRecord::DEFAULT_INPUT, format, channelCount, - sampleRate, status, acoustic_flags); -} - status_t AudioHardwareStub::setVoiceVolume(float volume) { return NO_ERROR; diff --git a/libs/audioflinger/AudioHardwareStub.h b/libs/audioflinger/AudioHardwareStub.h index 6c52728baf89..bf63cc5e2e47 100644 --- a/libs/audioflinger/AudioHardwareStub.h +++ b/libs/audioflinger/AudioHardwareStub.h @@ -78,13 +78,6 @@ public: status_t *status=0); virtual AudioStreamIn* openInputStream( - int format, - int channelCount, - uint32_t sampleRate, - status_t *status, - AudioSystem::audio_in_acoustics acoustics); - - virtual AudioStreamIn* openInputStream( int inputSource, int format, int channelCount, |