Index: media/audio/audio_input_controller.h |
diff --git a/media/audio/audio_input_controller.h b/media/audio/audio_input_controller.h |
index 5d555766a18cecbc87fbf4e6603642e4b8a7cd78..6255a4e764d7274d39b1caf9f8d5421bdba93485 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; |
tommi (sloooow) - chröme
2014/08/26 11:42:31
having |state| be a string is a bit strange...
henrika (OOO until Aug 14)
2014/08/27 13:44:05
Removed.
|
+ |
bool SharedMemoryAndSyncSocketMode() const { return sync_writer_ != NULL; } |
protected: |
@@ -266,17 +269,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 DoCreateForLowLatency(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(); |
@@ -319,6 +319,8 @@ class MEDIA_EXPORT AudioInputController |
// notifications from this class. |
EventHandler* handler_; |
+ media::AudioManager* const audio_manager_; |
+ |
// Pointer to the audio input stream object. |
AudioInputStream* stream_; |