| Index: media/audio/win/waveout_output_win.cc
|
| diff --git a/media/audio/win/waveout_output_win.cc b/media/audio/win/waveout_output_win.cc
|
| index 7f35065ab37fff590ddfb682e7bb6b825edd6cd7..5be9e0a444569dd4c94c62534c6caa613d880cdc 100644
|
| --- a/media/audio/win/waveout_output_win.cc
|
| +++ b/media/audio/win/waveout_output_win.cc
|
| @@ -75,18 +75,20 @@ inline WAVEHDR* PCMWaveOutAudioOutputStream::GetBuffer(int n) const {
|
| }
|
|
|
| PCMWaveOutAudioOutputStream::PCMWaveOutAudioOutputStream(
|
| - AudioManagerWin* manager, const AudioParameters& params, int num_buffers,
|
| + AudioManagerWin* manager,
|
| + const AudioParameters& params,
|
| + int num_buffers,
|
| UINT device_id)
|
| : state_(PCMA_BRAND_NEW),
|
| manager_(manager),
|
| - device_id_(device_id),
|
| - waveout_(NULL),
|
| callback_(NULL),
|
| num_buffers_(num_buffers),
|
| buffer_size_(params.GetBytesPerBuffer()),
|
| volume_(1),
|
| channels_(params.channels()),
|
| pending_bytes_(0),
|
| + device_id_(device_id),
|
| + waveout_(NULL),
|
| waiting_handle_(NULL),
|
| audio_bus_(AudioBus::Create(params)) {
|
| format_.Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE;
|
|
|