This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details.
void S_Play(void);
void S_PlayVol(void);
+void S_Play2(void);
void S_SoundList(void);
void S_Update_();
void S_StopAllSounds(qboolean clear);
// Internal sound data & structures
// =======================================================================
-channel_t channels[MAX_CHANNELS];
-int total_channels;
+channel_t channels[MAX_CHANNELS];
+int total_channels;
-int snd_blocked = 0;
-static qboolean snd_ambient = 1;
-qboolean snd_initialized = false;
+int snd_blocked = 0;
+static qboolean snd_ambient = 1;
+qboolean snd_initialized = false;
// pointer should go away
-volatile dma_t *shm = 0;
+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;
-vec_t sound_nominal_clip_dist=1000.0;
+vec3_t listener_origin;
+vec3_t listener_forward;
+vec3_t listener_right;
+vec3_t listener_up;
+vec_t sound_nominal_clip_dist=1000.0;
+mempool_t *snd_mempool;
-int soundtime; // sample PAIRS
-int paintedtime; // sample PAIRS
+// sample PAIRS
+int soundtime;
+int paintedtime;
//LordHavoc: increased the client sound limit from 512 to 4096 for the Nehahra movie
-#define MAX_SFX 4096
-sfx_t *known_sfx; // hunk allocated [MAX_SFX]
-int num_sfx;
+#define MAX_SFX 4096
+sfx_t *known_sfx; // allocated [MAX_SFX]
+int num_sfx;
-sfx_t *ambient_sfx[NUM_AMBIENTS];
+sfx_t *ambient_sfx[NUM_AMBIENTS];
int sound_started = 0;
-// FIXME: make bgmvolume/volume always be registered for sake of config saving, and add check for whether sound is enabled to menu
cvar_t bgmvolume = {CVAR_SAVE, "bgmvolume", "1"};
cvar_t volume = {CVAR_SAVE, "volume", "0.7"};
cvar_t nosound = {0, "nosound", "0"};
cvar_t precache = {0, "precache", "1"};
-//cvar_t loadas8bit = {0, "loadas8bit", "0"};
cvar_t bgmbuffer = {0, "bgmbuffer", "4096"};
cvar_t ambient_level = {0, "ambient_level", "0.3"};
cvar_t ambient_fade = {0, "ambient_fade", "100"};
Con_Printf ("sound system not started\n");
return;
}
-
- Con_Printf("%5d stereo\n", shm->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("0x%x dma buffer\n", shm->buffer);
+
+ Con_Printf("%5d stereo\n", shm->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("0x%x dma buffer\n", shm->buffer);
Con_Printf("%5d total_channels\n", total_channels);
}
S_Startup
================
*/
-
void S_Startup (void)
{
- int rc;
+ int rc;
if (!snd_initialized)
return;
sound_started = 1;
}
-
-void S_Play2(void);
-
-mempool_t *snd_mempool;
-
/*
================
S_Init
{
Con_Printf("\nSound Initialization\n");
- if (COM_CheckParm("-nosound"))
+ S_RawSamples_ClearQueue();
+
+ Cvar_RegisterVariable(&volume);
+ Cvar_RegisterVariable(&bgmvolume);
+
+ if (COM_CheckParm("-nosound") || COM_CheckParm("-safe"))
return;
snd_mempool = Mem_AllocPool("sound");
Cmd_AddCommand("soundinfo", S_SoundInfo_f);
Cvar_RegisterVariable(&nosound);
- Cvar_RegisterVariable(&volume);
Cvar_RegisterVariable(&precache);
-// Cvar_RegisterVariable(&loadas8bit);
- Cvar_RegisterVariable(&bgmvolume);
Cvar_RegisterVariable(&bgmbuffer);
Cvar_RegisterVariable(&ambient_level);
Cvar_RegisterVariable(&ambient_fade);
Cvar_RegisterVariable(&_snd_mixahead);
Cvar_RegisterVariable(&snd_swapstereo); // LordHavoc: for people with backwards sound wiring
- /*
- if (host_parms.memsize < 0x800000)
- {
- Cvar_Set ("loadas8bit", "1");
- Con_Printf ("loading all sounds as 8bit\n");
- }
- */
-
-
-
snd_initialized = true;
known_sfx = Mem_Alloc(snd_mempool, MAX_SFX*sizeof(sfx_t));
// provides a tick sound until washed clean
-// if (shm->buffer)
-// shm->buffer[4] = shm->buffer[5] = 0x7f; // force a pop for debugging
-
- ambient_sfx[AMBIENT_WATER] = S_PrecacheSound ("ambience/water1.wav");
- ambient_sfx[AMBIENT_SKY] = S_PrecacheSound ("ambience/wind2.wav");
+ ambient_sfx[AMBIENT_WATER] = S_PrecacheSound ("ambience/water1.wav", false);
+ ambient_sfx[AMBIENT_SKY] = S_PrecacheSound ("ambience/wind2.wav", false);
S_StopAllSounds (true);
}
*/
sfx_t *S_FindName (char *name)
{
- int i;
- sfx_t *sfx;
+ int i;
+ sfx_t *sfx;
if (!name)
Host_Error ("S_FindName: NULL\n");
Host_Error ("Sound name too long: %s", name);
// see if already loaded
- for (i=0 ; i < num_sfx ; i++)
+ for (i = 0;i < num_sfx;i++)
if (!strcmp(known_sfx[i].name, name))
- {
return &known_sfx[i];
- }
if (num_sfx == MAX_SFX)
Sys_Error ("S_FindName: out of sfx_t");
-
+
sfx = &known_sfx[i];
strcpy (sfx->name, name);
num_sfx++;
-
+
return sfx;
}
==================
*/
-sfx_t *S_PrecacheSound (char *name)
+sfx_t *S_PrecacheSound (char *name, int complain)
{
- sfx_t *sfx;
+ sfx_t *sfx;
if (!sound_started || nosound.integer)
return NULL;
// cache it in
if (precache.integer)
- S_LoadSound (sfx);
+ S_LoadSound (sfx, complain);
return sfx;
}
return; // not audible at all
// new channel
- sc = S_LoadSound (sfx);
+ sc = S_LoadSound (sfx, true);
if (!sc)
{
target_chan->sfx = NULL;
else
#endif
{
- memset(shm->buffer, clear, shm->samples * shm->samplebits/8);
+ int setsize = shm->samples * shm->samplebits / 8;
+ char *buf = shm->buffer;
+
+ while (setsize--)
+ *buf++ = 0;
+
+// 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->samplebits/8);
}
}
ss = &channels[total_channels];
total_channels++;
- sc = S_LoadSound (sfx);
+ sc = S_LoadSound (sfx, true);
if (!sc)
return;
continue;
}
}
-
-
}
//
ch = channels;
for (i=0 ; i<total_channels; i++, ch++)
if (ch->sfx && (ch->leftvol || ch->rightvol) )
- {
- //Con_Printf ("%3i %3i %s\n", ch->leftvol, ch->rightvol, ch->sfx->name);
total++;
- }
Con_Printf ("----(%i)----\n", total);
}
// check to make sure that we haven't overshot
if (paintedtime < soundtime)
- {
- //Con_Printf ("S_Update_ : overflow\n");
paintedtime = soundtime;
- }
// mix ahead of current position
endtime = soundtime + _snd_mixahead.value * shm->speed;
}
else
strcpy(name, Cmd_Argv(i));
- sfx = S_PrecacheSound(name);
+ sfx = S_PrecacheSound(name, true);
S_StartSound(hash++, 0, sfx, listener_origin, 1.0, 1.0);
i++;
}
}
else
strcpy(name, Cmd_Argv(i));
- sfx = S_PrecacheSound(name);
+ sfx = S_PrecacheSound(name, true);
S_StartSound(hash++, 0, sfx, listener_origin, 1.0, 0.0);
i++;
}
}
else
strcpy(name, Cmd_Argv(i));
- sfx = S_PrecacheSound(name);
+ sfx = S_PrecacheSound(name, true);
vol = atof(Cmd_Argv(i+1));
S_StartSound(hash++, 0, sfx, listener_origin, vol, 1.0);
i+=2;
if (!sound_started)
return;
- sfx = S_PrecacheSound (sound);
+ sfx = S_PrecacheSound (sound, true);
if (!sfx)
{
Con_Printf ("S_LocalSound: can't precache %s\n", sound);
{
}
+
+#define RAWSAMPLESBUFFER 32768
+short s_rawsamplesbuffer[RAWSAMPLESBUFFER * 2];
+int s_rawsamplesbuffer_start;
+int s_rawsamplesbuffer_count;
+
+void S_RawSamples_Enqueue(short *samples, unsigned int length)
+{
+ int b2, b3;
+ //Con_Printf("S_RawSamples_Enqueue: %i samples\n", length);
+ if (s_rawsamplesbuffer_count + length > RAWSAMPLESBUFFER)
+ return;
+ b2 = (s_rawsamplesbuffer_start + s_rawsamplesbuffer_count) % RAWSAMPLESBUFFER;
+ if (b2 + length > RAWSAMPLESBUFFER)
+ {
+ b3 = (b2 + length) % RAWSAMPLESBUFFER;
+ memcpy(s_rawsamplesbuffer + b2 * 2, samples, (RAWSAMPLESBUFFER - b2) * sizeof(short[2]));
+ memcpy(s_rawsamplesbuffer, samples + (RAWSAMPLESBUFFER - b2) * 2, b3 * sizeof(short[2]));
+ }
+ else
+ memcpy(s_rawsamplesbuffer + b2 * 2, samples, length * sizeof(short[2]));
+ s_rawsamplesbuffer_count += length;
+}
+
+void S_RawSamples_Dequeue(int *samples, unsigned int length)
+{
+ int b1, b2, l;
+ int i;
+ short *in;
+ int *out;
+ int count;
+ l = length;
+ if (l > s_rawsamplesbuffer_count)
+ l = s_rawsamplesbuffer_count;
+ b1 = (s_rawsamplesbuffer_start) % RAWSAMPLESBUFFER;
+ if (b1 + l > RAWSAMPLESBUFFER)
+ {
+ b2 = (b1 + l) % RAWSAMPLESBUFFER;
+ //memcpy(samples, s_rawsamplesbuffer + b1 * 2, (RAWSAMPLESBUFFER - b1) * sizeof(short[2]));
+ //memcpy(samples + (RAWSAMPLESBUFFER - b1) * 2, s_rawsamplesbuffer, b2 * sizeof(short[2]));
+ for (out = samples, in = s_rawsamplesbuffer + b1 * 2, count = (RAWSAMPLESBUFFER - b1) * 2, i = 0;i < count;i++)
+ out[i] = in[i];
+ for (out = samples + (RAWSAMPLESBUFFER - b1) * 2, in = s_rawsamplesbuffer, count = b2 * 2, i = 0;i < count;i++)
+ out[i] = in[i];
+ //Con_Printf("S_RawSamples_Dequeue: buffer wrap %i %i\n", (RAWSAMPLESBUFFER - b1), b2);
+ }
+ else
+ {
+ //memcpy(samples, s_rawsamplesbuffer + b1 * 2, l * sizeof(short[2]));
+ for (out = samples, in = s_rawsamplesbuffer + b1 * 2, count = l * 2, i = 0;i < count;i++)
+ out[i] = in[i];
+ //Con_Printf("S_RawSamples_Dequeue: normal %i\n", l);
+ }
+ if (l < length)
+ {
+ memset(samples + l * 2, 0, (length - l) * sizeof(int[2]));
+ //Con_Printf("S_RawSamples_Dequeue: padding with %i samples\n", length - l);
+ }
+ s_rawsamplesbuffer_start = (s_rawsamplesbuffer_start + l) % RAWSAMPLESBUFFER;
+ s_rawsamplesbuffer_count -= l;
+}
+
+void S_RawSamples_ClearQueue(void)
+{
+ s_rawsamplesbuffer_count = 0;
+ s_rawsamplesbuffer_start = 0;
+}
+
+int S_RawSamples_QueueWantsMore(void)
+{
+ if (s_rawsamplesbuffer_count < min(shm->speed >> 1, RAWSAMPLESBUFFER >> 1))
+ return RAWSAMPLESBUFFER - s_rawsamplesbuffer_count;
+ else
+ return 0;
+}
+
+void S_ResampleBuffer16Stereo(short *input, int inputlength, short *output, int outputlength)
+{
+ if (inputlength != outputlength)
+ {
+ int i, position, stopposition, step;
+ short *in, *out;
+ step = (float) inputlength * 256.0f / (float) outputlength;
+ position = 0;
+ stopposition = (inputlength - 1) << 8;
+ out = output;
+ for (i = 0;i < outputlength && position < stopposition;i++, position += step)
+ {
+ in = input + ((position >> 8) << 1);
+ out[0] = (((in[1] - in[0]) * (position & 255)) >> 8) + in[0];
+ out[1] = (((in[3] - in[2]) * (position & 255)) >> 8) + in[2];
+ out += 2;
+ }
+ stopposition = inputlength << 8;
+ for (i = 0;i < outputlength && position < stopposition;i++, position += step)
+ {
+ in = input + ((position >> 8) << 1);
+ out[0] = in[0];
+ out[1] = in[2];
+ out += 2;
+ }
+ }
+ else
+ memcpy(output, input, inputlength * sizeof(short[2]));
+}
+
+int S_RawSamples_SampleRate(void)
+{
+ return shm != NULL ? shm->speed : 0;
+}
projects / xonotic / darkplaces.git / blobdiff