| Index: media/audio/audio_input_controller.h
|
| diff --git a/media/audio/audio_input_controller.h b/media/audio/audio_input_controller.h
|
| index 35ec1b77fc72f8f527093e7345da2af5d4f40499..ae68f70c310804f8f1a07ce283bea0cc7aaffc43 100644
|
| --- a/media/audio/audio_input_controller.h
|
| +++ b/media/audio/audio_input_controller.h
|
| @@ -138,8 +138,7 @@ class MEDIA_EXPORT AudioInputController
|
|
|
| // Write certain amount of data from |data|. This method returns
|
| // number of written bytes.
|
| - virtual uint32 Write(const void* data,
|
| - uint32 size,
|
| + virtual uint32 Write(const AudioBus* data,
|
| double volume,
|
| bool key_pressed) = 0;
|
|
|
| @@ -230,8 +229,10 @@ class MEDIA_EXPORT AudioInputController
|
|
|
| // AudioInputCallback implementation. Threading details depends on the
|
| // device-specific implementation.
|
| - virtual void OnData(AudioInputStream* stream, const uint8* src, uint32 size,
|
| - uint32 hardware_delay_bytes, double volume) OVERRIDE;
|
| + virtual void OnData(AudioInputStream* stream,
|
| + const AudioBus* source,
|
| + uint32 hardware_delay_bytes,
|
| + double volume) OVERRIDE;
|
| virtual void OnError(AudioInputStream* stream) OVERRIDE;
|
|
|
| bool SharedMemoryAndSyncSocketMode() const { return sync_writer_ != NULL; }
|
| @@ -325,7 +326,6 @@ class MEDIA_EXPORT AudioInputController
|
| scoped_ptr<AudioPowerMonitor> audio_level_;
|
|
|
| // We need these to be able to feed data to the AudioPowerMonitor.
|
| - scoped_ptr<AudioBus> audio_bus_;
|
| media::AudioParameters audio_params_;
|
| base::TimeTicks last_audio_level_log_time_;
|
| #endif
|
|
|