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

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

Issue 7060011: Adding GetAudioInputDeviceNames to AudioManager, this function is supposed to do device enumerati... (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: Created 9 years, 7 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) 2011 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 #include "media/audio/audio_io.h" 5 #include "media/audio/audio_io.h"
6 6
7 #include <windows.h> 7 #include <windows.h>
8 #include <objbase.h> // This has to be before initguid.h 8 #include <objbase.h> // This has to be before initguid.h
9 #include <initguid.h> 9 #include <initguid.h>
10 #include <mmsystem.h> 10 #include <mmsystem.h>
11 #include <setupapi.h> 11 #include <setupapi.h>
12 12
13 #include "base/basictypes.h" 13 #include "base/basictypes.h"
14 #include "base/command_line.h" 14 #include "base/command_line.h"
15 #include "base/file_path.h" 15 #include "base/file_path.h"
16 #include "base/memory/scoped_ptr.h" 16 #include "base/memory/scoped_ptr.h"
17 #include "base/path_service.h" 17 #include "base/path_service.h"
18 #include "base/process_util.h" 18 #include "base/process_util.h"
19 #include "base/string_number_conversions.h" 19 #include "base/string_number_conversions.h"
20 #include "base/string_util.h" 20 #include "base/string_util.h"
21 #include "base/stringprintf.h"
21 #include "base/win/windows_version.h" 22 #include "base/win/windows_version.h"
22 #include "media/audio/fake_audio_input_stream.h" 23 #include "media/audio/fake_audio_input_stream.h"
23 #include "media/audio/fake_audio_output_stream.h" 24 #include "media/audio/fake_audio_output_stream.h"
24 #include "media/audio/win/audio_manager_win.h" 25 #include "media/audio/win/audio_manager_win.h"
25 #include "media/audio/win/wavein_input_win.h" 26 #include "media/audio/win/wavein_input_win.h"
26 #include "media/audio/win/waveout_output_win.h" 27 #include "media/audio/win/waveout_output_win.h"
27 #include "media/base/limits.h" 28 #include "media/base/limits.h"
28 29
29 // Libraries required for the SetupAPI and Wbem APIs used here. 30 // Libraries required for the SetupAPI and Wbem APIs used here.
30 #pragma comment(lib, "setupapi.lib") 31 #pragma comment(lib, "setupapi.lib")
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
246 } 247 }
247 248
248 FilePath path; 249 FilePath path;
249 PathService::Get(base::DIR_SYSTEM, &path); 250 PathService::Get(base::DIR_SYSTEM, &path);
250 path = path.Append(program); 251 path = path.Append(program);
251 CommandLine command_line(path); 252 CommandLine command_line(path);
252 command_line.AppendArg(argument); 253 command_line.AppendArg(argument);
253 base::LaunchApp(command_line, false, false, NULL); 254 base::LaunchApp(command_line, false, false, NULL);
254 } 255 }
255 256
257 void AudioManagerWin::GetAudioInputDeviceNames(
258 AudioInputDeviceNames* device_names) {
259 // TODO(xians): query a full list of valid devices.
260 if (HasAudioInputDevices()) {
261 // We use (device_name)_(index) to make up the unique_ids to identify the
262 // devices. For default device, the index is 0, so its unique_id is
263 // Default_0.
264 AudioInputDeviceName name;
265 name.device_name = AudioManagerBase::kDefaultDeviceName;
awong 2011/05/23 17:36:15 ...This really seems odd now...
xians 2011/05/23 20:15:59 We only prepend the default device to the list to
266 name.unique_id = StringPrintf("%s_0", AudioManagerBase::kDefaultDeviceName);
267 device_names->push_back(name);
268 }
269 }
270
256 // static 271 // static
257 AudioManager* AudioManager::CreateAudioManager() { 272 AudioManager* AudioManager::CreateAudioManager() {
258 return new AudioManagerWin(); 273 return new AudioManagerWin();
259 } 274 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698