Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(610)

Unified Diff: content/renderer/media/audio_device_factory.cc

Issue 10834033: Move AudioDevice and AudioInputDevice to media. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed comments and fixed a few lint issues Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/media/audio_device_factory.h ('k') | content/renderer/media/audio_device_thread.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/audio_device_factory.cc
===================================================================
--- content/renderer/media/audio_device_factory.cc (revision 148738)
+++ content/renderer/media/audio_device_factory.cc (working copy)
@@ -6,10 +6,10 @@
#include "base/logging.h"
#include "content/common/child_process.h"
-#include "content/renderer/media/audio_device.h"
-#include "content/renderer/media/audio_input_device.h"
#include "content/renderer/media/audio_input_message_filter.h"
#include "content/renderer/media/audio_message_filter.h"
+#include "media/audio/audio_input_device.h"
+#include "media/audio/audio_output_device.h"
namespace content {
@@ -22,18 +22,18 @@
if (factory_)
device = factory_->CreateOutputDevice();
- return device ? device : new AudioDevice(
+ return device ? device : new media::AudioOutputDevice(
AudioMessageFilter::Get(),
ChildProcess::current()->io_message_loop()->message_loop_proxy());
}
// static
-AudioInputDevice* AudioDeviceFactory::NewInputDevice() {
- AudioInputDevice* device = NULL;
+media::AudioInputDevice* AudioDeviceFactory::NewInputDevice() {
+ media::AudioInputDevice* device = NULL;
if (factory_)
device = factory_->CreateInputDevice();
- return device ? device : new AudioInputDevice(
+ return device ? device : new media::AudioInputDevice(
AudioInputMessageFilter::Get(),
ChildProcess::current()->io_message_loop()->message_loop_proxy());
}
« no previous file with comments | « content/renderer/media/audio_device_factory.h ('k') | content/renderer/media/audio_device_thread.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698