X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=snd_main.c;h=fafb23c1b6220b8f87d86dddc6b4ab9e11d7b195;hp=779d4b7a7d7cf0eff9509c54bbd3fa47a06b5eec;hb=56a3c771e738f95464663eff324789b647ef7481;hpb=02d044f26538be1307e6b240d9504ad5b9193680

diff --git a/snd_main.c b/snd_main.c
index 779d4b7a..fafb23c1 100644
--- a/snd_main.c
+++ b/snd_main.c
@@ -31,8 +31,6 @@ void S_Play2(void);
 void S_SoundList(void);
 void S_Update_();
 
-void S_ClearBuffer (void);
-
 
 // =======================================================================
 // Internal sound data & structures
@@ -89,6 +87,9 @@ const char* ambient_names [2] = { "sound/ambience/water1.wav", "sound/ambience/w
 // Functions
 // ====================================================================
 
+void S_FreeSfx (sfx_t *sfx, qboolean force);
+
+
 void S_SoundInfo_f(void)
 {
 	if (!sound_started)
@@ -139,9 +140,8 @@ void S_Startup(void)
 
 	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)
@@ -219,6 +219,27 @@ void S_Init(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
 // =======================================================================
@@ -236,9 +257,11 @@ sfx_t *S_FindName (const char *name)
 	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)
@@ -249,6 +272,7 @@ sfx_t *S_FindName (const char *name)
 	sfx = 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;
 
@@ -262,10 +286,12 @@ S_FreeSfx
 
 ==================
 */
-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);
@@ -284,11 +310,20 @@ void S_FreeSfx (sfx_t *sfx)
 				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);
 }
 
@@ -302,6 +337,7 @@ S_ServerSounds
 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
@@ -342,16 +378,10 @@ void S_ServerSounds (char serversound [][MAX_QPATH], unsigned int numsounds)
 	}
 
 	// 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);
 	}
 }
 
@@ -483,12 +513,10 @@ void SND_Spatialize(channel_t *ch, qboolean isstatic)
 	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
@@ -501,6 +529,7 @@ void SND_Spatialize(channel_t *ch, qboolean isstatic)
 		// 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
@@ -550,7 +579,7 @@ int S_StartSound (int entnum, int entchannel, sfx_t *sfx, vec3_t origin, float f
 {
 	channel_t *target_chan, *check;
 	int		ch_idx;
-	size_t	skip;
+	int		skip;
 
 	if (!sound_started || !sfx || nosound.integer)
 		return -1;
@@ -560,6 +589,9 @@ int S_StartSound (int entnum, int entchannel, sfx_t *sfx, vec3_t origin, float f
 		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)
@@ -581,8 +613,8 @@ int S_StartSound (int entnum, int entchannel, sfx_t *sfx, vec3_t origin, float f
 		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;
@@ -608,9 +640,9 @@ void S_StopChannel (unsigned int channel_ind)
 
 		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
@@ -968,7 +1000,7 @@ static void S_Play_Common(float fvol, float attenuation)
 
 			// 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;
 		}
@@ -1001,7 +1033,7 @@ void S_SoundList(void)
 	{
 		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' : ' ',
@@ -1038,7 +1070,7 @@ qboolean S_LocalSound (const char *sound)
 	// 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;