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

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

Issue 9805001: Move media/audio files into media namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 8 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.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 {
15
14 class AlsaWrapper; 16 class AlsaWrapper;
15 17
16 class MEDIA_EXPORT AudioManagerLinux : public AudioManagerBase { 18 class MEDIA_EXPORT AudioManagerLinux : public AudioManagerBase {
17 public: 19 public:
18 AudioManagerLinux(); 20 AudioManagerLinux();
19 21
20 // Call before using a newly created AudioManagerLinux instance. 22 // Call before using a newly created AudioManagerLinux instance.
21 virtual void Init() OVERRIDE; 23 virtual void Init() OVERRIDE;
22 24
23 // Implementation of AudioManager. 25 // Implementation of AudioManager.
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 68
67 // Called by MakeLinearInputStream and MakeLowLatencyInputStream. 69 // Called by MakeLinearInputStream and MakeLowLatencyInputStream.
68 AudioInputStream* MakeInputStream(const AudioParameters& params, 70 AudioInputStream* MakeInputStream(const AudioParameters& params,
69 const std::string& device_id); 71 const std::string& device_id);
70 72
71 scoped_ptr<AlsaWrapper> wrapper_; 73 scoped_ptr<AlsaWrapper> wrapper_;
72 74
73 DISALLOW_COPY_AND_ASSIGN(AudioManagerLinux); 75 DISALLOW_COPY_AND_ASSIGN(AudioManagerLinux);
74 }; 76 };
75 77
78 } // namespace media
79
76 #endif // MEDIA_AUDIO_LINUX_AUDIO_MANAGER_LINUX_H_ 80 #endif // MEDIA_AUDIO_LINUX_AUDIO_MANAGER_LINUX_H_
OLDNEW
« no previous file with comments | « media/audio/linux/alsa_wrapper.cc ('k') | media/audio/linux/audio_manager_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698