gave names to nearly all structs and enums which should make for better C++ error...

[xonotic/darkplaces.git] / snd_win.c

diff --git a/snd_win.c b/snd_win.c
index 3a1de319e9f72115c43b5d64b7020b6c3f216c96..2752446fb9ba3c2e3c7373d22037ab1e36889733 100644 (file)
--- a/snd_win.c
+++ b/snd_win.c
@@ -37,12 +37,11 @@ HRESULT (WINAPI *pDirectSoundCreate)(GUID FAR *lpGUID, LPDIRECTSOUND FAR *lplpDS
 // DirectSound output: 64KB in 1 buffer
 #define SECONDARY_BUFFER_SIZE  (64 * 1024)
 
 // 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;
 static qboolean        wav_init;
 
 static qboolean        wavonly;
 static qboolean        dsound_init;
 static qboolean        wav_init;

-static qboolean        snd_firsttime = true, snd_isdirect, snd_iswave;

 static qboolean        primary_format_set;
 
 static int     snd_sent, snd_completed;
 static qboolean        primary_format_set;
 
 static int     snd_sent, snd_completed;


@@ -86,7 +85,7 @@ S_BlockSound
 void S_BlockSound (void)
 {
        // DirectSound takes care of blocking itself
 void S_BlockSound (void)
 {
        // DirectSound takes care of blocking itself

-       if (snd_iswave)
+       if (wav_init)

        {
                snd_blocked++;
 
        {
                snd_blocked++;
 


@@ -104,7 +103,7 @@ S_UnblockSound
 void S_UnblockSound (void)
 {
        // DirectSound takes care of blocking itself
 void S_UnblockSound (void)
 {
        // DirectSound takes care of blocking itself

-       if (snd_iswave)
+       if (wav_init)

                snd_blocked--;
 }
 
                snd_blocked--;
 }
 


@@ -218,7 +217,7 @@ sndinitstat SNDDMA_InitDirect (void)
 
                if (hInstDS == NULL)
                {
 
                if (hInstDS == NULL)
                {

-                       Con_SafePrint("Couldn't load dsound.dll\n");
+                       Con_Print("Couldn't load dsound.dll\n");

                        return SIS_FAILURE;
                }
 
                        return SIS_FAILURE;
                }
 


@@ -226,7 +225,7 @@ sndinitstat SNDDMA_InitDirect (void)
 
                if (!pDirectSoundCreate)
                {
 
                if (!pDirectSoundCreate)
                {

-                       Con_SafePrint("Couldn't get DS proc addr\n");
+                       Con_Print("Couldn't get DS proc addr\n");

                        return SIS_FAILURE;
                }
        }
                        return SIS_FAILURE;
                }
        }


@@ -235,7 +234,7 @@ sndinitstat SNDDMA_InitDirect (void)
        {
                if (hresult != DSERR_ALLOCATED)
                {
        {
                if (hresult != DSERR_ALLOCATED)
                {

-                       Con_SafePrint("DirectSound create failed\n");
+                       Con_Print("DirectSound create failed\n");

                        return SIS_FAILURE;
                }
 
                        return SIS_FAILURE;
                }
 


@@ -245,7 +244,7 @@ sndinitstat SNDDMA_InitDirect (void)
                                                "Sound not available",
                                                MB_RETRYCANCEL | MB_SETFOREGROUND | MB_ICONEXCLAMATION) != IDRETRY)
                {
                                                "Sound not available",
                                                MB_RETRYCANCEL | MB_SETFOREGROUND | MB_ICONEXCLAMATION) != IDRETRY)
                {

-                       Con_SafePrint("DirectSoundCreate failure\n  hardware already in use\n");
+                       Con_Print("DirectSoundCreate failure\n  hardware already in use\n");

                        return SIS_NOTAVAIL;
                }
        }
                        return SIS_NOTAVAIL;
                }
        }


@@ -254,19 +253,19 @@ sndinitstat SNDDMA_InitDirect (void)
 
        if (DS_OK != pDS->lpVtbl->GetCaps (pDS, &dscaps))
        {
 
        if (DS_OK != pDS->lpVtbl->GetCaps (pDS, &dscaps))
        {

-               Con_SafePrint("Couldn't get DS caps\n");
+               Con_Print("Couldn't get DS caps\n");

        }
 
        if (dscaps.dwFlags & DSCAPS_EMULDRIVER)
        {
        }
 
        if (dscaps.dwFlags & DSCAPS_EMULDRIVER)
        {

-               Con_SafePrint("No DirectSound driver installed\n");
+               Con_Print("No DirectSound driver installed\n");

                FreeSound ();
                return SIS_FAILURE;
        }
 
        if (DS_OK != pDS->lpVtbl->SetCooperativeLevel (pDS, mainwindow, DSSCL_EXCLUSIVE))
        {
                FreeSound ();
                return SIS_FAILURE;
        }
 
        if (DS_OK != pDS->lpVtbl->SetCooperativeLevel (pDS, mainwindow, DSSCL_EXCLUSIVE))
        {

-               Con_SafePrint("Set coop level failed\n");
+               Con_Print("Set coop level failed\n");

                FreeSound ();
                return SIS_FAILURE;
        }
                FreeSound ();
                return SIS_FAILURE;
        }


