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

Side by Side Diff: media/audio/win/audio_manager_win.h

Issue 23654035: Rename AudioInputDeviceTest to AudioManagerTest since that is what it tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@enumAll
Patch Set: Another friend fix. 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 | « media/audio/audio_manager_unittest.cc ('k') | media/audio/win/wavein_input_win.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) 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_WIN_AUDIO_MANAGER_WIN_H_ 5 #ifndef MEDIA_AUDIO_WIN_AUDIO_MANAGER_WIN_H_
6 #define MEDIA_AUDIO_WIN_AUDIO_MANAGER_WIN_H_ 6 #define MEDIA_AUDIO_WIN_AUDIO_MANAGER_WIN_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "media/audio/audio_manager_base.h" 10 #include "media/audio/audio_manager_base.h"
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 const AudioParameters& input_params) OVERRIDE; 55 const AudioParameters& input_params) OVERRIDE;
56 56
57 private: 57 private:
58 enum EnumerationType { 58 enum EnumerationType {
59 kUninitializedEnumeration = 0, 59 kUninitializedEnumeration = 0,
60 kMMDeviceEnumeration, 60 kMMDeviceEnumeration,
61 kWaveEnumeration, 61 kWaveEnumeration,
62 }; 62 };
63 63
64 // Allow unit test to modify the utilized enumeration API. 64 // Allow unit test to modify the utilized enumeration API.
65 friend class AudioInputDeviceTest; 65 friend class AudioManagerTest;
66 66
67 EnumerationType enumeration_type_; 67 EnumerationType enumeration_type_;
68 EnumerationType enumeration_type() { return enumeration_type_; } 68 EnumerationType enumeration_type() { return enumeration_type_; }
69 void SetEnumerationType(EnumerationType type) { 69 void SetEnumerationType(EnumerationType type) {
70 enumeration_type_ = type; 70 enumeration_type_ = type;
71 } 71 }
72 72
73 // Returns a PCMWaveInAudioInputStream instance or NULL on failure. 73 // Returns a PCMWaveInAudioInputStream instance or NULL on failure.
74 // This method converts MMDevice-style device ID to WaveIn-style device ID if 74 // This method converts MMDevice-style device ID to WaveIn-style device ID if
75 // necessary. 75 // necessary.
(...skipping 11 matching lines...) Expand all
87 87
88 // Listen for output device changes. 88 // Listen for output device changes.
89 scoped_ptr<AudioDeviceListenerWin> output_device_listener_; 89 scoped_ptr<AudioDeviceListenerWin> output_device_listener_;
90 90
91 DISALLOW_COPY_AND_ASSIGN(AudioManagerWin); 91 DISALLOW_COPY_AND_ASSIGN(AudioManagerWin);
92 }; 92 };
93 93
94 } // namespace media 94 } // namespace media
95 95
96 #endif // MEDIA_AUDIO_WIN_AUDIO_MANAGER_WIN_H_ 96 #endif // MEDIA_AUDIO_WIN_AUDIO_MANAGER_WIN_H_
OLDNEW
« no previous file with comments | « media/audio/audio_manager_unittest.cc ('k') | media/audio/win/wavein_input_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698