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

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

Issue 23475037: Implement GetAudioOutputDevices for remaining platforms, consolidate tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkgr
Patch Set: Merge LKGR, remove anonymous namespaces. Created 7 years, 3 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
« no previous file with comments | « no previous file | 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 "base/android/jni_android.h" 8 #include "base/android/jni_android.h"
9 #include "base/gtest_prod_util.h" 9 #include "base/gtest_prod_util.h"
10 #include "media/audio/audio_manager_base.h" 10 #include "media/audio/audio_manager_base.h"
11 11
12 namespace media { 12 namespace media {
13 13
14 // Android implemention of AudioManager. 14 // Android implemention of AudioManager.
15 class MEDIA_EXPORT AudioManagerAndroid : public AudioManagerBase { 15 class MEDIA_EXPORT AudioManagerAndroid : public AudioManagerBase {
16 public: 16 public:
17 AudioManagerAndroid(); 17 AudioManagerAndroid();
18 18
19 // Implementation of AudioManager. 19 // Implementation of AudioManager.
20 virtual bool HasAudioOutputDevices() OVERRIDE; 20 virtual bool HasAudioOutputDevices() OVERRIDE;
21 virtual bool HasAudioInputDevices() OVERRIDE; 21 virtual bool HasAudioInputDevices() OVERRIDE;
22 virtual void GetAudioInputDeviceNames( 22 virtual void GetAudioInputDeviceNames(
23 media::AudioDeviceNames* device_names) OVERRIDE; 23 AudioDeviceNames* device_names) OVERRIDE;
24 virtual void GetAudioOutputDeviceNames(
25 AudioDeviceNames* device_names) OVERRIDE;
24 virtual AudioParameters GetInputStreamParameters( 26 virtual AudioParameters GetInputStreamParameters(
25 const std::string& device_id) OVERRIDE; 27 const std::string& device_id) OVERRIDE;
26 28
27 virtual AudioOutputStream* MakeAudioOutputStream( 29 virtual AudioOutputStream* MakeAudioOutputStream(
28 const AudioParameters& params, 30 const AudioParameters& params,
29 const std::string& device_id, 31 const std::string& device_id,
30 const std::string& input_device_id) OVERRIDE; 32 const std::string& input_device_id) OVERRIDE;
31 virtual AudioInputStream* MakeAudioInputStream( 33 virtual AudioInputStream* MakeAudioInputStream(
32 const AudioParameters& params, 34 const AudioParameters& params,
33 const std::string& device_id) OVERRIDE; 35 const std::string& device_id) OVERRIDE;
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 73
72 // Java AudioManager instance. 74 // Java AudioManager instance.
73 base::android::ScopedJavaGlobalRef<jobject> j_audio_manager_; 75 base::android::ScopedJavaGlobalRef<jobject> j_audio_manager_;
74 76
75 DISALLOW_COPY_AND_ASSIGN(AudioManagerAndroid); 77 DISALLOW_COPY_AND_ASSIGN(AudioManagerAndroid);
76 }; 78 };
77 79
78 } // namespace media 80 } // namespace media
79 81
80 #endif // MEDIA_AUDIO_ANDROID_AUDIO_MANAGER_ANDROID_H_ 82 #endif // MEDIA_AUDIO_ANDROID_AUDIO_MANAGER_ANDROID_H_
OLDNEW
« no previous file with comments | « no previous file | media/audio/android/audio_manager_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698