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

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

Issue 6142009: Upating the app, ceee, chrome, ipc, media, and net directories to use the correct lock.h file. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Unified patch updating all references to the new base/synchronization/lock.h Created 9 years, 11 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_output.h ('k') | media/base/pipeline_impl.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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 <map> 8 #include <map>
9 9
10 #include "base/lock.h"
11 #include "base/ref_counted.h" 10 #include "base/ref_counted.h"
12 #include "base/scoped_ptr.h" 11 #include "base/scoped_ptr.h"
12 #include "base/synchronization/lock.h"
13 #include "base/threading/thread.h" 13 #include "base/threading/thread.h"
14 #include "media/audio/audio_manager_base.h" 14 #include "media/audio/audio_manager_base.h"
15 15
16 class AlsaPcmOutputStream; 16 class AlsaPcmOutputStream;
17 class AlsaWrapper; 17 class AlsaWrapper;
18 18
19 class AudioManagerLinux : public AudioManagerBase { 19 class AudioManagerLinux : public AudioManagerBase {
20 public: 20 public:
21 AudioManagerLinux(); 21 AudioManagerLinux();
22 22
(...skipping 10 matching lines...) Expand all
33 virtual void UnMuteAll(); 33 virtual void UnMuteAll();
34 34
35 virtual void ReleaseOutputStream(AlsaPcmOutputStream* stream); 35 virtual void ReleaseOutputStream(AlsaPcmOutputStream* stream);
36 36
37 protected: 37 protected:
38 virtual ~AudioManagerLinux(); 38 virtual ~AudioManagerLinux();
39 39
40 private: 40 private:
41 scoped_ptr<AlsaWrapper> wrapper_; 41 scoped_ptr<AlsaWrapper> wrapper_;
42 42
43 Lock lock_; 43 base::Lock lock_;
44 std::map<AlsaPcmOutputStream*, scoped_refptr<AlsaPcmOutputStream> > 44 std::map<AlsaPcmOutputStream*, scoped_refptr<AlsaPcmOutputStream> >
45 active_streams_; 45 active_streams_;
46 46
47 DISALLOW_COPY_AND_ASSIGN(AudioManagerLinux); 47 DISALLOW_COPY_AND_ASSIGN(AudioManagerLinux);
48 }; 48 };
49 49
50 #endif // MEDIA_AUDIO_LINUX_AUDIO_MANAGER_LINUX_H_ 50 #endif // MEDIA_AUDIO_LINUX_AUDIO_MANAGER_LINUX_H_
OLDNEW
« no previous file with comments | « media/audio/linux/alsa_output.h ('k') | media/base/pipeline_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698