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 = (qbyte *)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);
+ Con_Printf("Sound format: %dHz, %d bit, %d channels\n", shm->format.speed,
+ shm->format.width * 8, shm->format.channels);
}
void S_Shutdown(void)
return NULL;
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, qboolean force)
{
+ unsigned int i;
+
// Never free a locked sfx unless forced
if (!force && (sfx->locks > 0 || (sfx->flags & SFXFLAG_PERMANENTLOCK)))
return;
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);
}
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 >= cl_max_entities)
+ if (entnum && entnum >= cl_max_entities)
CL_ExpandEntities(entnum);
// Pick a channel to play on
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
memset(channels, 0, MAX_CHANNELS * sizeof(channel_t));
// Clear sound buffer
- pbuf = S_LockBuffer();
+ pbuf = (unsigned char *)S_LockBuffer();
if (pbuf != NULL)
{
int setsize = shm->samples * shm->format.width;
{
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;