Module: wine Branch: master Commit: 08dd823c7c12c4f4a97731c09dae8c9a9c634ac0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08dd823c7c12c4f4a97731c09d... Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Aug 16 19:53:35 2011 +0200 mmdevapi: Use UINT32 for a number of frames and UINT64 to sum them. --- dlls/winealsa.drv/mmdevdrv.c | 4 ++-- dlls/winecoreaudio.drv/mmdevdrv.c | 4 ++-- dlls/wineoss.drv/mmdevdrv.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index e471e2c..836d444 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -108,8 +108,8 @@ struct ACImpl { float *vols; BOOL initted, started; - UINT64 written_frames, held_frames, tmp_buffer_frames; - UINT32 bufsize_frames, period_us; + UINT64 written_frames; + UINT32 bufsize_frames, held_frames, tmp_buffer_frames, period_us; UINT32 lcl_offs_frames; /* offs into local_buffer where valid data starts */ HANDLE timer; diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 78daa8c..c1a3a3a 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -124,8 +124,8 @@ struct ACImpl { AudioQueueRef aqueue; AudioObjectPropertyScope scope; HANDLE timer; - UINT32 period_ms, bufsize_frames, inbuf_frames, written_frames; - UINT64 last_time; + UINT32 period_ms, bufsize_frames, inbuf_frames; + UINT64 last_time, written_frames; AudioQueueBufferRef public_buffer; UINT32 getbuf_last; int playing; diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index ed3e2ba..93f71cc 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -121,8 +121,8 @@ struct ACImpl { oss_audioinfo ai; BOOL initted, playing; - UINT64 written_frames, held_frames, tmp_buffer_frames, inbuf_frames; - UINT32 period_us, bufsize_frames; + UINT64 written_frames; + UINT32 period_us, bufsize_frames, held_frames, tmp_buffer_frames, inbuf_frames; UINT32 lcl_offs_frames; /* offs into local_buffer where valid data starts */ BYTE *local_buffer, *tmp_buffer;