# HG changeset patch
# User nenolod
# Date 1171991576 28800
# Node ID 74a762a3592ed906ba2758c4893fa3423ad60b2f
# Parent  c787612e29ffb08cf880a93d13edee47aac02784
[svn] - temporarily cheat and disable certain codepaths for local files

diff -r c787612e29ff -r 74a762a3592e ChangeLog
--- a/ChangeLog	Tue Feb 20 09:02:15 2007 -0800
+++ b/ChangeLog	Tue Feb 20 09:12:56 2007 -0800
@@ -1,3 +1,12 @@
+2007-02-20 17:02:15 +0000  Yoshiki Yazawa <yaz@cc.rim.or.jp>
+  revision [1478]
+  - temporary workaround for ISO-8859-1 8bit character does not appear correctly.
+  
+  
+  trunk/src/madplug/input.c |    4 ++++
+  1 file changed, 4 insertions(+)
+
+
 2007-02-20 16:52:37 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
   revision [1476]
   - no idea why we were using a dynamically allocated buffer for raw aac
diff -r c787612e29ff -r 74a762a3592e src/aac/src/libmp4.c
--- a/src/aac/src/libmp4.c	Tue Feb 20 09:02:15 2007 -0800
+++ b/src/aac/src/libmp4.c	Tue Feb 20 09:12:56 2007 -0800
@@ -658,6 +658,8 @@
     gchar       *ext  = strrchr(temp, '.');
     gchar       *xmmstitle = NULL;
     faacDecConfigurationPtr config;
+    gboolean    remote = str_has_prefix_nocase(filename, "http:") ||
+			 str_has_prefix_nocase(filename, "https:");
 
     vfs_rewind(file);
     if((decoder = faacDecOpen()) == NULL){
@@ -772,8 +774,7 @@
         bufferconsumed += finfo.bytesconsumed;
         samplesdecoded = finfo.samples;
 
-        if(finfo.error > 0){
-            buffervalid--;
+        if(finfo.error > 0 && remote != FALSE){
             memmove(buffer, &buffer[1], buffervalid);
             if(buffervalid < BUFFER_SIZE) {
                buffervalid +=