don't hexdump png images while reading them (why did it do this??)

[xonotic/darkplaces.git] / snd_win.c

diff --git a/snd_win.c b/snd_win.c
index 8d4f00d272c5b91d004c7ce14169fc0af5209110..490edd292d92ba1163a9719fa28586701d133292 100644 (file)
--- a/snd_win.c
+++ b/snd_win.c
@@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "quakedef.h"
 #include "snd_main.h"
 #include <windows.h>
+#include <mmsystem.h>
 #include <dsound.h>
 
 extern HWND mainwindow;
@@ -37,7 +38,7 @@ HRESULT (WINAPI *pDirectSoundCreate)(GUID FAR *lpGUID, LPDIRECTSOUND FAR *lplpDS
 // DirectSound output: 64KB in 1 buffer
 #define SECONDARY_BUFFER_SIZE  (64 * 1024)
 
-typedef enum {SIS_SUCCESS, SIS_FAILURE, SIS_NOTAVAIL} sndinitstat;
+typedef enum sndinitstat_e {SIS_SUCCESS, SIS_FAILURE, SIS_NOTAVAIL} sndinitstat;
 
 static qboolean        wavonly;
 static qboolean        dsound_init;
@@ -397,6 +398,7 @@ sndinitstat SNDDMA_InitDirect (void)
        pDSBuf->lpVtbl->Play(pDSBuf, 0, 0, DSBPLAY_LOOPING);
 
        shm->samples = gSndBufSize / shm->format.width;
+       shm->sampleframes = shm->samples / shm->format.channels;
        shm->samplepos = 0;
        shm->buffer = (unsigned char *) lpData;
 
@@ -527,6 +529,7 @@ qboolean SNDDMA_InitWav (void)
        }
 
        shm->samples = gSndBufSize / shm->format.width;
+       shm->sampleframes = shm->samples / shm->format.channels;
        shm->samplepos = 0;
        shm->buffer = (unsigned char *) lpData;