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

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

Issue 11359196: Associate audio streams with their source/destination RenderView. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased; and numerous clean-ups. Created 8 years, 1 month 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
Index: content/renderer/media/audio_device_factory.cc
diff --git a/content/renderer/media/audio_device_factory.cc b/content/renderer/media/audio_device_factory.cc
deleted file mode 100644
index ad7968884e78c410b8e03094850e03da0efb7318..0000000000000000000000000000000000000000
--- a/content/renderer/media/audio_device_factory.cc
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "content/renderer/media/audio_device_factory.h"
-
-#include "base/logging.h"
-#include "content/common/child_process.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 {
-
-// static
-AudioDeviceFactory* AudioDeviceFactory::factory_ = NULL;
-
-// static
-media::AudioRendererSink* AudioDeviceFactory::NewOutputDevice() {
- media::AudioRendererSink* device = NULL;
- if (factory_)
- device = factory_->CreateOutputDevice();
-
- return device ? device : new media::AudioOutputDevice(
- AudioMessageFilter::Get(),
- ChildProcess::current()->io_message_loop()->message_loop_proxy());
-}
-
-// static
-media::AudioInputDevice* AudioDeviceFactory::NewInputDevice() {
- media::AudioInputDevice* device = NULL;
- if (factory_)
- device = factory_->CreateInputDevice();
-
- return device ? device : new media::AudioInputDevice(
- AudioInputMessageFilter::Get(),
- ChildProcess::current()->io_message_loop()->message_loop_proxy());
-}
-
-AudioDeviceFactory::AudioDeviceFactory() {
- DCHECK(!factory_) << "Can't register two factories at once.";
- factory_ = this;
-}
-
-AudioDeviceFactory::~AudioDeviceFactory() {
- factory_ = NULL;
-}
-
-} // namespace content

Powered by Google App Engine
This is Rietveld 408576698