Revision 1ea879e5 audio/dsoundaudio.c
| b/audio/dsoundaudio.c | ||
|---|---|---|
| 47 | 47 |
int set_primary; |
| 48 | 48 |
int bufsize_in; |
| 49 | 49 |
int bufsize_out; |
| 50 |
audsettings_t settings;
|
|
| 50 |
struct audsettings settings;
|
|
| 51 | 51 |
int latency_millis; |
| 52 | 52 |
} conf = {
|
| 53 | 53 |
1, |
| ... | ... | |
| 68 | 68 |
LPDIRECTSOUND dsound; |
| 69 | 69 |
LPDIRECTSOUNDCAPTURE dsound_capture; |
| 70 | 70 |
LPDIRECTSOUNDBUFFER dsound_primary_buffer; |
| 71 |
audsettings_t settings;
|
|
| 71 |
struct audsettings settings;
|
|
| 72 | 72 |
} dsound; |
| 73 | 73 |
|
| 74 | 74 |
static dsound glob_dsound; |
| ... | ... | |
| 307 | 307 |
return -1; |
| 308 | 308 |
} |
| 309 | 309 |
|
| 310 |
static int waveformat_from_audio_settings (WAVEFORMATEX *wfx, audsettings_t *as) |
|
| 310 |
static int waveformat_from_audio_settings (WAVEFORMATEX *wfx, |
|
| 311 |
struct audsettings *as) |
|
| 311 | 312 |
{
|
| 312 | 313 |
memset (wfx, 0, sizeof (*wfx)); |
| 313 | 314 |
|
| ... | ... | |
| 346 | 347 |
return 0; |
| 347 | 348 |
} |
| 348 | 349 |
|
| 349 |
static int waveformat_to_audio_settings (WAVEFORMATEX *wfx, audsettings_t *as) |
|
| 350 |
static int waveformat_to_audio_settings (WAVEFORMATEX *wfx, |
|
| 351 |
struct audsettings *as) |
|
| 350 | 352 |
{
|
| 351 | 353 |
if (wfx->wFormatTag != WAVE_FORMAT_PCM) {
|
| 352 | 354 |
dolog ("Invalid wave format, tag is not PCM, but %d\n",
|
| ... | ... | |
| 448 | 450 |
int src_len1 = dst_len; |
| 449 | 451 |
int src_len2 = 0; |
| 450 | 452 |
int pos = hw->rpos + dst_len; |
| 451 |
st_sample_t *src1 = hw->mix_buf + hw->rpos;
|
|
| 452 |
st_sample_t *src2 = NULL;
|
|
| 453 |
struct st_sample *src1 = hw->mix_buf + hw->rpos;
|
|
| 454 |
struct st_sample *src2 = NULL;
|
|
| 453 | 455 |
|
| 454 | 456 |
if (pos > hw->samples) {
|
| 455 | 457 |
src_len1 = hw->samples - hw->rpos; |
Also available in: Unified diff