# HG changeset patch
# User nenolod
# Date 1169554488 28800
# Node ID 2fa253251598d8c2433e67242aec312af570b28d
# Parent  04b0c54d16bbee31705a3097976ced6afbcb1c07
[svn] - fix uninitialized value conditional jump, maybe it will help

diff -r 04b0c54d16bb -r 2fa253251598 ChangeLog
--- a/ChangeLog	Tue Jan 23 03:00:28 2007 -0800
+++ b/ChangeLog	Tue Jan 23 04:14:48 2007 -0800
@@ -1,3 +1,11 @@
+2007-01-23 11:00:28 +0000  Yoshiki Yazawa <yaz@cc.rim.or.jp>
+  revision [1150]
+  - if the performer of a track is not specified in cue sheet, the performer of the album will be used.
+  
+  trunk/src/cue/cuesheet.c |    4 +++-
+  1 file changed, 3 insertions(+), 1 deletion(-)
+
+
 2007-01-23 06:23:12 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
   revision [1148]
   - update welsh translation:
diff -r 04b0c54d16bb -r 2fa253251598 src/vorbis/vorbis.c
--- a/src/vorbis/vorbis.c	Tue Jan 23 03:00:28 2007 -0800
+++ b/src/vorbis/vorbis.c	Tue Jan 23 04:14:48 2007 -0800
@@ -34,6 +34,8 @@
 #  include "config.h"
 #endif
 
+#define DEBUG
+
 #include <glib.h>
 #include <gtk/gtk.h>
 
@@ -349,7 +351,7 @@
      * alert us what section we're currently decoding in case we
      * need to change playback settings at a section boundary
      */
-    int current_section;
+    int current_section = last_section;
 
     g_mutex_lock(vf_mutex);
     if (use_rg) {
@@ -377,14 +379,11 @@
         return last_section;
 
     case OV_HOLE:
+	break;
     case OV_EBADLINK:
-        /*
-         * error in the stream.  Not a problem, just
-         * reporting it in case we (the app) cares.
-         * In this case, we don't.
-         */
-        g_mutex_unlock(vf_mutex);
-        return last_section;
+	g_print("OV_EBADLINK\n");
+	return last_section;
+	break;
     }
 
     if (current_section != last_section) {
@@ -478,10 +477,11 @@
     }
     vi = ov_info(&vf, -1);
 
+    /* XXX this isn't very correct, but it works */
+    vorbis_is_streaming = ((time = ov_time_total(&vf, -1)) <= 1.);
+
     if (vorbis_is_streaming)
         time = -1;
-    else
-        time = ov_time_total(&vf, -1) * 1000;
 
     if (vi->channels > 2) {
         vorbis_eos = TRUE;
@@ -520,6 +520,7 @@
             do_seek();
 
         if (vorbis_eos) {
+	    g_print("vorbis_eos true\n");
             xmms_usleep(20000);
             continue;
         }
@@ -533,6 +534,7 @@
              */
             if (title)
                 g_free(title);
+
             g_mutex_lock(vf_mutex);
             title = vorbis_generate_title(&vf, filename);
             use_rg = vorbis_update_replaygain(&rg_scale);