| Index: remoting/host/audio_scheduler.h
|
| diff --git a/remoting/host/audio_scheduler.h b/remoting/host/audio_scheduler.h
|
| index 9ccc991e2590fd545506b59d2b07ba7730548f90..0a3e03b27a2731a8f7ee1ebd1482cdd175176111 100644
|
| --- a/remoting/host/audio_scheduler.h
|
| +++ b/remoting/host/audio_scheduler.h
|
| @@ -22,6 +22,7 @@ class AudioStub;
|
| class AudioCapturer;
|
| class AudioEncoder;
|
| class AudioPacket;
|
| +class DesktopEnvironment;
|
|
|
| // AudioScheduler is responsible for fetching audio data from the AudioCapturer
|
| // and encoding it before passing it to the AudioStub for delivery to the
|
| @@ -36,7 +37,7 @@ class AudioScheduler : public base::RefCountedThreadSafe<AudioScheduler> {
|
| AudioScheduler(
|
| scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner,
|
| scoped_refptr<base::SingleThreadTaskRunner> network_task_runner,
|
| - AudioCapturer* audio_capturer,
|
| + DesktopEnvironment* desktop_environment,
|
| scoped_ptr<AudioEncoder> audio_encoder,
|
| protocol::AudioStub* audio_stub);
|
|
|
| @@ -53,7 +54,7 @@ class AudioScheduler : public base::RefCountedThreadSafe<AudioScheduler> {
|
| virtual ~AudioScheduler();
|
|
|
| // Called on the audio thread to start capturing.
|
| - void StartOnAudioThread();
|
| + void StartOnAudioThread(DesktopEnvironment* desktop_environment);
|
|
|
| // Called on the audio thread to stop capturing.
|
| void StopOnAudioThread(const base::Closure& done_task);
|
| @@ -67,7 +68,7 @@ class AudioScheduler : public base::RefCountedThreadSafe<AudioScheduler> {
|
| scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner_;
|
| scoped_refptr<base::SingleThreadTaskRunner> network_task_runner_;
|
|
|
| - AudioCapturer* audio_capturer_;
|
| + scoped_ptr<AudioCapturer> audio_capturer_;
|
|
|
| scoped_ptr<AudioEncoder> audio_encoder_;
|
|
|
|
|