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

Side by Side Diff: media/audio/linux/audio_manager_linux.cc

Issue 8499029: make pulseaudio available for all posix platforms because it's not linux only (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: don't include pulse on windows Created 9 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 unified diff | Download patch
« no previous file with comments | « no previous file | media/audio/linux/pulse_output.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/audio/linux/audio_manager_linux.h" 5 #include "media/audio/linux/audio_manager_linux.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/environment.h" 8 #include "base/environment.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/nix/xdg_util.h" 10 #include "base/nix/xdg_util.h"
11 #include "base/process_util.h" 11 #include "base/process_util.h"
12 #include "base/stl_util.h" 12 #include "base/stl_util.h"
13 #include "media/audio/audio_output_dispatcher.h" 13 #include "media/audio/audio_output_dispatcher.h"
14 #include "media/audio/fake_audio_input_stream.h" 14 #include "media/audio/fake_audio_input_stream.h"
15 #include "media/audio/fake_audio_output_stream.h" 15 #include "media/audio/fake_audio_output_stream.h"
16 #include "media/audio/linux/alsa_input.h" 16 #include "media/audio/linux/alsa_input.h"
17 #include "media/audio/linux/alsa_output.h" 17 #include "media/audio/linux/alsa_output.h"
18 #include "media/audio/linux/alsa_wrapper.h" 18 #include "media/audio/linux/alsa_wrapper.h"
19 #if defined(USE_PULSEAUDIO) 19 #if defined(USE_PULSEAUDIO)
20 #include "media/audio/linux/pulse_output.h" 20 #include "media/audio/pulse/pulse_output.h"
21 #endif 21 #endif
22 #include "media/base/limits.h" 22 #include "media/base/limits.h"
23 #include "media/base/media_switches.h" 23 #include "media/base/media_switches.h"
24 24
25 // Maximum number of output streams that can be open simultaneously. 25 // Maximum number of output streams that can be open simultaneously.
26 static const size_t kMaxOutputStreams = 50; 26 static const size_t kMaxOutputStreams = 50;
27 27
28 static const int kMaxInputChannels = 2; 28 static const int kMaxInputChannels = 2;
29 29
30 // Since "default", "pulse" and "dmix" devices are virtual devices mapped to 30 // Since "default", "pulse" and "dmix" devices are virtual devices mapped to
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after
317 } 317 }
318 } 318 }
319 319
320 return has_device; 320 return has_device;
321 } 321 }
322 322
323 // static 323 // static
324 AudioManager* AudioManager::CreateAudioManager() { 324 AudioManager* AudioManager::CreateAudioManager() {
325 return new AudioManagerLinux(); 325 return new AudioManagerLinux();
326 } 326 }
OLDNEW
« no previous file with comments | « no previous file | media/audio/linux/pulse_output.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698