X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/2b1a35585e9edead2200e4e4868d549c3b1e8106..d94506110fbfebcd3f49546c2403b5448589362a:/data/keymap.xml

diff --git a/data/keymap.xml b/data/keymap.xml
index 5e73490e..036ea467 100644
--- a/data/keymap.xml
+++ b/data/keymap.xml
@@ -78,7 +78,7 @@
 
 	<map context="InfobarEPGActions">
 		<key id="KEY_INFO" mapto="showEventInfo" flags="b" />
-		<key id="KEY_INFO" mapto="showSingleServiceEPG" flags="l" />
+		<key id="KEY_INFO" mapto="showEventInfoPlugin" flags="l" />
 	</map>
 	
 	<map context="InfobarInstantRecord">
@@ -197,12 +197,12 @@
 			<key id="KEY_AUDIO" mapto="audioSelection" flags="m" />
 		</device>
 		<device name="dreambox advanced remote control (native)">
-			<key id="KEY_YELLOW" mapto="audioSelection" flags="m" />
+			<key id="KEY_YELLOW" mapto="audioSelection" flags="b" />
 		</device>
 	</map>
 
 	<map context="InfobarSubserviceSelectionActions">
-		<key id="KEY_GREEN" mapto="subserviceSelection" flags="m" />
+		<key id="KEY_GREEN" mapto="subserviceSelection" flags="b" />
 	</map>
 
 	<map context="InfobarSubserviceQuickzapActions">
@@ -265,8 +265,8 @@
 
 	<map context="InfobarSeekActions">
 		<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_YELLOW" mapto="pauseService" flags="b" />
+			<key id="KEY_GREEN" mapto="unPauseService" flags="b" />
 			<key id="KEY_RED" mapto="seekBack" flags="b" />
 			<key id="KEY_BLUE" mapto="seekFwd" flags="b" />
 			<key id="KEY_RED" mapto="seekBackManual" flags="l" />
@@ -332,7 +332,7 @@
 
 	<map context="InfobarTimeshiftActions">
 		<device name="dreambox remote control (native)">
-			<key id="KEY_YELLOW" mapto="timeshiftStart" flags="m" />
+			<key id="KEY_YELLOW" mapto="timeshiftStart" flags="b" />
 			<key id="KEY_TV" mapto="timeshiftStop" flags="m" />
 		</device>
 		<device name="dreambox advanced remote control (native)">
@@ -351,7 +351,7 @@
 	<map context="InfobarTimeshiftActivateActions">
 		<device name="dreambox remote control (native)">
 			<key id="KEY_RED" mapto="timeshiftActivateEnd" flags="b" />
-			<key id="KEY_YELLOW" mapto="timeshiftActivateEndAndPause" flags="m" />
+			<key id="KEY_YELLOW" mapto="timeshiftActivateEndAndPause" flags="b" />
 		</device>
 		<device name="dreambox advanced remote control (native)">
 			<key id="KEY_PREVIOUSSONG" mapto="timeshiftActivateEnd" flags="m" />
@@ -398,9 +398,6 @@
 			<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" />
@@ -415,7 +412,7 @@
 		</device>
 		<device name="dreambox advanced remote control (native)">
 			<key id="KEY_0" mapto="toggleMark" flags="m" />
-			<key id="KEY_YELLOW" mapto="toggleMark" flags="m" />
+			<key id="KEY_YELLOW" mapto="toggleMark" flags="b" />
 		</device>
 		<device name="dreambox ir keyboard">
 			<key id="KEY_TAB" mapto="toggleMark" flags="m" />
@@ -478,6 +475,8 @@
 		<key id="KEY_MENU" mapto="input_date_time" flags="m" />
 		<key id="KEY_CHANNELUP" mapto="nextBouquet" flags="m" />
 		<key id="KEY_CHANNELDOWN" mapto="prevBouquet" flags="m" />
+		<key id="KEY_NEXT" mapto="nextService" flags="m" />
+		<key id="KEY_PREVIOUS" mapto="prevService" flags="m" />
 	</map>
 
 	<map context="EventViewActions">