#include "quakedef.h"
+#include "snd_main.h"
#include "snd_ogg.h"
#include "snd_wav.h"
{NULL, NULL}
};
-// Handle for the Vorbisfile DLL
+// Handles for the Vorbis and Vorbisfile DLLs
+static dllhandle_t vo_dll = NULL;
static dllhandle_t vf_dll = NULL;
typedef struct
*/
qboolean OGG_OpenLibrary (void)
{
- const char* dllname;
+ const char* dllnames_vo [] =
+ {
+#ifdef WIN32
+ "vorbis.dll",
+#elif defined(MACOSX)
+ "libvorbis.dylib",
+#else
+ "libvorbis.so.0",
+ "libvorbis.so",
+#endif
+ NULL
+ };
+ const char* dllnames_vf [] =
+ {
+#ifdef WIN32
+ "vorbisfile.dll",
+#elif defined(MACOSX)
+ "libvorbisfile.dylib",
+#else
+ "libvorbisfile.so.3",
+ "libvorbisfile.so",
+#endif
+ NULL
+ };
// Already loaded?
if (vf_dll)
return true;
-#ifdef WIN32
- dllname = "vorbisfile.dll";
-#else
- dllname = "libvorbisfile.so";
-#endif
+// COMMANDLINEOPTION: Sound: -novorbis disables ogg vorbis sound support
+ if (COM_CheckParm("-novorbis"))
+ return false;
- // Load the DLL
- if (! Sys_LoadLibrary (dllname, &vf_dll, oggvorbisfuncs))
+ // Load the DLLs
+ // We need to load both by hand because some OSes seem to not load
+ // the vorbis DLL automatically when loading the VorbisFile DLL
+ if (! Sys_LoadLibrary (dllnames_vo, &vo_dll, NULL) ||
+ ! Sys_LoadLibrary (dllnames_vf, &vf_dll, oggvorbisfuncs))
{
+ Sys_UnloadLibrary (&vo_dll);
Con_Printf ("Ogg Vorbis support disabled\n");
return false;
}
void OGG_CloseLibrary (void)
{
Sys_UnloadLibrary (&vf_dll);
+ Sys_UnloadLibrary (&vo_dll);
}
{
if (qov_pcm_seek (&per_ch->vf, (ogg_int64_t)start) != 0)
return NULL;
-
- sb->offset = start;
sb->length = 0;
- newlength = 0;
}
// Else, move forward the samples we need to keep in the sfxbuffer
else
{
memmove (sb->data, sb->data + (start - sb->offset) * factor, newlength * factor);
- sb->offset = start;
sb->length = newlength;
}
+ sb->offset = start;
+
// We add exactly 1 sec of sound to the buffer:
// 1- to ensure we won't lose any sample during the resampling process
// 2- to force one call to OGG_FetchSound per second to regulate the workload
(sfx->format.speed + sb->length) * factor, buff_len);
return NULL;
}
- newlength = per_sfx->format.speed * factor; // 1 sec of sound before resampling
+ newlength = per_sfx->format.speed * factor; // -> 1 sec of sound before resampling
// Decompress in the resampling_buffer
#if BYTE_ORDER == LITTLE_ENDIAN
return false;
Mem_FreePool (&s->mempool);
- s->mempool = Mem_AllocPool (s->name);
+ s->mempool = Mem_AllocPool (s->name, 0, NULL);
// Load the file
data = FS_LoadFile (filename, s->mempool, false);
long ret;
sfxbuffer_t *sb;
- Con_DPrintf ("\"%s\" will be streamed\n", filename);
+ Con_DPrintf ("\"%s\" will be cached\n", filename);
// Decode it
buff = Mem_Alloc (s->mempool, (int)len);