summaryrefslogtreecommitdiffstats
path: root/remoting/host/simple_host_process.cc
diff options
context:
space:
mode:
authorkxing@chromium.org <kxing@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-13 19:38:07 +0000
committerkxing@chromium.org <kxing@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-13 19:38:07 +0000
commit677bb0a47d38068702e7a7c7da33f741aaab4bef (patch)
tree68000557c2b033b7472d2a1d95fa267fdf183bae /remoting/host/simple_host_process.cc
parentfe71d3e65e1c2d884e394606441ff161b2a0c036 (diff)
downloadchromium_src-677bb0a47d38068702e7a7c7da33f741aaab4bef.zip
chromium_src-677bb0a47d38068702e7a7c7da33f741aaab4bef.tar.gz
chromium_src-677bb0a47d38068702e7a7c7da33f741aaab4bef.tar.bz2
Piping for host-side audio capture
Review URL: https://chromiumcodereview.appspot.com/10692082 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146623 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host/simple_host_process.cc')
-rw-r--r--remoting/host/simple_host_process.cc7
1 files changed, 6 insertions, 1 deletions
diff --git a/remoting/host/simple_host_process.cc b/remoting/host/simple_host_process.cc
index e9935d1..eb3db60 100644
--- a/remoting/host/simple_host_process.cc
+++ b/remoting/host/simple_host_process.cc
@@ -33,6 +33,7 @@
#include "net/base/network_change_notifier.h"
#include "net/socket/ssl_server_socket.h"
#include "remoting/base/constants.h"
+#include "remoting/host/audio_capturer.h"
#include "remoting/host/capturer_fake.h"
#include "remoting/host/chromoting_host.h"
#include "remoting/host/chromoting_host_context.h"
@@ -228,8 +229,12 @@ class SimpleHost : public HeartbeatSender::Listener {
scoped_ptr<EventExecutor> event_executor = EventExecutor::Create(
context_.desktop_task_runner(),
context_.ui_task_runner(), capturer.get());
+ scoped_ptr<AudioCapturer> audio_capturer(NULL);
desktop_environment_ = DesktopEnvironment::CreateFake(
- &context_, capturer.Pass(), event_executor.Pass());
+ &context_,
+ capturer.Pass(),
+ event_executor.Pass(),
+ audio_capturer.Pass());
} else {
desktop_environment_ = DesktopEnvironment::Create(&context_);
}