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

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

Issue 144613003: Remove use of CoreAudioUtil::IsSupported() from AudioManager startup. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix tests. Created 6 years, 11 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
« no previous file with comments | « media/audio/audio_manager_unittest.cc ('k') | media/audio/win/audio_manager_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 #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 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
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.
76 // (Please see device_enumeration_win.h for more info about the two kinds of 76 // (Please see device_enumeration_win.h for more info about the two kinds of
77 // device IDs.) 77 // device IDs.)
78 AudioInputStream* CreatePCMWaveInAudioInputStream( 78 AudioInputStream* CreatePCMWaveInAudioInputStream(
79 const AudioParameters& params, 79 const AudioParameters& params,
80 const std::string& device_id); 80 const std::string& device_id);
81 81
82 // Helper methods for constructing AudioDeviceListenerWin on the audio thread. 82 // Helper methods for performing expensive initialization tasks on the audio
83 void CreateDeviceListener(); 83 // thread instead of on the UI thread which AudioManager is constructed on.
84 void DestroyDeviceListener(); 84 void InitializeOnAudioThread();
85 void ShutdownOnAudioThread();
85 86
86 void GetAudioDeviceNamesImpl(bool input, AudioDeviceNames* device_names); 87 void GetAudioDeviceNamesImpl(bool input, AudioDeviceNames* device_names);
87 88
88 // Listen for output device changes. 89 // Listen for output device changes.
89 scoped_ptr<AudioDeviceListenerWin> output_device_listener_; 90 scoped_ptr<AudioDeviceListenerWin> output_device_listener_;
90 91
91 DISALLOW_COPY_AND_ASSIGN(AudioManagerWin); 92 DISALLOW_COPY_AND_ASSIGN(AudioManagerWin);
92 }; 93 };
93 94
94 } // namespace media 95 } // namespace media
95 96
96 #endif // MEDIA_AUDIO_WIN_AUDIO_MANAGER_WIN_H_ 97 #endif // MEDIA_AUDIO_WIN_AUDIO_MANAGER_WIN_H_
OLDNEW
« no previous file with comments | « media/audio/audio_manager_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