From 99d8e8619ebecaf00818fd175d7097013b08d121 Mon Sep 17 00:00:00 2001
From: hschang <chang@dev3>
Date: Thu, 3 Apr 2014 15:49:40 +0900
Subject: [PATCH] [keymap/rcinput] Adding key code for fastforward/rewind.

---
 data/keymap.xml        | 23 ++++++++++++-----------
 lib/driver/rcinput.cpp |  4 +++-
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/data/keymap.xml b/data/keymap.xml
index cdc583e..16bfaac 100755
--- a/data/keymap.xml
+++ b/data/keymap.xml
@@ -297,13 +297,9 @@
 			<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	-->
+<!--	ikseong insert KEY_PAUSE, KEY_PLAY	-->
 			<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" />
@@ -321,6 +317,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 +342,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 +355,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" />
@@ -396,7 +397,6 @@
 			<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)">
@@ -408,6 +408,7 @@
 			<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">
diff --git a/lib/driver/rcinput.cpp b/lib/driver/rcinput.cpp
index f21e109..64757c5 100644
--- a/lib/driver/rcinput.cpp
+++ b/lib/driver/rcinput.cpp
@@ -51,8 +51,10 @@ int getType(int code)
 	case 138: // help
 	case 139: // menu
 	case 163: // FF
+	case 208: // FF
 	case 164: // pause
-	case 165: // RF
+	case 165: // RW
+	case 168: // RW
 	case 167: // record
 	case 174: // exit
 	case 207: // play
-- 
2.7.4