Index: media/audio/pulse/audio_manager_pulse.h |
diff --git a/media/audio/pulse/audio_manager_pulse.h b/media/audio/pulse/audio_manager_pulse.h |
index b679278510ac4e628da35a72082a3ae39caa7eaa..b8f3ef3773149cd93aa6468d1b6da74b5dc7f15d 100644 |
--- a/media/audio/pulse/audio_manager_pulse.h |
+++ b/media/audio/pulse/audio_manager_pulse.h |
@@ -73,9 +73,9 @@ class MEDIA_EXPORT AudioManagerPulse : public AudioManagerBase { |
// Callback to get the native sample rate of PulseAudio, used by |
// GetNativeSampleRate(). |
watk
2016/09/15 21:21:52
comment is out of date
DaleCurtis
2016/09/15 21:35:49
Fixed.
|
- static void SampleRateInfoCallback(pa_context* context, |
- const pa_server_info* info, |
- void* user_data); |
+ static void AudioHardwareInfoCallback(pa_context* context, |
+ const pa_server_info* info, |
+ void* user_data); |
// Called by MakeLinearOutputStream and MakeLowLatencyOutputStream. |
AudioOutputStream* MakeOutputStream(const AudioParameters& params, |
@@ -85,13 +85,14 @@ class MEDIA_EXPORT AudioManagerPulse : public AudioManagerBase { |
AudioInputStream* MakeInputStream(const AudioParameters& params, |
const std::string& device_id); |
- // Gets the native sample rate of Pulse. |
- int GetNativeSampleRate(); |
+ // Updates |native_input_sample_rate_| and |native_channel_count_|. |
+ void UpdateNativeAudioHardwareInfo(); |
pa_threaded_mainloop* input_mainloop_; |
pa_context* input_context_; |
AudioDeviceNames* devices_; |
int native_input_sample_rate_; |
+ int native_channel_count_; |
DISALLOW_COPY_AND_ASSIGN(AudioManagerPulse); |
}; |