record is more important than EPG (at least on red button)

diff --git a/data/keymap.xml b/data/keymap.xml
index e1d99ff1b8865589f1565778490b61b7cc0faf43..884fae8426431762ec9e77c95a595837c4f2df4c 100644 (file)
--- a/data/keymap.xml
+++ b/data/keymap.xml
@@ -54,8 +54,7 @@
 <!--           <key id="r" mapto="instantRecord" flags="m" /> -->
                <key id="r" mapto="showEPGList" flags="m" />
                <key id="KEY_INFO" mapto="showEPGList" flags="m" />
 <!--           <key id="r" mapto="instantRecord" flags="m" /> -->
                <key id="r" mapto="showEPGList" flags="m" />
                <key id="KEY_INFO" mapto="showEPGList" flags="m" />

-<!--           <key id="KEY_RED" mapto="instantRecord" flags="m" /> -->
-               <key id="KEY_RED" mapto="showEPGList" flags="m" />
+               <key id="KEY_RED" mapto="instantRecord" flags="m" />

                <key id="1" mapto="zapUp" flags="mr" />
                <key id="2" mapto="zapDown" flags="mr" />
                <key id="KEY_M" mapto="mainMenu" flags="mr" />
                <key id="1" mapto="zapUp" flags="mr" />
                <key id="2" mapto="zapDown" flags="mr" />
                <key id="KEY_M" mapto="mainMenu" flags="mr" />


@@ -94,7 +93,6 @@
                <key id="p" mapto="bouquet:(provider == PREMIERE) &amp;&amp; (type == 1)" flags="m" />
                <key id="d" mapto="bouquet:(provider == ARD) &amp;&amp; (type == 1)" flags="m" />
                <key id="a" mapto="bouquet:" flags="m" />
                <key id="p" mapto="bouquet:(provider == PREMIERE) &amp;&amp; (type == 1)" flags="m" />
                <key id="d" mapto="bouquet:(provider == ARD) &amp;&amp; (type == 1)" flags="m" />
                <key id="a" mapto="bouquet:" flags="m" />

-               <key id="KEY_C" mapto="contextMenu" flags="m" />

                <key id="KEY_M" mapto="mark" flags="m" />
                <key id="KEY_D" mapto="bouquet:(provider == ARD)" flags="m" />
                <key id="KEY_A" mapto="bouquet:" flags="m" />
                <key id="KEY_M" mapto="mark" flags="m" />
                <key id="KEY_D" mapto="bouquet:(provider == ARD)" flags="m" />
                <key id="KEY_A" mapto="bouquet:" flags="m" />


@@ -142,4 +140,7 @@
        <map context="StandbyActions">
                <key id="KEY_POWER" mapto="power" flags="m" />
        </map>
        <map context="StandbyActions">
                <key id="KEY_POWER" mapto="power" flags="m" />
        </map>

+       <map context="ContextMenuActions">
+               <key id="KEY_MENU" mapto="contextMenu" flags="m" />
+       </map>

 </keymap>
 </keymap>