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

Unified Diff: media/audio/win/audio_manager_win.h

Issue 8606006: Adds support for capture device enumeration on Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Rebase and fix lint warnings Created 9 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/audio/audio_input_device_unittest.cc ('k') | media/audio/win/audio_manager_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/win/audio_manager_win.h
===================================================================
--- media/audio/win/audio_manager_win.h (revision 111497)
+++ media/audio/win/audio_manager_win.h (working copy)
@@ -6,9 +6,11 @@
#define MEDIA_AUDIO_WIN_AUDIO_MANAGER_WIN_H_
#include <windows.h>
+#include <string>
#include "base/basictypes.h"
#include "base/compiler_specific.h"
+#include "base/gtest_prod_util.h"
#include "media/audio/audio_manager_base.h"
class PCMWaveOutAudioOutputStream;
@@ -16,7 +18,7 @@
// Windows implementation of the AudioManager singleton. This class is internal
// to the audio output and only internal users can call methods not exposed by
// the AudioManager class.
-class AudioManagerWin : public AudioManagerBase {
+class MEDIA_EXPORT AudioManagerWin : public AudioManagerBase {
public:
AudioManagerWin();
// Implementation of AudioManager.
@@ -42,8 +44,23 @@
void ReleaseInputStream(AudioInputStream* stream);
private:
+ enum EnumerationType {
+ kUninitializedEnumeration = 0,
+ kMMDeviceEnumeration,
+ kWaveEnumeration,
+ };
+
virtual ~AudioManagerWin();
+ // Allow unit test to modify the utilized enumeration API.
+ friend class AudioInputDeviceTest;
+
+ EnumerationType enumeration_type_;
+ EnumerationType enumeration_type() { return enumeration_type_; }
+ void SetEnumerationType(EnumerationType type) {
+ enumeration_type_ = type;
+ }
+
// Number of currently open output streams.
int num_output_streams_;
« no previous file with comments | « media/audio/audio_input_device_unittest.cc ('k') | media/audio/win/audio_manager_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698