X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=data%2Fkeymap.xml;h=f91650c8227fa25ffc8c7d54018a2439866d7171;hp=cdc583eac92a29fee7bae0bfadd3c6df2ed0028c;hb=HEAD;hpb=f1186b323fe59536ceb717a799839e9cbc48b30a

diff --git a/data/keymap.xml b/data/keymap.xml
index cdc583e..f91650c 100755
--- a/data/keymap.xml
+++ b/data/keymap.xml
@@ -90,7 +90,6 @@
 			<key id="KEY_RECORD" mapto="instantRecord" flags="m" />
 		</device>
 		<device name="dreambox remote control (native)">
-<!--	ikseong insert KEY_RECORD action	-->
 			<key id="KEY_RECORD" mapto="instantRecord" flags="m" />
 			<key id="KEY_RED" mapto="instantRecord" flags="b" />
 		</device>
@@ -175,12 +174,6 @@
 		<key id="KEY_ENTER" mapto="ok" flags="m" />
 		<key id="KEY_EXIT" mapto="back" flags="m" />
 		<key id="KEY_ESC" mapto="back" flags="m" />
-<!--	ikseong for factory test	-->
-		<key id="KEY_SUBTITLE" mapto="test" flags="m" />
-		<key id="KEY_RADIO" mapto="testexit" flags="m" />
-		<key id="KEY_PAUSE" mapto="agingend" flags="m" />
-		<key id="KEY_STOP" mapto="agingfinish" flags="m" />		
-		<key id="KEY_GREEN" mapto="agingstart" flags="m" />
 	</map>
 	
 	<map context="InfobarMenuActions">
@@ -204,7 +197,6 @@
 		<key id="KEY_VIDEO" mapto="showMovies" flags="m" />
 		<key id="KEY_RADIO" mapto="showRadio" flags="m" />
 		<key id="KEY_TV" mapto="showTv" flags="m" />
-<!--	ikseong insert KEY_SUBTITLE action for subtitle hotkey	-->
 		<key id="KEY_SUBTITLE" mapto="showSubtitle" flags="m" />
 	</map>
 
@@ -253,6 +245,8 @@
 		<key id="KEY_POWER" mapto="power_long" flags="l" />
 		<key id="KEY_POWER" mapto="power_down" flags="m" />
 		<key id="KEY_POWER" mapto="power_up" flags="b" />
+		<key id="KEY_EDIT" mapto="timer_down" flags="m" />
+		<key id="KEY_EDIT" mapto="timer_up" flags="b" />
 		<device name="dreambox front panel">
 			<key id="KEY_POWER" mapto="deepstandby" flags="l" />
 		</device>
@@ -297,17 +291,12 @@
 			<key id="KEY_BLUE" mapto="seekFwd" flags="b" />
 			<key id="KEY_RED" mapto="seekBackManual" flags="l" />
 			<key id="KEY_BLUE" mapto="seekFwdManual" flags="l" />
-<!--	ikseong insert KEY_PAUSE, KEY_PLAY, KEY_REWIND, KEY_FASTFORWARD	-->
 			<key id="KEY_PAUSE" mapto="pauseService" flags="m" />
 			<key id="KEY_PLAY" mapto="playpauseService" flags="m" />
-			<key id="KEY_REWIND" mapto="seekBack" flags="b" />
-			<key id="KEY_FASTFORWARD" mapto="seekFwd" flags="b" />
-			<key id="KEY_REWIND" mapto="seekBackManual" flags="l" />
-			<key id="KEY_FASTFORWARD" 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_PLAY" mapto="playpauseService" 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" />
@@ -321,6 +310,11 @@
 			<key id="KEY_REWIND" mapto="seekBackManual" flags="l" />
 			<key id="KEY_FASTFORWARD" mapto="seekFwdManual" flags="l" />
 		</device>
+
+		<key id="KEY_REWIND" mapto="seekBack" flags="b" />
+		<key id="KEY_FASTFORWARD" mapto="seekFwd" flags="b" />
+		<key id="KEY_REWIND" mapto="seekBackManual" flags="l" />
+		<key id="KEY_FASTFORWARD" mapto="seekFwdManual" flags="l" />
 		
 		<key id="KEY_LEFT" mapto="seekBack" flags="m" />
 		<key id="KEY_RIGHT" mapto="seekFwd" flags="m" />
@@ -341,11 +335,6 @@
 			<key id="KEY_BLUE" mapto="seekFwd" flags="b" />
 			<key id="KEY_RED" mapto="seekBackManual" flags="l" />
 			<key id="KEY_BLUE" mapto="seekFwdManual" flags="l" />
