Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 2042 into donut

Browse Source 
* changes:
  Remove deprecated openInputStream factory method
This commit is contained in:
Android (Google) Code Review
2009-05-20 07:15:50 -07:00
parent a59aba8cd8 fe9f0722b0
commit eb2c314b4d
6 changed files with 0 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libs/audioflinger/A2dpAudioInterface.h
View File

@@ -62,17 +62,6 @@ public:
status_t *status, status_t *status,
AudioSystem::audio_in_acoustics acoustics); 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: protected:
virtual status_t doRouting(); virtual status_t doRouting();
virtual status_t dump(int fd, const Vector<String16>& args); virtual status_t dump(int fd, const Vector<String16>& args);

4
libs/audioflinger/AudioDumpInterface.h
View File

@@ -82,10 +82,6 @@ public:
uint32_t sampleRate, status_t *status, AudioSystem::audio_in_acoustics acoustics) uint32_t sampleRate, status_t *status, AudioSystem::audio_in_acoustics acoustics)
{ return mFinalInterface->openInputStream(inputSource, format, channelCount, sampleRate, status, 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); } virtual status_t dump(int fd, const Vector<String16>& args) { return mFinalInterface->dumpState(fd, args); }
protected: protected:

9
libs/audioflinger/AudioHardwareGeneric.cpp
View File

@@ -127,15 +127,6 @@ AudioStreamIn* AudioHardwareGeneric::openInputStream(
return mInput; 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) { void AudioHardwareGeneric::closeInputStream(AudioStreamInGeneric* in) {
if (in == mInput) mInput = 0; if (in == mInput) mInput = 0;
} }

7
libs/audioflinger/AudioHardwareGeneric.h
View File

@@ -119,13 +119,6 @@ public:
status_t *status, status_t *status,
AudioSystem::audio_in_acoustics acoustics); 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 closeOutputStream(AudioStreamOutGeneric* out);
void closeInputStream(AudioStreamInGeneric* in); void closeInputStream(AudioStreamInGeneric* in);
protected: protected:

9
libs/audioflinger/AudioHardwareStub.cpp
View File

@@ -77,15 +77,6 @@ AudioStreamIn* AudioHardwareStub::openInputStream(
return 0; 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) status_t AudioHardwareStub::setVoiceVolume(float volume)
{ {
return NO_ERROR; return NO_ERROR;

7
libs/audioflinger/AudioHardwareStub.h
View File

@@ -77,13 +77,6 @@ public:
uint32_t sampleRate=0, uint32_t sampleRate=0,
status_t *status=0); 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( virtual AudioStreamIn* openInputStream(
int inputSource, int inputSource,
int format, int format,