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

Unified Diff: remoting/host/remoting_me2me_host.cc

Issue 11316010: Fix AudioCapturer implementation to read from audio pipe even when there are no active clients. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 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 | « remoting/host/linux/audio_pipe_reader.cc ('k') | remoting/remoting.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/remoting_me2me_host.cc
diff --git a/remoting/host/remoting_me2me_host.cc b/remoting/host/remoting_me2me_host.cc
index 6291e4189f4a112a7b726b00a09c22cdfd7a3bb6..75293478911cd3cfeba0e170545f2353f07d70d4 100644
--- a/remoting/host/remoting_me2me_host.cc
+++ b/remoting/host/remoting_me2me_host.cc
@@ -444,6 +444,21 @@ void HostProcess::StartHostProcess() {
return;
}
+#if defined(OS_LINUX)
+ // TODO(sergeyu): Pass configuration parameters to the Linux-specific version
+ // of DesktopEnvironmentFactory when we have it.
+ remoting::VideoFrameCapturer::EnableXDamage(true);
+
+ // If an audio pipe is specific on the command-line then initialize
+ // AudioCapturerLinux to capture from it.
+ FilePath audio_pipe_name = CommandLine::ForCurrentProcess()->
+ GetSwitchValuePath(kAudioPipeSwitchName);
+ if (!audio_pipe_name.empty()) {
+ remoting::AudioCapturerLinux::InitializePipeReader(
+ context_->audio_task_runner(), audio_pipe_name);
+ }
+#endif // defined(OS_LINUX)
+
// Create a desktop environment factory appropriate to the build type &
// platform.
#if defined(OS_WIN)
@@ -897,14 +912,6 @@ int main(int argc, char** argv) {
new remoting::AutoThreadTaskRunner(message_loop.message_loop_proxy(),
quit_message_loop)));
-#if defined(OS_LINUX)
- // TODO(sergeyu): Pass configuration parameters to the Linux-specific version
- // of DesktopEnvironmentFactory when we have it.
- remoting::VideoFrameCapturer::EnableXDamage(true);
- remoting::AudioCapturerLinux::SetPipeName(CommandLine::ForCurrentProcess()->
- GetSwitchValuePath(kAudioPipeSwitchName));
-#endif // defined(OS_LINUX)
-
if (!context->Start())
return remoting::kInitializationFailed;
« no previous file with comments | « remoting/host/linux/audio_pipe_reader.cc ('k') | remoting/remoting.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698