X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/718dac0e6e2bcd6727dda2eeae49ddc3518515b9..732d8e1232eb2492af79c2ee38b7cde37fa84ad9:/data/keymap.xml

diff --git a/data/keymap.xml b/data/keymap.xml
index 59949962..8533859a 100644
--- a/data/keymap.xml
+++ b/data/keymap.xml
@@ -48,31 +48,53 @@
 		<key id="KEY_0" mapto="0" flags="m" />
 	</map>
 
-	<map context="InfobarActions">
-		<key id="m" mapto="mainMenu" flags="mr" />
-		<key id="c" mapto="switchChannelDown" flags="mr" />
-<!--		<key id="r" mapto="instantRecord" flags="m" /> -->
-		<key id="r" mapto="showEPGList" flags="m" />
+	<map context="InfobarEPGActions">
 		<key id="KEY_INFO" mapto="showEPGList" flags="m" />
+	</map>
+	
+	<map context="InfobarInstantRecord">
 		<key id="KEY_RED" mapto="instantRecord" flags="m" />
-		<key id="1" mapto="zapUp" flags="mr" />
-		<key id="2" mapto="zapDown" flags="mr" />
-		<key id="KEY_M" mapto="mainMenu" flags="mr" />
-		<key id="KEY_C" mapto="switchChannelDown" flags="mr" />
-		<key id="KEY_R" mapto="instantRecord" flags="m" />
+	</map>
+
+	<map context="InfobarChannelSelection">
 		<key id="KEY_LEFT" mapto="zapUp" flags="mr" />
 		<key id="KEY_RIGHT" mapto="zapDown" flags="mr" />
 		<key id="KEY_UP" mapto="switchChannelUp" flags="mr" />
 		<key id="KEY_DOWN" mapto="switchChannelDown" flags="mr" />
+
+		<key id="BTN_0" mapto="zapUp" flags="mr" />
+		<key id="BTN_1" mapto="zapDown" flags="mr" />
+	</map>
+	
+	<map context="InfobarMenuActions">
 		<key id="KEY_MENU" mapto="mainMenu" flags="mr" />
+	</map>
+	
+	<map context="InfobarShowHideActions">
 		<key id="KEY_OK" mapto="toggleShow" flags="m" />
 		<key id="KEY_EXIT" mapto="hide" flags="m" />
+	</map>
+
+	<map context="InfobarActions">
 		<key id="KEY_VIDEO" mapto="showMovies" flags="m" />
+	</map>
+
+	<map context="InfobarAudioSelectionActions">
+		<key id="KEY_AUDIO" mapto="audioSelection" flags="m" />
+	</map>
+
+	<map context="InfobarVolumeActions">
 		<key id="KEY_VOLUMEUP" mapto="volumeUp" flags="mr" />
 		<key id="KEY_VOLUMEDOWN" mapto="volumeDown" flags="mr" />
 		<key id="KEY_MUTE" mapto="volumeMute" flags="mr" />
+	</map>
+	
+	<map context="PowerKeyActions">
 		<key id="KEY_POWER" mapto="powerdown" flags="m" />
 		<key id="KEY_POWER" mapto="powerup" flags="b" />
+	</map>
+	
+	<map context="NumberZapActions">
 		<key id="KEY_1" mapto="1" flags="m" />
 		<key id="KEY_2" mapto="2" flags="m" />
 		<key id="KEY_3" mapto="3" flags="m" />
@@ -83,9 +105,22 @@
 		<key id="KEY_8" mapto="8" flags="m" />
 		<key id="KEY_9" mapto="9" flags="m" />
 		<key id="KEY_0" mapto="0" flags="m" />
-		
+	</map>
+	
+
+	<map context="InfobarPVRActions">
 		<key id="KEY_YELLOW" mapto="pauseService" flags="m" />
 		<key id="KEY_GREEN" mapto="unPauseService" flags="m" />
+		<key id="KEY_RED" mapto="seekBack" flags="m" />
+		<key id="KEY_BLUE" mapto="seekFwd" flags="m" />
+
+		<key id="KEY_LEFT" mapto="seekBack" flags="m" />
+		<key id="KEY_RIGHT" mapto="seekFwd" flags="m" />
+	</map>
+
+	<map context="MoviePlayerActions">
+		<key id="KEY_VIDEO" mapto="leavePlayer" flags="m" />
+		<key id="KEY_TV" mapto="leavePlayer" flags="m" />
 	</map>
 	
 	<map context="ChannelSelectActions">
@@ -100,18 +135,22 @@
 		<key id="KEY_RED" mapto="bouquet:(type == 1) || (type == 17)" flags="m" />
 		<key id="KEY_GREEN" mapto="bouquet:(provider == ARD) &amp;&amp; (type == 1)" flags="m" />
 		<key id="KEY_YELLOW" mapto="bouquet:(provider == ZDF) &amp;&amp; (type == 1)" flags="m" />
-		<key id="KEY_BLUE" mapto="bouquet:(type == 1) FROM BOUQUET &quot;bouquets.tv&quot; ORDER BY bouquet" flags="m" />
+		<!--<key id="KEY_BLUE" mapto="bouquet:(type == 1) FROM BOUQUET &quot;bouquets.tv&quot; ORDER BY bouquet" flags="m" />-->
+		<key id="KEY_BLUE" mapto="showFavourites" flags="m" />
 		<key id="KEY_INFO" mapto="showEPGList" flags="m" />
 	</map>
+
 	<map context="EPGSelectActions">
 		<key id="KEY_GREEN" mapto="timerAdd" flags="m" />
 	</map>
+
 	<map context="EventViewActions">
 		<key id="KEY_UP" mapto="pageUp" flags="mr" />
 		<key id="KEY_DOWN" mapto="pageDown" flags="mr" />
 		<key id="KEY_LEFT" mapto="prevEvent" flags="mr" />
 		<key id="KEY_RIGHT" mapto="nextEvent" flags="mr" />
 	</map>
+
 	<map context="OkCancelActions">
 		<key id="\x0a" mapto="ok" flags="m" />
 		<key id="\x1b" mapto="cancel" flags="m" />
@@ -123,6 +162,7 @@
 		<key id="KEY_ENTER" mapto="ok" flags="m" />
 		<key id="KEY_ESC" mapto="cancel" flags="m" />
 	</map>
+
 	<map context="WindowActions">
 		
 	</map>