Merge branch 'master' into async_picload

[enigma2.git] / data / keymap.xml

diff --git a/data/keymap.xml b/data/keymap.xml
index 96814b40b4ce7cb4bc714321b5d065cde6766540..6b8b583dfca65cba73c357832301ab75c93e4624 100644 (file)
--- a/data/keymap.xml
+++ b/data/keymap.xml
@@ -77,8 +77,8 @@
        </map>
 
        <map context="InfobarEPGActions">
-               <key id="KEY_INFO" mapto="showEventInfo" flags="b" />
-               <key id="KEY_INFO" mapto="showSingleServiceEPG" flags="l" />
+               <key id="KEY_INFO" mapto="showEventView" flags="b" />
+               <key id="KEY_INFO" mapto="showEventInfoPlugin" flags="l" />
        </map>
        
        <map context="InfobarInstantRecord">
@@ -381,6 +381,7 @@
                </device>
                <device name="dreambox advanced remote control (native)">
                        <key id="KEY_TV" mapto="leavePlayer" flags="m" />
+                       <key id="KEY_STOP" mapto="leavePlayer" flags="m" />
                </device>
                <device name="dreambox ir keyboard">
                        <key id="KEY_STOP" mapto="leavePlayer" flags="m" />
@@ -615,6 +616,7 @@
                </device>
                <device name="dreambox advanced remote control (native)">
                        <key id="KEY_PLAYPAUSE" mapto="pause" flags="m" />
+                       <key id="KEY_PLAY" mapto="pause" flags="m" />
                        <key id="KEY_STOP" mapto="stop" flags="b" />
                        <key id="KEY_STOP" mapto="shift_stop" flags="l" />
                        <key id="KEY_RECORD" mapto="shift_record" flags="l" />
@@ -640,5 +642,6 @@
                <key id="KEY_CHANNELUP" mapto="nextBouquet" flags="m" />
                <key id="KEY_CHANNELDOWN" mapto="prevBouquet" flags="m" />
                <key id="KEY_VIDEO" mapto="delete" flags="m" />
+               <key id="KEY_TEXT" mapto="subtitles" flags="m" />
        </map>
 </keymap>