From 78ab889bd7db440684fdf33877e4b56005047609 Mon Sep 17 00:00:00 2001 From: divverent Date: Mon, 14 May 2007 14:25:46 +0000 Subject: [PATCH] need to explicitly load vorbis_comment_query from libvorbis, not libvorbisfile, on Win32 git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@7278 d7cf8633-e32d-0410-b094-e92efae38249 --- snd_ogg.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/snd_ogg.c b/snd_ogg.c index 7ef40386..50861408 100644 --- 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"); -- 2.39.2