Index: content/renderer/pepper/pepper_platform_audio_output_impl.h |
diff --git a/content/renderer/pepper/pepper_platform_audio_output_impl.h b/content/renderer/pepper/pepper_platform_audio_output_impl.h |
index 3b426adbf7a6fe1d7b2e8989b9c3ad37f3ef1b41..3e9c5319f7522667af3e681692ffb662bb85cc31 100644 |
--- a/content/renderer/pepper/pepper_platform_audio_output_impl.h |
+++ b/content/renderer/pepper/pepper_platform_audio_output_impl.h |
@@ -7,7 +7,7 @@ |
#include "base/basictypes.h" |
#include "base/memory/ref_counted.h" |
-#include "content/renderer/media/audio_message_filter.h" |
+#include "media/audio/audio_device_ipc.h" |
#include "webkit/plugins/ppapi/plugin_delegate.h" |
namespace media{ |
@@ -22,7 +22,7 @@ namespace content { |
class PepperPlatformAudioOutputImpl |
: public webkit::ppapi::PluginDelegate::PlatformAudioOutput, |
- public AudioMessageFilter::Delegate, |
+ public media::AudioDeviceIPCDelegate, |
public base::RefCountedThreadSafe<PepperPlatformAudioOutputImpl> { |
public: |
// Factory function, returns NULL on failure. StreamCreated() will be called |
@@ -38,7 +38,7 @@ class PepperPlatformAudioOutputImpl |
virtual void ShutDown() OVERRIDE; |
// AudioMessageFilter::Delegate. |
scherkus (not reviewing)
2012/07/23 22:57:51
update docs
tommi (sloooow) - chröme
2012/07/24 09:49:44
Done.
|
- virtual void OnStateChanged(AudioStreamState state) OVERRIDE; |
+ virtual void OnStateChanged(media::AudioStreamState state) OVERRIDE; |
virtual void OnStreamCreated(base::SharedMemoryHandle handle, |
base::SyncSocket::Handle socket_handle, |
uint32 length) OVERRIDE; |
@@ -66,9 +66,9 @@ class PepperPlatformAudioOutputImpl |
// ACCESSED ON THE MAIN THREAD. |
webkit::ppapi::PluginDelegate::PlatformAudioOutputClient* client_; |
- // MessageFilter used to send/receive IPC. THIS MUST ONLY BE ACCESSED ON THE |
+ // 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_refptr<AudioMessageFilter> filter_; |
+ media::AudioDeviceIPC* ipc_; |
// Our ID on the MessageFilter. THIS MUST ONLY BE ACCESSED ON THE I/O THREAD |
// or else you could race with the initialize function which sets it. |