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

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

Issue 8818012: Remove the AudioManager singleton. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Set svn eol properties for a couple of files Created 9 years 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_output_unittest.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) 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 <string>
9
10 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
11 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
12 #include "base/threading/thread.h" 11 #include "base/threading/thread.h"
13 #include "media/audio/audio_manager_base.h" 12 #include "media/audio/audio_manager_base.h"
14 13
15 class AlsaWrapper; 14 class AlsaWrapper;
16 15
17 class MEDIA_EXPORT AudioManagerLinux : public AudioManagerBase { 16 class MEDIA_EXPORT AudioManagerLinux : public AudioManagerBase {
18 public: 17 public:
19 AudioManagerLinux(); 18 AudioManagerLinux();
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 void GetAlsaDevicesInfo(void** hint, media::AudioDeviceNames* device_names); 53 void GetAlsaDevicesInfo(void** hint, media::AudioDeviceNames* device_names);
55 54
56 // Checks if the specific ALSA device is available. 55 // Checks if the specific ALSA device is available.
57 bool IsAlsaDeviceAvailable(const char* device_name); 56 bool IsAlsaDeviceAvailable(const char* device_name);
58 57
59 // Returns true if a device is present for the given stream type. 58 // Returns true if a device is present for the given stream type.
60 bool HasAnyAlsaAudioDevice(StreamType stream); 59 bool HasAnyAlsaAudioDevice(StreamType stream);
61 60
62 scoped_ptr<AlsaWrapper> wrapper_; 61 scoped_ptr<AlsaWrapper> wrapper_;
63 62
64 std::set<AudioOutputStream*> active_streams_; 63 size_t active_output_stream_count_;
65 64
66 DISALLOW_COPY_AND_ASSIGN(AudioManagerLinux); 65 DISALLOW_COPY_AND_ASSIGN(AudioManagerLinux);
67 }; 66 };
68 67
69 #endif // MEDIA_AUDIO_LINUX_AUDIO_MANAGER_LINUX_H_ 68 #endif // MEDIA_AUDIO_LINUX_AUDIO_MANAGER_LINUX_H_
OLDNEW
« no previous file with comments | « media/audio/linux/alsa_output_unittest.cc ('k') | media/audio/linux/audio_manager_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698