# HG changeset patch
# User William Pitcock <nenolod@atheme-project.org>
# Date 1185399256 18000
# Node ID ea2ecaeff8ce090076e366901aa2298b30421ce3
# Parent  616d34396eeffa5e221ac6ae2c88c674b52a8e91# Parent  6d87598ff8a959a0131eafe42c8d1d295fb222c6
Automated merge with ssh://hg.atheme.org//hg/audacious-plugins

diff -r 6d87598ff8a9 -r ea2ecaeff8ce src/vorbis/vorbis.c
--- a/src/vorbis/vorbis.c	Wed Jul 25 23:21:07 2007 +0200
+++ b/src/vorbis/vorbis.c	Wed Jul 25 16:34:16 2007 -0500
@@ -482,7 +482,7 @@
 
     title = vorbis_generate_title(&vf, filename);
     use_rg = vorbis_update_replaygain(&rg_scale);
-    br = ov_bitrate(&vf, -1);
+    br = vi->bitrate_nominal / 1000;
 
     g_mutex_unlock(vf_mutex);
 
@@ -532,8 +532,6 @@
             else
                 time = ov_time_total(&vf, -1) * 1000;
 
-	    br = ov_bitrate(&vf, current_section);
-
             g_mutex_unlock(vf_mutex);
 
             vorbis_ip.set_info(title, time, br, samplerate, channels);
@@ -541,21 +539,6 @@
 
             last_section = current_section;
         }
-
-        if (!(vi->bitrate_upper == vi->bitrate_lower && vi->bitrate_upper == vi->bitrate_nominal)
-            && (playback->output->output_time() > timercount + 1000
-                || playback->output->output_time() < timercount)) {
-            /*
-             * simple hack to avoid updating too
-             * often
-             */
-            g_mutex_lock(vf_mutex);
-            br = ov_bitrate_instant(&vf);
-            g_mutex_unlock(vf_mutex);
-            if (br > 0)
-                vorbis_ip.set_info(title, time, br, samplerate, channels);
-            timercount = playback->output->output_time();
-        }
     }
     if (!playback->error)
         playback->output->close_audio();