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

Side by Side Diff: media/audio/android/audio_manager_android.h

Issue 9965076: Revert 130180 - 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 | « content/test/webrtc_audio_device_test.cc ('k') | media/audio/android/audio_manager_android.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_ANDROID_AUDIO_MANAGER_ANDROID_H_ 5 #ifndef MEDIA_AUDIO_ANDROID_AUDIO_MANAGER_ANDROID_H_
6 #define MEDIA_AUDIO_ANDROID_AUDIO_MANAGER_ANDROID_H_ 6 #define MEDIA_AUDIO_ANDROID_AUDIO_MANAGER_ANDROID_H_
7 7
8 #include "media/audio/audio_manager_base.h" 8 #include "media/audio/audio_manager_base.h"
9 9
10 namespace media {
11
12 // Android implemention of AudioManager. 10 // Android implemention of AudioManager.
13 class AudioManagerAndroid : public AudioManagerBase { 11 class AudioManagerAndroid : public AudioManagerBase {
14 public: 12 public:
15 AudioManagerAndroid(); 13 AudioManagerAndroid();
16 14
17 // Implementation of AudioManager. 15 // Implementation of AudioManager.
18 virtual bool HasAudioOutputDevices() OVERRIDE; 16 virtual bool HasAudioOutputDevices() OVERRIDE;
19 virtual bool HasAudioInputDevices() OVERRIDE; 17 virtual bool HasAudioInputDevices() OVERRIDE;
20 virtual void MuteAll() OVERRIDE; 18 virtual void MuteAll() OVERRIDE;
21 virtual void UnMuteAll() OVERRIDE; 19 virtual void UnMuteAll() OVERRIDE;
22 20
23 // Implementation of AudioManagerBase. 21 // Implementation of AudioManagerBase.
24 virtual AudioOutputStream* MakeLinearOutputStream( 22 virtual AudioOutputStream* MakeLinearOutputStream(
25 const AudioParameters& params) OVERRIDE; 23 const AudioParameters& params) OVERRIDE;
26 virtual AudioOutputStream* MakeLowLatencyOutputStream( 24 virtual AudioOutputStream* MakeLowLatencyOutputStream(
27 const AudioParameters& params) OVERRIDE; 25 const AudioParameters& params) OVERRIDE;
28 virtual AudioInputStream* MakeLinearInputStream( 26 virtual AudioInputStream* MakeLinearInputStream(
29 const AudioParameters& params, const std::string& device_id) OVERRIDE; 27 const AudioParameters& params, const std::string& device_id) OVERRIDE;
30 virtual AudioInputStream* MakeLowLatencyInputStream( 28 virtual AudioInputStream* MakeLowLatencyInputStream(
31 const AudioParameters& params, const std::string& device_id) OVERRIDE; 29 const AudioParameters& params, const std::string& device_id) OVERRIDE;
32 30
33 protected: 31 protected:
34 virtual ~AudioManagerAndroid(); 32 virtual ~AudioManagerAndroid();
35 33
36 private: 34 private:
37 DISALLOW_COPY_AND_ASSIGN(AudioManagerAndroid); 35 DISALLOW_COPY_AND_ASSIGN(AudioManagerAndroid);
38 }; 36 };
39 37
40 } // namespace media
41
42 #endif // MEDIA_AUDIO_ANDROID_AUDIO_MANAGER_ANDROID_H_ 38 #endif // MEDIA_AUDIO_ANDROID_AUDIO_MANAGER_ANDROID_H_
OLDNEW
« no previous file with comments | « content/test/webrtc_audio_device_test.cc ('k') | media/audio/android/audio_manager_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698