Remove deprecated openInputStream factory method
diff --git a/libs/audioflinger/A2dpAudioInterface.h b/libs/audioflinger/A2dpAudioInterface.h
index 1348197..091e775 100644
--- a/libs/audioflinger/A2dpAudioInterface.h
+++ b/libs/audioflinger/A2dpAudioInterface.h
@@ -62,17 +62,6 @@
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 6d94ac8..b72c94e 100644
--- a/libs/audioflinger/AudioDumpInterface.h
+++ b/libs/audioflinger/AudioDumpInterface.h
@@ -82,10 +82,6 @@
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 8b9a5a7..a97c0bc 100644
--- a/libs/audioflinger/AudioHardwareGeneric.cpp
+++ b/libs/audioflinger/AudioHardwareGeneric.cpp
@@ -127,15 +127,6 @@
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 adda385..c89df87 100644
--- a/libs/audioflinger/AudioHardwareGeneric.h
+++ b/libs/audioflinger/AudioHardwareGeneric.h
@@ -119,13 +119,6 @@
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 7159b0b..c61e6e6 100644
--- a/libs/audioflinger/AudioHardwareStub.cpp
+++ b/libs/audioflinger/AudioHardwareStub.cpp
@@ -77,15 +77,6 @@
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 6c52728..bf63cc5 100644
--- a/libs/audioflinger/AudioHardwareStub.h
+++ b/libs/audioflinger/AudioHardwareStub.h
@@ -78,13 +78,6 @@
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,
