srclength = in_length * in_format->channels;
outcount = (double)in_length * shm->format.speed / in_format->speed;
- Con_DPrintf("ResampleSfx(%s): %d samples @ %dHz -> %d samples @ %dHz\n",
- sfxname, in_length, in_format->speed, outcount, shm->format.speed);
+ //Con_DPrintf("ResampleSfx(%s): %d samples @ %dHz -> %d samples @ %dHz\n",
+ // sfxname, in_length, in_format->speed, outcount, shm->format.speed);
// Trivial case (direct transfer)
if (in_format->speed == shm->format.speed)
// General case (linear interpolation with a fixed-point fractional
// step, 18-bit integer part and 14-bit fractional part)
// Can handle up to 2^18 (262144) samples per second (> 96KHz stereo)
- #define FRACTIONAL_BITS 14
- #define FRACTIONAL_MASK ((1 << FRACTIONAL_BITS) - 1)
- #define INTEGER_BITS (sizeof(samplefrac)*8 - FRACTIONAL_BITS)
+# define FRACTIONAL_BITS 14
+# define FRACTIONAL_MASK ((1 << FRACTIONAL_BITS) - 1)
+# define INTEGER_BITS (sizeof(samplefrac)*8 - FRACTIONAL_BITS)
else
{
const unsigned int fracstep = (double)in_format->speed / shm->format.speed * (1 << FRACTIONAL_BITS);
// Check that we can handle one second of that sound
if (in_format->speed * in_format->channels > (1 << INTEGER_BITS))
- Sys_Error ("ResampleSfx: sound quality too high for resampling (%uHz, %u channel(s))",
+ {
+ Con_Printf ("ResampleSfx: sound quality too high for resampling (%uHz, %u channel(s))",
in_format->speed, in_format->channels);
+ return 0;
+ }
// We work 1 sec at a time to make sure we don't accumulate any
// significant error when adding "fracstep" over several seconds, and
if (s->fetcher != NULL)
{
if (s->format.speed != shm->format.speed)
- Sys_Error ("S_LoadSound: sound %s hasn't been resampled (%uHz instead of %uHz)", s->name);
+ Con_Printf ("S_LoadSound: sound %s hasn't been resampled (%uHz instead of %uHz)", s->name);
return true;
}
// LordHavoc: if the sound filename does not begin with sound/, try adding it
if (strncasecmp(s->name, "sound/", 6))
{
- len = snprintf (namebuffer, sizeof(namebuffer), "sound/%s", s->name);
- if (len >= sizeof (namebuffer))
+ len = dpsnprintf (namebuffer, sizeof(namebuffer), "sound/%s", s->name);
+ if (len < 0)
{
// name too long
- Con_DPrintf("S_LoadSound: name \"%s\" is too long\n", s->name);
+ Con_Printf("S_LoadSound: name \"%s\" is too long\n", s->name);
return false;
}
if (S_LoadWavFile (namebuffer, s))
}
// LordHavoc: then try without the added sound/ as wav and ogg
- len = snprintf (namebuffer, sizeof(namebuffer), "%s", s->name);
- if (len >= sizeof (namebuffer))
+ len = dpsnprintf (namebuffer, sizeof(namebuffer), "%s", s->name);
+ if (len < 0)
{
// name too long
- Con_DPrintf("S_LoadSound: name \"%s\" is too long\n", s->name);
+ Con_Printf("S_LoadSound: name \"%s\" is too long\n", s->name);
return false;
}
if (S_LoadWavFile (namebuffer, s))
Con_Printf("S_LoadSound: Couldn't load \"%s\"\n", s->name);
return false;
}
-
-void S_UnloadSound (sfx_t *s)
-{
- if (s->fetcher != NULL)
- {
- unsigned int i;
-
- // Stop all channels that use this sound
- for (i = 0; i < total_channels ; i++)
- if (channels[i].sfx == s)
- S_StopChannel (i);
-
- s->fetcher = NULL;
- s->fetcher_data = NULL;
- Mem_FreePool(&s->mempool);
- }
-}