| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef CONTENT_RENDERER_PEPPER_PEPPER_PLATFORM_AUDIO_OUTPUT_H_ | 5 #ifndef CONTENT_RENDERER_PEPPER_PEPPER_PLATFORM_AUDIO_OUTPUT_H_ |
| 6 #define CONTENT_RENDERER_PEPPER_PEPPER_PLATFORM_AUDIO_OUTPUT_H_ | 6 #define CONTENT_RENDERER_PEPPER_PEPPER_PLATFORM_AUDIO_OUTPUT_H_ |
| 7 | 7 |
| 8 #include <memory> |
| 9 |
| 8 #include "base/macros.h" | 10 #include "base/macros.h" |
| 9 #include "base/memory/ref_counted.h" | 11 #include "base/memory/ref_counted.h" |
| 10 #include "base/memory/scoped_ptr.h" | |
| 11 #include "media/audio/audio_output_ipc.h" | 12 #include "media/audio/audio_output_ipc.h" |
| 12 | 13 |
| 13 namespace media { | 14 namespace media { |
| 14 class AudioParameters; | 15 class AudioParameters; |
| 15 } | 16 } |
| 16 | 17 |
| 17 namespace base { | 18 namespace base { |
| 18 class SingleThreadTaskRunner; | 19 class SingleThreadTaskRunner; |
| 19 } | 20 } |
| 20 | 21 |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 73 void StartPlaybackOnIOThread(); | 74 void StartPlaybackOnIOThread(); |
| 74 void StopPlaybackOnIOThread(); | 75 void StopPlaybackOnIOThread(); |
| 75 void ShutDownOnIOThread(); | 76 void ShutDownOnIOThread(); |
| 76 | 77 |
| 77 // The client to notify when the stream is created. THIS MUST ONLY BE | 78 // The client to notify when the stream is created. THIS MUST ONLY BE |
| 78 // ACCESSED ON THE MAIN THREAD. | 79 // ACCESSED ON THE MAIN THREAD. |
| 79 AudioHelper* client_; | 80 AudioHelper* client_; |
| 80 | 81 |
| 81 // Used to send/receive IPC. THIS MUST ONLY BE ACCESSED ON THE | 82 // Used to send/receive IPC. THIS MUST ONLY BE ACCESSED ON THE |
| 82 // I/O thread except to send messages and get the message loop. | 83 // I/O thread except to send messages and get the message loop. |
| 83 scoped_ptr<media::AudioOutputIPC> ipc_; | 84 std::unique_ptr<media::AudioOutputIPC> ipc_; |
| 84 | 85 |
| 85 scoped_refptr<base::SingleThreadTaskRunner> main_task_runner_; | 86 scoped_refptr<base::SingleThreadTaskRunner> main_task_runner_; |
| 86 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner_; | 87 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner_; |
| 87 | 88 |
| 88 DISALLOW_COPY_AND_ASSIGN(PepperPlatformAudioOutput); | 89 DISALLOW_COPY_AND_ASSIGN(PepperPlatformAudioOutput); |
| 89 }; | 90 }; |
| 90 | 91 |
| 91 } // namespace content | 92 } // namespace content |
| 92 | 93 |
| 93 #endif // CONTENT_RENDERER_PEPPER_PEPPER_PLATFORM_AUDIO_OUTPUT_H_ | 94 #endif // CONTENT_RENDERER_PEPPER_PEPPER_PLATFORM_AUDIO_OUTPUT_H_ |
| OLD | NEW |