X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/84702da5d3a6df33717b399b859008a3cf8a1522..ee309cf051241984e862ada9f53c5bf5a263a5dc:/data/keymap.xml

diff --git a/data/keymap.xml b/data/keymap.xml
index a81d5efd..0a0dc867 100644
--- a/data/keymap.xml
+++ b/data/keymap.xml
@@ -17,25 +17,38 @@
 		<key id="2" mapto="moveDown" flags="mr" />
 	</map>
 	
-	<map context="InputActions">
-		<key id="KEY_LEFT" mapto="moveLeft" flags="mr" />
-		<key id="KEY_RIGHT" mapto="moveRight" flags="mr" />
-		<key id="KEY_HOME" mapto="moveHome" flags="mr" />
-		<key id="KEY_END" mapto="moveEnd" flags="mr" />
+	<map context="KeyboardInputActions">
+		<key id="KEY_LEFT" mapto="left" flags="mr" />
+		<key id="KEY_RIGHT" mapto="right" flags="mr" />
+		<key id="KEY_HOME" mapto="home" flags="mr" />
+		<key id="KEY_END" mapto="end" flags="mr" />
+		<key id="KEY_BACK" mapto="home" flags="mr" />
+		<key id="KEY_FORWARD" mapto="end" flags="mr" />
 		<key id="KEY_DELETE" mapto="deleteForward" flags="mr" />
 		<key id="KEY_BACKSPACE" mapto="deleteBackward" flags="mr" />
-		
+		<key id="KEY_TAB" mapto="tab" flags="mr" />
 		<key id="KEY_INSERT" mapto="toggleOverwrite" flags="m" />
-		<key id="KEY_ENTER" mapto="accept" flags="m" />
 	</map>
 
 	<map context="SetupActions">
+		<key id="KEY_ENTER" mapto="ok" flags="m" />
 		<key id="KEY_OK" mapto="ok" flags="m" />
 		<key id="KEY_EXIT" mapto="cancel" flags="m" />
+		<key id="KEY_ESC" mapto="cancel" flags="m" />
 		<key id="KEY_LEFT" mapto="left" flags="mr" />
 		<key id="KEY_RIGHT" mapto="right" flags="mr" />
 		<key id="KEY_RED" mapto="cancel" flags="m" />
 		<key id="KEY_GREEN" mapto="save" flags="m" />
+		<device name="dreambox remote control (native)">
+			<key id="KEY_MUTE" mapto="deleteForward" flags="mr" />
+			<key id="KEY_NEXT" mapto="deleteForward" flags="mr" />
+			<key id="KEY_PREVIOUS" mapto="deleteBackward" flags="mr" />
+		</device>
+		<device name="dreambox advanced remote control (native)">
+			<key id="KEY_MUTE" mapto="deleteForward" flags="mr" />
+			<key id="KEY_NEXT" mapto="deleteForward" flags="mr" />
+			<key id="KEY_PREVIOUS" mapto="deleteBackward" flags="mr" />
+		</device>
 		<key id="KEY_1" mapto="1" flags="m" />
 		<key id="KEY_2" mapto="2" flags="m" />
 		<key id="KEY_3" mapto="3" flags="m" />
@@ -64,15 +77,25 @@
 	</map>
 
 	<map context="InfobarEPGActions">
-		<key id="KEY_INFO" mapto="showEventInfo" flags="m" />
+		<key id="KEY_INFO" mapto="showEventInfo" flags="b" />
+		<key id="KEY_INFO" mapto="showEventInfoPlugin" flags="l" />
 	</map>
 	
 	<map context="InfobarInstantRecord">
-		<key id="KEY_RED" mapto="instantRecord" flags="m" />
+		<device name="dreambox advanced remote control (native)">
+			<key id="KEY_RECORD" 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" />
+		</device>
+		<device name="dreambox remote control (native)">
+			<key id="KEY_RED" mapto="instantRecord" flags="b" />
+		</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">
@@ -82,6 +105,10 @@
 		<key id="KEY_DOWN" mapto="switchChannelDown" flags="mr" />
 		<key id="KEY_PREVIOUS" mapto="historyBack" flags="mr" />
 		<key id="KEY_NEXT" mapto="historyNext" flags="mr" />
