need to explicitly load vorbis_comment_query from libvorbis, not libvorbisfile, on...
authordivverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Mon, 14 May 2007 14:25:46 +0000 (14:25 +0000)
committerdivverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Mon, 14 May 2007 14:25:46 +0000 (14:25 +0000)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@7278 d7cf8633-e32d-0410-b094-e92efae38249

snd_ogg.c

index 7ef4038..5086140 100644 (file)
--- a/snd_ogg.c
+++ b/snd_ogg.c
@@ -214,7 +214,7 @@ static ogg_int64_t (*qov_pcm_total) (OggVorbis_File *vf,int i);
 static long (*qov_read) (OggVorbis_File *vf,char *buffer,int length,
                                                 int bigendianp,int word,int sgned,int *bitstream);
 
-static dllfunction_t oggvorbisfuncs[] =
+static dllfunction_t vorbisfilefuncs[] =
 {
        {"ov_clear",                            (void **) &qov_clear},
        {"ov_info",                                     (void **) &qov_info},
@@ -227,6 +227,12 @@ static dllfunction_t oggvorbisfuncs[] =
        {NULL, NULL}
 };
 
+static dllfunction_t vorbisfuncs[] =
+{
+       {"vorbis_comment_query",        (void **) &qvorbis_comment_query},
+       {NULL, NULL}
+};
+
 // Handles for the Vorbis and Vorbisfile DLLs
 static dllhandle_t vo_dll = NULL;
 static dllhandle_t vf_dll = NULL;
@@ -348,8 +354,8 @@ qboolean OGG_OpenLibrary (void)
        // 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))
+       if (! Sys_LoadLibrary (dllnames_vo, &vo_dll, vorbisfuncs) ||
+               ! Sys_LoadLibrary (dllnames_vf, &vf_dll, vorbisfilefuncs))
        {
                Sys_UnloadLibrary (&vo_dll);
                Con_Printf ("Ogg Vorbis support disabled\n");