Unnamed

Index: trunk/apps/action.h
===================================================================
--- trunk/apps/action.h	(revision 16495)
+++ trunk/apps/action.h	(working copy)
@@ -93,7 +93,9 @@
     ACTION_STD_QUICKSCREEN,
     ACTION_STD_KEYLOCK,
     ACTION_STD_REC,
-    
+#if CONFIG_TUNER
+    ACTION_STD_RADIO,
+#endif
     ACTION_F3, /* just so everything works again, possibly change me */
     /* code context actions */
     
@@ -114,6 +116,11 @@
     ACTION_WPS_QUICKSCREEN,/* optional */
     ACTION_WPS_MENU, /*this should be the same as ACTION_STD_MENU */
     ACTION_WPS_REC,
+#if CONFIG_TUNER
+    ACTION_WPS_RADIO,
+#endif
+    ACTION_WPS_PLAYINGTIME,
+
 #if 0
     ACTION_WPSAB_SINGLE, /* This needs to be #defined in 
                             the config-<target>.h to one of the ACTION_WPS_ actions
Index: trunk/apps/tree.c
===================================================================
--- trunk/apps/tree.c	(revision 16495)
+++ trunk/apps/tree.c	(working copy)
@@ -724,6 +724,11 @@
                 return GO_TO_RECSCREEN;
 #endif
 
+#if CONFIG_TUNER
+        case ACTION_STD_RADIO:
+             return GO_TO_FM;
+#endif
+
             case ACTION_TREE_WPS:
                 return GO_TO_PREVIOUS_MUSIC;
                 break;
Index: trunk/apps/gui/gwps.c
===================================================================
--- trunk/apps/gui/gwps.c	(revision 16495)
+++ trunk/apps/gui/gwps.c	(working copy)
@@ -234,6 +234,16 @@
 #endif
         switch(button)
         {
+        case ACTION_WPS_PLAYINGTIME:
+             playing_time ();
+             break;
+
+#if CONFIG_TUNER
+            case ACTION_WPS_RADIO:
+                 exit = true;
+                 return GO_TO_FM;
+#endif
+
             case ACTION_WPS_CONTEXT:
 #if LCD_DEPTH > 1
                 show_main_backdrop();
Index: trunk/apps/menu.c
===================================================================
--- trunk/apps/menu.c	(revision 16495)
+++ trunk/apps/menu.c	(working copy)
@@ -379,7 +379,15 @@
             continue;
         if (action == ACTION_NONE)
             continue;
-        
+
+#if CONFIG_TUNER
+        if (action == ACTION_STD_RADIO)
+             {
+             ret = GO_TO_FM;
+             done =true;
+             }
+#endif
+
 #ifdef HAVE_RECORDING
         if (action == ACTION_STD_REC)
         {
Index: trunk/apps/keymaps/keymap-h1x0_h3x0.c
===================================================================
--- trunk/apps/keymaps/keymap-h1x0_h3x0.c	(revision 16495)
+++ trunk/apps/keymaps/keymap-h1x0_h3x0.c	(working copy)
@@ -62,6 +62,7 @@
     { ACTION_STD_OK,            BUTTON_RIGHT,               BUTTON_NONE },
     { ACTION_STD_OK,            BUTTON_ON|BUTTON_REL,       BUTTON_NONE },
     { ACTION_STD_REC,           BUTTON_REC|BUTTON_REPEAT,        BUTTON_NONE },
+    { ACTION_STD_RADIO,           BUTTON_REC|BUTTON_REL,        BUTTON_NONE },
     
     LAST_ITEM_IN_LIST
 }; /* button_context_standard */
@@ -90,7 +91,9 @@
     { ACTION_WPS_ABRESET,       BUTTON_ON|BUTTON_SELECT,        BUTTON_ON },
     { ACTION_WPS_ID3SCREEN,     BUTTON_ON|BUTTON_MODE,          BUTTON_NONE },
     { ACTION_WPS_REC,           BUTTON_REC|BUTTON_REPEAT,        BUTTON_NONE },
-    
+    { ACTION_WPS_RADIO,           BUTTON_REC|BUTTON_REL,        BUTTON_NONE },
+    { ACTION_WPS_PLAYINGTIME,         BUTTON_ON|BUTTON_REC,           BUTTON_NONE },
+
     LAST_ITEM_IN_LIST
 }; /* button_context_wps */