Index: content/renderer/media/renderer_webaudiodevice_impl.h |
diff --git a/content/renderer/media/renderer_webaudiodevice_impl.h b/content/renderer/media/renderer_webaudiodevice_impl.h |
index 5b06242e4a6a197d002a8361f32eedf397278ebb..a39d42ecf41153028e0ecb7282d0e6ce1d594ff7 100644 |
--- a/content/renderer/media/renderer_webaudiodevice_impl.h |
+++ b/content/renderer/media/renderer_webaudiodevice_impl.h |
@@ -8,19 +8,22 @@ |
#include <vector> |
#include "base/memory/ref_counted.h" |
-#include "content/renderer/media/audio_device.h" |
+#include "media/base/audio_renderer_sink.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebAudioDevice.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h" |
+class AudioDeviceFactoryInterface; |
+ |
namespace media { |
-class AudioParameters; |
+class AudioRendererSink; |
} |
class RendererWebAudioDeviceImpl |
: public WebKit::WebAudioDevice, |
- public AudioDevice::RenderCallback { |
+ public media::AudioRendererSink::RenderCallback { |
public: |
- RendererWebAudioDeviceImpl(const media::AudioParameters& params, |
+ RendererWebAudioDeviceImpl(AudioDeviceFactoryInterface* audio_device_factory, |
Chris Rogers
2012/06/14 17:41:44
This seems unnecessarily complex to require a fact
|
+ const media::AudioParameters& params, |
WebKit::WebAudioDevice::RenderCallback* callback); |
virtual ~RendererWebAudioDeviceImpl(); |
@@ -29,14 +32,14 @@ class RendererWebAudioDeviceImpl |
virtual void stop(); |
virtual double sampleRate(); |
- // AudioDevice::RenderCallback implementation. |
+ // AudioRendererSink::RenderCallback implementation. |
virtual int Render(const std::vector<float*>& audio_data, |
int number_of_frames, |
int audio_delay_milliseconds) OVERRIDE; |
virtual void OnRenderError() OVERRIDE; |
private: |
- scoped_refptr<AudioDevice> audio_device_; |
+ scoped_refptr<media::AudioRendererSink> audio_device_; |
bool is_running_; |
// Weak reference to the callback into WebKit code. |