diff src/madplug/decoder.c @ 789:354c69a939bc trunk

[svn] revising vfs_fread() check code. - check vfs handle code has been restored to original position. - accidentally removed substitution to ret has been restored. - in audmad_is_our_fd(), check code just puts log message instead of return. please let me know if log message would be put upon proper mp3 file. - in scan_file(), check code returns if vfs_fread() fails. this fixes open audio with bogus parameters problem.
author yaz
date Tue, 06 Mar 2007 22:08:18 -0800
parents 2461b711162b
children 2b2313fc1ddc
line wrap: on
line diff
--- a/src/madplug/decoder.c	Tue Mar 06 15:43:15 2007 -0800
+++ b/src/madplug/decoder.c	Tue Mar 06 22:08:18 2007 -0800
@@ -195,7 +195,7 @@
 
     while (1) {
         remainder = stream.bufend - stream.next_frame;
-
+	
         /*
            if (remainder >= BUFFER_SIZE)
            {
@@ -208,10 +208,8 @@
                              BUFFER_SIZE - remainder);
 
         if (len <= 0) {
-#ifdef DEBUG
             g_message("scan_file: len <= 0 abort.");
-#endif
-            break;
+            return 0;
         }
 
         mad_stream_buffer(&stream, buffer, len + remainder);