fix no more working seek forward / seek back with red / blue button when

[enigma2.git] / data / keymap.xml

diff --git a/data/keymap.xml b/data/keymap.xml
index 0979b7a37b8edfa7a9395bc78cd643ffc62588fd..56664164a526cf4cc061fbf2e1f7c0c1af481ff6 100644 (file)
--- a/data/keymap.xml
+++ b/data/keymap.xml
@@ -71,11 +71,17 @@
        </map>
        
        <map context="InfobarInstantRecord">
-               <key id="KEY_RED" mapto="instantRecord" flags="m" />
+               <device name="dreambox remote control (native)">
+                       <key id="KEY_RED" mapto="instantRecord" flags="b" />
+               </device>
+               <device name="dreambox advanced remote control (native)">
+                       <key id="KEY_RECORD" mapto="instantRecord" flags="m" />
+                       <key id="KEY_STOP" mapto="instantRecord" flags="m" />
+               </device>
        </map>
 
        <map context="InfobarExtensions">
-               <key id="KEY_BLUE" mapto="extensions" flags="m" />
+               <key id="KEY_BLUE" mapto="extensions" flags="b" />
        </map>
        
        <map context="InfobarChannelSelection">
@@ -157,7 +163,12 @@
        </map>
 
        <map context="InfobarAudioSelectionActions">
-               <key id="KEY_AUDIO" mapto="audioSelection" flags="m" />
+               <device name="dreambox remote control (native)">
+                       <key id="KEY_AUDIO" mapto="audioSelection" flags="m" />
+               </device>
+               <device name="dreambox advanced remote control (native)">
+                       <key id="KEY_YELLOW" mapto="audioSelection" flags="m" />
+               </device>
        </map>
 
        <map context="InfobarSubserviceSelectionActions">
@@ -202,12 +213,22 @@
        </map>  
 
        <map context="InfobarSeekActions">
-               <key id="KEY_YELLOW" mapto="pauseService" flags="m" />
-               <key id="KEY_GREEN" mapto="unPauseService" flags="m" />
-               <key id="KEY_RED" mapto="seekBackDown" flags="m" />
-               <key id="KEY_RED" mapto="seekBackUp" flags="b" />
-               <key id="KEY_BLUE" mapto="seekFwdDown" flags="m" />
-               <key id="KEY_BLUE" mapto="seekFwdUp" flags="b" />
+               <device name="dreambox remote control (native)">
+                       <key id="KEY_YELLOW" mapto="pauseService" flags="m" />
+                       <key id="KEY_GREEN" mapto="unPauseService" flags="m" />
+                       <key id="KEY_RED" mapto="seekBack" flags="b" />
+                       <key id="KEY_BLUE" mapto="seekFwd" flags="b" />
+                       <key id="KEY_RED" mapto="seekBackManual" flags="l" />
+                       <key id="KEY_BLUE" mapto="seekFwdManual" flags="l" />
+               </device>
+               <device name="dreambox advanced remote control (native)">
+                       <key id="KEY_PLAY" mapto="playpauseService" flags="m" />
+                       <!--key id="KEY_GREEN" mapto="unPauseService" flags="m" /-->
+                       <key id="KEY_PREVIOUSSONG" mapto="seekBack" flags="b" />
+                       <key id="KEY_NEXTSONG" mapto="seekFwd" flags="b" />
+                       <key id="KEY_PREVIOUSSONG" mapto="seekBackManual" flags="l" />
+                       <key id="KEY_NEXTSONG" mapto="seekFwdManual" flags="l" />
+               </device>
                
                <key id="KEY_LEFT" mapto="seekBack" flags="m" />
                <key id="KEY_RIGHT" mapto="seekFwd" flags="m" />
@@ -223,13 +244,25 @@
        </map>
 
        <map context="InfobarTimeshiftActions">
-               <key id="KEY_YELLOW" mapto="timeshiftStart" flags="m" />
-               <key id="KEY_TV" mapto="timeshiftStop" flags="m" />
+               <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_STOP" mapto="timeshiftStop" flags="m" />
+               </device>
        </map>
 
        <map context="InfobarTimeshiftActivateActions">
-               <key id="KEY_RED" mapto="timeshiftActivateEnd" flags="m" />
-               <key id="KEY_YELLOW" mapto="timeshiftActivateEndAndPause" flags="m" />
+               <device name="dreambox remote control (native)">
+                       <key id="KEY_RED" mapto="timeshiftActivateEnd" flags="m" />
+                       <key id="KEY_YELLOW" mapto="timeshiftActivateEndAndPause" flags="m" />
+               </device>
+               <device name="dreambox advanced remote control (native)">
+                       <key id="KEY_PREVIOUSSONG" mapto="timeshiftActivateEnd" flags="m" />
+                       <key id="KEY_PLAY" mapto="timeshiftActivateEndAndPause" flags="m" />
+               </device>
        </map>
 
        <map context="MovieSelectionActions">
