Merge branch 'master' of /home/tmbinc/enigma2-git into tmbinc/FixTimingBugs

[enigma2.git] / data / keymap.xml

diff --git a/data/keymap.xml b/data/keymap.xml
index 3f8e681dfa0145a2832de8b9e7bbd225fb5cd289..0a0dc867747f4475b6388593b220896d5a120bfa 100644 (file)
--- a/data/keymap.xml
+++ b/data/keymap.xml
@@ -78,13 +78,13 @@
 
        <map context="InfobarEPGActions">
                <key id="KEY_INFO" mapto="showEventInfo" flags="b" />
-               <key id="KEY_INFO" mapto="showSingleServiceEPG" flags="l" />
+               <key id="KEY_INFO" mapto="showEventInfoPlugin" flags="l" />
        </map>
        
        <map context="InfobarInstantRecord">
                <device name="dreambox advanced remote control (native)">
                        <key id="KEY_RECORD" mapto="instantRecord" flags="m" />
-                       <key id="KEY_STOP" mapto="instantRecord" flags="m" />
+                       <!-- this breaks timeshift end!!! key id="KEY_STOP" mapto="instantRecord" flags="m" /-->
                </device>
                <device name="dreambox ir keyboard">
                        <key id="KEY_RECORD" mapto="instantRecord" flags="m" />
@@ -332,18 +332,20 @@
 
        <map context="InfobarTimeshiftActions">
                <device name="dreambox remote control (native)">
+                       <key id="KEY_YELLOW" mapto="timeshiftStart" flags="m" />
                        <key id="KEY_TV" mapto="timeshiftStop" flags="m" />
                </device>
                <device name="dreambox advanced remote control (native)">
                        <key id="KEY_PLAY" mapto="timeshiftStart" flags="m" />
                        <key id="KEY_PLAYPAUSE" mapto="timeshiftStart" flags="m" />
+                       <key id="KEY_TV" mapto="timeshiftStop" flags="m" />
                        <key id="KEY_STOP" mapto="timeshiftStop" flags="m" />
                </device>
                <device name="dreambox ir keyboard">
+                       <key id="KEY_YELLOW" mapto="timeshiftStart" flags="m" />
                        <key id="KEY_PAUSE" mapto="timeshiftStart" flags="m" />
                        <key id="KEY_STOP" mapto="timeshiftStop" flags="m" />
                </device>
-               <key id="KEY_YELLOW" mapto="timeshiftStart" flags="m" />
        </map>
 
        <map context="InfobarTimeshiftActivateActions">
@@ -379,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" />
@@ -613,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" />
@@ -638,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>