@@ -292,13 +291,11 @@ sndinitstat SNDDMA_InitDirect (void)
 
                        if (DS_OK != pDSPBuf->lpVtbl->SetFormat (pDSPBuf, &pformat))
                        {
 
                        if (DS_OK != pDSPBuf->lpVtbl->SetFormat (pDSPBuf, &pformat))
                        {

-                               if (snd_firsttime)
-                                       Con_SafePrint("Set primary sound buffer format: no\n");
+                               Con_Print("Set primary sound buffer format: no\n");

                        }
                        else
                        {
                        }
                        else
                        {

-                               if (snd_firsttime)
-                                       Con_SafePrint("Set primary sound buffer format: yes\n");
+                               Con_Print("Set primary sound buffer format: yes\n");

 
                                primary_format_set = true;
                        }
 
                                primary_format_set = true;
                        }


@@ -320,7 +317,7 @@ sndinitstat SNDDMA_InitDirect (void)
 
                if (DS_OK != pDS->lpVtbl->CreateSoundBuffer(pDS, &dsbuf, &pDSBuf, NULL))
                {
 
                if (DS_OK != pDS->lpVtbl->CreateSoundBuffer(pDS, &dsbuf, &pDSBuf, NULL))
                {

-                       Con_SafePrint("DS:CreateSoundBuffer Failed\n");
+                       Con_Print("DS:CreateSoundBuffer Failed\n");

                        FreeSound ();
                        return SIS_FAILURE;
                }
                        FreeSound ();
                        return SIS_FAILURE;
                }


@@ -331,19 +328,18 @@ sndinitstat SNDDMA_InitDirect (void)
 
                if (DS_OK != pDSBuf->lpVtbl->GetCaps (pDSBuf, &dsbcaps))
                {
 
                if (DS_OK != pDSBuf->lpVtbl->GetCaps (pDSBuf, &dsbcaps))
                {

-                       Con_SafePrint("DS:GetCaps failed\n");
+                       Con_Print("DS:GetCaps failed\n");

                        FreeSound ();
                        return SIS_FAILURE;
                }
 
                        FreeSound ();
                        return SIS_FAILURE;
                }
 

-               if (snd_firsttime)
-                       Con_SafePrint("Using secondary sound buffer\n");
+               Con_Print("Using secondary sound buffer\n");

        }
        else
        {
                if (DS_OK != pDS->lpVtbl->SetCooperativeLevel (pDS, mainwindow, DSSCL_WRITEPRIMARY))
                {
        }
        else
        {
                if (DS_OK != pDS->lpVtbl->SetCooperativeLevel (pDS, mainwindow, DSSCL_WRITEPRIMARY))
                {

-                       Con_SafePrint("Set coop level failed\n");
+                       Con_Print("Set coop level failed\n");

                        FreeSound ();
                        return SIS_FAILURE;
                }
                        FreeSound ();
                        return SIS_FAILURE;
                }


@@ -355,17 +351,16 @@ sndinitstat SNDDMA_InitDirect (void)
                }
 
                pDSBuf = pDSPBuf;
                }
 
                pDSBuf = pDSPBuf;

-               Con_SafePrint("Using primary sound buffer\n");
+               Con_Print("Using primary sound buffer\n");

        }
 
        // Make sure mixer is active
        pDSBuf->lpVtbl->Play(pDSBuf, 0, 0, DSBPLAY_LOOPING);
 
        }
 
        // Make sure mixer is active
        pDSBuf->lpVtbl->Play(pDSBuf, 0, 0, DSBPLAY_LOOPING);
 

-       if (snd_firsttime)
-               Con_SafePrintf("   %d channel(s)\n"
-                              "   %d bits/sample\n"
-                                          "   %d samples/sec\n",
-                                          shm->format.channels, shm->format.width * 8, shm->format.speed);
+       Con_Printf("   %d channel(s)\n"
+                      "   %d bits/sample\n"
+                                  "   %d samples/sec\n",
+                                  shm->format.channels, shm->format.width * 8, shm->format.speed);

 
        gSndBufSize = dsbcaps.dwBufferBytes;
 
 
        gSndBufSize = dsbcaps.dwBufferBytes;
 


