PulseAudio Sound Playback on Linux

media/audio/linux/audio_manager_linux.cc

 // Copyright (c) 2011 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 "media/audio/linux/audio_manager_linux.h"
 
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/logging.h"
 #include "base/nix/xdg_util.h"
 #include "base/process_util.h"
 #include "base/stl_util.h"
 #include "media/audio/audio_output_dispatcher.h"
 #include "media/audio/fake_audio_input_stream.h"
 #include "media/audio/fake_audio_output_stream.h"
 #include "media/audio/linux/alsa_input.h"
 #include "media/audio/linux/alsa_output.h"
 #include "media/audio/linux/alsa_wrapper.h"
+#include "media/audio/linux/pulse_output.h"

[Paweł Hajdan Jr., 2011/08/09 16:32:51]

This header includes PA headers. audio_manager_linux.cc is always compiled, so
this will still break on systems not using PA.

[slock, 2011/08/09 18:13:55]

Done.

 #include "media/base/limits.h"
 #include "media/base/media_switches.h"
 
 // Maximum number of output streams that can be open simultaneously.
 static const size_t kMaxOutputStreams = 50;
 
 static const int kMaxInputChannels = 2;
 
 // Since "default", "pulse" and "dmix" devices are virtual devices mapped to
 // real devices, we remove them from the list to avoiding duplicate counting.
@@ skipping 63 matching lines @@
 
   if (!initialized()) {
     return NULL;
   }
 
   // Don't allow opening more than |kMaxOutputStreams| streams.
   if (active_streams_.size() >= kMaxOutputStreams) {
     return NULL;
   }
 
-  std::string device_name = AlsaPcmOutputStream::kAutoSelectDevice;
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kAlsaOutputDevice)) {
-    device_name = CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
-        switches::kAlsaOutputDevice);
+  bool pulse = true;
+  AudioOutputStream* stream;
+  if (pulse) {
+    stream = new PulseAudioOutputStream(params, this);
+  } else {
+    std::string device_name = AlsaPcmOutputStream::kAutoSelectDevice;

[Paweł Hajdan Jr., 2011/08/09 16:32:51]

Isn't this dead code? |pulse| is always true.

[slock, 2011/08/09 18:13:55]

Yes it was, and it shouldn't have been there.  I thought I had most of my Git
wrinkles figured out, but I have no idea what happened there.

+    if (CommandLine::ForCurrentProcess()->HasSwitch(
+        switches::kAlsaOutputDevice)) {
+      device_name = CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+          switches::kAlsaOutputDevice);
+    }
+    stream = new AlsaPcmOutputStream(device_name, params, wrapper_.get(), this,
+                                     GetMessageLoop());
   }
-  AlsaPcmOutputStream* stream =
-      new AlsaPcmOutputStream(device_name, params, wrapper_.get(), this,
-                              GetMessageLoop());
   active_streams_.insert(stream);
   return stream;
 }
 
 AudioInputStream* AudioManagerLinux::MakeAudioInputStream(
     const AudioParameters& params) {
   if (!params.IsValid() || params.channels > kMaxInputChannels)
     return NULL;
 
   if (params.format == AudioParameters::AUDIO_MOCK) {
@@ skipping 42 matching lines @@
 }
 
 void AudioManagerLinux::MuteAll() {
   NOTIMPLEMENTED();
 }
 
 void AudioManagerLinux::UnMuteAll() {
   NOTIMPLEMENTED();
 }
 
-void AudioManagerLinux::ReleaseOutputStream(AlsaPcmOutputStream* stream) {
+void AudioManagerLinux::ReleaseOutputStream(AudioOutputStream* stream) {
   if (stream) {
     active_streams_.erase(stream);
     delete stream;
   }
 }
 
 bool AudioManagerLinux::CanShowAudioInputSettings() {
   scoped_ptr<base::Environment> env(base::Environment::Create());
   base::nix::DesktopEnvironment desktop = base::nix::GetDesktopEnvironment(
       env.get());
@@ skipping 45 matching lines @@
       return true;
   }
 
   return false;
 }
 
 // static
 AudioManager* AudioManager::CreateAudioManager() {
   return new AudioManagerLinux();
 }