changeset 1111:53f8a1d3a070 trunk

[svn] - improve support of non-standard bitrates - remove unreached code
author nenolod
date Mon, 29 May 2006 17:51:48 -0700
parents c4063c84b797
children 73631b1e8611
files Plugins/Input/mpg123/common.c Plugins/Input/mpg123/layer3.c
diffstat 2 files changed, 4 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- a/Plugins/Input/mpg123/common.c	Mon May 29 11:25:33 2006 -0700
+++ b/Plugins/Input/mpg123/common.c	Mon May 29 17:51:48 2006 -0700
@@ -357,6 +357,10 @@
     default:
         return (0);
     }
+
+    if (!fr->bitrate_index)
+        fr->framesize = 0;
+
     if (fr->framesize > MAXFRAMESIZE)
         return 0;
     return 1;
--- a/Plugins/Input/mpg123/layer3.c	Mon May 29 11:25:33 2006 -0700
+++ b/Plugins/Input/mpg123/layer3.c	Mon May 29 17:51:48 2006 -0700
@@ -1825,27 +1825,6 @@
             }
         }
 
-#ifdef XMMS_EQ
-        if (mpgdec_info->eq_active) {
-            int i, sb;
-            
-            if (single < 0) {
-                for (sb = 0, i = 0; sb < SBLIMIT; sb++) {
-                    for (ss = 0; ss < SSLIMIT; ss++) {
-                        hybridIn[0][sb][ss] *= mpgdec_info->eq_mul[i];
-                        hybridIn[1][sb][ss] *= mpgdec_info->eq_mul[i++];
-                    }
-                }
-            }
-            else {
-                for (sb = 0, i = 0; sb < SBLIMIT; sb++) {
-                    for (ss = 0; ss < SSLIMIT; ss++)
-                        hybridIn[0][sb][ss] *= mpgdec_info->eq_mul[i++];
-                }
-            }
-        }
-#endif
-        
         for (ch = 0; ch < stereo1; ch++) {
             struct gr_info_s *gr_info = &(sideinfo.ch[ch].gr[gr]);