Cleaned up alot more memory leaks. (still get 720 leaks just running demo1.dem)

[xonotic/darkplaces.git] / snd_win.c

diff --git a/snd_win.c b/snd_win.c
index 3a1de319e9f72115c43b5d64b7020b6c3f216c96..8197b256342316136c3ae4017d2eb8347bc279c8 100644 (file)
--- a/snd_win.c
+++ b/snd_win.c
@@ -218,7 +218,7 @@ sndinitstat SNDDMA_InitDirect (void)
 
                if (hInstDS == NULL)
                {
-                       Con_SafePrint("Couldn't load dsound.dll\n");
+                       Con_Print("Couldn't load dsound.dll\n");
                        return SIS_FAILURE;
                }
 
@@ -226,7 +226,7 @@ sndinitstat SNDDMA_InitDirect (void)
 
                if (!pDirectSoundCreate)
                {
-                       Con_SafePrint("Couldn't get DS proc addr\n");
+                       Con_Print("Couldn't get DS proc addr\n");
                        return SIS_FAILURE;
                }
        }
@@ -235,7 +235,7 @@ sndinitstat SNDDMA_InitDirect (void)
        {
                if (hresult != DSERR_ALLOCATED)
                {
-                       Con_SafePrint("DirectSound create failed\n");
+                       Con_Print("DirectSound create failed\n");
                        return SIS_FAILURE;
                }
 
@@ -245,7 +245,7 @@ sndinitstat SNDDMA_InitDirect (void)
                                                "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;
                }
        }
@@ -254,19 +254,19 @@ sndinitstat SNDDMA_InitDirect (void)
 
        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)
        {
-               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))
        {
-               Con_SafePrint("Set coop level failed\n");
+               Con_Print("Set coop level failed\n");
                FreeSound ();
                return SIS_FAILURE;
        }
@@ -293,12 +293,12 @@ sndinitstat SNDDMA_InitDirect (void)
                        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
                        {
                                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;
                        }
@@ -320,7 +320,7 @@ sndinitstat SNDDMA_InitDirect (void)
 
                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;
                }
@@ -331,19 +331,19 @@ sndinitstat SNDDMA_InitDirect (void)
 
                if (DS_OK != pDSBuf->lpVtbl->GetCaps (pDSBuf, &dsbcaps))
                {
-                       Con_SafePrint("DS:GetCaps failed\n");
+                       Con_Print("DS:GetCaps failed\n");
                        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))
                {
-                       Con_SafePrint("Set coop level failed\n");
+                       Con_Print("Set coop level failed\n");
                        FreeSound ();
                        return SIS_FAILURE;
                }
@@ -355,14 +355,14 @@ sndinitstat SNDDMA_InitDirect (void)
                }
 
                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);
 
        if (snd_firsttime)
-               Con_SafePrintf("   %d channel(s)\n"
+               Con_Printf("   %d channel(s)\n"
                               "   %d bits/sample\n"
                                           "   %d samples/sec\n",
                                           shm->format.channels, shm->format.width * 8, shm->format.speed);
@@ -376,14 +376,14 @@ sndinitstat SNDDMA_InitDirect (void)
        {
                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)
                {
-                       Con_SafePrint("SNDDMA_InitDirect: DS: couldn't restore buffer\n");
+                       Con_Print("SNDDMA_InitDirect: DS: couldn't restore buffer\n");
                        FreeSound ();
                        return SIS_FAILURE;
                }
@@ -453,7 +453,7 @@ qboolean SNDDMA_InitWav (void)
        {
                if (hr != MMSYSERR_ALLOCATED)
                {
-                       Con_SafePrint("waveOutOpen failed\n");
+                       Con_Print("waveOutOpen failed\n");
                        return false;
                }
 
@@ -463,7 +463,7 @@ qboolean SNDDMA_InitWav (void)
                                                "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;
                }
        }
@@ -477,14 +477,14 @@ qboolean SNDDMA_InitWav (void)
        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)
        {
-               Con_SafePrint("Sound: Failed to lock.\n");
+               Con_Print("Sound: Failed to lock.\n");
                FreeSound ();
                return false;
        }
@@ -500,7 +500,7 @@ qboolean SNDDMA_InitWav (void)
 
        if (hWaveHdr == NULL)
        {
-               Con_SafePrint("Sound: Failed to Alloc header.\n");
+               Con_Print("Sound: Failed to Alloc header.\n");
                FreeSound ();
                return false;
        }
@@ -509,7 +509,7 @@ qboolean SNDDMA_InitWav (void)
 
        if (lpWaveHdr == NULL)
        {
-               Con_SafePrint("Sound: Failed to lock header.\n");
+               Con_Print("Sound: Failed to lock header.\n");
                FreeSound ();
                return false;
        }
@@ -525,7 +525,7 @@ qboolean SNDDMA_InitWav (void)
                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;
                }
@@ -575,12 +575,12 @@ qboolean SNDDMA_Init(void)
                                snd_isdirect = true;
 
                                if (snd_firsttime)
-                                       Con_SafePrint("DirectSound initialized\n");
+                                       Con_Print("DirectSound initialized\n");
                        }
                        else
                        {
                                snd_isdirect = false;
-                               Con_SafePrint("DirectSound failed to init\n");
+                               Con_Print("DirectSound failed to init\n");
                        }
                }
        }
@@ -599,11 +599,11 @@ qboolean SNDDMA_Init(void)
                        if (snd_iswave)
                        {
                                if (snd_firsttime)
-                                       Con_SafePrint("Wave sound initialized\n");
+                                       Con_Print("Wave sound initialized\n");
                        }
                        else
                        {
-                               Con_SafePrint("Wave sound failed to init\n");
+                               Con_Print("Wave sound failed to init\n");
                        }
                }
        }
@@ -693,7 +693,7 @@ void SNDDMA_Submit(void)
 
                if (wResult != MMSYSERR_NOERROR)
                {
-                       Con_SafePrint("Failed to write block to device\n");
+                       Con_Print("Failed to write block to device\n");
                        FreeSound ();
                        return;
                }