Mercurial > audlegacy-plugins

changeset 537:e55f789573e3 trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[svn] - treat all failures the same. this is XIPH. we're not going to ever be able to recover from it.
author nenolod
date Tue, 23 Jan 2007 06:20:09 -0800
parents a61e18a4a84a
children f93983482697
files ChangeLog src/vorbis/vorbis.c
diffstat 2 files changed, 12 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Jan 23 04:34:30 2007 -0800
+++ b/ChangeLog	Tue Jan 23 06:20:09 2007 -0800
@@ -1,3 +1,11 @@
+2007-01-23 12:34:30 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
+  revision [1158]
+  - kill dumb debug notice
+  
+  trunk/src/vorbis/vorbis.c |    1 -
+  1 file changed, 1 deletion(-)
+
+
 2007-01-23 12:33:51 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
   revision [1156]
   - make sure g_mutex_unlock(vf_mutex); is done
--- a/src/vorbis/vorbis.c	Tue Jan 23 04:34:30 2007 -0800
+++ b/src/vorbis/vorbis.c	Tue Jan 23 06:20:09 2007 -0800
@@ -34,6 +34,8 @@
 #  include "config.h"
 #endif
 
+#define DEBUG
+
 #include <glib.h>
 #include <gtk/gtk.h>
 
@@ -367,7 +369,7 @@
                     2, 1, &current_section);
     }
 
-    switch (bytes) {
+    if (bytes <= 0) {
     case 0:
         /* EOF */
         g_mutex_unlock(vf_mutex);
@@ -375,12 +377,6 @@
         vorbis_ip.output->buffer_free();
         vorbis_eos = TRUE;
         return last_section;
-
-    case OV_HOLE:
-    case OV_EBADLINK:
-	g_mutex_unlock(vf_mutex);
-	return current_section;
-	break;
     }
 
     if (current_section != last_section) {
@@ -517,6 +513,7 @@
             do_seek();
 
         if (vorbis_eos) {
+	    g_print("vorbis_eos true\n");
             xmms_usleep(20000);
             continue;
         }