X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/1c49592bb36371a4a717156a2f93c557f972390c..519737512d47e82940d4aed5b499d59f7ee2a651:/data/keymap.xml

diff --git a/data/keymap.xml b/data/keymap.xml
index 804af795..3b2185da 100644
--- a/data/keymap.xml
+++ b/data/keymap.xml
@@ -67,20 +67,22 @@
 	</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="showSingleServiceEPG" flags="l" />
 	</map>
 	
 	<map context="InfobarInstantRecord">
 		<device name="dreambox remote control (native)">
-			<key id="KEY_RED" mapto="instantRecord" flags="m" />
+			<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">
@@ -215,16 +217,18 @@
 		<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_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="pauseService" flags="m" />
+			<key id="KEY_PLAY" mapto="playpauseService" 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_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" />
@@ -232,12 +236,38 @@
 
 		<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="seek:-15" flags="b" />
+		<key id="KEY_3" mapto="seek:15" flags="b" />
+		<key id="KEY_1" mapto="seekBackDef" flags="l" />
+		<key id="KEY_3" mapto="seekFwdDef" flags="l" />
+		<key id="KEY_4" mapto="seek:-60" flags="m" />
+		<key id="KEY_6" mapto="seek:60" flags="m" />
+		<key id="KEY_7" mapto="seek:-300" flags="m" />
+		<key id="KEY_9" mapto="seek:300" 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>
+		
+		<key id="KEY_1" mapto="seek:-15" flags="m" />
+		<key id="KEY_3" mapto="seek:15" flags="m" />
+		<key id="KEY_1" mapto="seekBackDef" flags="l" />
+		<key id="KEY_3" mapto="seekFwdDef" flags="l" />
+		<key id="KEY_4" mapto="seek:-60" flags="m" />
+		<key id="KEY_6" mapto="seek:60" flags="m" />
+		<key id="KEY_7" mapto="seek:-300" flags="m" />
+		<key id="KEY_9" mapto="seek:300" flags="m" />
 	</map>
 
 	<map context="InfobarTimeshiftActions">
@@ -281,6 +311,21 @@
 	</map>
 	
 	<map context="InfobarCueSheetActions">
+		<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_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="MediaPlayerCueSheetActions">
 		<device name="dreambox remote control (native)">
 			<key id="KEY_PREVIOUSSONG" mapto="jumpPreviousMark" flags="m" />
 			<key id="KEY_PLAYPAUSE" mapto="toggleMark" flags="m" />
@@ -297,6 +342,18 @@
 		<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" />
@@ -440,17 +497,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" />
@@ -470,7 +516,7 @@
 		<key id="KEY_CHANNELDOWN" mapto="size-" flags="mr" />
 	</map>
 	
-	<map context="MediaPlayerSeekActions">
+	<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" />
@@ -487,5 +533,13 @@
 		<key id="KEY_NEXT" mapto="next" flags="mr" />
 		
 		<key id="KEY_MENU" mapto="menu" flags="m" />
+
+		<key id="KEY_0" 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_STOP" mapto="shift_stop" flags="m" />
+		<key id="KEY_RECORD" mapto="shift_record" flags="m" />
 	</map>
 </keymap>