Chromium Code Reviews| Index: media/audio/android/audio_manager_android.h |
| diff --git a/media/audio/android/audio_manager_android.h b/media/audio/android/audio_manager_android.h |
| index ab43a60dac109f37b02d2dc752d3b50bdf1b31ce..cab9f2ce7ecb54aa542d771ecb022e48eee8c52a 100644 |
| --- a/media/audio/android/audio_manager_android.h |
| +++ b/media/audio/android/audio_manager_android.h |
| @@ -15,13 +15,20 @@ class AudioManagerAndroid : public AudioManagerBase { |
| // Implementation of AudioManager. |
| virtual bool HasAudioOutputDevices() OVERRIDE; |
| virtual bool HasAudioInputDevices() OVERRIDE; |
| - virtual AudioOutputStream* MakeAudioOutputStream( |
| - const AudioParameters& params) OVERRIDE; |
| - virtual AudioInputStream* MakeAudioInputStream( |
| - const AudioParameters& params, const std::string& device_id) OVERRIDE; |
| virtual void MuteAll() OVERRIDE; |
| virtual void UnMuteAll() OVERRIDE; |
| + // Implementation of AudioManagerBase. |
| + virtual int GetMaxAudioOutputStreamsAllowed() OVERRIDE; |
|
tommi (sloooow) - chröme
2012/03/05 14:28:28
return size_t?
no longer working on chromium
2012/03/06 15:27:07
As we discussed, hope it is fine to use int.
|
| + virtual AudioOutputStream* MakeAudioLinearOutputStream( |
|
tommi (sloooow) - chröme
2012/03/05 14:28:28
I think the word "Audio" isn't necessary in these
no longer working on chromium
2012/03/06 15:27:28
Done.
|
| + const AudioParameters& params) OVERRIDE; |
| + virtual AudioOutputStream* MakeAudioLowLatencyOutputStream( |
| + const AudioParameters& params) OVERRIDE; |
| + virtual AudioInputStream* MakeAudioLinearInputStream( |
| + const AudioParameters& params, const std::string& device_id) OVERRIDE; |
| + virtual AudioInputStream* MakeAudioLowLatencyInputStream( |
| + const AudioParameters& params, const std::string& device_id) OVERRIDE; |
| + |
| protected: |
| virtual ~AudioManagerAndroid(); |