| 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 cff290376313327d1154b6928baf7795f6dc28c9..9dacb9c1770f036b337cd89f107d272a782d8aac 100644
|
| --- a/media/audio/pulse/audio_manager_pulse.h
|
| +++ b/media/audio/pulse/audio_manager_pulse.h
|
| @@ -27,6 +27,8 @@ class MEDIA_EXPORT AudioManagerPulse : public AudioManagerBase {
|
| virtual void ShowAudioInputSettings() OVERRIDE;
|
| virtual void GetAudioInputDeviceNames(media::AudioDeviceNames* device_names)
|
| OVERRIDE;
|
| + virtual AudioParameters GetInputStreamParameters(
|
| + const std::string& device_id) OVERRIDE;
|
|
|
| // Implementation of AudioManagerBase.
|
| virtual AudioOutputStream* MakeLinearOutputStream(
|
| @@ -37,10 +39,10 @@ class MEDIA_EXPORT AudioManagerPulse : public AudioManagerBase {
|
| const AudioParameters& params, const std::string& device_id) OVERRIDE;
|
| virtual AudioInputStream* MakeLowLatencyInputStream(
|
| const AudioParameters& params, const std::string& device_id) OVERRIDE;
|
| - virtual AudioParameters GetPreferredLowLatencyOutputStreamParameters(
|
| - const AudioParameters& input_params) OVERRIDE;
|
|
|
| - int GetNativeSampleRate();
|
| + protected:
|
| + virtual AudioParameters GetPreferredOutputStreamParameters(
|
| + const AudioParameters& input_params) OVERRIDE;
|
|
|
| private:
|
| bool Init();
|
| @@ -64,6 +66,9 @@ 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();
|
| +
|
| pa_threaded_mainloop* input_mainloop_;
|
| pa_context* input_context_;
|
| AudioDeviceNames* devices_;
|
|
|