Chromium Code Reviews| Index: media/audio/audio_input_controller.h |
| diff --git a/media/audio/audio_input_controller.h b/media/audio/audio_input_controller.h |
| index e1e14ee3c30e94b07ed34f0043e215b635a94168..b25d5be01c1aa356730ed557c0112d82e82af35e 100644 |
| --- a/media/audio/audio_input_controller.h |
| +++ b/media/audio/audio_input_controller.h |
| @@ -84,7 +84,8 @@ class UserInputMonitor; |
| class MEDIA_EXPORT AudioInputController |
| : public base::RefCountedThreadSafe<AudioInputController>, |
| - public AudioInputStream::AudioInputCallback { |
| + public AudioInputStream::AudioInputCallback, |
| + public AudioManager::StateChangeListener { |
| public: |
| // Error codes to make native loggin more clear. These error codes are added |
| @@ -234,6 +235,8 @@ class MEDIA_EXPORT AudioInputController |
| double volume) OVERRIDE; |
| virtual void OnError(AudioInputStream* stream) OVERRIDE; |
| + virtual void OnStateChange(const std::string state) OVERRIDE; |
| + |
| bool SharedMemoryAndSyncSocketMode() const { return sync_writer_ != NULL; } |
| protected: |
| @@ -260,14 +263,14 @@ class MEDIA_EXPORT AudioInputController |
| }; |
| #endif |
| - AudioInputController(EventHandler* handler, |
| + AudioInputController(AudioManager* audio_manager, |
| + EventHandler* handler, |
| SyncWriter* sync_writer, |
| UserInputMonitor* user_input_monitor); |
| virtual ~AudioInputController(); |
| // Methods called on the audio thread (owned by the AudioManager). |
| - void DoCreate(AudioManager* audio_manager, const AudioParameters& params, |
| - const std::string& device_id); |
| + void DoCreate(const AudioParameters& params, const std::string& device_id); |
| void DoCreateForStream(AudioInputStream* stream_to_control); |
| void DoRecord(); |
| void DoClose(); |
| @@ -305,6 +308,8 @@ class MEDIA_EXPORT AudioInputController |
| // notifications from this class. |
| EventHandler* handler_; |
| + media::AudioManager* audio_manager_; |
|
no longer working on chromium
2014/08/25 08:20:05
nit, media::AudioManager* const
henrika (OOO until Aug 14)
2014/08/25 12:47:44
const media::AudioManager* audio_manager_ does not
|
| + |
| // Pointer to the audio input stream object. |
| AudioInputStream* stream_; |