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

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

Issue 6628020: Cleaning up src/media to be consistent with static versus anonymous namespaces. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src
Patch Set: fix namespaces Created 9 years, 9 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2010 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 "media/audio/audio_output_dispatcher.h" 12 #include "media/audio/audio_output_dispatcher.h"
13 #include "media/audio/fake_audio_input_stream.h" 13 #include "media/audio/fake_audio_input_stream.h"
14 #include "media/audio/fake_audio_output_stream.h" 14 #include "media/audio/fake_audio_output_stream.h"
15 #include "media/audio/linux/alsa_input.h" 15 #include "media/audio/linux/alsa_input.h"
16 #include "media/audio/linux/alsa_output.h" 16 #include "media/audio/linux/alsa_output.h"
17 #include "media/audio/linux/alsa_wrapper.h" 17 #include "media/audio/linux/alsa_wrapper.h"
18 #include "media/base/limits.h" 18 #include "media/base/limits.h"
19 #include "media/base/media_switches.h" 19 #include "media/base/media_switches.h"
20 20
21 namespace { 21 // Maximum number of output streams that can be open simultaneously.
22 static const size_t kMaxOutputStreams = 50;
22 23
23 // Maximum number of output streams that can be open simultaneously. 24 static const int kMaxInputChannels = 2;
24 const size_t kMaxOutputStreams = 50;
25
26 const int kMaxInputChannels = 2;
27
28 } // namespace
29 25
30 // Implementation of AudioManager. 26 // Implementation of AudioManager.
31 bool AudioManagerLinux::HasAudioOutputDevices() { 27 bool AudioManagerLinux::HasAudioOutputDevices() {
32 // TODO(ajwong): Make this actually query audio devices. 28 // TODO(ajwong): Make this actually query audio devices.
33 return true; 29 return true;
34 } 30 }
35 31
36 bool AudioManagerLinux::HasAudioInputDevices() { 32 bool AudioManagerLinux::HasAudioInputDevices() {
37 // TODO(satish): Make this actually query audio devices. 33 // TODO(satish): Make this actually query audio devices.
38 return true; 34 return true;
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 env.get()); 144 env.get());
149 std::string command((desktop == base::nix::DESKTOP_ENVIRONMENT_GNOME) ? 145 std::string command((desktop == base::nix::DESKTOP_ENVIRONMENT_GNOME) ?
150 "gnome-volume-control" : "kmix"); 146 "gnome-volume-control" : "kmix");
151 base::LaunchApp(CommandLine(FilePath(command)), false, false, NULL); 147 base::LaunchApp(CommandLine(FilePath(command)), false, false, NULL);
152 } 148 }
153 149
154 // static 150 // static
155 AudioManager* AudioManager::CreateAudioManager() { 151 AudioManager* AudioManager::CreateAudioManager() {
156 return new AudioManagerLinux(); 152 return new AudioManagerLinux();
157 } 153 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698