From: Mats Lidell <matsl_at_contactor.se>
Date: Fri, 09 Aug 2002 09:43:52 +0200

Hi,

This patch adds the following:
* Param icon shown in main_menu
* Audio icon shown in wps.
* Param shown when changing volume in wps.
* Volume icon change when volume is changed in sound_menu.

Disclaimer: Patch slightly edited due to that I have other things
changed as well. Should work though since patch is such a smart tool.

----------------------------------------------------------------------
Index: main_menu.c
===================================================================
RCS file: /cvsroot/rockbox/apps/main_menu.c,v
retrieving revision 1.46
diff -u -u -r1.46 main_menu.c
--- main_menu.c 7 Aug 2002 11:23:36 -0000 1.46
+++ main_menu.c 9 Aug 2002 07:36:00 -0000
_at__at_ -192,6 +192,12 _at__at_
     };
 
     m=menu_init( items, sizeof items / sizeof(struct menu_items) );
+#ifdef HAVE_LCD_CHARCELLS
+ lcd_icon(ICON_PARAM, true);
+#endif
     menu_run(m);
+#ifdef HAVE_LCD_CHARCELLS
+ lcd_icon(ICON_PARAM, false);
+#endif
     menu_exit(m);
 }
Index: sound_menu.c
===================================================================
RCS file: /cvsroot/rockbox/apps/sound_menu.c,v
retrieving revision 1.19
diff -u -u -r1.19 sound_menu.c
--- sound_menu.c 8 Aug 2002 20:44:24 -0000 1.19
+++ sound_menu.c 9 Aug 2002 07:36:00 -0000
_at__at_ -24,6 +24,7 _at__at_
 #include "button.h"
 #include "mpeg.h"
 #include "settings.h"
+#include "status.h"
 
 static char *fmt[] =
 {
_at__at_ -67,6 +68,7 _at__at_
         }
         lcd_puts(0,1,str);
         lcd_update();
+ status_draw();
 
         switch( button_get(true) ) {
 #ifdef HAVE_RECORDER_KEYPAD
Index: wps.c
===================================================================
RCS file: /cvsroot/rockbox/apps/wps.c,v
retrieving revision 1.51
diff -u -u -r1.51 wps.c
--- wps.c 8 Aug 2002 15:38:15 -0000 1.51
+++ wps.c 9 Aug 2002 07:36:01 -0000
_at__at_ -197,6 +202,11 _at__at_
 
     old_release_mask = button_set_release(RELEASE_MASK);
 
+#ifdef HAVE_LCD_CHARCELLS
+ lcd_icon(ICON_AUDIO, true);
+ lcd_icon(ICON_PARAM, false);
+#endif
+
     if(mpeg_is_playing())
     {
         id3 = mpeg_current_track();
_at__at_ -213,7 +223,7 _at__at_
             id3 = mpeg_current_track();
             draw_screen(id3);
         }
-
+
         switch(button)
         {
             case BUTTON_ON:
_at__at_ -226,6 +236,7 _at__at_
 
 #ifdef HAVE_LCD_CHARCELLS
                 lcd_icon(ICON_RECORD, false);
+ lcd_icon(ICON_AUDIO, false);
 #endif
                 button_set_release(old_release_mask);
                 return 0;
_at__at_ -329,6 +340,7 _at__at_
                     
             case BUTTON_MENU:
                 lcd_icon(ICON_PARAM, true);
+ lcd_icon(ICON_AUDIO, false);
                 menu_button_is_down = true;
                 break;
 
_at__at_ -403,6 +415,9 _at__at_
                 {
                     dont_go_to_menu = false;
                 }
+#ifdef HAVE_LCD_CHARCELLS
+ lcd_icon(ICON_AUDIO, true);
+#endif
                 menu_button_is_down = false;
                 break;
 
_at__at_ -429,6 +444,10 _at__at_
                     break;
                 }
 
+#ifdef HAVE_LCD_CHARCELLS
+ lcd_icon(ICON_RECORD, false);
+ lcd_icon(ICON_AUDIO, false);
+#endif
                 mpeg_stop();
                 status_set_playmode(STATUS_STOP);
                 button_set_release(old_release_mask);
----------------------------------------------------------------------

Yours

-- 
%% Mats

Received on 2002-08-09