| 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 662c4614a8ce97effbb19885ae7b82e8db50e2dc..bb1d1c08faef5834c12b403b3baafff19be4920b 100644
|
| --- a/media/audio/pulse/audio_manager_pulse.h
|
| +++ b/media/audio/pulse/audio_manager_pulse.h
|
| @@ -17,12 +17,11 @@ namespace media {
|
|
|
| class MEDIA_EXPORT AudioManagerPulse : public AudioManagerBase {
|
| public:
|
| - AudioManagerPulse(
|
| - scoped_refptr<base::SingleThreadTaskRunner> task_runner,
|
| - scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner,
|
| - AudioLogFactory* audio_log_factory);
|
| -
|
| - bool Init();
|
| + AudioManagerPulse(std::unique_ptr<AudioThread> audio_thread,
|
| + AudioLogFactory* audio_log_factory,
|
| + pa_threaded_mainloop* pa_mainloop,
|
| + pa_context* pa_context);
|
| + ~AudioManagerPulse() override;
|
|
|
| // Implementation of AudioManager.
|
| bool HasAudioOutputDevices() override;
|
| @@ -52,16 +51,12 @@ class MEDIA_EXPORT AudioManagerPulse : public AudioManagerBase {
|
| const LogCallback& log_callback) override;
|
|
|
| protected:
|
| - ~AudioManagerPulse() override;
|
| -
|
| + void ShutdownOnAudioThread() override;
|
| AudioParameters GetPreferredOutputStreamParameters(
|
| const std::string& output_device_id,
|
| const AudioParameters& input_params) override;
|
|
|
| private:
|
| - bool InitPulse();
|
| - void DestroyPulse();
|
| -
|
| void GetAudioDeviceNames(bool input, media::AudioDeviceNames* device_names);
|
|
|
| // Callback to get the devices' info like names, used by GetInputDevices().
|
|
|