diff options
| author | malc <malc@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-12-03 22:48:44 +0000 |
|---|---|---|
| committer | malc <malc@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-12-03 22:48:44 +0000 |
| commit | 1ea879e5580f63414693655fcf0328559cdce138 (patch) | |
| tree | 45f2e4d57a73fd269004d1a32aeb450ad4881c13 /audio/dsoundaudio.c | |
| parent | 8b0de438d4c814fc2d7d1330a146a2e1cb8877b2 (diff) | |
| download | qemu-1ea879e5580f63414693655fcf0328559cdce138.zip qemu-1ea879e5580f63414693655fcf0328559cdce138.tar.gz qemu-1ea879e5580f63414693655fcf0328559cdce138.tar.bz2 | |
Make audio violate POSIX less
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5864 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'audio/dsoundaudio.c')
| -rw-r--r-- | audio/dsoundaudio.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/audio/dsoundaudio.c b/audio/dsoundaudio.c index cba8c80..df4b2f0 100644 --- a/audio/dsoundaudio.c +++ b/audio/dsoundaudio.c @@ -47,7 +47,7 @@ static struct { int set_primary; int bufsize_in; int bufsize_out; - audsettings_t settings; + struct audsettings settings; int latency_millis; } conf = { 1, @@ -68,7 +68,7 @@ typedef struct { LPDIRECTSOUND dsound; LPDIRECTSOUNDCAPTURE dsound_capture; LPDIRECTSOUNDBUFFER dsound_primary_buffer; - audsettings_t settings; + struct audsettings settings; } dsound; static dsound glob_dsound; @@ -307,7 +307,8 @@ static int dsound_restore_out (LPDIRECTSOUNDBUFFER dsb) return -1; } -static int waveformat_from_audio_settings (WAVEFORMATEX *wfx, audsettings_t *as) +static int waveformat_from_audio_settings (WAVEFORMATEX *wfx, + struct audsettings *as) { memset (wfx, 0, sizeof (*wfx)); @@ -346,7 +347,8 @@ static int waveformat_from_audio_settings (WAVEFORMATEX *wfx, audsettings_t *as) return 0; } -static int waveformat_to_audio_settings (WAVEFORMATEX *wfx, audsettings_t *as) +static int waveformat_to_audio_settings (WAVEFORMATEX *wfx, + struct audsettings *as) { if (wfx->wFormatTag != WAVE_FORMAT_PCM) { dolog ("Invalid wave format, tag is not PCM, but %d\n", @@ -448,8 +450,8 @@ static void dsound_write_sample (HWVoiceOut *hw, uint8_t *dst, int dst_len) int src_len1 = dst_len; int src_len2 = 0; int pos = hw->rpos + dst_len; - st_sample_t *src1 = hw->mix_buf + hw->rpos; - st_sample_t *src2 = NULL; + struct st_sample *src1 = hw->mix_buf + hw->rpos; + struct st_sample *src2 = NULL; if (pos > hw->samples) { src_len1 = hw->samples - hw->rpos; |