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

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

Issue 9566002: On windows, create PCMWaveInAudioInputStream instance with correct device ID. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Use the solution suggested by Henrik. Created 8 years, 9 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
OLDNEW
1 // Copyright (c) 2011 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 <windows.h> 8 #include <windows.h>
9 #include <string> 9 #include <string>
10 10
11 #include "base/basictypes.h" 11 #include "base/basictypes.h"
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 55
56 // Allow unit test to modify the utilized enumeration API. 56 // Allow unit test to modify the utilized enumeration API.
57 friend class AudioInputDeviceTest; 57 friend class AudioInputDeviceTest;
58 58
59 EnumerationType enumeration_type_; 59 EnumerationType enumeration_type_;
60 EnumerationType enumeration_type() { return enumeration_type_; } 60 EnumerationType enumeration_type() { return enumeration_type_; }
61 void SetEnumerationType(EnumerationType type) { 61 void SetEnumerationType(EnumerationType type) {
62 enumeration_type_ = type; 62 enumeration_type_ = type;
63 } 63 }
64 64
65 // Returns a PCMWaveInAudioInputStream instance or NULL on failure.
66 // This method converts MMDevice-style device ID to WaveIn-style device ID if
67 // necessary.
68 // (Please see device_enumeration_win.h for more info about the two kinds of
69 // device IDs.)
70 AudioInputStream* CreatePCMWaveInAudioInputStream(
71 const AudioParameters& params,
72 const std::string& device_id);
73
65 // Number of currently open output streams. 74 // Number of currently open output streams.
66 int num_output_streams_; 75 int num_output_streams_;
67 76
68 DISALLOW_COPY_AND_ASSIGN(AudioManagerWin); 77 DISALLOW_COPY_AND_ASSIGN(AudioManagerWin);
69 }; 78 };
70 79
71 #endif // MEDIA_AUDIO_WIN_AUDIO_MANAGER_WIN_H_ 80 #endif // MEDIA_AUDIO_WIN_AUDIO_MANAGER_WIN_H_
OLDNEW
« no previous file with comments | « no previous file | media/audio/win/audio_manager_win.cc » ('j') | media/audio/win/audio_manager_win.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698