+		<key id="KEY_BACK" mapto="historyBack" flags="mr" />
+		<key id="KEY_FORWARD" mapto="historyNext" flags="mr" />
+		<key id="KEY_CHANNELUP" mapto="openServiceList" flags="m" />
+		<key id="KEY_CHANNELDOWN" mapto="openServiceList" flags="m" />
 		<key id="BTN_0" mapto="zapUp" flags="mr" />
 		<key id="BTN_1" mapto="zapDown" flags="mr" />
 	</map>
@@ -89,16 +116,35 @@
 	<map context="MinuteInputActions">
 		<key id="KEY_UP" mapto="up" flags="mr" />
 		<key id="KEY_DOWN" mapto="down" flags="mr" />
-		<key id="KEY_OK" mapto="ok" flags="mr" />
-		<key id="KEY_EXIT" mapto="cancel" flags="mr" />
+		<key id="KEY_OK" mapto="ok" flags="m" />
+		<key id="KEY_ENTER" mapto="ok" flags="m" />
+		<key id="KEY_EXIT" mapto="cancel" flags="m" />
+		<key id="KEY_ESC" mapto="cancel" flags="m" />
+	</map>
+
+	<map context="InputAsciiActions">
+		<device name="Console">
+			<key id="KEY_ASCII" mapto="gotAsciiCode" flags="mr" />
+		</device>
 	</map>
 
 	<map context="InputBoxActions">
 		<key id="KEY_LEFT" mapto="left" flags="mr" />
 		<key id="KEY_RIGHT" mapto="right" flags="mr" />
 		<key id="KEY_OK" mapto="ok" flags="m" />
+		<key id="KEY_ENTER" mapto="ok" flags="m" />
 		<key id="KEY_EXIT" mapto="back" flags="m" />
-		<key id="KEY_MUTE" mapto="delete" flags="mr" />
+		<key id="KEY_ESC" mapto="back" flags="m" />
+		<device name="dreambox remote control (native)">
+			<key id="KEY_MUTE" mapto="deleteForward" flags="mr" />
+			<key id="KEY_NEXT" mapto="deleteForward" flags="mr" />
+			<key id="KEY_PREVIOUS" mapto="deleteBackward" flags="mr" />
+		</device>
+		<device name="dreambox advanced remote control (native)">
+			<key id="KEY_MUTE" mapto="deleteForward" flags="mr" />
+			<key id="KEY_NEXT" mapto="deleteForward" flags="mr" />
+			<key id="KEY_PREVIOUS" mapto="deleteBackward" flags="mr" />
+		</device>
 		<key id="KEY_1" mapto="1" flags="m" />
 		<key id="KEY_2" mapto="2" flags="m" />
 		<key id="KEY_3" mapto="3" flags="m" />
@@ -117,7 +163,9 @@
 		<key id="KEY_UP" mapto="up" flags="mr" />
 		<key id="KEY_DOWN" mapto="down" flags="mr" />
 		<key id="KEY_OK" mapto="ok" flags="m" />
+		<key id="KEY_ENTER" mapto="ok" flags="m" />
 		<key id="KEY_EXIT" mapto="back" flags="m" />
+		<key id="KEY_ESC" mapto="back" flags="m" />
 	</map>
 	
 	<map context="InfobarMenuActions">
@@ -130,28 +178,58 @@
 	
 	<map context="InfobarShowHideActions">
 		<key id="KEY_OK" mapto="toggleShow" flags="m" />
+		<key id="KEY_ENTER" mapto="toggleShow" flags="m" />
 		<key id="KEY_EXIT" mapto="hide" flags="m" />
