Chromium Code Reviews| Index: media/audio/pulse/pulse_input.h |
| diff --git a/media/audio/pulse/pulse_input.h b/media/audio/pulse/pulse_input.h |
| index e0b2be9e2ef31134f7680b59e82956708844ca7f..de9b9d4ce0d25721e1404480c8a40bf01129c814 100644 |
| --- a/media/audio/pulse/pulse_input.h |
| +++ b/media/audio/pulse/pulse_input.h |
| @@ -52,6 +52,16 @@ class PulseAudioInputStream : public AgcAudioStream<AudioInputStream> { |
| int error, |
| void* user_data); |
| + // pa_context_get_server_info callback. It's used by |
| + // GetSystemDefaultInputDevice to set |device_name_| to the |
|
Henrik Grunell
2016/03/09 00:49:17
|device_name_| -> |system_device_name_|
rchtara
2016/03/09 16:16:09
Done.
|
| + // default system input device. |
| + static void GetSystemDefaultInputDeviceCallback(pa_context* context, |
| + const pa_server_info* info, |
| + void* user_data); |
| + |
| + // Get default system input device for the input stream |
|
Henrik Grunell
2016/03/09 00:49:17
Nit: Add "." in end.
rchtara
2016/03/09 16:16:09
Done.
|
| + void GetSystemDefaultInputDevice(); |
| + |
| // Helper for the ReadCallback. |
| void ReadData(); |
| @@ -60,7 +70,10 @@ class PulseAudioInputStream : public AgcAudioStream<AudioInputStream> { |
| AudioManagerPulse* audio_manager_; |
| AudioInputCallback* callback_; |
| - std::string device_name_; |
| + const std::string device_name_; |
| + // The name of the system default device. Returned |
|
Henrik Grunell
2016/03/09 00:49:17
Change "Returned" -> "Set". Also add that it's set
rchtara
2016/03/09 16:16:09
Done.
|
| + // by GetSystemDefaultOutputDeviceCallback. |
|
Henrik Grunell
2016/03/09 00:49:17
Nit: "by" fits on first line.
rchtara
2016/03/09 16:16:09
Done.
|
| + std::string default_system_device_name_; |
| AudioParameters params_; |
|
Henrik Grunell
2016/03/09 00:49:17
Empty line before params.
rchtara
2016/03/09 16:16:09
Done.
|
| int channels_; |
| double volume_; |