| 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 20707bc5d274bc08d50b4a6c6fd455db4c9dbb2c..c65b6340b5dfdcfc06c7206af2174da9871c72c3 100644
|
| --- a/media/audio/android/audio_manager_android.h
|
| +++ b/media/audio/android/audio_manager_android.h
|
| @@ -15,7 +15,7 @@
|
|
|
| namespace media {
|
|
|
| -class OpenSLESOutputStream;
|
| +class MuteableAudioOutputStream;
|
|
|
| // Android implemention of AudioManager.
|
| class MEDIA_EXPORT AudioManagerAndroid : public AudioManagerBase {
|
| @@ -54,6 +54,10 @@ class MEDIA_EXPORT AudioManagerAndroid : public AudioManagerBase {
|
| const AudioParameters& params,
|
| const std::string& device_id,
|
| const LogCallback& log_callback) override;
|
| + AudioOutputStream* MakeBitstreamOutputStream(
|
| + const AudioParameters& params,
|
| + const std::string& device_id,
|
| + const LogCallback& log_callback) override;
|
| AudioInputStream* MakeLinearInputStream(
|
| const AudioParameters& params,
|
| const std::string& device_id,
|
| @@ -96,7 +100,7 @@ class MEDIA_EXPORT AudioManagerAndroid : public AudioManagerBase {
|
| // Java AudioManager instance.
|
| base::android::ScopedJavaGlobalRef<jobject> j_audio_manager_;
|
|
|
| - typedef std::set<OpenSLESOutputStream*> OutputStreams;
|
| + typedef std::set<MuteableAudioOutputStream*> OutputStreams;
|
| OutputStreams streams_;
|
|
|
| // Enabled when first input stream is created and set to false when last
|
|
|