+		<key id="KEY_ESC" mapto="hide" flags="m" />
 	</map>
 
 	<map context="InfobarActions">
 		<key id="KEY_VIDEO" mapto="showMovies" flags="m" />
 		<key id="KEY_RADIO" mapto="showRadio" flags="m" />
+		<key id="KEY_TV" mapto="showTv" flags="m" />
 	</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 ir keyboard">
+			<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">
 		<key id="KEY_GREEN" mapto="subserviceSelection" flags="m" />
 	</map>
 
+	<map context="InfobarSubserviceQuickzapActions">
+		<key id="KEY_PREVIOUS" mapto="prevSubservice" flags="m" />
+		<key id="KEY_NEXT" mapto="nextSubservice" flags="m" />
+		<key id="KEY_BACK" mapto="prevSubservice" flags="m" />
+		<key id="KEY_FORWARD" mapto="nextSubservice" flags="m" />
+		<key id="KEY_EXIT" mapto="exit" flags="m" />
+		<key id="KEY_ESC" mapto="exit" flags="m" />
+		<device name="dreambox remote control (native)">
+			<key id="KEY_TV" mapto="exit" flags="m" />
+		</device>
+		<device name="dreambox advanced remote control (native)">
+			<key id="KEY_TV" mapto="exit" flags="m" />
+		</device>
+	</map>
+
 	<map context="GlobalActions">
 		<key id="KEY_VOLUMEUP" mapto="volumeUp" flags="mr" />
 		<key id="KEY_VOLUMEDOWN" mapto="volumeDown" flags="mr" />
 		<key id="KEY_MUTE" mapto="volumeMute" flags="mr" />
-		<key id="KEY_POWER" mapto="powerdown" flags="m" />
-		<key id="KEY_POWER" mapto="powerup" flags="b" />
+		<key id="KEY_POWER" mapto="power_long" flags="l" />
+		<key id="KEY_POWER" mapto="power_down" flags="m" />
+		<key id="KEY_POWER" mapto="power_up" flags="b" />
+		<device name="dreambox front panel">
+			<key id="KEY_POWER" mapto="deepstandby" flags="l" />
+		</device>
 	</map>
 	
 	<map context="PowerKeyActions">
@@ -173,40 +251,122 @@
 	</map>
 
 	<map context="TextEntryActions">
-		<key id="KEY_MUTE" mapto="delete" flags="mr" />
+		<device name="dreambox remote control (native)">
+			<key id="KEY_MUTE" mapto="deleteForward" flags="mr" />
+			<key id="KEY_NEXT" mapto="deleteForward" flags="mr" />
+			<key id="KEY_PREVIOUS" mapto="deleteBackward" flags="mr" />
+		</device>
+		<device name="dreambox advanced remote control (native)">
+			<key id="KEY_MUTE" mapto="deleteForward" flags="mr" />
+			<key id="KEY_NEXT" mapto="deleteForward" flags="mr" />
+			<key id="KEY_PREVIOUS" mapto="deleteBackward" flags="mr" />
+		</device>
 	</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_PLAYPAUSE" mapto="playpauseService" 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>
+		<device name="dreambox ir keyboard">
+			<key id="KEY_PAUSE" mapto="pauseService" flags="m" />
+			<key id="KEY_PLAY" mapto="playpauseService" flags="m" />
+			<key id="KEY_REWIND" mapto="seekBack" flags="b" />
+			<key id="KEY_FASTFORWARD" mapto="seekFwd" flags="b" />
+			<key id="KEY_REWIND" mapto="seekBackManual" flags="l" />
+			<key id="KEY_FASTFORWARD" mapto="seekFwdManual" flags="l" />
+		</device>
 		
 		<key id="KEY_LEFT" mapto="seekBack" flags="m" />
 		<key id="KEY_RIGHT" mapto="seekFwd" flags="m" />
+
+		<key id="KEY_OK" mapto="unPauseService" flags="m" />
 		
