X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=snd_dma.c;h=24525fee956237fd4e42020ca014fe6a4f33c2ba;hp=6be221abc0b89178702adcba44e22485de8a3abe;hb=49efc53510842f29eccbc160e1aa56c17e575468;hpb=0cbb44e2f44f2107585e42ab0b4dde618c49b560 diff --git a/snd_dma.c b/snd_dma.c index 6be221ab..24525fee 100644 --- a/snd_dma.c +++ b/snd_dma.c @@ -22,9 +22,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "quakedef.h" #ifdef _WIN32 -#include "winquake.h" +#include +#include +extern DWORD gSndBufSize; +extern LPDIRECTSOUND pDS; +extern LPDIRECTSOUNDBUFFER pDSBuf; #endif +#include "snd_ogg.h" + + void S_Play(void); void S_PlayVol(void); void S_Play2(void); @@ -38,20 +45,21 @@ void S_StopAllSoundsC(void); // ======================================================================= channel_t channels[MAX_CHANNELS]; -int total_channels; +unsigned int total_channels; int snd_blocked = 0; static qboolean snd_ambient = 1; -qboolean snd_initialized = false; +cvar_t snd_initialized = { CVAR_READONLY, "snd_initialized", "0"}; +cvar_t snd_streaming = { CVAR_SAVE, "snd_streaming", "1"}; // pointer should go away volatile dma_t *shm = 0; volatile dma_t sn; -vec3_t listener_origin; -vec3_t listener_forward; -vec3_t listener_right; -vec3_t listener_up; +vec3_t listener_vieworigin; +vec3_t listener_viewforward; +vec3_t listener_viewleft; +vec3_t listener_viewup; vec_t sound_nominal_clip_dist=1000.0; mempool_t *snd_mempool; @@ -115,46 +123,92 @@ void S_SoundInfo_f(void) { if (!sound_started || !shm) { - Con_Printf ("sound system not started\n"); + Con_Print("sound system not started\n"); return; } - Con_Printf("%5d stereo\n", shm->channels - 1); + Con_Printf("%5d stereo\n", shm->format.channels - 1); Con_Printf("%5d samples\n", shm->samples); Con_Printf("%5d samplepos\n", shm->samplepos); - Con_Printf("%5d samplebits\n", shm->samplebits); - Con_Printf("%5d submission_chunk\n", shm->submission_chunk); - Con_Printf("%5d speed\n", shm->speed); + Con_Printf("%5d samplebits\n", shm->format.width * 8); + Con_Printf("%5d speed\n", shm->format.speed); Con_Printf("0x%x dma buffer\n", shm->buffer); - Con_Printf("%5d total_channels\n", total_channels); + Con_Printf("%5u total_channels\n", total_channels); } +void S_UnloadSounds(void) +{ + int i; + for (i = 0;i < num_sfx;i++) + S_UnloadSound(known_sfx + i); +} -/* -================ -S_Startup -================ -*/ -void S_Startup (void) +void S_LoadSounds(void) { - int rc; + int i; + for (i = 0;i < num_sfx;i++) + S_LoadSound(known_sfx + i, false); +} - if (!snd_initialized) +void S_Startup(void) +{ + if (!snd_initialized.integer) return; - if (!fakedma) - { - rc = SNDDMA_Init(); + shm = &sn; + memset((void *)shm, 0, sizeof(*shm)); + +// create a piece of DMA memory - if (!rc) + if (fakedma) + { + shm->format.width = 2; + shm->format.speed = 22050; + shm->format.channels = 2; + shm->samples = 32768; + shm->samplepos = 0; + shm->buffer = Mem_Alloc(snd_mempool, shm->format.channels * shm->samples * shm->format.width); + } + else + { + if (!SNDDMA_Init()) { - Con_Printf("S_Startup: SNDDMA_Init failed.\n"); + Con_Print("S_Startup: SNDDMA_Init failed.\n"); sound_started = 0; + shm = NULL; return; } } sound_started = 1; + + Con_DPrintf("Sound sampling rate: %i\n", shm->format.speed); + + //S_LoadSounds(); + + S_StopAllSounds(true); +} + +void S_Shutdown(void) +{ + if (!sound_started) + return; + + //S_UnloadSounds(); + + if (fakedma) + Mem_Free(shm->buffer); + else + SNDDMA_Shutdown(); + + shm = NULL; + sound_started = 0; +} + +void S_Restart_f(void) +{ + S_Shutdown(); + S_Startup(); } /* @@ -162,9 +216,9 @@ void S_Startup (void) S_Init ================ */ -void S_Init (void) +void S_Init(void) { - Con_DPrintf("\nSound Initialization\n"); + Con_DPrint("\nSound Initialization\n"); S_RawSamples_ClearQueue(); @@ -186,9 +240,12 @@ void S_Init (void) Cmd_AddCommand("stopsound", S_StopAllSoundsC); Cmd_AddCommand("soundlist", S_SoundList); Cmd_AddCommand("soundinfo", S_SoundInfo_f); + Cmd_AddCommand("snd_restart", S_Restart_f); Cvar_RegisterVariable(&nosound); Cvar_RegisterVariable(&snd_precache); + Cvar_RegisterVariable(&snd_initialized); + Cvar_RegisterVariable(&snd_streaming); Cvar_RegisterVariable(&bgmbuffer); Cvar_RegisterVariable(&ambient_level); Cvar_RegisterVariable(&ambient_fade); @@ -197,69 +254,52 @@ void S_Init (void) Cvar_RegisterVariable(&_snd_mixahead); Cvar_RegisterVariable(&snd_swapstereo); // LordHavoc: for people with backwards sound wiring - snd_initialized = true; + Cvar_SetValueQuick(&snd_initialized, true); known_sfx = Mem_Alloc(snd_mempool, MAX_SFX*sizeof(sfx_t)); num_sfx = 0; - S_Startup (); - SND_InitScaletable (); -// create a piece of DMA memory - - if (fakedma) - { - shm = (void *) Mem_Alloc(snd_mempool, sizeof(*shm)); - shm->splitbuffer = 0; - shm->samplebits = 16; - shm->speed = 22050; - shm->channels = 2; - shm->samples = 32768; - shm->samplepos = 0; - shm->soundalive = true; - shm->gamealive = true; - shm->submission_chunk = 1; - shm->buffer = Mem_Alloc(snd_mempool, shm->channels * shm->samples * (shm->samplebits / 8)); - } - - if (!sound_started) - return; - - Con_DPrintf ("Sound sampling rate: %i\n", shm->speed); - - // provides a tick sound until washed clean - ambient_sfx[AMBIENT_WATER] = S_PrecacheSound ("ambience/water1.wav", false); ambient_sfx[AMBIENT_SKY] = S_PrecacheSound ("ambience/wind2.wav", false); - S_StopAllSounds (true); + total_channels = MAX_DYNAMIC_CHANNELS + NUM_AMBIENTS; // no statics + memset(channels, 0, MAX_CHANNELS * sizeof(channel_t)); + + OGG_OpenLibrary (); } // ======================================================================= -// Shutdown sound engine +// Load a sound // ======================================================================= -void S_Shutdown(void) +/* +========= +S_GetCached + +========= +*/ +sfx_t *S_GetCached (const char *name) { - if (!sound_started) - return; + int i; - if (shm) - shm->gamealive = 0; + if (!snd_initialized.integer) + return NULL; - shm = 0; - sound_started = 0; + if (!name) + Host_Error("S_IsCached: NULL\n"); - if (!fakedma) - SNDDMA_Shutdown(); -} + if (strlen(name) >= MAX_QPATH) + Host_Error("Sound name too long: %s", name); + for(i = 0;i < num_sfx;i++) + if(!strcmp(known_sfx[i].name, name)) + return &known_sfx[i]; -// ======================================================================= -// Load a sound -// ======================================================================= + return NULL; +} /* ================== @@ -272,11 +312,14 @@ sfx_t *S_FindName (char *name) int i; sfx_t *sfx; + if (!snd_initialized.integer) + return NULL; + if (!name) - Host_Error ("S_FindName: NULL\n"); + Host_Error("S_FindName: NULL\n"); if (strlen(name) >= MAX_QPATH) - Host_Error ("Sound name too long: %s", name); + Host_Error("Sound name too long: %s", name); // see if already loaded for (i = 0;i < num_sfx;i++) @@ -284,14 +327,11 @@ sfx_t *S_FindName (char *name) return &known_sfx[i]; if (num_sfx == MAX_SFX) - Sys_Error ("S_FindName: out of sfx_t"); + Sys_Error("S_FindName: out of sfx_t"); - sfx = &known_sfx[i]; + sfx = &known_sfx[num_sfx++]; memset(sfx, 0, sizeof(*sfx)); - strcpy (sfx->name, name); - - num_sfx++; - + strlcpy (sfx->name, name, sizeof (sfx->name)); return sfx; } @@ -304,14 +344,53 @@ S_TouchSound */ void S_TouchSound (char *name) { - sfx_t *sfx; - - if (!sound_started) - return; + sfx_t *sfx; sfx = S_FindName (name); + + // Set the "used" flag for this sound + if (sfx != NULL) + sfx->flags |= SFXFLAG_USED; +} + + +/* +================== +S_ClearUsed + +Reset the "used" flag of all precached sounds +================== +*/ +void S_ClearUsed (void) +{ + int i; + + for (i = 0; i < num_sfx; i++) + known_sfx[i].flags &= ~SFXFLAG_USED; +} + + +/* +================== +S_PurgeUnused + +Free all precached sounds without the "used" flag +================== +*/ +void S_PurgeUnused (void) +{ + int i; + sfx_t *sfx; + + for (i = 0; i < num_sfx; i++) + { + sfx = &known_sfx[i]; + if (! (sfx->flags & SFXFLAG_USED)) + S_UnloadSound (sfx); + } } + /* ================== S_PrecacheSound @@ -322,14 +401,13 @@ sfx_t *S_PrecacheSound (char *name, int complain) { sfx_t *sfx; - if (!sound_started || nosound.integer) + if (!snd_initialized.integer) return NULL; - sfx = S_FindName (name); + sfx = S_FindName(name); -// cache it in - if (snd_precache.integer) - S_LoadSound (sfx, complain); + if (!nosound.integer && snd_precache.integer) + S_LoadSound(sfx, complain); return sfx; } @@ -340,6 +418,8 @@ sfx_t *S_PrecacheSound (char *name, int complain) /* ================= SND_PickChannel + +Picks a channel based on priorities, empty slots, number of channels ================= */ channel_t *SND_PickChannel(int entnum, int entchannel) @@ -347,27 +427,34 @@ channel_t *SND_PickChannel(int entnum, int entchannel) int ch_idx; int first_to_die; int life_left; + channel_t* ch; // Check for replacement sound, or find the best one to replace first_to_die = -1; life_left = 0x7fffffff; for (ch_idx=NUM_AMBIENTS ; ch_idx < NUM_AMBIENTS + MAX_DYNAMIC_CHANNELS ; ch_idx++) { + ch = &channels[ch_idx]; if (entchannel != 0 // channel 0 never overrides - && channels[ch_idx].entnum == entnum - && (channels[ch_idx].entchannel == entchannel || entchannel == -1) ) + && ch->entnum == entnum + && (ch->entchannel == entchannel || entchannel == -1) ) { // always override sound from same entity first_to_die = ch_idx; break; } // don't let monster sounds override player sounds - if (channels[ch_idx].entnum == cl.viewentity && entnum != cl.viewentity && channels[ch_idx].sfx) + if (ch->entnum == cl.viewentity && entnum != cl.viewentity && ch->sfx) + continue; + + // don't override looped sounds + if ((ch->flags & CHANNELFLAG_FORCELOOP) != 0 || + (ch->sfx != NULL && ch->sfx->loopstart >= 0)) continue; - if (channels[ch_idx].end - paintedtime < life_left) + if (ch->end - paintedtime < life_left) { - life_left = channels[ch_idx].end - paintedtime; + life_left = ch->end - paintedtime; first_to_die = ch_idx; } } @@ -384,15 +471,14 @@ channel_t *SND_PickChannel(int entnum, int entchannel) /* ================= SND_Spatialize + +Spatializes a channel ================= */ void SND_Spatialize(channel_t *ch, int isstatic) { - vec_t dot; - vec_t dist; - vec_t lscale, rscale, scale; + vec_t dist, scale, pan; vec3_t source_vec; - sfx_t *snd; // anything coming from the view entity will always be full volume // LordHavoc: make sounds with ATTN_NONE have no spatialization @@ -408,39 +494,20 @@ void SND_Spatialize(channel_t *ch, int isstatic) { //Con_Printf("-- entnum %i origin %f %f %f neworigin %f %f %f\n", ch->entnum, ch->origin[0], ch->origin[1], ch->origin[2], cl_entities[ch->entnum].state_current.origin[0], cl_entities[ch->entnum].state_current.origin[1], cl_entities[ch->entnum].state_current.origin[2]); VectorCopy(cl_entities[ch->entnum].state_current.origin, ch->origin); - if (cl_entities[ch->entnum].state_current.modelindex && cl.model_precache[cl_entities[ch->entnum].state_current.modelindex]->brush.TraceBox) + if (cl_entities[ch->entnum].state_current.modelindex && cl.model_precache[cl_entities[ch->entnum].state_current.modelindex]->soundfromcenter) VectorMAMAM(1.0f, ch->origin, 0.5f, cl.model_precache[cl_entities[ch->entnum].state_current.modelindex]->normalmins, 0.5f, cl.model_precache[cl_entities[ch->entnum].state_current.modelindex]->normalmaxs, ch->origin); } // calculate stereo seperation and distance attenuation - snd = ch->sfx; - VectorSubtract(ch->origin, listener_origin, source_vec); - - dist = VectorNormalizeLength(source_vec) * ch->dist_mult; - - dot = DotProduct(listener_right, source_vec); - - if (shm->channels == 1) - { - rscale = 1.0; - lscale = 1.0; - } - else - { - rscale = 1.0 + dot; - lscale = 1.0 - dot; - } - - // add in distance effect - scale = (1.0 - dist) * rscale; - ch->rightvol = (int) (ch->master_vol * scale); - if (ch->rightvol < 0) - ch->rightvol = 0; - - scale = (1.0 - dist) * lscale; - ch->leftvol = (int) (ch->master_vol * scale); - if (ch->leftvol < 0) - ch->leftvol = 0; + VectorSubtract(ch->origin, listener_vieworigin, source_vec); + dist = VectorNormalizeLength(source_vec); + // distance + scale = ch->master_vol * (1.0 - (dist * ch->dist_mult)); + // panning + pan = scale * DotProduct(listener_viewleft, source_vec); + // calculate the volumes + ch->leftvol = (int) (scale + pan); + ch->rightvol = (int) (scale - pan); } // LordHavoc: allow adjusting volume of static sounds @@ -449,6 +516,10 @@ void SND_Spatialize(channel_t *ch, int isstatic) ch->leftvol *= snd_staticvolume.value; ch->rightvol *= snd_staticvolume.value; } + + // clamp volumes + ch->leftvol = bound(0, ch->leftvol, 255); + ch->rightvol = bound(0, ch->rightvol, 255); } @@ -459,18 +530,11 @@ void SND_Spatialize(channel_t *ch, int isstatic) void S_StartSound(int entnum, int entchannel, sfx_t *sfx, vec3_t origin, float fvol, float attenuation) { channel_t *target_chan, *check; - sfxcache_t *sc; int vol; int ch_idx; - int skip; + size_t skip; - if (!sound_started) - return; - - if (!sfx) - return; - - if (nosound.integer) + if (!sound_started || !sfx || !sfx->fetcher || nosound.integer) return; vol = fvol*255; @@ -482,13 +546,6 @@ void S_StartSound(int entnum, int entchannel, sfx_t *sfx, vec3_t origin, float f // spatialize memset (target_chan, 0, sizeof(*target_chan)); - /* - if (cls.state == ca_connected && entnum > 0 && cl_entities[entnum].state_current.active) - { - target_chan.follow = true; - VectorSubtract(origin, cl_entities[entnum].state_current.origin, target_chan.followoriginoffset); - } - */ VectorCopy(origin, target_chan->origin); target_chan->dist_mult = attenuation / sound_nominal_clip_dist; target_chan->master_vol = vol; @@ -496,20 +553,22 @@ void S_StartSound(int entnum, int entchannel, sfx_t *sfx, vec3_t origin, float f target_chan->entchannel = entchannel; SND_Spatialize(target_chan, false); - if (!target_chan->leftvol && !target_chan->rightvol) - return; // not audible at all + // LordHavoc: spawn the sound anyway because the player might teleport to it + //if (!target_chan->leftvol && !target_chan->rightvol) + // return; // not audible at all -// new channel - sc = S_LoadSound (sfx, true); - if (!sc) + // new channel + if (!S_LoadSound (sfx, true)) { target_chan->sfx = NULL; return; // couldn't load the sound's data } target_chan->sfx = sfx; + target_chan->flags = CHANNELFLAG_NONE; target_chan->pos = 0.0; - target_chan->end = paintedtime + sc->length; + target_chan->end = paintedtime + sfx->total_length; + target_chan->lastptime = paintedtime; // if an identical sound has also been started this frame, offset the pos // a bit to keep it from just making the first one louder @@ -521,16 +580,15 @@ void S_StartSound(int entnum, int entchannel, sfx_t *sfx, vec3_t origin, float f if (check->sfx == sfx && !check->pos) { // LordHavoc: fixed skip calculations - skip = 0.1 * shm->speed; - if (skip > sc->length) - skip = sc->length; + skip = 0.1 * sfx->format.speed; + if (skip > sfx->total_length) + skip = sfx->total_length; if (skip > 0) skip = rand() % skip; target_chan->pos += skip; target_chan->end -= skip; break; } - } } @@ -552,33 +610,26 @@ void S_StopSound(int entnum, int entchannel) void S_StopAllSounds(qboolean clear) { - if (!sound_started) - return; - total_channels = MAX_DYNAMIC_CHANNELS + NUM_AMBIENTS; // no statics memset(channels, 0, MAX_CHANNELS * sizeof(channel_t)); if (clear) - S_ClearBuffer (); + S_ClearBuffer(); } -void S_StopAllSoundsC (void) +void S_StopAllSoundsC(void) { - S_StopAllSounds (true); + S_StopAllSounds(true); } -void S_ClearBuffer (void) +void S_ClearBuffer(void) { int clear; -#ifdef _WIN32 - if (!sound_started || !shm || (!shm->buffer && !pDSBuf)) -#else - if (!sound_started || !shm || !shm->buffer) -#endif + if (!sound_started || !shm) return; - if (shm->samplebits == 8) + if (shm->format.width == 1) clear = 0x80; else clear = 0; @@ -593,36 +644,37 @@ void S_ClearBuffer (void) reps = 0; - while ((hresult = pDSBuf->lpVtbl->Lock(pDSBuf, 0, gSndBufSize, &pData, &dwSize, NULL, NULL, 0)) != DS_OK) + while ((hresult = pDSBuf->lpVtbl->Lock(pDSBuf, 0, gSndBufSize, (LPVOID*)&pData, &dwSize, NULL, NULL, 0)) != DS_OK) { if (hresult != DSERR_BUFFERLOST) { - Con_Printf ("S_ClearBuffer: DS::Lock Sound Buffer Failed\n"); + Con_Print("S_ClearBuffer: DS::Lock Sound Buffer Failed\n"); S_Shutdown (); return; } if (++reps > 10000) { - Con_Printf ("S_ClearBuffer: DS: couldn't restore buffer\n"); + Con_Print("S_ClearBuffer: DS: couldn't restore buffer\n"); S_Shutdown (); return; } } - memset(pData, clear, shm->samples * shm->samplebits/8); + memset(pData, clear, shm->samples * shm->format.width); pDSBuf->lpVtbl->Unlock(pDSBuf, pData, dwSize, NULL, 0); } else #endif + if (shm->buffer) { - int setsize = shm->samples * shm->samplebits / 8; + int setsize = shm->samples * shm->format.width; char *buf = shm->buffer; while (setsize--) - *buf++ = 0; + *buf++ = clear; // on i586/i686 optimized versions of glibc, glibc *wrongly* IMO, // reads the memory area before writing to it causing a seg fault @@ -640,32 +692,31 @@ S_StaticSound void S_StaticSound (sfx_t *sfx, vec3_t origin, float vol, float attenuation) { channel_t *ss; - sfxcache_t *sc; if (!sfx) return; if (total_channels == MAX_CHANNELS) { - Con_Printf ("total_channels == MAX_CHANNELS\n"); + Con_Print("total_channels == MAX_CHANNELS\n"); return; } - sc = S_LoadSound (sfx, true); - if (!sc) + if (!S_LoadSound (sfx, true)) return; - if (sc->loopstart == -1) + if (sfx->loopstart == -1) Con_DPrintf("Quake compatibility warning: Static sound \"%s\" is not looped\n", sfx->name); ss = &channels[total_channels++]; memset(ss, 0, sizeof(*ss)); - ss->forceloop = true; + ss->flags = CHANNELFLAG_FORCELOOP; ss->sfx = sfx; VectorCopy (origin, ss->origin); ss->master_vol = vol; ss->dist_mult = (attenuation/64) / sound_nominal_clip_dist; - ss->end = paintedtime + sc->length; + ss->end = paintedtime + sfx->total_length; + ss->lastptime = paintedtime; SND_Spatialize (ss, true); } @@ -692,15 +743,16 @@ void S_UpdateAmbientSounds (void) if (!snd_ambient || ambient_level.value <= 0 || !cl.worldmodel || !cl.worldmodel->brush.AmbientSoundLevelsForPoint) return; - cl.worldmodel->brush.AmbientSoundLevelsForPoint(cl.worldmodel, listener_origin, ambientlevels, sizeof(ambientlevels)); + cl.worldmodel->brush.AmbientSoundLevelsForPoint(cl.worldmodel, listener_vieworigin, ambientlevels, sizeof(ambientlevels)); // calc ambient sound levels for (ambient_channel = 0 ; ambient_channel< NUM_AMBIENTS ; ambient_channel++) { - if (ambient_sfx[ambient_channel] && ambient_sfx[ambient_channel]->silentlymissing) + if (ambient_sfx[ambient_channel] && + (ambient_sfx[ambient_channel]->flags & SFXFLAG_SILENTLYMISSING)) continue; chan = &channels[ambient_channel]; - chan->forceloop = true; + chan->flags |= CHANNELFLAG_FORCELOOP; chan->sfx = ambient_sfx[ambient_channel]; vol = ambient_level.value * ambientlevels[ambient_channel]; @@ -733,20 +785,18 @@ S_Update Called once each time through the main loop ============ */ -void S_Update(vec3_t origin, vec3_t forward, vec3_t right, vec3_t up) +void S_Update(vec3_t origin, vec3_t forward, vec3_t left, vec3_t up) { - int i, j; - int total; - channel_t *ch; - channel_t *combine; + unsigned int i, j, total; + channel_t *ch, *combine; - if (!sound_started || (snd_blocked > 0)) + if (!snd_initialized.integer || (snd_blocked > 0)) return; - VectorCopy(origin, listener_origin); - VectorCopy(forward, listener_forward); - VectorCopy(right, listener_right); - VectorCopy(up, listener_up); + VectorCopy(origin, listener_vieworigin); + VectorCopy(forward, listener_viewforward); + VectorCopy(left, listener_viewleft); + VectorCopy(up, listener_viewup); // update general area ambient sound sources S_UpdateAmbientSounds (); @@ -808,7 +858,7 @@ void S_Update(vec3_t origin, vec3_t forward, vec3_t right, vec3_t up) if (ch->sfx && (ch->leftvol || ch->rightvol) ) total++; - Con_Printf ("----(%i)----\n", total); + Con_Printf("----(%u)----\n", total); } // mix some sound @@ -822,16 +872,12 @@ void GetSoundtime(void) static int oldsamplepos; int fullsamples; - fullsamples = shm->samples / shm->channels; + fullsamples = shm->samples / shm->format.channels; // it is possible to miscount buffers if it has wrapped twice between // calls to S_Update. Oh well. -#ifdef __sun__ - soundtime = SNDDMA_GetSamples(); -#else samplepos = SNDDMA_GetDMAPos(); - if (samplepos < oldsamplepos) { buffers++; // buffer wrapped @@ -845,8 +891,7 @@ void GetSoundtime(void) } oldsamplepos = samplepos; - soundtime = buffers*fullsamples + samplepos/shm->channels; -#endif + soundtime = buffers * fullsamples + samplepos / shm->format.channels; } void IN_Accumulate (void); @@ -879,8 +924,8 @@ void S_Update_(void) paintedtime = soundtime; // mix ahead of current position - endtime = soundtime + _snd_mixahead.value * shm->speed; - samps = shm->samples >> (shm->channels-1); + endtime = soundtime + _snd_mixahead.value * shm->format.speed; + samps = shm->samples >> (shm->format.channels - 1); if (endtime > (unsigned int)(soundtime + samps)) endtime = soundtime + samps; @@ -891,8 +936,8 @@ void S_Update_(void) if (pDSBuf) { - if (pDSBuf->lpVtbl->GetStatus (pDSBuf, &dwStatus) != DD_OK) - Con_Printf ("Couldn't get sound buffer status\n"); + if (pDSBuf->lpVtbl->GetStatus (pDSBuf, &dwStatus) != DS_OK) + Con_Print("Couldn't get sound buffer status\n"); if (dwStatus & DSBSTATUS_BUFFERLOST) pDSBuf->lpVtbl->Restore (pDSBuf); @@ -916,7 +961,7 @@ console functions =============================================================================== */ -void S_Play(void) +static void S_Play_Common(float fvol, float attenuation) { int i; char name[256]; @@ -926,86 +971,56 @@ void S_Play(void) while (isfxcache; - if (!sc) - continue; - size = sc->length*sc->width*(sc->stereo+1); - total += size; - if (sc->loopstart >= 0) - Con_Printf ("L"); - else - Con_Printf (" "); - Con_Printf("(%2db) %6i : %s\n",sc->width*8, size, sfx->name); + if (sfx->fetcher != NULL) + { + size = sfx->mempool->totalsize; + total += size; + Con_Printf("%c(%2db) %7i : %s\n", sfx->loopstart >= 0 ? 'L' : ' ', sfx->format.width * 8, size, sfx->name); + } } - Con_Printf ("Total resident: %i\n", total); + Con_Printf("Total resident: %i\n", total); } @@ -1013,40 +1028,23 @@ void S_LocalSound (char *sound) { sfx_t *sfx; - if (nosound.integer) - return; - if (!sound_started) + if (!snd_initialized.integer || nosound.integer) return; sfx = S_PrecacheSound (sound, true); if (!sfx) { - Con_Printf ("S_LocalSound: can't precache %s\n", sound); + Con_Printf("S_LocalSound: can't precache %s\n", sound); return; } S_StartSound (cl.viewentity, -1, sfx, vec3_origin, 1, 1); } -void S_ClearPrecache (void) -{ -} - - -void S_BeginPrecaching (void) -{ -} - - -void S_EndPrecaching (void) -{ -} - - #define RAWSAMPLESBUFFER 32768 short s_rawsamplesbuffer[RAWSAMPLESBUFFER * 2]; int s_rawsamplesbuffer_start; -int s_rawsamplesbuffer_count; +size_t s_rawsamplesbuffer_count; void S_RawSamples_Enqueue(short *samples, unsigned int length) { @@ -1068,7 +1066,8 @@ void S_RawSamples_Enqueue(short *samples, unsigned int length) void S_RawSamples_Dequeue(int *samples, unsigned int length) { - int b1, b2, l; + int b1, b2; + size_t l; int i; short *in; int *out; @@ -1112,7 +1111,7 @@ void S_RawSamples_ClearQueue(void) int S_RawSamples_QueueWantsMore(void) { - if (s_rawsamplesbuffer_count < min(shm->speed >> 1, RAWSAMPLESBUFFER >> 1)) + if (shm != NULL && s_rawsamplesbuffer_count < min(shm->format.speed >> 1, RAWSAMPLESBUFFER >> 1)) return RAWSAMPLESBUFFER - s_rawsamplesbuffer_count; else return 0; @@ -1150,5 +1149,6 @@ void S_ResampleBuffer16Stereo(short *input, int inputlength, short *output, int int S_RawSamples_SampleRate(void) { - return shm != NULL ? shm->speed : 0; + return shm != NULL ? shm->format.speed : 0; } +