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

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

Issue 7601002: Revert r95841 due to failing media_unittests on linux_shared bot. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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
« no previous file with comments | « media/audio/linux/alsa_wrapper.h ('k') | media/audio/simple_sources.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 #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 16
17 class MEDIA_EXPORT AudioManagerLinux : public AudioManagerBase { 17 class AudioManagerLinux : public AudioManagerBase {
18 public: 18 public:
19 AudioManagerLinux(); 19 AudioManagerLinux();
20 20
21 // Call before using a newly created AudioManagerLinux instance. 21 // Call before using a newly created AudioManagerLinux instance.
22 virtual void Init(); 22 virtual void Init();
23 23
24 // Implementation of AudioManager. 24 // Implementation of AudioManager.
25 virtual bool HasAudioOutputDevices(); 25 virtual bool HasAudioOutputDevices();
26 virtual bool HasAudioInputDevices(); 26 virtual bool HasAudioInputDevices();
27 virtual AudioOutputStream* MakeAudioOutputStream( 27 virtual AudioOutputStream* MakeAudioOutputStream(
(...skipping 16 matching lines...) Expand all
44 bool HasAnyValidAudioInputDevice(void** hint); 44 bool HasAnyValidAudioInputDevice(void** hint);
45 45
46 scoped_ptr<AlsaWrapper> wrapper_; 46 scoped_ptr<AlsaWrapper> wrapper_;
47 47
48 std::set<AlsaPcmOutputStream*> active_streams_; 48 std::set<AlsaPcmOutputStream*> active_streams_;
49 49
50 DISALLOW_COPY_AND_ASSIGN(AudioManagerLinux); 50 DISALLOW_COPY_AND_ASSIGN(AudioManagerLinux);
51 }; 51 };
52 52
53 #endif // MEDIA_AUDIO_LINUX_AUDIO_MANAGER_LINUX_H_ 53 #endif // MEDIA_AUDIO_LINUX_AUDIO_MANAGER_LINUX_H_
OLDNEW
« no previous file with comments | « media/audio/linux/alsa_wrapper.h ('k') | media/audio/simple_sources.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698