-		<key id="KEY_1" mapto="seek:-30" flags="m" />
-		<key id="KEY_3" mapto="seek:30" flags="m" />
-		<key id="KEY_4" mapto="seek:-90" flags="m" />
-		<key id="KEY_6" mapto="seek:90" flags="m" />
-		<key id="KEY_7" mapto="seek:-270" flags="m" />
-		<key id="KEY_9" mapto="seek:270" flags="m" />
+		<key id="KEY_1" mapto="seekdef:1" flags="m" />
+		<key id="KEY_3" mapto="seekdef:3" flags="m" />
+		<key id="KEY_4" mapto="seekdef:4" flags="m" />
+		<key id="KEY_6" mapto="seekdef:6" flags="m" />
+		<key id="KEY_7" mapto="seekdef:7" flags="m" />
+		<key id="KEY_9" mapto="seekdef:9" flags="m" />
+	</map>
+
+	<map context="MediaPlayerSeekActions">
+		<device name="dreambox remote control (native)">
+			<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_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>
+		<device name="dreambox ir keyboard">
+			<key id="KEY_REWIND" mapto="seekBack" flags="b" />
+			<key id="KEY_FASTFORWARD" mapto="seekFwd" flags="b" />
+			<key id="KEY_REWIND" mapto="seekBackManual" flags="l" />
+			<key id="KEY_FASTFORWARD" mapto="seekFwdManual" flags="l" />
+		</device>
+		
+		<key id="KEY_1" mapto="seekdef:1" flags="m" />
+		<key id="KEY_3" mapto="seekdef:3" flags="m" />
+		<key id="KEY_4" mapto="seekdef:4" flags="m" />
+		<key id="KEY_6" mapto="seekdef:6" flags="m" />
+		<key id="KEY_7" mapto="seekdef:7" flags="m" />
+		<key id="KEY_9" mapto="seekdef:9" flags="m" />
 	</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_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>
 	</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="b" />
+			<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" />
+			<key id="KEY_PLAYPAUSE" mapto="timeshiftActivateEndAndPause" flags="m" />
+		</device>
+		<device name="dreambox ir keyboard">
+			<key id="KEY_REWIND" mapto="timeshiftActivateEnd" flags="m" />
+			<key id="KEY_PAUSE" mapto="timeshiftActivateEndAndPause" flags="m" />
+		</device>
 	</map>
 
 	<map context="MovieSelectionActions">
 		<key id="KEY_MENU" mapto="contextMenu" flags="m" />
+		<key id="KEY_INFO" mapto="showEventInfo" flags="m" />
 	</map>
 
 	<map context="InfobarMovieListActions">
@@ -216,19 +376,69 @@
 	</map>
 
 	<map context="MoviePlayerActions">
-		<key id="KEY_TV" mapto="leavePlayer" flags="m" />
+		<device name="dreambox remote control (native)">
+			<key id="KEY_TV" mapto="leavePlayer" flags="m" />
+		</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" />
+		</device>
 	</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_PREVIOUS" mapto="jumpPreviousMark" flags="m" />
+			<key id="KEY_NEXT" mapto="jumpNextMark" flags="m" />
+			<key id="KEY_0" mapto="toggleMark" flags="m" />
+		</device>
+		<device name="dreambox advanced remote control (native)">
+			<key id="KEY_PREVIOUS" mapto="jumpPreviousMark" flags="m" />
+			<key id="KEY_0" mapto="toggleMark" flags="m" />
+			<key id="KEY_NEXT" mapto="jumpNextMark" flags="m" />
+			<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>
+		<device name="dreambox ir keyboard">
+			<key id="KEY_PREVIOUSSONG" mapto="jumpPreviousMark" flags="m" />
+			<key id="KEY_TAB" mapto="toggleMark" flags="m" />
+			<key id="KEY_NEXTSONG" mapto="jumpNextMark" flags="m" />
+		</device>
+	</map>
+	
+	<map context="MediaPlayerCueSheetActions">
+		<device name="dreambox remote control (native)">
+			<key id="KEY_0" mapto="toggleMark" flags="m" />
+		</device>
+		<device name="dreambox advanced remote control (native)">
+			<key id="KEY_0" mapto="toggleMark" flags="m" />
+			<key id="KEY_YELLOW" mapto="toggleMark" flags="m" />
+		</device>
+		<device name="dreambox ir keyboard">
+			<key id="KEY_TAB" mapto="toggleMark" 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" />
+		<key id="KEY_ESC" mapto="exit" flags="m" />
+	</map>
+
 	<map context="ChannelSelectBaseActions">
 		<key id="KEY_RED" mapto="showAllServices" flags="m" />
 		<key id="KEY_GREEN" mapto="showSatellites" flags="m" />
