| 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 22b48c82173d9627251e103c30a613a671c4e92c..8849f3790f93fe1c64d44f3d5b4dbb562e1363a7 100644
|
| --- a/media/audio/android/audio_manager_android.h
|
| +++ b/media/audio/android/audio_manager_android.h
|
| @@ -35,24 +35,31 @@ class MEDIA_EXPORT AudioManagerAndroid : public AudioManagerBase {
|
|
|
| AudioOutputStream* MakeAudioOutputStream(
|
| const AudioParameters& params,
|
| - const std::string& device_id) override;
|
| - AudioInputStream* MakeAudioInputStream(const AudioParameters& params,
|
| - const std::string& device_id) override;
|
| + const std::string& device_id,
|
| + const LogCallback& log_callback) override;
|
| + AudioInputStream* MakeAudioInputStream(
|
| + const AudioParameters& params,
|
| + const std::string& device_id,
|
| + const LogCallback& log_callback) override;
|
| void ReleaseOutputStream(AudioOutputStream* stream) override;
|
| void ReleaseInputStream(AudioInputStream* stream) override;
|
|
|
| // Implementation of AudioManagerBase.
|
| AudioOutputStream* MakeLinearOutputStream(
|
| - const AudioParameters& params) override;
|
| + const AudioParameters& params,
|
| + const LogCallback& log_callback) override;
|
| AudioOutputStream* MakeLowLatencyOutputStream(
|
| const AudioParameters& params,
|
| - const std::string& device_id) override;
|
| + const std::string& device_id,
|
| + const LogCallback& log_callback) override;
|
| AudioInputStream* MakeLinearInputStream(
|
| const AudioParameters& params,
|
| - const std::string& device_id) override;
|
| + const std::string& device_id,
|
| + const LogCallback& log_callback) override;
|
| AudioInputStream* MakeLowLatencyInputStream(
|
| const AudioParameters& params,
|
| - const std::string& device_id) override;
|
| + const std::string& device_id,
|
| + const LogCallback& log_callback) override;
|
|
|
| static bool RegisterAudioManager(JNIEnv* env);
|
|
|
|
|