From 5dd0b00d957affdf7fa8ca9013aedf5cf1beafbd Mon Sep 17 00:00:00 2001
From: Andreas Monzner <andreas.monzner@multimedia-labs.de>
Date: Thu, 7 Aug 2008 09:04:19 +0000
Subject: small keymap fixes for new rc

---
 data/keymap.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/data/keymap.xml b/data/keymap.xml
index 3f8e681d..96814b40 100644
--- a/data/keymap.xml
+++ b/data/keymap.xml
@@ -84,7 +84,7 @@
 	<map context="InfobarInstantRecord">
 		<device name="dreambox advanced remote control (native)">
 			<key id="KEY_RECORD" mapto="instantRecord" flags="m" />
-			<key id="KEY_STOP" 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" />
@@ -332,18 +332,20 @@
 
 	<map context="InfobarTimeshiftActions">
 		<device name="dreambox remote control (native)">
+			<key id="KEY_YELLOW" mapto="timeshiftStart" flags="m" />
 			<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">
-- 
cgit v1.2.3