move the -1 setting of csqc_* to a better place (argh...)

[xonotic/darkplaces.git] / snd_ogg.c

diff --git a/snd_ogg.c b/snd_ogg.c
index ccedb504c5e7260d69c3b6e5bc5d7246871425d1..316e838f37a893322aab3976d4d08944a485083d 100644 (file)
--- a/snd_ogg.c
+++ b/snd_ogg.c
@@ -353,16 +353,7 @@ 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, vorbisfuncs) ||
-               ! Sys_LoadLibrary (dllnames_vf, &vf_dll, vorbisfilefuncs))
-       {
-               Sys_UnloadLibrary (&vo_dll);
-               Con_Printf ("Ogg Vorbis support disabled\n");
-               return false;
-       }
-
-       Con_Printf ("Ogg Vorbis support enabled\n");
-       return true;
+       return Sys_LoadLibrary (dllnames_vo, &vo_dll, vorbisfuncs) && Sys_LoadLibrary (dllnames_vf, &vf_dll, vorbisfilefuncs);
 }
 
 
@@ -567,23 +558,16 @@ static const snd_buffer_t* OGG_FetchSound (void *sfxfetcher, void **chfetcherpoi
 OGG_FetchEnd
 ====================
 */
-static void OGG_FetchEnd (channel_t* ch)
+static void OGG_FetchEnd (void *chfetcherdata)
 {
-       ogg_stream_perchannel_t* per_ch;
+       ogg_stream_perchannel_t* per_ch = (ogg_stream_perchannel_t *)chfetcherdata;
 
-       per_ch = (ogg_stream_perchannel_t *)ch->fetcher_data;
        if (per_ch != NULL)
        {
-               size_t buff_len;
-
                // Free the ogg vorbis decoder
                qov_clear (&per_ch->vf);
 
-               buff_len = per_ch->sb.maxframes * per_ch->sb.format.channels * per_ch->sb.format.width;
-               ch->sfx->memsize -= sizeof (*per_ch) - sizeof (per_ch->sb.samples) + buff_len;
-
                Mem_Free (per_ch);
-               ch->fetcher_data = NULL;
        }
 }
 
@@ -593,20 +577,15 @@ static void OGG_FetchEnd (channel_t* ch)
 OGG_FreeSfx
 ====================
 */
-static void OGG_FreeSfx (sfx_t* sfx)
+static void OGG_FreeSfx (void *sfxfetcherdata)
 {
-       ogg_stream_persfx_t* per_sfx = (ogg_stream_persfx_t *)sfx->fetcher_data;
+       ogg_stream_persfx_t* per_sfx = (ogg_stream_persfx_t *)sfxfetcherdata;
 
        // Free the Ogg Vorbis file
        Mem_Free(per_sfx->file);
-       sfx->memsize -= per_sfx->filesize;
 
        // Free the stream structure
        Mem_Free(per_sfx);
-       sfx->memsize -= sizeof (*per_sfx);
-
-       sfx->fetcher_data = NULL;
-       sfx->fetcher = NULL;
 }
 
 
@@ -634,13 +613,15 @@ Load an Ogg Vorbis file into memory
 qboolean OGG_LoadVorbisFile (const char *filename, sfx_t *sfx)
 {
        unsigned char *data;
-       const char *loopcomment;
+       const char *thiscomment;
        fs_offset_t filesize;
        ov_decode_t ov_decode;
        OggVorbis_File vf;
        vorbis_info *vi;
        vorbis_comment *vc;
        ogg_int64_t len, buff_len;
+       double peak = 0.0;
+       double gaindb = 0.0;
 
        if (!vf_dll)
                return false;
@@ -654,7 +635,8 @@ qboolean OGG_LoadVorbisFile (const char *filename, sfx_t *sfx)
        if (data == NULL)
                return false;
 
-       Con_DPrintf ("Loading Ogg Vorbis file \"%s\"\n", filename);
+       if (developer_loading.integer >= 2)
+               Con_Printf ("Loading Ogg Vorbis file \"%s\"\n", filename);
 
        // Open it with the VorbisFile API
        ov_decode.buffer = data;
@@ -686,7 +668,8 @@ qboolean OGG_LoadVorbisFile (const char *filename, sfx_t *sfx)
        {
                ogg_stream_persfx_t* per_sfx;
 
-               Con_DPrintf ("\"%s\" will be streamed\n", filename);
+               if (developer_loading.integer >= 2)
+                       Con_Printf ("Ogg sound file \"%s\" will be streamed\n", filename);
                per_sfx = (ogg_stream_persfx_t *)Mem_Alloc (snd_mempool, sizeof (*per_sfx));
                strlcpy(per_sfx->name, sfx->name, sizeof(per_sfx->name));
                sfx->memsize += sizeof (*per_sfx);
@@ -706,9 +689,15 @@ qboolean OGG_LoadVorbisFile (const char *filename, sfx_t *sfx)
                vc = qov_comment(&vf, -1);
                if(vc)
                {
-                       loopcomment = qvorbis_comment_query(vc, "LOOP_START", 0);
-                       if(loopcomment)
-                               sfx->loopstart = bound(0, (unsigned int) (atof(loopcomment) * (double)snd_renderbuffer->format.speed / (double)per_sfx->format.speed), sfx->total_length);
+                       thiscomment = qvorbis_comment_query(vc, "LOOP_START", 0);
+                       if(thiscomment)
+                               sfx->loopstart = bound(0, (unsigned int) (atof(thiscomment) * (double)snd_renderbuffer->format.speed / (double)per_sfx->format.speed), sfx->total_length);
+                       thiscomment = qvorbis_comment_query(vc, "REPLAYGAIN_TRACK_PEAK", 0);
+                       if(thiscomment)
+                               peak = atof(thiscomment);
+                       thiscomment = qvorbis_comment_query(vc, "REPLAYGAIN_TRACK_GAIN", 0);
+                       if(thiscomment)
+                               gaindb = atof(thiscomment);
                }
        }
        else
@@ -720,7 +709,8 @@ qboolean OGG_LoadVorbisFile (const char *filename, sfx_t *sfx)
                snd_buffer_t *sb;
                snd_format_t ogg_format;
 
-               Con_DPrintf ("\"%s\" will be cached\n", filename);
+               if (developer_loading.integer >= 2)
+                       Con_Printf ("Ogg sound file \"%s\" will be cached\n", filename);
 
                // Decode it
                buff = (char *)Mem_Alloc (snd_mempool, (int)len);
@@ -758,9 +748,15 @@ qboolean OGG_LoadVorbisFile (const char *filename, sfx_t *sfx)
                vc = qov_comment(&vf, -1);
                if(vc)
                {
-                       loopcomment = qvorbis_comment_query(vc, "LOOP_START", 0);
-                       if(loopcomment)
-                               sfx->loopstart = bound(0, (unsigned int) (atoi(loopcomment) * (double)snd_renderbuffer->format.speed / (double)sb->format.speed), sfx->total_length);
+                       thiscomment = qvorbis_comment_query(vc, "LOOP_START", 0);
+                       if(thiscomment)
+                               sfx->loopstart = bound(0, (unsigned int) (atoi(thiscomment) * (double)snd_renderbuffer->format.speed / (double)sb->format.speed), sfx->total_length);
+                       thiscomment = qvorbis_comment_query(vc, "REPLAYGAIN_TRACK_PEAK", 0);
+                       if(thiscomment)
+                               peak = atof(thiscomment);
+                       thiscomment = qvorbis_comment_query(vc, "REPLAYGAIN_TRACK_GAIN", 0);
+                       if(thiscomment)
+                               gaindb = atof(thiscomment);
                }
 
                qov_clear (&vf);
@@ -768,5 +764,13 @@ qboolean OGG_LoadVorbisFile (const char *filename, sfx_t *sfx)
                Mem_Free (buff);
        }
 
+       if(peak)
+       {
+               sfx->volume_mult = min(1 / peak, exp(gaindb * 0.05 * log(10)));
+               sfx->volume_peak = peak;
+               if (developer_loading.integer >= 2)
+                       Con_Printf ("Ogg sound file \"%s\" uses ReplayGain (gain %f, peak %f)\n", filename, sfx->volume_mult, sfx->volume_peak);
+       }
+
        return true;
 }