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

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

Issue 10952024: Adding pulseaudio input support to chrome (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased and addressed Dale's final comments. Created 7 years, 10 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
« no previous file with comments | « media/audio/audio_util.cc ('k') | media/audio/linux/audio_manager_linux.cc » ('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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #ifndef MEDIA_AUDIO_LINUX_AUDIO_MANAGER_LINUX_H_ 5 #ifndef MEDIA_AUDIO_LINUX_AUDIO_MANAGER_LINUX_H_
6 #define MEDIA_AUDIO_LINUX_AUDIO_MANAGER_LINUX_H_ 6 #define MEDIA_AUDIO_LINUX_AUDIO_MANAGER_LINUX_H_
7 7
8 #include <string> 8 #include <string>
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
11 #include "base/threading/thread.h" 11 #include "base/threading/thread.h"
12 #include "media/audio/audio_manager_base.h" 12 #include "media/audio/audio_manager_base.h"
13 13
14 namespace media { 14 namespace media {
15 15
16 class AlsaWrapper; 16 class AlsaWrapper;
17 17
18 class MEDIA_EXPORT AudioManagerLinux : public AudioManagerBase { 18 class MEDIA_EXPORT AudioManagerLinux : public AudioManagerBase {
19 public: 19 public:
20 AudioManagerLinux(); 20 AudioManagerLinux();
21 21
22 static void ShowLinuxAudioInputSettings();
23
22 // Implementation of AudioManager. 24 // Implementation of AudioManager.
23 virtual bool HasAudioOutputDevices() OVERRIDE; 25 virtual bool HasAudioOutputDevices() OVERRIDE;
24 virtual bool HasAudioInputDevices() OVERRIDE; 26 virtual bool HasAudioInputDevices() OVERRIDE;
25 virtual void ShowAudioInputSettings() OVERRIDE; 27 virtual void ShowAudioInputSettings() OVERRIDE;
26 virtual void GetAudioInputDeviceNames(media::AudioDeviceNames* device_names) 28 virtual void GetAudioInputDeviceNames(media::AudioDeviceNames* device_names)
27 OVERRIDE; 29 OVERRIDE;
28 30
29 // Implementation of AudioManagerBase. 31 // Implementation of AudioManagerBase.
30 virtual AudioOutputStream* MakeLinearOutputStream( 32 virtual AudioOutputStream* MakeLinearOutputStream(
31 const AudioParameters& params) OVERRIDE; 33 const AudioParameters& params) OVERRIDE;
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 const std::string& device_id); 69 const std::string& device_id);
68 70
69 scoped_ptr<AlsaWrapper> wrapper_; 71 scoped_ptr<AlsaWrapper> wrapper_;
70 72
71 DISALLOW_COPY_AND_ASSIGN(AudioManagerLinux); 73 DISALLOW_COPY_AND_ASSIGN(AudioManagerLinux);
72 }; 74 };
73 75
74 } // namespace media 76 } // namespace media
75 77
76 #endif // MEDIA_AUDIO_LINUX_AUDIO_MANAGER_LINUX_H_ 78 #endif // MEDIA_AUDIO_LINUX_AUDIO_MANAGER_LINUX_H_
OLDNEW
« no previous file with comments | « media/audio/audio_util.cc ('k') | media/audio/linux/audio_manager_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698