| Index: content/renderer/pepper/pepper_platform_audio_output.h
|
| diff --git a/content/renderer/pepper/pepper_platform_audio_output.h b/content/renderer/pepper/pepper_platform_audio_output.h
|
| index a5bd3d9e727545ecaa06a05dc22e5b64ac989ffe..97d7d68231a2bf89097ac64558074940c4a756c6 100644
|
| --- a/content/renderer/pepper/pepper_platform_audio_output.h
|
| +++ b/content/renderer/pepper/pepper_platform_audio_output.h
|
| @@ -8,6 +8,7 @@
|
| #include "base/macros.h"
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/scoped_ptr.h"
|
| +#include "content/common/media/audio_output.mojom.h"
|
| #include "media/audio/audio_output_ipc.h"
|
|
|
| namespace media {
|
| @@ -32,6 +33,8 @@ class PepperPlatformAudioOutput
|
| int source_render_frame_id,
|
| AudioHelper* client);
|
|
|
| + media::AudioOutputIPC* getIPC() override;
|
| +
|
| // The following three methods are all called on main thread.
|
|
|
| // Starts the playback. Returns false on error or if called before the
|
| @@ -50,7 +53,8 @@ class PepperPlatformAudioOutput
|
| void OnStateChanged(media::AudioOutputIPCDelegateState state) override;
|
| void OnDeviceAuthorized(media::OutputDeviceStatus device_status,
|
| const media::AudioParameters& output_params) override;
|
| - void OnStreamCreated(base::SharedMemoryHandle handle,
|
| + void OnStreamCreated(mojom::AudioOutputStreamPtr* stream,
|
| + base::SharedMemoryHandle handle,
|
| base::SyncSocket::Handle socket_handle,
|
| int length) override;
|
| void OnIPCClosed() override;
|
| @@ -78,6 +82,8 @@ class PepperPlatformAudioOutput
|
| // ACCESSED ON THE MAIN THREAD.
|
| AudioHelper* client_;
|
|
|
| + mojom::AudioOutputStreamPtr* stream_;
|
| +
|
| // Used to send/receive IPC. THIS MUST ONLY BE ACCESSED ON THE
|
| // I/O thread except to send messages and get the message loop.
|
| scoped_ptr<media::AudioOutputIPC> ipc_;
|
|
|