From 443f609be62b812878c7c9a832d8014ab56bbf6f Mon Sep 17 00:00:00 2001 From: Teruaki Kawashima Date: Thu, 27 Aug 2009 14:24:58 +0000 Subject: 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 --- apps/plugins/mpegplayer/mpegplayer.c | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) (limited to 'apps/plugins/mpegplayer/mpegplayer.c') diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c index 47407cca8e..a66a588ace 100644 --- a/apps/plugins/mpegplayer/mpegplayer.c +++ b/apps/plugins/mpegplayer/mpegplayer.c @@ -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(); -- cgit v1.2.3