new commands: prvm_edictget, prvm_globalget - read values from edicts/globals into...

[xonotic/darkplaces.git] / snd_win.c

diff --git a/snd_win.c b/snd_win.c
index 2313e41938a3da2e2a0e53178407b60901006ea5..1228bd7f1c069b6450682931a7ccf139d8324c1a 100644 (file)
--- a/snd_win.c
+++ b/snd_win.c
@@ -237,7 +237,7 @@ static sndinitstat SndSys_InitDirectSound (const snd_format_t* requested)
                        return SIS_FAILURE;
                }
 
-               pDirectSoundCreate = (void *)GetProcAddress(hInstDS,"DirectSoundCreate");
+               pDirectSoundCreate = (HRESULT (__stdcall *)(GUID *, LPDIRECTSOUND *,IUnknown *))GetProcAddress(hInstDS,"DirectSoundCreate");
 
                if (!pDirectSoundCreate)
                {
@@ -473,7 +473,7 @@ static qboolean SndSys_InitMmsystem (const snd_format_t* requested)
                SndSys_Shutdown ();
                return false;
        }
-       lpData = GlobalLock(hData);
+       lpData = (HPSTR)GlobalLock(hData);
        if (!lpData)
        {
                Con_Print("Sound: Failed to lock.\n");
@@ -737,8 +737,6 @@ Returns the number of sample frames consumed since the sound started
 unsigned int SndSys_GetSoundTime (void)
 {
        unsigned int factor;
-       MMRESULT res;
-       MMTIME mmtime;
 
        factor = snd_renderbuffer->format.width * snd_renderbuffer->format.channels;
 
@@ -779,12 +777,15 @@ unsigned int SndSys_GetSoundTime (void)
                /*
                 * S_PaintAndSubmit: WARNING: newsoundtime (soundtime (275 < 134217707)
                 * apparently this sound time wraps quite early?
+               {
+               MMRESULT res;
+               MMTIME mmtime;
 
                mmtime.wType = TIME_SAMPLES;
                res = waveOutGetPosition(hWaveOut, &mmtime, sizeof(mmtime));
                if(res == MMSYSERR_NOERROR)
                        return mmtime.u.sample;
-
+               }
                */
        }