1
0
Fork 0
forked from len0rd/rockbox

Rearange menu of mpegplayer. Add new menu with "settings" and "quit", and remove quit item from settings menu.

The setting menu was bit wierd as it had "quit" item at it's buttom.
Also, there are 2 almost same menu definitions in mpeg_menu and it doesn't looks good, imo.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22518 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Teruaki Kawashima 2009-08-27 14:24:58 +00:00
parent ed940e8830
commit 443f609be6
3 changed files with 70 additions and 57 deletions

View file

@ -1485,10 +1485,8 @@ static void button_loop(void)
rb->lcd_clear_display();
rb->lcd_update();
#if defined(HAVE_LCD_MODES)
#if (HAVE_LCD_MODES & LCD_MODE_YUV)
rb->lcd_set_mode(LCD_MODE_YUV);
#endif
#if defined(HAVE_LCD_MODES) && (HAVE_LCD_MODES & LCD_MODE_YUV)
rb->lcd_set_mode(LCD_MODE_YUV);
#endif
wvs_init();
@ -1569,13 +1567,11 @@ static void button_loop(void)
stream_show_vo(false);
wvs_backlight_brightness_video_mode(false);
#if defined(HAVE_LCD_MODES)
#if (HAVE_LCD_MODES & LCD_MODE_YUV)
rb->lcd_set_mode(LCD_MODE_RGB565);
#endif
#if defined(HAVE_LCD_MODES) && (HAVE_LCD_MODES & LCD_MODE_YUV)
rb->lcd_set_mode(LCD_MODE_RGB565);
#endif
result = mpeg_menu(0);
result = mpeg_menu();
/* The menu can change the font, so restore */
rb->lcd_setfont(FONT_SYSFIXED);
@ -1587,10 +1583,8 @@ static void button_loop(void)
break;
default:
#if defined(HAVE_LCD_MODES)
#if (HAVE_LCD_MODES & LCD_MODE_YUV)
rb->lcd_set_mode(LCD_MODE_YUV);
#endif
#if defined(HAVE_LCD_MODES) && (HAVE_LCD_MODES & LCD_MODE_YUV)
rb->lcd_set_mode(LCD_MODE_YUV);
#endif
/* If not stopped, show video again */
if (state != STREAM_STOPPED) {
@ -1751,10 +1745,8 @@ enum plugin_status plugin_start(const void* parameter)
}
}
#if defined(HAVE_LCD_MODES)
#if (HAVE_LCD_MODES & LCD_MODE_YUV)
rb->lcd_set_mode(LCD_MODE_RGB565);
#endif
#if defined(HAVE_LCD_MODES) && (HAVE_LCD_MODES & LCD_MODE_YUV)
rb->lcd_set_mode(LCD_MODE_RGB565);
#endif
stream_exit();