]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - snd_mem.c
use dynamic eye position-centered bouncegrid when rendering in dynamic
[xonotic/darkplaces.git] / snd_mem.c
index 47398c6e0bde95f92279ed238d5c60dd82543410..75f9e829560df539cc84e5a1a543d092da4a410e 100644 (file)
--- a/snd_mem.c
+++ b/snd_mem.c
@@ -17,443 +17,374 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
-// snd_mem.c: sound caching
+
 
 #include "quakedef.h"
 
-qbyte *S_Alloc (int size);
+#include "snd_main.h"
+#include "snd_ogg.h"
+#include "snd_wav.h"
+#include "snd_modplug.h"
+
+unsigned char resampling_buffer [48000 * 2 * 2];
+
 
 /*
-================
-ResampleSfx
-================
+====================
+Snd_CreateRingBuffer
+
+If "buffer" is NULL, the function allocates one buffer of "sampleframes" sample frames itself
+(if "sampleframes" is 0, the function chooses the size).
+====================
 */
-void ResampleSfx (sfxcache_t *sc, qbyte *data, char *name)
+snd_ringbuffer_t *Snd_CreateRingBuffer (const snd_format_t* format, unsigned int sampleframes, void* buffer)
 {
-       int i, outcount, srcsample, srclength, samplefrac, fracstep;
-
-       // this is usually 0.5 (128), 1 (256), or 2 (512)
-       fracstep = ((double) sc->speed / (double) shm->speed) * 256.0;
+       snd_ringbuffer_t *ringbuffer;
 
-       srclength = sc->length << sc->stereo;
+       // If the caller provides a buffer, it must give us its size
+       if (sampleframes == 0 && buffer != NULL)
+               return NULL;
 
-       outcount = (double) sc->length * (double) shm->speed / (double) sc->speed;
-       sc->length = outcount;
-       if (sc->loopstart != -1)
-               sc->loopstart = (double) sc->loopstart * (double) shm->speed / (double) sc->speed;
+       ringbuffer = (snd_ringbuffer_t*)Mem_Alloc(snd_mempool, sizeof (*ringbuffer));
+       memset(ringbuffer, 0, sizeof(*ringbuffer));
+       memcpy(&ringbuffer->format, format, sizeof(ringbuffer->format));
 
-       sc->speed = shm->speed;
+       // If we haven't been given a buffer
+       if (buffer == NULL)
+       {
+               unsigned int maxframes;
+               size_t memsize;
 
-// resample / decimate to the current source rate
+               if (sampleframes == 0)
+                       maxframes = (format->speed + 1) / 2;  // Make the sound buffer large enough for containing 0.5 sec of sound
+               else
+                       maxframes = sampleframes;
 
-       if (fracstep == 256)
-       {
-               // fast case for direct transfer
-               if (sc->width == 1) // 8bit
-                       for (i = 0;i < srclength;i++)
-                               ((signed char *)sc->data)[i] = ((unsigned char *)data)[i] - 128;
-               else //if (sc->width == 2) // 16bit
-                       for (i = 0;i < srclength;i++)
-                               ((short *)sc->data)[i] = LittleShort (((short *)data)[i]);
+               memsize = maxframes * format->width * format->channels;
+               ringbuffer->ring = (unsigned char *) Mem_Alloc(snd_mempool, memsize);
+               ringbuffer->maxframes = maxframes;
        }
        else
        {
-               // general case
-               Con_DPrintf("ResampleSfx: resampling sound %s\n", name);
-               samplefrac = 0;
-               if ((fracstep & 255) == 0) // skipping points on perfect multiple
-               {
-                       srcsample = 0;
-                       fracstep >>= 8;
-                       if (sc->width == 2)
-                       {
-                               short *out = (void *)sc->data, *in = (void *)data;
-                               if (sc->stereo) // LordHavoc: stereo sound support
-                               {
-                                       fracstep <<= 1;
-                                       for (i=0 ; i<outcount ; i++)
-                                       {
-                                               *out++ = LittleShort (in[srcsample  ]);
-                                               *out++ = LittleShort (in[srcsample+1]);
-                                               srcsample += fracstep;
-                                       }
-                               }
-                               else
-                               {
-                                       for (i=0 ; i<outcount ; i++)
-                                       {
-                                               *out++ = LittleShort (in[srcsample  ]);
-                                               srcsample += fracstep;
-                                       }
-                               }
-                       }
-                       else
-                       {
-                               signed char *out = (void *)sc->data;
-                               unsigned char *in = (void *)data;
-                               if (sc->stereo) // LordHavoc: stereo sound support
-                               {
-                                       fracstep <<= 1;
-                                       for (i=0 ; i<outcount ; i++)
-                                       {
-                                               *out++ = in[srcsample  ] - 128;
-                                               *out++ = in[srcsample+1] - 128;
-                                               srcsample += fracstep;
-                                       }
-                               }
-                               else
-                               {
-                                       for (i=0 ; i<outcount ; i++)
-                                       {
-                                               *out++ = in[srcsample  ] - 128;
-                                               srcsample += fracstep;
-                                       }
-                               }
-                       }
-               }
-               else
-               {
-                       int sample;
-                       int a, b;
-                       if (sc->width == 2)
-                       {
-                               short *out = (void *)sc->data, *in = (void *)data;
-                               if (sc->stereo) // LordHavoc: stereo sound support
-                               {
-                                       for (i=0 ; i<outcount ; i++)
-                                       {
-                                               srcsample = (samplefrac >> 8) << 1;
-                                               a = in[srcsample  ];
-                                               if (srcsample+2 >= srclength)
-                                                       b = 0;
-                                               else
-                                                       b = in[srcsample+2];
-                                               sample = (((b - a) * (samplefrac & 255)) >> 8) + a;
-                                               *out++ = (short) sample;
-                                               a = in[srcsample+1];
-                                               if (srcsample+2 >= srclength)
-                                                       b = 0;
-                                               else
-                                                       b = in[srcsample+3];
-                                               sample = (((b - a) * (samplefrac & 255)) >> 8) + a;
-                                               *out++ = (short) sample;
-                                               samplefrac += fracstep;
-                                       }
-                               }
-                               else
-                               {
-                                       for (i=0 ; i<outcount ; i++)
-                                       {
-                                               srcsample = samplefrac >> 8;
-                                               a = in[srcsample  ];
-                                               if (srcsample+1 >= srclength)
-                                                       b = 0;
-                                               else
-                                                       b = in[srcsample+1];
-                                               sample = (((b - a) * (samplefrac & 255)) >> 8) + a;
-                                               *out++ = (short) sample;
-                                               samplefrac += fracstep;
-                                       }
-                               }
-                       }
-                       else
-                       {
-                               signed char *out = (void *)sc->data;
-                               unsigned char *in = (void *)data;
-                               if (sc->stereo) // LordHavoc: stereo sound support
-                               {
-                                       for (i=0 ; i<outcount ; i++)
-                                       {
-                                               srcsample = (samplefrac >> 8) << 1;
-                                               a = (int) in[srcsample  ] - 128;
-                                               if (srcsample+2 >= srclength)
-                                                       b = 0;
-                                               else
-                                                       b = (int) in[srcsample+2] - 128;
-                                               sample = (((b - a) * (samplefrac & 255)) >> 8) + a;
-                                               *out++ = (signed char) sample;
-                                               a = (int) in[srcsample+1] - 128;
-                                               if (srcsample+2 >= srclength)
-                                                       b = 0;
-                                               else
-                                                       b = (int) in[srcsample+3] - 128;
-                                               sample = (((b - a) * (samplefrac & 255)) >> 8) + a;
-                                               *out++ = (signed char) sample;
-                                               samplefrac += fracstep;
-                                       }
-                               }
-                               else
-                               {
-                                       for (i=0 ; i<outcount ; i++)
-                                       {
-                                               srcsample = samplefrac >> 8;
-                                               a = (int) in[srcsample  ] - 128;
-                                               if (srcsample+1 >= srclength)
-                                                       b = 0;
-                                               else
-                                                       b = (int) in[srcsample+1] - 128;
-                                               sample = (((b - a) * (samplefrac & 255)) >> 8) + a;
-                                               *out++ = (signed char) sample;
-                                               samplefrac += fracstep;
-                                       }
-                               }
-                       }
-               }
+               ringbuffer->ring = (unsigned char *) buffer;
+               ringbuffer->maxframes = sampleframes;
        }
 
-       // LordHavoc: use this for testing if it ever becomes useful again
-       //COM_WriteFile (va("sound/%s.pcm", name), sc->data, (sc->length << sc->stereo) * sc->width);
+       return ringbuffer;
 }
 
-//=============================================================================
 
 /*
-==============
-S_LoadSound
-==============
+====================
+Snd_CreateSndBuffer
+====================
 */
-sfxcache_t *S_LoadSound (sfx_t *s, int complain)
+snd_buffer_t *Snd_CreateSndBuffer (const unsigned char *samples, unsigned int sampleframes, const snd_format_t* in_format, unsigned int sb_speed)
 {
-    char namebuffer[256];
-       qbyte *data;
-       wavinfo_t info;
-       int len;
-       sfxcache_t *sc;
+       size_t newsampleframes, memsize;
+       snd_buffer_t* sb;
 
-       // see if still in memory
-       if (s->sfxcache)
-               return s->sfxcache;
+       newsampleframes = (size_t) ((double)sampleframes * (double)sb_speed / (double)in_format->speed);
 
-       // load it in
-       strcpy(namebuffer, "sound/");
-       strcat(namebuffer, s->name);
+       memsize = newsampleframes * in_format->channels * in_format->width;
+       memsize += sizeof (*sb) - sizeof (sb->samples);
 
-       data = FS_LoadFile(namebuffer, false);
+       sb = (snd_buffer_t*)Mem_Alloc (snd_mempool, memsize);
+       sb->format.channels = in_format->channels;
+       sb->format.width = in_format->width;
+       sb->format.speed = sb_speed;
+       sb->maxframes = newsampleframes;
+       sb->nbframes = 0;
 
-       if (!data)
+       if (!Snd_AppendToSndBuffer (sb, samples, sampleframes, in_format))
        {
-               if (complain)
-                       Con_Printf ("Couldn't load %s\n", namebuffer);
+               Mem_Free (sb);
                return NULL;
        }
 
-       info = GetWavinfo (s->name, data, fs_filesize);
-       // LordHavoc: stereo sounds are now allowed (intended for music)
-       if (info.channels < 1 || info.channels > 2)
+       return sb;
+}
+
+
+/*
+====================
+Snd_AppendToSndBuffer
+====================
+*/
+qboolean Snd_AppendToSndBuffer (snd_buffer_t* sb, const unsigned char *samples, unsigned int sampleframes, const snd_format_t* format)
+{
+       size_t srclength, outcount;
+       unsigned char *out_data;
+
+       //Con_DPrintf("ResampleSfx: %d samples @ %dHz -> %d samples @ %dHz\n",
+       //                      sampleframes, format->speed, outcount, sb->format.speed);
+
+       // If the formats are incompatible
+       if (sb->format.channels != format->channels || sb->format.width != format->width)
        {
-               Con_Printf ("%s has an unsupported number of channels (%i)\n",s->name, info.channels);
-               Mem_Free(data);
-               return NULL;
+               Con_Print("AppendToSndBuffer: incompatible sound formats!\n");
+               return false;
        }
 
-       // calculate resampled length
-       len = (int) ((double) info.samples * (double) shm->speed / (double) info.rate);
-       len = len * info.width * info.channels;
+       outcount = (size_t) ((double)sampleframes * (double)sb->format.speed / (double)format->speed);
 
-       // FIXME: add S_UnloadSounds or something?
-       Mem_FreePool(&s->mempool);
-       s->mempool = Mem_AllocPool(s->name);
-       sc = s->sfxcache = Mem_Alloc(s->mempool, len + sizeof(sfxcache_t));
-       if (!sc)
+       // If the sound buffer is too short
+       if (outcount > sb->maxframes - sb->nbframes)
        {
-               Mem_FreePool(&s->mempool);
-               Mem_Free(data);
-               return NULL;
+               Con_Print("AppendToSndBuffer: sound buffer too short!\n");
+               return false;
        }
 
-       sc->length = info.samples;
-       sc->loopstart = info.loopstart;
-       sc->speed = info.rate;
-       sc->width = info.width;
-       sc->stereo = info.channels == 2;
+       out_data = &sb->samples[sb->nbframes * sb->format.width * sb->format.channels];
+       srclength = sampleframes * format->channels;
 
-       ResampleSfx (sc, data + info.dataofs, s->name);
+       // Trivial case (direct transfer)
+       if (format->speed == sb->format.speed)
+       {
+               if (format->width == 1)
+               {
+                       size_t i;
 
-       Mem_Free(data);
-       return sc;
-}
+                       for (i = 0; i < srclength; i++)
+                               ((signed char*)out_data)[i] = samples[i] - 128;
+               }
+               else  // if (format->width == 2)
+                       memcpy (out_data, samples, srclength * format->width);
+       }
 
+       // 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)
+       else
+       {
+               const unsigned int fracstep = (unsigned int)((double)format->speed / sb->format.speed * (1 << FRACTIONAL_BITS));
+               size_t remain_in = srclength, total_out = 0;
+               unsigned int samplefrac;
+               const unsigned char *in_ptr = samples;
+               unsigned char *out_ptr = out_data;
+
+               // Check that we can handle one second of that sound
+               if (format->speed * format->channels > (1 << INTEGER_BITS))
+               {
+                       Con_Printf ("ResampleSfx: sound quality too high for resampling (%uHz, %u channel(s))\n",
+                                          format->speed, 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
+               // also to be able to handle very long sounds.
+               while (total_out < outcount)
+               {
+                       size_t tmpcount, interpolation_limit, i, j;
+                       unsigned int srcsample;
 
-/*
-===============================================================================
+                       samplefrac = 0;
 
-WAV loading
+                       // If more than 1 sec of sound remains to be converted
+                       if (outcount - total_out > sb->format.speed)
+                       {
+                               tmpcount = sb->format.speed;
+                               interpolation_limit = tmpcount;  // all samples can be interpolated
+                       }
+                       else
+                       {
+                               tmpcount = outcount - total_out;
+                               interpolation_limit = (int)ceil((double)(((remain_in / format->channels) - 1) << FRACTIONAL_BITS) / fracstep);
+                               if (interpolation_limit > tmpcount)
+                                       interpolation_limit = tmpcount;
+                       }
 
-===============================================================================
-*/
+                       // 16 bit samples
+                       if (format->width == 2)
+                       {
+                               const short* in_ptr_short;
 
+                               // Interpolated part
+                               for (i = 0; i < interpolation_limit; i++)
+                               {
+                                       srcsample = (samplefrac >> FRACTIONAL_BITS) * format->channels;
+                                       in_ptr_short = &((const short*)in_ptr)[srcsample];
 
-qbyte *data_p;
-qbyte *iff_end;
-qbyte *last_chunk;
-qbyte *iff_data;
-int iff_chunk_len;
+                                       for (j = 0; j < format->channels; j++)
+                                       {
+                                               int a, b;
 
+                                               a = *in_ptr_short;
+                                               b = *(in_ptr_short + format->channels);
+                                               *((short*)out_ptr) = (((b - a) * (samplefrac & FRACTIONAL_MASK)) >> FRACTIONAL_BITS) + a;
 
-short GetLittleShort(void)
-{
-       short val = 0;
-       val = *data_p;
-       val = val + (*(data_p+1)<<8);
-       data_p += 2;
-       return val;
-}
+                                               in_ptr_short++;
+                                               out_ptr += sizeof (short);
+                                       }
 
-int GetLittleLong(void)
-{
-       int val = 0;
-       val = *data_p;
-       val = val + (*(data_p+1)<<8);
-       val = val + (*(data_p+2)<<16);
-       val = val + (*(data_p+3)<<24);
-       data_p += 4;
-       return val;
-}
+                                       samplefrac += fracstep;
+                               }
 
-void FindNextChunk(char *name)
-{
-       while (1)
-       {
-               data_p=last_chunk;
+                               // Non-interpolated part
+                               for (/* nothing */; i < tmpcount; i++)
+                               {
+                                       srcsample = (samplefrac >> FRACTIONAL_BITS) * format->channels;
+                                       in_ptr_short = &((const short*)in_ptr)[srcsample];
 
-               if (data_p >= iff_end)
-               {       // didn't find the chunk
-                       data_p = NULL;
-                       return;
-               }
+                                       for (j = 0; j < format->channels; j++)
+                                       {
+                                               *((short*)out_ptr) = *in_ptr_short;
 
-               data_p += 4;
-               iff_chunk_len = GetLittleLong();
-               if (iff_chunk_len < 0)
-               {
-                       data_p = NULL;
-                       return;
+                                               in_ptr_short++;
+                                               out_ptr += sizeof (short);
+                                       }
+
+                                       samplefrac += fracstep;
+                               }
+                       }
+                       // 8 bit samples
+                       else  // if (format->width == 1)
+                       {
+                               const unsigned char* in_ptr_byte;
+
+                               // Convert up to 1 sec of sound
+                               for (i = 0; i < interpolation_limit; i++)
+                               {
+                                       srcsample = (samplefrac >> FRACTIONAL_BITS) * format->channels;
+                                       in_ptr_byte = &((const unsigned char*)in_ptr)[srcsample];
+
+                                       for (j = 0; j < format->channels; j++)
+                                       {
+                                               int a, b;
+
+                                               a = *in_ptr_byte - 128;
+                                               b = *(in_ptr_byte + format->channels) - 128;
+                                               *((signed char*)out_ptr) = (((b - a) * (samplefrac & FRACTIONAL_MASK)) >> FRACTIONAL_BITS) + a;
+
+                                               in_ptr_byte++;
+                                               out_ptr += sizeof (signed char);
+                                       }
+
+                                       samplefrac += fracstep;
+                               }
+
+                               // Non-interpolated part
+                               for (/* nothing */; i < tmpcount; i++)
+                               {
+                                       srcsample = (samplefrac >> FRACTIONAL_BITS) * format->channels;
+                                       in_ptr_byte = &((const unsigned char*)in_ptr)[srcsample];
+
+                                       for (j = 0; j < format->channels; j++)
+                                       {
+                                               *((signed char*)out_ptr) = *in_ptr_byte - 128;
+
+                                               in_ptr_byte++;
+                                               out_ptr += sizeof (signed char);
+                                       }
+
+                                       samplefrac += fracstep;
+                               }
+                       }
+
+                       // Update the counters and the buffer position
+                       remain_in -= format->speed * format->channels;
+                       in_ptr += format->speed * format->channels * format->width;
+                       total_out += tmpcount;
                }
-               data_p -= 8;
-               last_chunk = data_p + 8 + ( (iff_chunk_len + 1) & ~1 );
-               if (!strncmp(data_p, name, 4))
-                       return;
        }
-}
 
-void FindChunk(char *name)
-{
-       last_chunk = iff_data;
-       FindNextChunk (name);
+       sb->nbframes += outcount;
+       return true;
 }
 
 
-void DumpChunks(void)
-{
-       char str[5];
-
-       str[4] = 0;
-       data_p=iff_data;
-       do
-       {
-               memcpy (str, data_p, 4);
-               data_p += 4;
-               iff_chunk_len = GetLittleLong();
-               Con_Printf ("0x%x : %s (%d)\n", (int)(data_p - 4), str, iff_chunk_len);
-               data_p += (iff_chunk_len + 1) & ~1;
-       } while (data_p < iff_end);
-}
+//=============================================================================
 
 /*
-============
-GetWavinfo
-============
+==============
+S_LoadSound
+==============
 */
-wavinfo_t GetWavinfo (char *name, qbyte *wav, int wavlength)
+qboolean S_LoadSound (sfx_t *sfx, qboolean complain)
 {
-       wavinfo_t info;
-       int i;
-       int format;
-       int samples;
+       char namebuffer[MAX_QPATH + 16];
+       size_t len;
 
-       memset (&info, 0, sizeof(info));
+       // See if already loaded
+       if (sfx->fetcher != NULL)
+               return true;
 
-       if (!wav)
-               return info;
+       // If we weren't able to load it previously, no need to retry
+       // Note: S_PrecacheSound clears this flag to cause a retry
+       if (sfx->flags & SFXFLAG_FILEMISSING)
+               return false;
 
-       iff_data = wav;
-       iff_end = wav + wavlength;
+       // No sound?
+       if (snd_renderbuffer == NULL)
+               return false;
 
-       // find "RIFF" chunk
-       FindChunk("RIFF");
-       if (!(data_p && !strncmp(data_p+8, "WAVE", 4)))
-       {
-               Con_Printf("Missing RIFF/WAVE chunks\n");
-               return info;
-       }
+       // Initialize volume peak to 0; if ReplayGain is supported, the loader will change this away
+       sfx->volume_peak = 0.0;
 
-       // get "fmt " chunk
-       iff_data = data_p + 12;
-       //DumpChunks ();
+       if (developer_loading.integer)
+               Con_Printf("loading sound %s\n", sfx->name);
 
-       FindChunk("fmt ");
-       if (!data_p)
-       {
-               Con_Printf("Missing fmt chunk\n");
-               return info;
-       }
-       data_p += 8;
-       format = GetLittleShort();
-       if (format != 1)
-       {
-               Con_Printf("Microsoft PCM format only\n");
-               return info;
-       }
-
-       info.channels = GetLittleShort();
-       info.rate = GetLittleLong();
-       data_p += 4+2;
-       info.width = GetLittleShort() / 8;
+       SCR_PushLoadingScreen(true, sfx->name, 1);
 
-       // get cue chunk
-       FindChunk("cue ");
-       if (data_p)
+       // LordHavoc: if the sound filename does not begin with sound/, try adding it
+       if (strncasecmp(sfx->name, "sound/", 6))
        {
-               data_p += 32;
-               info.loopstart = GetLittleLong();
-
-               // if the next chunk is a LIST chunk, look for a cue length marker
-               FindNextChunk ("LIST");
-               if (data_p)
+               dpsnprintf (namebuffer, sizeof(namebuffer), "sound/%s", sfx->name);
+               len = strlen(namebuffer);
+               if (len >= 4 && !strcasecmp (namebuffer + len - 4, ".wav"))
                {
-                       if (!strncmp (data_p + 28, "mark", 4))
-                       {       // this is not a proper parse, but it works with cooledit...
-                               data_p += 24;
-                               i = GetLittleLong ();   // samples in loop
-                               info.samples = info.loopstart + i;
-                       }
+                       if (S_LoadWavFile (namebuffer, sfx))
+                               goto loaded;
+                       memcpy (namebuffer + len - 3, "ogg", 4);
+               }
+               if (len >= 4 && !strcasecmp (namebuffer + len - 4, ".ogg"))
+               {
+                       if (OGG_LoadVorbisFile (namebuffer, sfx))
+                               goto loaded;
+               }
+               else
+               {
+                       if (ModPlug_LoadModPlugFile (namebuffer, sfx))
+                               goto loaded;
                }
        }
-       else
-               info.loopstart = -1;
 
-       // find data chunk
-       FindChunk("data");
-       if (!data_p)
+       // LordHavoc: then try without the added sound/ as wav and ogg
+       dpsnprintf (namebuffer, sizeof(namebuffer), "%s", sfx->name);
+       len = strlen(namebuffer);
+       // request foo.wav: tries foo.wav, then foo.ogg
+       // request foo.ogg: tries foo.ogg only
+       // request foo.mod: tries foo.mod only
+       if (len >= 4 && !strcasecmp (namebuffer + len - 4, ".wav"))
        {
-               Con_Printf("Missing data chunk\n");
-               return info;
+               if (S_LoadWavFile (namebuffer, sfx))
+                       goto loaded;
+               memcpy (namebuffer + len - 3, "ogg", 4);
        }
-
-       data_p += 4;
-       samples = GetLittleLong () / info.width / info.channels;
-
-       if (info.samples)
+       if (len >= 4 && !strcasecmp (namebuffer + len - 4, ".ogg"))
        {
-               if (samples < info.samples)
-                       Host_Error ("Sound %s has a bad loop length", name);
+               if (OGG_LoadVorbisFile (namebuffer, sfx))
+                       goto loaded;
        }
        else
-               info.samples = samples;
+       {
+               if (ModPlug_LoadModPlugFile (namebuffer, sfx))
+                       goto loaded;
+       }
 
-       info.dataofs = data_p - wav;
+       // Can't load the sound!
+       sfx->flags |= SFXFLAG_FILEMISSING;
+       if (complain)
+               Con_DPrintf("failed to load sound \"%s\"\n", sfx->name);
 
-       return info;
-}
+       SCR_PopLoadingScreen(false);
+       return false;
 
+loaded:
+       SCR_PopLoadingScreen(false);
+       return true;
+}