@@ -376,14 +371,14 @@ sndinitstat SNDDMA_InitDirect (void)
        {
                if (hresult != DSERR_BUFFERLOST)
                {
        {
                if (hresult != DSERR_BUFFERLOST)
                {

-                       Con_SafePrint("SNDDMA_InitDirect: DS::Lock Sound Buffer Failed\n");
+                       Con_Print("SNDDMA_InitDirect: DS::Lock Sound Buffer Failed\n");

                        FreeSound ();
                        return SIS_FAILURE;
                }
 
                if (++reps > 10000)
                {
                        FreeSound ();
                        return SIS_FAILURE;
                }
 
                if (++reps > 10000)
                {

-                       Con_SafePrint("SNDDMA_InitDirect: DS: couldn't restore buffer\n");
+                       Con_Print("SNDDMA_InitDirect: DS: couldn't restore buffer\n");

                        FreeSound ();
                        return SIS_FAILURE;
                }
                        FreeSound ();
                        return SIS_FAILURE;
                }


@@ -453,7 +448,7 @@ qboolean SNDDMA_InitWav (void)
        {
                if (hr != MMSYSERR_ALLOCATED)
                {
        {
                if (hr != MMSYSERR_ALLOCATED)
                {

-                       Con_SafePrint("waveOutOpen failed\n");
+                       Con_Print("waveOutOpen failed\n");

                        return false;
                }
 
                        return false;
                }
 


@@ -463,7 +458,7 @@ qboolean SNDDMA_InitWav (void)
                                                "Sound not available",
                                                MB_RETRYCANCEL | MB_SETFOREGROUND | MB_ICONEXCLAMATION) != IDRETRY)
                {
                                                "Sound not available",
                                                MB_RETRYCANCEL | MB_SETFOREGROUND | MB_ICONEXCLAMATION) != IDRETRY)
                {

-                       Con_SafePrint("waveOutOpen failure;\n  hardware already in use\n");
+                       Con_Print("waveOutOpen failure;\n  hardware already in use\n");

                        return false;
                }
        }
                        return false;
                }
        }


@@ -477,14 +472,14 @@ qboolean SNDDMA_InitWav (void)
        hData = GlobalAlloc(GMEM_MOVEABLE | GMEM_SHARE, gSndBufSize);
        if (!hData)
        {
        hData = GlobalAlloc(GMEM_MOVEABLE | GMEM_SHARE, gSndBufSize);
        if (!hData)
        {

-               Con_SafePrint("Sound: Out of memory.\n");
+               Con_Print("Sound: Out of memory.\n");

                FreeSound ();
                return false;
        }
        lpData = GlobalLock(hData);
        if (!lpData)
        {
                FreeSound ();
                return false;
        }
        lpData = GlobalLock(hData);
        if (!lpData)
        {

-               Con_SafePrint("Sound: Failed to lock.\n");
+               Con_Print("Sound: Failed to lock.\n");

                FreeSound ();
                return false;
        }
                FreeSound ();
                return false;
        }


@@ -500,7 +495,7 @@ qboolean SNDDMA_InitWav (void)
 
        if (hWaveHdr == NULL)
        {
 
        if (hWaveHdr == NULL)
        {

-               Con_SafePrint("Sound: Failed to Alloc header.\n");
+               Con_Print("Sound: Failed to Alloc header.\n");

                FreeSound ();
                return false;
        }
                FreeSound ();
                return false;
        }


@@ -509,7 +504,7 @@ qboolean SNDDMA_InitWav (void)
 
        if (lpWaveHdr == NULL)
        {
 
        if (lpWaveHdr == NULL)
        {

-               Con_SafePrint("Sound: Failed to lock header.\n");
+               Con_Print("Sound: Failed to lock header.\n");

                FreeSound ();
                return false;
        }
                FreeSound ();
                return false;
        }


@@ -525,7 +520,7 @@ qboolean SNDDMA_InitWav (void)
                if (waveOutPrepareHeader(hWaveOut, lpWaveHdr+i, sizeof(WAVEHDR)) !=
                                MMSYSERR_NOERROR)
                {
                if (waveOutPrepareHeader(hWaveOut, lpWaveHdr+i, sizeof(WAVEHDR)) !=
                                MMSYSERR_NOERROR)
                {

-                       Con_SafePrint("Sound: failed to prepare wave headers\n");
+                       Con_Print("Sound: failed to prepare wave headers\n");

                        FreeSound ();
                        return false;
                }
                        FreeSound ();
                        return false;
                }