@@ -236,6 +446,10 @@
 		<key id="KEY_BLUE" mapto="showFavourites" flags="m" />
 		<key id="KEY_CHANNELUP" mapto="nextBouquet" flags="m" />
 		<key id="KEY_CHANNELDOWN" mapto="prevBouquet" flags="m" />
+		<key id="KEY_PREVIOUS" mapto="prevMarker" flags="m" />
+		<key id="KEY_NEXT" mapto="nextMarker" flags="m" />
+		<key id="KEY_BACK" mapto="prevMarker" flags="m" />
+		<key id="KEY_FORWARD" mapto="nextMarker" flags="m" />
 	</map>
 
 	<map context="ChannelSelectEPGActions">
@@ -286,10 +500,9 @@
 		<key id="\x1b" mapto="cancel" flags="m" />
 
 		<!-- use this on rcu, ok? -->
-		<key id="KEY_OK" mapto="ok" flags="m" />		
+		<key id="KEY_OK" mapto="ok" flags="m" />
 		<key id="KEY_EXIT" mapto="cancel" flags="m" />
 
-
 		<key id="KEY_ENTER" mapto="ok" flags="m" />
 		<key id="KEY_ESC" mapto="cancel" flags="m" />
 	</map>
@@ -312,17 +525,19 @@
 	</map>
 	
 	<map context="ColorActions">
-		<key id="KEY_RED" mapto="red" flags="m" />		
+		<key id="KEY_RED" mapto="red" flags="m" />
 		<key id="KEY_GREEN" mapto="green" flags="m" />
-		<key id="KEY_YELLOW" mapto="yellow" flags="m" />		
+		<key id="KEY_YELLOW" mapto="yellow" flags="m" />
 		<key id="KEY_BLUE" mapto="blue" flags="m" />
 	</map>
 
 	<map context="MsgBoxActions">
 		<key id="KEY_GREEN" mapto="alwaysOK" flags="m" />
-		<key id="KEY_OK" mapto="ok" flags="m" />		
+		<key id="KEY_OK" mapto="ok" flags="m" />
+		<key id="KEY_ENTER" mapto="ok" flags="m" />
 		<key id="KEY_RED" mapto="cancel" flags="m" />
 		<key id="KEY_EXIT" mapto="cancel" flags="m" />
+		<key id="KEY_ESC" mapto="cancel" flags="m" />
 	</map>
 
 	<map context="WindowActions">
@@ -347,35 +562,86 @@
 	<map context="StandbyActions">
 		<key id="KEY_POWER" mapto="power" flags="m" />
 	</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_OK" mapto="showMenu" flags="m" />
-	</map>
 	
