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

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

Issue 1855183005: Revert of Remove "#pragma comment(lib" in media. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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/BUILD.gn ('k') | media/audio/win/wavein_input_win.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 #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>
(...skipping 19 matching lines...) Expand all
30 #include "media/audio/win/audio_manager_win.h" 30 #include "media/audio/win/audio_manager_win.h"
31 #include "media/audio/win/core_audio_util_win.h" 31 #include "media/audio/win/core_audio_util_win.h"
32 #include "media/audio/win/device_enumeration_win.h" 32 #include "media/audio/win/device_enumeration_win.h"
33 #include "media/audio/win/wavein_input_win.h" 33 #include "media/audio/win/wavein_input_win.h"
34 #include "media/audio/win/waveout_output_win.h" 34 #include "media/audio/win/waveout_output_win.h"
35 #include "media/base/bind_to_current_loop.h" 35 #include "media/base/bind_to_current_loop.h"
36 #include "media/base/channel_layout.h" 36 #include "media/base/channel_layout.h"
37 #include "media/base/limits.h" 37 #include "media/base/limits.h"
38 #include "media/base/media_switches.h" 38 #include "media/base/media_switches.h"
39 39
40 // Libraries required for the SetupAPI and Wbem APIs used here.
41 #pragma comment(lib, "setupapi.lib")
42
40 // The following are defined in various DDK headers, and we (re)define them here 43 // The following are defined in various DDK headers, and we (re)define them here
41 // to avoid adding the DDK as a chrome dependency. 44 // to avoid adding the DDK as a chrome dependency.
42 #define DRV_QUERYDEVICEINTERFACE 0x80c 45 #define DRV_QUERYDEVICEINTERFACE 0x80c
43 #define DRVM_MAPPER_PREFERRED_GET 0x2015 46 #define DRVM_MAPPER_PREFERRED_GET 0x2015
44 #define DRV_QUERYDEVICEINTERFACESIZE 0x80d 47 #define DRV_QUERYDEVICEINTERFACESIZE 0x80d
45 DEFINE_GUID(AM_KSCATEGORY_AUDIO, 0x6994ad04, 0x93ef, 0x11d0, 48 DEFINE_GUID(AM_KSCATEGORY_AUDIO, 0x6994ad04, 0x93ef, 0x11d0,
46 0xa3, 0xcc, 0x00, 0xa0, 0xc9, 0x22, 0x31, 0x96); 49 0xa3, 0xcc, 0x00, 0xa0, 0xc9, 0x22, 0x31, 0x96);
47 50
48 namespace media { 51 namespace media {
49 52
(...skipping 485 matching lines...) Expand 10 before | Expand all | Expand 10 after
535 return new PCMWaveInAudioInputStream(this, params, kNumInputBuffers, 538 return new PCMWaveInAudioInputStream(this, params, kNumInputBuffers,
536 xp_device_id); 539 xp_device_id);
537 } 540 }
538 541
539 /// static 542 /// static
540 AudioManager* CreateAudioManager(AudioLogFactory* audio_log_factory) { 543 AudioManager* CreateAudioManager(AudioLogFactory* audio_log_factory) {
541 return new AudioManagerWin(audio_log_factory); 544 return new AudioManagerWin(audio_log_factory);
542 } 545 }
543 546
544 } // namespace media 547 } // namespace media
OLDNEW
« no previous file with comments | « media/audio/BUILD.gn ('k') | media/audio/win/wavein_input_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698