@@ -244,19 +277,41 @@
        </map>
 
        <map context="MoviePlayerActions">
+               <device name="dreambox advanced remote control (native)">
+                       <key id="KEY_STOP" mapto="leavePlayer" flags="m" />
+               </device>
                <key id="KEY_TV" mapto="leavePlayer" flags="m" />
        </map>
        
        <map context="InfobarCueSheetActions">
-               <key id="KEY_PREVIOUSSONG" mapto="jumpPreviousMark" flags="m" />
-               <key id="KEY_PLAYPAUSE" mapto="toggleMark" flags="m" />
-               <key id="KEY_NEXTSONG" mapto="jumpNextMark" flags="m" />
+               <device name="dreambox remote control (native)">
+                       <key id="KEY_PREVIOUSSONG" mapto="jumpPreviousMark" flags="m" />
+                       <key id="KEY_PLAYPAUSE" mapto="toggleMark" flags="m" />
+                       <key id="KEY_NEXTSONG" mapto="jumpNextMark" flags="m" />
+               </device>
+               <device name="dreambox advanced remote control (native)">
+                       <key id="KEY_RED" mapto="jumpPreviousMark" flags="m" />
+                       <key id="KEY_YELLOW" mapto="toggleMark" flags="m" />
+                       <key id="KEY_BLUE" mapto="jumpNextMark" flags="m" />
+               </device>
        </map>
        
        <map context="InfobarTeletextActions">
                <key id="KEY_TEXT" mapto="startTeletext" flags="m" />
        </map>
 
+       <map context="InfobarRdsActions">
+               <key id="KEY_TEXT" mapto="startRassInteractive" flags="m" />
+       </map>
+
+       <map context="RassInteractiveActions">
+               <key id="KEY_LEFT" mapto="prevSubPage" flags="mr" />
+               <key id="KEY_RIGHT" mapto="nextSubPage" flags="mr" />
+               <key id="KEY_UP" mapto="prevPage" flags="mr" />
+               <key id="KEY_DOWN" mapto="nextPage" flags="mr" />
+               <key id="KEY_EXIT" mapto="exit" flags="m" />
+       </map>
+
        <map context="ChannelSelectBaseActions">
                <key id="KEY_RED" mapto="showAllServices" flags="m" />
                <key id="KEY_GREEN" mapto="showSatellites" flags="m" />
@@ -400,17 +455,6 @@
                <!--key id="KEY_BLUE" mapto="settings" flags="mr" /-->
                
        </map>  
-       <map context="CutListEditorActions">
-               <key id="KEY_NEXT" mapto="setIn" flags="m" />
-               <key id="KEY_PREVIOUS" mapto="setOut" flags="m" />
-               <key id="KEY_0" mapto="setMark" flags="m" />
-               <key id="KEY_CHANNELUP" mapto="addMark" flags="m" />
-               <key id="KEY_CHANNELDOWN" mapto="removeMark" flags="m" />
-               <key id="KEY_EXIT" mapto="leave" flags="m" />
-               <key id="KEY_ESC" mapto="leave" flags="m" />
-               <key id="KEY_OK" mapto="showMenu" flags="m" />
-               <key id="KEY_ENTER" mapto="showMenu" flags="m" />
-       </map>
        
        <map context="CiSelectionActions">
                <key id="KEY_LEFT" mapto="left" flags="mr" />
@@ -431,8 +475,16 @@
        </map>
        
        <map context="MediaPlayerSeekActions">
-               <key id="KEY_YELLOW" mapto="pause" flags="m" />
-               <key id="KEY_GREEN" mapto="play" flags="m" />
+               <device name="dreambox remote control (native)">
+                       <key id="KEY_YELLOW" mapto="pause" flags="m" />
+                       <key id="KEY_GREEN" mapto="play" flags="m" />
+               </device>
+               <device name="dreambox advanced remote control (native)">
+                       <key id="KEY_PLAYPAUSE" mapto="pause" flags="m" />
+                       <key id="KEY_STOP" mapto="stop" flags="m" />
+                       <!--key id="KEY_GREEN" mapto="play" flags="m" /-->
+               </device>
+               
                <key id="KEY_TV" mapto="stop" flags="m" />
 
                <key id="KEY_PREVIOUS" mapto="previous" flags="mr" />