+	<map context="SleepTimerEditorActions">
+		<key id="KEY_OK" mapto="select" flags="m" />
+		<key id="KEY_ENTER" mapto="select" flags="m" />
+		<key id="KEY_EXIT" mapto="exit" flags="m" />
+		<key id="KEY_ESC" mapto="exit" flags="m" />
+		<key id="KEY_1" mapto="1" flags="m" />
+		<key id="KEY_2" mapto="2" flags="m" />
+		<key id="KEY_3" mapto="3" flags="m" />
+		<key id="KEY_4" mapto="4" flags="m" />
+		<key id="KEY_5" mapto="5" flags="m" />
+		<key id="KEY_6" mapto="6" flags="m" />
+		<key id="KEY_7" mapto="7" flags="m" />
+		<key id="KEY_8" mapto="8" flags="m" />
+		<key id="KEY_9" mapto="9" flags="m" />
+		<key id="KEY_0" mapto="0" flags="m" />
+		<key id="KEY_LEFT" mapto="selectLeft" flags="mr" />
+		<key id="KEY_RIGHT" mapto="selectRight" flags="mr" />
+		<key id="KEY_RED" mapto="disableTimer" flags="mr" />
+		<key id="KEY_YELLOW" mapto="toggleAsk" flags="mr" />
+		<key id="KEY_GREEN" mapto="toggleAction" flags="mr" />
+		<!--key id="KEY_BLUE" mapto="settings" flags="mr" /-->
+	</map>	
+	
+	<map context="CiSelectionActions">
+		<key id="KEY_LEFT" mapto="left" flags="mr" />
+		<key id="KEY_RIGHT" mapto="right" flags="mr" />
+	</map>
+
 	<map context="PiPSetupActions">
 		<key id="KEY_UP" mapto="up" flags="mr" />
 		<key id="KEY_DOWN" mapto="down" flags="mr" />
 		<key id="KEY_LEFT" mapto="left" flags="mr" />
 		<key id="KEY_RIGHT" mapto="right" flags="mr" />
 		<key id="KEY_EXIT" mapto="cancel" flags="m" />
-		<key id="KEY_OK" mapto="ok" flags="m" />		
+		<key id="KEY_ESC" mapto="cancel" flags="m" />
+		<key id="KEY_ENTER" mapto="ok" flags="m" />
+		<key id="KEY_OK" mapto="ok" flags="m" />
 		<key id="KEY_CHANNELUP" mapto="size+" flags="mr" />
 		<key id="KEY_CHANNELDOWN" mapto="size-" flags="mr" />
 	</map>
 	
-	<map context="MediaPlayerSeekActions">
-		<key id="KEY_YELLOW" mapto="pause" flags="m" />
-		<key id="KEY_GREEN" mapto="play" flags="m" />
-		<key id="KEY_TV" mapto="stop" flags="m" />
-
-		<key id="KEY_PREVIOUS" mapto="previous" flags="mr" />
-		<key id="KEY_NEXT" mapto="next" flags="mr" />
+	<map context="MediaPlayerActions">
+		<device name="dreambox remote control (native)">
+			<key id="KEY_YELLOW" mapto="pause" flags="m" />
+			<key id="KEY_GREEN" mapto="play" flags="m" />
+			<key id="KEY_TV" mapto="stop" flags="b" />
+			<key id="KEY_TV" mapto="shift_stop" flags="l" />
+			<key id="KEY_RADIO" mapto="shift_record" flags="l" />
+			<key id="KEY_PREVIOUS" mapto="previous" flags="m" />
+			<key id="KEY_NEXT" mapto="next" flags="m" />
+		</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" />
+			<key id="KEY_PREVIOUS" mapto="previous" flags="m" />
+			<key id="KEY_NEXT" mapto="next" flags="m" />
+			<key id="KEY_RED" mapto="previous" flags="m" />
+			<key id="KEY_BLUE" mapto="next" flags="m" />
+		</device>
+		<device name="dreambox ir keyboard">
+			<key id="KEY_PAUSE" mapto="pause" flags="m" />
+			<key id="KEY_PLAY" mapto="play" 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" />
+			<key id="KEY_PREVIOUSSONG" mapto="previous" flags="m" />
+			<key id="KEY_NEXTSONG" mapto="next" flags="m" />
+		</device>
 		
 		<key id="KEY_MENU" mapto="menu" flags="m" />
+
+		<key id="KEY_2" mapto="skipListbegin" flags="m" />
+		<key id="KEY_8" mapto="skipListend" flags="m" />
+		<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>