@@ -559,30 +554,20 @@ qboolean SNDDMA_Init(void)
        if (COM_CheckParm ("-wavonly"))
                wavonly = true;
 
        if (COM_CheckParm ("-wavonly"))
                wavonly = true;
 

-       dsound_init = wav_init = 0;
+       dsound_init = false;
+       wav_init = false;

 
        stat = SIS_FAILURE;     // assume DirectSound won't initialize
 
        // Init DirectSound
        if (!wavonly)
        {
 
        stat = SIS_FAILURE;     // assume DirectSound won't initialize
 
        // Init DirectSound
        if (!wavonly)
        {

-               if (snd_firsttime || snd_isdirect)
-               {
-                       stat = SNDDMA_InitDirect ();
+               stat = SNDDMA_InitDirect ();

 
 

-                       if (stat == SIS_SUCCESS)
-                       {
-                               snd_isdirect = true;
-
-                               if (snd_firsttime)
-                                       Con_SafePrint("DirectSound initialized\n");
-                       }
-                       else
-                       {
-                               snd_isdirect = false;
-                               Con_SafePrint("DirectSound failed to init\n");
-                       }
-               }
+               if (stat == SIS_SUCCESS)
+                       Con_Print("DirectSound initialized\n");
+               else
+                       Con_Print("DirectSound failed to init\n");

        }
 
        // if DirectSound didn't succeed in initializing, try to initialize
        }
 
        // if DirectSound didn't succeed in initializing, try to initialize


@@ -591,29 +576,16 @@ qboolean SNDDMA_Init(void)
        // to have sound)
        if (!dsound_init && (stat != SIS_NOTAVAIL))
        {
        // to have sound)
        if (!dsound_init && (stat != SIS_NOTAVAIL))
        {

-               if (snd_firsttime || snd_iswave)
-               {
-
-                       snd_iswave = SNDDMA_InitWav ();
-
-                       if (snd_iswave)
-                       {
-                               if (snd_firsttime)
-                                       Con_SafePrint("Wave sound initialized\n");
-                       }
-                       else
-                       {
-                               Con_SafePrint("Wave sound failed to init\n");
-                       }
-               }
+               if (SNDDMA_InitWav ())
+                       Con_Print("Wave sound initialized\n");
+               else
+                       Con_Print("Wave sound failed to init\n");

        }
 
        }
 

-       snd_firsttime = false;
-

        if (!dsound_init && !wav_init)
        if (!dsound_init && !wav_init)

-               return 0;
+               return false;

 
 

-       return 1;
+       return true;

 }
 
 /*
 }
 
 /*


@@ -676,6 +648,8 @@ void SNDDMA_Submit(void)
                return;
 
        paintpot += (paintedtime - prev_painted) * shm->format.channels * shm->format.width;
                return;
 
        paintpot += (paintedtime - prev_painted) * shm->format.channels * shm->format.width;

+       if (paintpot > WAV_BUFFERS * WAV_BUFFER_SIZE)
+               paintpot = WAV_BUFFERS * WAV_BUFFER_SIZE;

        prev_painted = paintedtime;
 
        // submit new sound blocks
        prev_painted = paintedtime;
 
        // submit new sound blocks


@@ -693,7 +667,7 @@ void SNDDMA_Submit(void)
 
                if (wResult != MMSYSERR_NOERROR)
                {
 
                if (wResult != MMSYSERR_NOERROR)
                {

-                       Con_SafePrint("Failed to write block to device\n");
+                       Con_Print("Failed to write block to device\n");

                        FreeSound ();
                        return;
                }
                        FreeSound ();
                        return;
                }


@@ -714,10 +688,12 @@ void SNDDMA_Shutdown(void)
        FreeSound ();
 }
 
        FreeSound ();
 }
 

-DWORD dsound_dwSize;
-DWORD dsound_dwSize2;
-DWORD *dsound_pbuf;
-DWORD *dsound_pbuf2;
+
+static DWORD dsound_dwSize;
+static DWORD dsound_dwSize2;
+static DWORD *dsound_pbuf;
+static DWORD *dsound_pbuf2;
+

 void *S_LockBuffer(void)
 {
        int reps;
 void *S_LockBuffer(void)
 {
        int reps;


@@ -758,8 +734,10 @@ void *S_LockBuffer(void)
                }
                return dsound_pbuf;
        }
                }
                return dsound_pbuf;
        }

-       else
+       else if (wav_init)

                return shm->buffer;
                return shm->buffer;

+       else
+               return NULL;

 }
 
 void S_UnlockBuffer(void)
 }
 
 void S_UnlockBuffer(void)