Update of /cvsroot/rockbox/apps
In directory labb.contactor.se:/var/tmp/cvs-serv13230/apps
Modified Files:
debug_menu.c
Log Message:
Removed the sound debugging screen
Index: debug_menu.c
===================================================================
RCS file: /cvsroot/rockbox/apps/debug_menu.c,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -b -r1.75 -r1.76
--- debug_menu.c 19 Jul 2004 21:21:34 -0000 1.75
+++ debug_menu.c 23 Jul 2004 08:58:06 -0000 1.76
@@ -1497,136 +1497,6 @@
}
#endif
-static bool dbg_sound(void)
-{
- char buf[128];
- bool done = false;
- bool set = true;
- long ll, lr, rr, rl;
- int d, i;
-#ifdef HAVE_MAS3587F
- long superbass;
- long val;
-#endif
-
-#ifdef HAVE_LCD_BITMAP
- lcd_setmargins(0, 0);
-#endif
-
- /* Normal stereo */
- ll = 0x80000;
- lr = 0x00000;
- rr = 0x80000;
- rl = 0x00000;
-
-#ifdef HAVE_MAS3587F
- /* Set the MDB to the Archos "flat" setting, but not activated */
- mas_codec_writereg(MAS_REG_KMDB_STR, 0);
- mas_codec_writereg(MAS_REG_KMDB_HAR, 0x3000);
- mas_codec_writereg(MAS_REG_KMDB_FC, 0x0600);
- mas_codec_writereg(MAS_REG_KMDB_SWITCH, 0);
-#endif
-
- while(!done)
- {
- int button;
-
-#ifdef HAVE_MAS3587F
- superbass = mas_codec_readreg(MAS_REG_KLOUDNESS) & 0x0004;
-#endif
-
- lcd_clear_display();
- d = 200 - ll * 100 / 0x80000;
- i = d / 100;
- snprintf(buf, sizeof buf, "LL: -%d.%02d (%05x)", i, d % 100, ll);
- lcd_puts(0, 0, buf);
-
- d = - lr * 100 / 0x80000;
- i = d / 100;
- snprintf(buf, sizeof buf, "LR: -%d.%02d (%05x)", i, d % 100,
- lr & 0x000fffff);
- lcd_puts(0, 1, buf);
-
-#ifdef HAVE_MAS3587F
- if(superbass)
- lcd_puts(0, 2, "Super Bass");
-#endif
- lcd_update();
-
- /* Wait for a key to be pushed */
- button = button_get(true);
- switch(button) {
-#if defined(HAVE_PLAYER_KEYPAD) || defined(HAVE_NEO_KEYPAD)
- case BUTTON_STOP | BUTTON_REL:
-#else
- case BUTTON_OFF | BUTTON_REL:
-#endif
- done = true;
- break;
-
- case BUTTON_LEFT:
- case BUTTON_LEFT | BUTTON_REPEAT:
- if(ll < 0x100000)
- {
- ll += 0x80000/128;
- rr += 0x80000/128;
- lr -= 0x80000/128;
- rl -= 0x80000/128;
- }
- set = true;
- break;
-
- case BUTTON_RIGHT:
- case BUTTON_RIGHT | BUTTON_REPEAT:
- if(ll > 0x80000)
- {
- ll -= 0x80000/128;
- rr -= 0x80000/128;
- lr += 0x80000/128;
- rl += 0x80000/128;
- }
- set = true;
- break;
-
- case BUTTON_PLAY:
- if(set) /* This means that the current config is the
- custom one */
- mpeg_sound_set(SOUND_CHANNELS, MPEG_SOUND_STEREO);
-
- set = !set;
- break;
-
-#ifdef HAVE_MAS3587F
- case BUTTON_ON:
- val = mas_codec_readreg(MAS_REG_KLOUDNESS);
- val ^= 0x0004;
- mas_codec_writereg(MAS_REG_KLOUDNESS, val);
- if(val)
- mas_codec_writereg(MAS_REG_KMDB_SWITCH, 0x0902);
- else
- mas_codec_writereg(MAS_REG_KMDB_SWITCH, 0);
- break;
-#endif
- }
- if(set)
- {
-#ifdef HAVE_MAS3587F
- mas_writemem(MAS_BANK_D0, 0x7fc, &ll, 1); /* LL */
- mas_writemem(MAS_BANK_D0, 0x7fd, &lr, 1); /* LR */
- mas_writemem(MAS_BANK_D0, 0x7fe, &rl, 1); /* RL */
- mas_writemem(MAS_BANK_D0, 0x7ff, &rr, 1); /* RR */
-#else
- mas_writemem(MAS_BANK_D1, 0x7f8, &ll, 1); /* LL */
- mas_writemem(MAS_BANK_D1, 0x7f9, &lr, 1); /* LR */
- mas_writemem(MAS_BANK_D1, 0x7fa, &rl, 1); /* RL */
- mas_writemem(MAS_BANK_D1, 0x7fb, &rr, 1); /* RR */
-#endif
- }
- }
-
- return false;
-}
-
#ifdef HAVE_LCD_BITMAP
extern bool do_screendump_instead_of_usb;
@@ -1677,7 +1547,6 @@
#ifdef HAVE_FMRADIO
{ "FM Radio", -1, dbg_fm_radio },
#endif
- { "Sound test", -1, dbg_sound },
};
m=menu_init( items, sizeof items / sizeof(struct menu_item), NULL,
_______________________________________________
http://cool.haxx.se/mailman/listinfo/rockbox-cvs
|