-<!--	ikseong insert KEY_REWIND, KEY_FASTFORWARD	-->
-			<key id="KEY_REWIND" mapto="seekBack" flags="b" />
-			<key id="KEY_FASTFORWARD" mapto="seekFwd" flags="b" />
-			<key id="KEY_REWIND" mapto="seekBackManual" flags="l" />
-			<key id="KEY_FASTFORWARD" mapto="seekFwdManual" flags="l" />
 		</device>
 		<device name="dreambox advanced remote control (native)">
 			<key id="KEY_PREVIOUSSONG" mapto="seekBack" flags="b" />
@@ -359,6 +348,11 @@
 			<key id="KEY_REWIND" mapto="seekBackManual" flags="l" />
 			<key id="KEY_FASTFORWARD" mapto="seekFwdManual" flags="l" />
 		</device>
+
+		<key id="KEY_REWIND" mapto="seekBack" flags="b" />
+		<key id="KEY_FASTFORWARD" mapto="seekFwd" flags="b" />
+		<key id="KEY_REWIND" mapto="seekBackManual" flags="l" />
+		<key id="KEY_FASTFORWARD" mapto="seekFwdManual" flags="l" />
 		
 		<key id="KEY_1" mapto="seekdef:1" flags="m" />
 		<key id="KEY_3" mapto="seekdef:3" flags="m" />
@@ -372,16 +366,15 @@
 		<device name="dreambox remote control (native)">
 			<key id="KEY_YELLOW" mapto="timeshiftStart" flags="b" />
 			<key id="KEY_TV" mapto="timeshiftStop" flags="m" />
-<!--	ikseong insert KEY_PAUSE, KEY_PLAY, KEY_STOP	-->
 			<key id="KEY_PLAY" mapto="timeshiftStart" flags="m" />
 			<key id="KEY_PAUSE" mapto="timeshiftStart" flags="m" />
 			<key id="KEY_STOP" 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_PLAY" mapto="timeshiftStart" flags="m" />
 			<key id="KEY_STOP" mapto="timeshiftStop" flags="m" />
+			<key id="KEY_TV" mapto="timeshiftStop" flags="m" />
 		</device>
 		<device name="dreambox ir keyboard">
 			<key id="KEY_YELLOW" mapto="timeshiftStart" flags="m" />
@@ -394,20 +387,19 @@
 		<device name="dreambox remote control (native)">
 			<key id="KEY_RED" mapto="timeshiftActivateEnd" flags="b" />
 			<key id="KEY_YELLOW" mapto="timeshiftActivateEndAndPause" flags="b" />
-<!--	ikseong insert KEY_PAUSE, KEY_PLAY, KEY_REWIND	-->
 			<key id="KEY_PLAY" mapto="timeshiftActivateEndAndPause" flags="m" />
-			<key id="KEY_REWIND" mapto="timeshiftActivateEnd" flags="m" />
 			<key id="KEY_PAUSE" 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" />
 			<key id="KEY_PLAYPAUSE" mapto="timeshiftActivateEndAndPause" flags="m" />
+			<key id="KEY_PLAY" mapto="timeshiftActivateEndAndPause" flags="m" />
 		</device>
 		<device name="dreambox ir keyboard">
 			<key id="KEY_REWIND" mapto="timeshiftActivateEnd" flags="m" />
 			<key id="KEY_PAUSE" mapto="timeshiftActivateEndAndPause" flags="m" />
 		</device>
+		<key id="KEY_REWIND" mapto="timeshiftActivateEnd" flags="m" />
 	</map>
 
 	<map context="MovieSelectionActions">
@@ -426,7 +418,6 @@
 		<device name="dreambox remote control (native)">
 			<key id="KEY_TV" mapto="leavePlayer" flags="m" />
 			<key id="KEY_STOP" mapto="leavePlayer" flags="m" />
-<!--	ikseong insert KEY_SUBTITLE action for subtitle hotkey	-->
 			<key id="KEY_SUBTITLE" mapto="showSubtitle" flags="m" />		
 		</device>
 		<device name="dreambox advanced remote control (native)">
@@ -667,7 +658,6 @@
 			<key id="KEY_RADIO" mapto="shift_record" flags="l" />
 			<key id="KEY_PREVIOUS" mapto="previous" flags="m" />
 			<key id="KEY_NEXT" mapto="next" flags="m" />
-<!--	ikseong insert KEY_PAUSE, KEY_PLAY, KEY_STOP, KEY_RECORD, KEY_REWIND, KEY_FASTFORWARD	-->
 			<key id="KEY_PAUSE" mapto="pause" flags="m" />
 			<key id="KEY_PLAY" mapto="play" flags="m" />
 			<key id="KEY_STOP" mapto="stop" flags="b" />