void S_SoundList(void);
void S_Update_();
-void S_ClearBuffer (void);
-
// =======================================================================
// Internal sound data & structures
vec_t sound_nominal_clip_dist=1000.0;
mempool_t *snd_mempool;
-// sample PAIRS
int soundtime;
int paintedtime;
-
// Linked list of known sfx
sfx_t *known_sfx = NULL;
// Functions
// ====================================================================
+void S_FreeSfx (sfx_t *sfx, qboolean force);
+
+
void S_SoundInfo_f(void)
{
- if (!sound_started || !shm)
+ if (!sound_started)
{
Con_Print("sound system not started\n");
return;
shm->format.channels = 2;
shm->samples = 32768;
shm->samplepos = 0;
- shm->buffer = Mem_Alloc(snd_mempool, shm->format.channels * shm->samples * shm->format.width);
+ shm->buffer = (unsigned char *)Mem_Alloc(snd_mempool, shm->format.channels * shm->samples * shm->format.width);
}
else
{
sound_started = true;
- Con_DPrintf("Sound sampling rate: %i\n", shm->format.speed);
-
- S_StopAllSounds ();
+ Con_Printf("Sound format: %dHz, %d bit, %d channels\n", shm->format.speed,
+ shm->format.width * 8, shm->format.channels);
}
void S_Shutdown(void)
}
+/*
+================
+S_Terminate
+
+Shutdown and free all resources
+================
+*/
+void S_Terminate (void)
+{
+ S_Shutdown ();
+ OGG_CloseLibrary ();
+
+ // Free all SFXs
+ while (known_sfx != NULL)
+ S_FreeSfx (known_sfx, true);
+
+ Cvar_SetValueQuick (&snd_initialized, false);
+ Mem_FreePool (&snd_mempool);
+}
+
+
// =======================================================================
// Load a sound
// =======================================================================
if (!snd_initialized.integer)
return NULL;
- // Add the default sound directory to the path
if (strlen (name) >= sizeof (sfx->name))
- Host_Error ("S_FindName: sound name too long (%s)", name);
+ {
+ Con_Printf ("S_FindName: sound name too long (%s)", name);
+ return NULL;
+ }
// Look for this sound in the list of known sfx
for (sfx = known_sfx; sfx != NULL; sfx = sfx->next)
return sfx;
// Add a sfx_t struct for this sound
- sfx = Mem_Alloc (snd_mempool, sizeof (*sfx));
+ sfx = (sfx_t *)Mem_Alloc (snd_mempool, sizeof (*sfx));
memset (sfx, 0, sizeof(*sfx));
strlcpy (sfx->name, name, sizeof (sfx->name));
+ sfx->memsize = sizeof(*sfx);
sfx->next = known_sfx;
known_sfx = sfx;
==================
*/
-void S_FreeSfx (sfx_t *sfx)
+void S_FreeSfx (sfx_t *sfx, qboolean force)
{
- // Never free a locked sfx
- if (sfx->locks > 0 || (sfx->flags & SFXFLAG_PERMANENTLOCK))
+ unsigned int i;
+
+ // Never free a locked sfx unless forced
+ if (!force && (sfx->locks > 0 || (sfx->flags & SFXFLAG_PERMANENTLOCK)))
return;
Con_DPrintf ("S_FreeSfx: freeing %s\n", sfx->name);
break;
}
if (prev_sfx == NULL)
- Sys_Error ("S_FreeSfx: Can't find SFX %s in the list!\n", sfx->name);
+ {
+ Con_Printf ("S_FreeSfx: Can't find SFX %s in the list!\n", sfx->name);
+ return;
+ }
}
+ // Stop all channels using this sfx
+ for (i = 0; i < total_channels; i++)
+ if (channels[i].sfx == sfx)
+ S_StopChannel (i);
+
// Free it
- Mem_FreePool (&sfx->mempool);
+ if (sfx->fetcher != NULL && sfx->fetcher->free != NULL)
+ sfx->fetcher->free (sfx);
Mem_Free (sfx);
}
void S_ServerSounds (char serversound [][MAX_QPATH], unsigned int numsounds)
{
sfx_t *sfx;
+ sfx_t *sfxnext;
unsigned int i;
// Start the ambient sounds and make them loop
channels[i].sfx = ambient_sfxs[i];
channels[i].flags |= CHANNELFLAG_FORCELOOP;
+ channels[i].master_vol = 0;
}
}
}
// Free all unlocked sfx
- sfx = known_sfx;
- while (sfx != NULL)
+ for (sfx = known_sfx;sfx;sfx = sfxnext)
{
- sfx_t* crtsfx;
-
- // We may lose the "next" pointer after S_FreeSfx
- crtsfx = sfx;
- sfx = sfx->next;
-
- S_FreeSfx (crtsfx);
+ sfxnext = sfx->next;
+ S_FreeSfx (sfx, false);
}
}
else
{
// update sound origin if we know about the entity
- if (ch->entnum > 0 && cls.state == ca_connected && cl_entities[ch->entnum].state_current.active)
+ if (ch->entnum > 0 && cls.state == ca_connected && cl_entities[ch->entnum].render.model)
{
- //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] && 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);
+ //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].persistent.trail_origin[0], cl_entities[ch->entnum].persistent.trail_origin[1], cl_entities[ch->entnum].persistent.trail_origin[2]);
+ VectorCopy(cl_entities[ch->entnum].persistent.trail_origin, ch->origin);
}
// calculate stereo seperation and distance attenuation
// calculate the volumes
ch->leftvol = (int) (scale + pan);
ch->rightvol = (int) (scale - pan);
+ //Con_Printf("%f %f %f:%f %f %f:%f %f:%d %d\n", ch->origin[0], ch->origin[1], ch->origin[2], source_vec[0], source_vec[1], source_vec[2], scale, pan, ch->leftvol, ch->rightvol);
}
// Adjust volume of static sounds
{
channel_t *target_chan, *check;
int ch_idx;
- size_t skip;
+ int skip;
if (!sound_started || !sfx || nosound.integer)
return -1;
return -1;
}
+ if (entnum && entnum >= cl_max_entities)
+ CL_ExpandEntities(entnum);
+
// Pick a channel to play on
target_chan = SND_PickChannel(entnum, entchannel);
if (!target_chan)
if (check->sfx == sfx && !check->pos)
{
skip = 0.1 * sfx->format.speed;
- if (skip > sfx->total_length)
- skip = sfx->total_length;
+ if (skip > (int)sfx->total_length)
+ skip = (int)sfx->total_length;
if (skip > 0)
skip = rand() % skip;
target_chan->pos += skip;
if (sfx->fetcher != NULL)
{
- snd_fetcher_end_t fetcher_end = sfx->fetcher->end;
- if (fetcher_end != NULL)
- fetcher_end (ch);
+ snd_fetcher_endsb_t fetcher_endsb = sfx->fetcher->endsb;
+ if (fetcher_endsb != NULL)
+ fetcher_endsb (ch);
}
// Remove the lock it holds
void S_StopAllSounds (void)
{
unsigned int i;
+ unsigned char *pbuf;
+
+ if (!sound_started)
+ return;
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_ClearBuffer ();
+ // Clear sound buffer
+ pbuf = (unsigned char *)S_LockBuffer();
+ if (pbuf != NULL)
+ {
+ int setsize = shm->samples * shm->format.width;
+ int clear = (shm->format.width == 1) ? 0x80 : 0;
+
+ // FIXME: is it (still) true? (check with OSS and ALSA)
+ // on i586/i686 optimized versions of glibc, glibc *wrongly* IMO,
+ // reads the memory area before writing to it causing a seg fault
+ // since the memory is PROT_WRITE only and not PROT_READ|PROT_WRITE
+ //memset(shm->buffer, clear, shm->samples * shm->format.width);
+ while (setsize--)
+ *pbuf++ = clear;
+
+ S_UnlockBuffer ();
+ }
}
void S_PauseGameSounds (qboolean toggle)
}
-void S_ClearBuffer(void)
-{
- int clear;
- unsigned char *pbuf;
-
- if (!sound_started || !shm)
- return;
-
- if (shm->format.width == 1)
- clear = 0x80; // 8 bit sound (unsigned)
- else
- clear = 0; // 16 bit sound (signed)
-
- pbuf = S_LockBuffer();
- if (pbuf != NULL)
- {
- int setsize = shm->samples * shm->format.width;
-
- while (setsize--)
- *pbuf++ = clear;
-
- // on i586/i686 optimized versions of glibc, glibc *wrongly* IMO,
- // reads the memory area before writing to it causing a seg fault
- // since the memory is PROT_WRITE only and not PROT_READ|PROT_WRITE
- //memset(shm->buffer, clear, shm->samples * shm->format.width);
-
- S_UnlockBuffer ();
- }
-}
-
-
/*
=================
S_StaticSound
float vol;
int ambient_channel;
channel_t *chan;
- qbyte ambientlevels[NUM_AMBIENTS];
-
- // Mute ambient sounds until proven otherwise
- for (ambient_channel = 0 ; ambient_channel < NUM_AMBIENTS;ambient_channel++)
- channels[ambient_channel].master_vol = 0;
+ unsigned char ambientlevels[NUM_AMBIENTS];
if (ambient_level.value <= 0 || !cl.worldmodel || !cl.worldmodel->brush.AmbientSoundLevelsForPoint)
return;
for (ambient_channel = 0 ; ambient_channel< NUM_AMBIENTS ; ambient_channel++)
{
chan = &channels[ambient_channel];
- if (chan->sfx == NULL || (chan->sfx->flags & SFXFLAG_FILEMISSING))
+ if (chan->sfx == NULL || chan->sfx->fetcher == NULL)
continue;
vol = ambient_level.value * ambientlevels[ambient_channel];
// Free the sfx if the file didn't exist
if (ch_ind < 0)
- S_FreeSfx (sfx);
+ S_FreeSfx (sfx, false);
else
channels[ch_ind].flags |= CHANNELFLAG_LOCALSOUND;
}
{
if (sfx->fetcher != NULL)
{
- size = sfx->mempool->totalsize;
+ size = (int)sfx->memsize;
total += size;
Con_Printf ("%c%c%c%c(%2db, %6s) %8i : %s\n",
(sfx->loopstart >= 0) ? 'L' : ' ',
// Local sounds must not be freed
sfx->flags |= SFXFLAG_PERMANENTLOCK;
- ch_ind = S_StartSound (cl.viewentity, 0, sfx, vec3_origin, 1, 1);
+ ch_ind = S_StartSound (cl.viewentity, 0, sfx, vec3_origin, 1, 0);
if (ch_ind < 0)
return false;
projects / xonotic / darkplaces.git / blobdiff