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

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

Issue 7473021: PulseAudio Sound Playback on Linux (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: "Gyp and command line flag added, pausing/stopping/restarting works" Created 9 years, 4 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) 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 #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 <set> 8 #include <set>
9 9
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 class AlsaPcmOutputStream; 14 class AlsaPcmOutputStream;
15 class AlsaWrapper; 15 class AlsaWrapper;
16 class PulseOutputStream;
vrk (LEFT CHROMIUM) 2011/08/05 15:02:26 unused; remove
slock 2011/08/08 20:30:15 Done. Also removed line 14.
16 17
17 class AudioManagerLinux : public AudioManagerBase { 18 class AudioManagerLinux : public AudioManagerBase {
18 public: 19 public:
19 AudioManagerLinux(); 20 AudioManagerLinux();
20 21
21 // Call before using a newly created AudioManagerLinux instance. 22 // Call before using a newly created AudioManagerLinux instance.
22 virtual void Init(); 23 virtual void Init();
23 24
24 // Implementation of AudioManager. 25 // Implementation of AudioManager.
25 virtual bool HasAudioOutputDevices(); 26 virtual bool HasAudioOutputDevices();
26 virtual bool HasAudioInputDevices(); 27 virtual bool HasAudioInputDevices();
27 virtual AudioOutputStream* MakeAudioOutputStream( 28 virtual AudioOutputStream* MakeAudioOutputStream(
28 const AudioParameters& params); 29 const AudioParameters& params);
29 virtual AudioInputStream* MakeAudioInputStream(const AudioParameters& params); 30 virtual AudioInputStream* MakeAudioInputStream(const AudioParameters& params);
30 virtual bool CanShowAudioInputSettings(); 31 virtual bool CanShowAudioInputSettings();
31 virtual void ShowAudioInputSettings(); 32 virtual void ShowAudioInputSettings();
32 virtual void GetAudioInputDeviceNames(media::AudioDeviceNames* device_names); 33 virtual void GetAudioInputDeviceNames(media::AudioDeviceNames* device_names);
33 34
34 virtual void MuteAll(); 35 virtual void MuteAll();
35 virtual void UnMuteAll(); 36 virtual void UnMuteAll();
36 37
37 virtual void ReleaseOutputStream(AlsaPcmOutputStream* stream); 38 virtual void ReleaseOutputStream(AudioOutputStream* stream);
38 39
39 protected: 40 protected:
40 virtual ~AudioManagerLinux(); 41 virtual ~AudioManagerLinux();
41 42
42 private: 43 private:
43 // Helper method to query if there is any valid input device 44 // Helper method to query if there is any valid input device
44 bool HasAnyValidAudioInputDevice(void** hint); 45 bool HasAnyValidAudioInputDevice(void** hint);
45 46
46 scoped_ptr<AlsaWrapper> wrapper_; 47 scoped_ptr<AlsaWrapper> wrapper_;
47 48
48 std::set<AlsaPcmOutputStream*> active_streams_; 49 std::set<AudioOutputStream*> active_streams_;
49 50
50 DISALLOW_COPY_AND_ASSIGN(AudioManagerLinux); 51 DISALLOW_COPY_AND_ASSIGN(AudioManagerLinux);
51 }; 52 };
52 53
53 #endif // MEDIA_AUDIO_LINUX_AUDIO_MANAGER_LINUX_H_ 54 #endif // MEDIA_AUDIO_LINUX_AUDIO_MANAGER_LINUX_H_
OLDNEW
« no previous file with comments | « no previous file | media/audio/linux/audio_manager_linux.cc » ('j') | media/audio/linux/pulse_output.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698