Mercurial > mplayer.hg
comparison libao2/ao_win32.c @ 13735:83c5f9888576
ringbuffer variable intialization fix for multifile playback patch by Rune Petersen <rune.mail-list at mail.tele.dk>
author | faust3 |
---|---|
date | Fri, 22 Oct 2004 12:43:34 +0000 |
parents | 5b9c594dc6e9 |
children | a92101a7eb49 |
comparison
equal
deleted
inserted
replaced
13734:efefaa53aaf9 | 13735:83c5f9888576 |
---|---|
164 mp_msg(MSGT_AO, MSGL_V,"ao_win32: Samplerate:%iHz Channels:%i Format:%s\n",rate, channels, audio_out_format_name(format)); | 164 mp_msg(MSGT_AO, MSGL_V,"ao_win32: Samplerate:%iHz Channels:%i Format:%s\n",rate, channels, audio_out_format_name(format)); |
165 mp_msg(MSGT_AO, MSGL_V,"ao_win32: Buffersize:%d\n",ao_data.buffersize); | 165 mp_msg(MSGT_AO, MSGL_V,"ao_win32: Buffersize:%d\n",ao_data.buffersize); |
166 | 166 |
167 //fill waveformatex | 167 //fill waveformatex |
168 ZeroMemory( &wformat, sizeof(WAVEFORMATEXTENSIBLE)); | 168 ZeroMemory( &wformat, sizeof(WAVEFORMATEXTENSIBLE)); |
169 wformat.Format.cbSize = (channels>2)?sizeof(WAVEFORMATEXTENSIBLE):0; | 169 wformat.Format.cbSize = (channels>2)?sizeof(WAVEFORMATEXTENSIBLE)-sizeof(WAVEFORMATEX):0; |
170 wformat.Format.nChannels = channels; | 170 wformat.Format.nChannels = channels; |
171 wformat.Format.nSamplesPerSec = rate; | 171 wformat.Format.nSamplesPerSec = rate; |
172 if(format == AFMT_AC3) | 172 if(format == AFMT_AC3) |
173 { | 173 { |
174 wformat.Format.wFormatTag = WAVE_FORMAT_DOLBY_AC3_SPDIF; | 174 wformat.Format.wFormatTag = WAVE_FORMAT_DOLBY_AC3_SPDIF; |
220 buffer += sizeof(WAVEHDR) * BUFFER_COUNT; | 220 buffer += sizeof(WAVEHDR) * BUFFER_COUNT; |
221 for(i = 0; i < BUFFER_COUNT; i++) { | 221 for(i = 0; i < BUFFER_COUNT; i++) { |
222 waveBlocks[i].lpData = buffer; | 222 waveBlocks[i].lpData = buffer; |
223 buffer += BUFFER_SIZE; | 223 buffer += BUFFER_SIZE; |
224 } | 224 } |
225 buf_write=0; | |
226 buf_write_pos=0; | |
227 full_buffers=0; | |
228 buffered_bytes=0; | |
225 | 229 |
226 return 1; | 230 return 1; |
227 } | 231 } |
228 | 232 |
229 // close audio device | 233 // close audio device |