X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/415ca9463253732802a6166871261438639d3975..2b557e7ef4b0518736c5162a501cd9bc743930b3:/data/keymap.xml

diff --git a/data/keymap.xml b/data/keymap.xml
index 1d60a679..f152e555 100644
--- a/data/keymap.xml
+++ b/data/keymap.xml
@@ -71,7 +71,12 @@
 	</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="m" />
+		</device>
+		<device name="dreambox advanced remote control (native)">
+			<key id="KEY_RECORD" mapto="instantRecord" flags="m" />
+		</device>
 	</map>
 
 	<map context="InfobarExtensions">
@@ -157,7 +162,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 +212,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="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>
+		<device name="dreambox advanced remote control (native)">
+			<key id="KEY_PLAY" mapto="pauseService" flags="m" />
+			<!--key id="KEY_GREEN" mapto="unPauseService" flags="m" /-->
+			<key id="KEY_PREVIOUSSONG" mapto="seekBackDown" flags="m" />
+			<key id="KEY_PREVIOUSSONG" mapto="seekBackUp" flags="b" />
+			<key id="KEY_NEXTSONG" mapto="seekFwdDown" flags="m" />
+			<key id="KEY_NEXTSONG" mapto="seekFwdUp" flags="b" />
+		</device>
 		
 		<key id="KEY_LEFT" mapto="seekBack" flags="m" />
 		<key id="KEY_RIGHT" mapto="seekFwd" flags="m" />
@@ -223,13 +243,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,13 +276,23 @@
 	</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">
@@ -378,6 +420,28 @@
 	<map context="StandbyActions">
 		<key id="KEY_POWER" mapto="power" flags="m" />
 	</map>
+	
+	<map context="SleepTimerEditorActions">
+		<key id="KEY_OK" mapto="select" flags="m" />
+		<key id="KEY_EXIT" 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="CutListEditorActions">
 		<key id="KEY_NEXT" mapto="setIn" flags="m" />
 		<key id="KEY_PREVIOUS" mapto="setOut" flags="m" />
@@ -409,8 +473,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" />