X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=data%2Fkeymap.xml;h=036ea467357a85f3e700e4fce625041f04829330;hb=f834b32700be1cde60218fea84756fdc91fddacd;hp=f1ee889ef333a42625842447c7d487766e0d687e;hpb=96a171a3f8daf3ebae2990c1bfa10bdeb0c5e87c;p=vuplus_dvbapp

diff --git a/data/keymap.xml b/data/keymap.xml
index f1ee889..036ea46 100644
--- a/data/keymap.xml
+++ b/data/keymap.xml
@@ -18,17 +18,16 @@
 	</map>
 	
 	<map context="KeyboardInputActions">
-		<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" />
-		<key id="KEY_BACK" mapto="moveHome" flags="mr" />
-		<key id="KEY_FORWARD" mapto="moveEnd" flags="mr" />
+		<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">
@@ -79,17 +78,20 @@
 
 	<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">
 		<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>
-		<key id="KEY_RED" mapto="instantRecord" flags="b" />
+		<device name="dreambox remote control (native)">
+			<key id="KEY_RED" mapto="instantRecord" flags="b" />
+		</device>
 	</map>
 
 	<map context="InfobarExtensions">
@@ -121,7 +123,9 @@
 	</map>
 
 	<map context="InputAsciiActions">
-		<key id="KEY_ASCII" mapto="gotAsciiCode" flags="mr" />
+		<device name="Console">
+			<key id="KEY_ASCII" mapto="gotAsciiCode" flags="mr" />
+		</device>
 	</map>
 
 	<map context="InputBoxActions">
@@ -193,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">
@@ -211,6 +215,9 @@
 		<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">
@@ -258,14 +265,15 @@
 
 	<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" />
 			<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" />
@@ -286,14 +294,12 @@
 
 		<key id="KEY_OK" mapto="unPauseService" 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" />
+		<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">
@@ -316,38 +322,40 @@
 			<key id="KEY_FASTFORWARD" mapto="seekFwdManual" flags="l" />
 		</device>
 		
-		<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" />
+		<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">
 		<device name="dreambox remote control (native)">
+			<key id="KEY_YELLOW" mapto="timeshiftStart" flags="b" />
 			<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>
-		<key id="KEY_YELLOW" mapto="timeshiftStart" flags="m" />
 	</map>
 
 	<map context="InfobarTimeshiftActivateActions">
 		<device name="dreambox remote control (native)">
-			<key id="KEY_RED" mapto="timeshiftActivateEnd" flags="m" />
-			<key id="KEY_YELLOW" mapto="timeshiftActivateEndAndPause" flags="m" />
+			<key id="KEY_RED" mapto="timeshiftActivateEnd" flags="b" />
+			<key id="KEY_YELLOW" mapto="timeshiftActivateEndAndPause" flags="b" />
 		</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">
@@ -372,6 +380,7 @@
 			<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">
@@ -399,19 +408,14 @@
 	
 	<map context="MediaPlayerCueSheetActions">
 		<device name="dreambox remote control (native)">
-			<key id="KEY_PREVIOUS" mapto="jumpPreviousMark" flags="b" />
-			<key id="KEY_NEXT" mapto="jumpNextMark" flags="b" />
 			<key id="KEY_0" mapto="toggleMark" flags="m" />
 		</device>
 		<device name="dreambox advanced remote control (native)">
-			<key id="KEY_PREVIOUS" mapto="jumpPreviousMark" flags="b" />
 			<key id="KEY_0" mapto="toggleMark" flags="m" />
-			<key id="KEY_NEXT" mapto="jumpNextMark" flags="b" />
+			<key id="KEY_YELLOW" mapto="toggleMark" flags="b" />
 		</device>
 		<device name="dreambox ir keyboard">
-			<key id="KEY_PREVIOUSSONG" mapto="jumpPreviousMark" flags="b" />
 			<key id="KEY_TAB" mapto="toggleMark" flags="m" />
-			<key id="KEY_NEXTSONG" mapto="jumpNextMark" flags="b" />
 		</device>
 	</map>
 	
@@ -471,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">
@@ -604,16 +610,19 @@
 			<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="l" />
-			<key id="KEY_NEXT" mapto="next" 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="l" />
-			<key id="KEY_NEXT" mapto="next" 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" />
@@ -621,8 +630,8 @@
 			<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="l" />
-			<key id="KEY_NEXTSONG" mapto="next" 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" />
@@ -632,5 +641,6 @@
 		<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>