// =======================================================================
channel_t channels[MAX_CHANNELS];
-int total_channels;
+unsigned int total_channels;
int snd_blocked = 0;
static qboolean snd_ambient = 1;
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;
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 speed\n", shm->speed);
- Con_Printf("0x%x dma buffer\n", shm->buffer);
- Con_Printf("%5d total_channels\n", total_channels);
+ Con_Printf("%5d samplebits\n", shm->format.width * 8);
+ Con_Printf("%5d speed\n", shm->format.speed);
+ Con_Printf("%p dma buffer\n", shm->buffer);
+ Con_Printf("%5u total_channels\n", total_channels);
}
void S_UnloadSounds(void)
if (fakedma)
{
- shm->samplebits = 16;
- shm->speed = 22050;
- shm->channels = 2;
+ 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->channels * shm->samples * (shm->samplebits / 8));
+ shm->buffer = Mem_Alloc(snd_mempool, shm->format.channels * shm->samples * shm->format.width);
}
else
{
sound_started = 1;
- Con_DPrintf("Sound sampling rate: %i\n", shm->speed);
+ Con_DPrintf("Sound sampling rate: %i\n", shm->format.speed);
//S_LoadSounds();
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);
sfx = &known_sfx[num_sfx++];
memset(sfx, 0, sizeof(*sfx));
- strncpy(sfx->name, name, sizeof(sfx->name));
+ strlcpy (sfx->name, name, sizeof (sfx->name));
return sfx;
}
/*
=================
SND_PickChannel
+
+Picks a channel based on priorities, empty slots, number of channels
=================
*/
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;
}
}
/*
=================
SND_Spatialize
+
+Spatializes a channel
=================
*/
void SND_Spatialize(channel_t *ch, int isstatic)
// Start a sound effect
// =======================================================================
-void S_StartSound(int entnum, int entchannel, sfx_t *sfx, vec3_t origin, float fvol, float attenuation)
+int 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 || !sfx || !sfx->sfxcache || nosound.integer)
- return;
+ if (!sound_started || !sfx || !sfx->fetcher || nosound.integer)
+ return -1;
vol = fvol*255;
// pick a channel to play on
target_chan = SND_PickChannel(entnum, entchannel);
if (!target_chan)
- return;
+ return -1;
// spatialize
memset (target_chan, 0, sizeof(*target_chan));
//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
+ return -1; // 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
if (check->sfx == sfx && !check->pos)
{
// LordHavoc: fixed skip calculations
- skip = 0.1 * sc->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;
break;
}
}
+
+ return (target_chan - channels);
}
-void S_StopSound(int entnum, int entchannel)
+void S_StopChannel (unsigned int channel_ind)
{
- int i;
+ channel_t *ch;
+
+ if (channel_ind >= total_channels)
+ return;
- for (i=0 ; i<MAX_DYNAMIC_CHANNELS ; i++)
+ ch = &channels[channel_ind];
+ if (ch->sfx != NULL)
{
- if (channels[i].entnum == entnum
- && channels[i].entchannel == entchannel)
+ if (ch->sfx->fetcher != NULL)
{
- channels[i].end = 0;
- channels[i].sfx = NULL;
- return;
+ snd_fetcher_end_t fetcher_end = ch->sfx->fetcher->end;
+ if (fetcher_end != NULL)
+ fetcher_end (ch);
}
+ ch->sfx = NULL;
}
+ ch->end = 0;
+}
+
+void S_PauseChannel (unsigned int channel_ind, qboolean toggle)
+{
+ if (toggle)
+ channels[channel_ind].flags |= CHANNELFLAG_PAUSED;
+ else
+ channels[channel_ind].flags &= ~CHANNELFLAG_PAUSED;
+}
+
+void S_LoopChannel (unsigned int channel_ind, qboolean toggle)
+{
+ if (toggle)
+ channels[channel_ind].flags |= CHANNELFLAG_FORCELOOP;
+ else
+ channels[channel_ind].flags &= ~CHANNELFLAG_FORCELOOP;
+}
+
+void S_StopSound(int entnum, int entchannel)
+{
+ unsigned int i;
+
+ for (i = 0; i < MAX_DYNAMIC_CHANNELS; i++)
+ if (channels[i].entnum == entnum && channels[i].entchannel == entchannel)
+ {
+ S_StopChannel (i);
+ return;
+ }
}
void S_StopAllSounds(qboolean clear)
{
+ unsigned int i;
+
+ for (i = 0; i < total_channels; i++)
+ S_StopChannel (i);
+
total_channels = MAX_DYNAMIC_CHANNELS + NUM_AMBIENTS; // no statics
memset(channels, 0, MAX_CHANNELS * sizeof(channel_t));
S_StopAllSounds(true);
}
+void S_PauseGameSounds (void)
+{
+ unsigned int i;
+
+ for (i = 0; i < total_channels; i++)
+ {
+ channel_t *ch;
+
+ ch = &channels[i];
+ if (ch->sfx != NULL && ! (ch->flags & CHANNELFLAG_LOCALSOUND))
+ ch->flags |= CHANNELFLAG_PAUSED;
+ }
+}
+
+void S_ResumeGameSounds (void)
+{
+ unsigned int i;
+
+ for (i = 0; i < total_channels; i++)
+ {
+ channel_t *ch;
+
+ ch = &channels[i];
+ if (ch->sfx != NULL && ! (ch->flags & CHANNELFLAG_LOCALSOUND))
+ ch->flags &= ~CHANNELFLAG_PAUSED;
+ }
+}
+
+void S_SetChannelVolume (unsigned int ch_ind, float fvol)
+{
+ channels[ch_ind].master_vol = fvol * 255;
+}
+
+
void S_ClearBuffer(void)
{
int clear;
if (!sound_started || !shm)
return;
- if (shm->samplebits == 8)
+ if (shm->format.width == 1)
clear = 0x80;
else
clear = 0;
}
}
- memset(pData, clear, shm->samples * shm->samplebits/8);
+ memset(pData, clear, shm->samples * shm->format.width);
pDSBuf->lpVtbl->Unlock(pDSBuf, pData, dwSize, NULL, 0);
#endif
if (shm->buffer)
{
- int setsize = shm->samples * shm->samplebits / 8;
+ int setsize = shm->samples * shm->format.width;
char *buf = shm->buffer;
while (setsize--)
void S_StaticSound (sfx_t *sfx, vec3_t origin, float vol, float attenuation)
{
channel_t *ss;
- sfxcache_t *sc;
if (!sfx)
return;
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);
}
(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];
*/
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 (!snd_initialized.integer || (snd_blocked > 0))
return;
if (ch->sfx && (ch->leftvol || ch->rightvol) )
total++;
- Con_Printf("----(%i)----\n", total);
+ Con_Printf("----(%u)----\n", total);
}
// mix some sound
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.
}
oldsamplepos = samplepos;
- soundtime = buffers*fullsamples + samplepos/shm->channels;
+ soundtime = buffers * fullsamples + samplepos / shm->format.channels;
}
void IN_Accumulate (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;
static void S_Play_Common(float fvol, float attenuation)
{
- int i;
+ int i, ch_ind;
char name[256];
sfx_t *sfx;
else
i++;
- S_StartSound(-1, 0, sfx, listener_vieworigin, fvol, attenuation);
+ ch_ind = S_StartSound(-1, 0, sfx, listener_vieworigin, fvol, attenuation);
+ if (ch_ind >= 0)
+ channels[ch_ind].flags |= CHANNELFLAG_LOCALSOUND;
}
}
{
int i;
sfx_t *sfx;
- sfxcache_t *sc;
int size, total;
total = 0;
for (sfx=known_sfx, i=0 ; i<num_sfx ; i++, sfx++)
{
- sc = sfx->sfxcache;
- if (sc)
+ if (sfx->fetcher != NULL)
{
- size = sc->length*sc->width*(sc->stereo+1);
+ size = sfx->mempool->totalsize;
total += size;
- Con_Printf("%c(%2db) %6i : %s\n", sc->loopstart >= 0 ? 'L' : ' ',sc->width*8, size, sfx->name);
+ Con_Printf ("%c%c(%2db, %6s) %8i : %s\n",
+ (sfx->loopstart >= 0) ? 'L' : ' ',
+ (sfx->flags & SFXFLAG_STREAMED) ? 'S' : ' ',
+ sfx->format.width * 8,
+ (sfx->format.channels == 2) ? "stereo" : "mono",
+ size,
+ sfx->name);
}
}
Con_Printf("Total resident: %i\n", total);
void S_LocalSound (char *sound)
{
sfx_t *sfx;
+ int ch_ind;
if (!snd_initialized.integer || nosound.integer)
return;
Con_Printf("S_LocalSound: can't precache %s\n", sound);
return;
}
- S_StartSound (cl.viewentity, -1, sfx, vec3_origin, 1, 1);
+
+ ch_ind = S_StartSound (cl.viewentity, -1, sfx, vec3_origin, 1, 1);
+ if (ch_ind >= 0)
+ channels[ch_ind].flags |= CHANNELFLAG_LOCALSOUND;
}
#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)
{
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;
int S_RawSamples_QueueWantsMore(void)
{
- if (shm != NULL && 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;
int S_RawSamples_SampleRate(void)
{
- return shm != NULL ? shm->speed : 0;
+ return shm != NULL ? shm->format.speed : 0;
}
projects / xonotic / darkplaces.git / blobdiff