Too much on the last commit.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18085 a1c6a512-1295-4272-9138-f99709370657

4 files changed, 10 insertions, 13 deletions

diff --git a/apps/codecs/libfaad/SOURCES b/apps/codecs/libfaad/SOURCES
index f97e14d9e4..4c7a34d210 100644
--- a/apps/codecs/libfaad/SOURCES
+++ b/apps/codecs/libfaad/SOURCES
@@ -33,4 +33,3 @@ sbr_tf_grid.c
 specrec.c
 syntax.c
 tns.c
-mdct2.c
\ No newline at end of file
diff --git a/apps/codecs/libfaad/filtbank.c b/apps/codecs/libfaad/filtbank.c
index 724110ecc5..9b1bc854ad 100644
--- a/apps/codecs/libfaad/filtbank.c
+++ b/apps/codecs/libfaad/filtbank.c
@@ -1,19 +1,19 @@
 /*
 ** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding
 ** Copyright (C) 2003-2004 M. Bakker, Ahead Software AG, http://www.nero.com
-**
+**  
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
 ** the Free Software Foundation; either version 2 of the License, or
 ** (at your option) any later version.
-**
+** 
 ** This program is distributed in the hope that it will be useful,
 ** but WITHOUT ANY WARRANTY; without even the implied warranty of
 ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ** GNU General Public License for more details.
-**
+** 
 ** You should have received a copy of the GNU General Public License
-** along with this program; if not, write to the Free Software
+** along with this program; if not, write to the Free Software 
 ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
@@ -42,7 +42,6 @@
 #include "kbd_win.h"
 #include "sine_win.h"
 #include "mdct.h"
-#include "mdct2.h"
 
 
 fb_info *filter_bank_init(uint16_t frame_len)
diff --git a/apps/debug_menu.c b/apps/debug_menu.c
index 8c624dcc9a..b2144e2169 100644
--- a/apps/debug_menu.c
+++ b/apps/debug_menu.c
@@ -303,7 +303,7 @@ static bool dbg_buffering_thread(void)
     lcd_setfont(FONT_SYSFIXED);
     while(!done)
     {
-        button = get_action(CONTEXT_STD,HZ*2);
+        button = get_action(CONTEXT_STD,HZ/5);
         switch(button)
         {
             case ACTION_STD_NEXT:
@@ -2041,9 +2041,9 @@ static int database_callback(int btn, struct gui_synclist *lists)
     simplelist_addline(SIMPLELIST_ADD_LINE, "Commit delayed: %s",
              stat->commit_delayed ? "Yes" : "No");
 
-    simplelist_addline(SIMPLELIST_ADD_LINE, "Queue length: %d",
+    simplelist_addline(SIMPLELIST_ADD_LINE, "Queue length: %d", 
              stat->queue_length);
-
+    
     if (synced)
     {
         synced = false;
@@ -2068,7 +2068,7 @@ static bool dbg_tagcache_info(void)
     info.action_callback = database_callback;
     info.hide_selection = true;
     info.scroll_all = true;
-
+    
     /* Don't do nonblock here, must give enough processing time
        for tagcache thread. */
     /* info.timeout = TIMEOUT_NOBLOCK; */
@@ -2428,7 +2428,7 @@ static bool dbg_isp1583(void)
     struct simplelist_info isp1583;
     isp1583.scroll_all = true;
     simplelist_info_init(&isp1583, "ISP1583", dbg_usb_num_items(), NULL);
-    isp1583.timeout = HZ/100;
+    isp1583.timeout = HZ/100; 
     isp1583.hide_selection = true;
     isp1583.get_name = dbg_usb_item;
     isp1583.action_callback = isp1583_action_callback;
@@ -2453,7 +2453,7 @@ static bool dbg_pic(void)
     struct simplelist_info pic;
     pic.scroll_all = true;
     simplelist_info_init(&pic, "PIC", pic_dbg_num_items(), NULL);
-    pic.timeout = HZ/100;
+    pic.timeout = HZ/100; 
     pic.hide_selection = true;
     pic.get_name = pic_dbg_item;
     pic.action_callback = pic_action_callback;
diff --git a/apps/plugins/SOURCES b/apps/plugins/SOURCES
index ac9e1c3977..4bcc144ed8 100644
--- a/apps/plugins/SOURCES
+++ b/apps/plugins/SOURCES
@@ -20,7 +20,6 @@ stats.c
 stopwatch.c
 vbrfix.c
 viewer.c
-test_codec.c
 #ifdef HAVE_BACKLIGHT
 lamp.c
 #endif /* HAVE_BACKLIGHT */