From 2e46f7ce3e4acadc88f4c5db6eca18a4ef78f072 Mon Sep 17 00:00:00 2001
From: ghost <andreas.monzner@multimedia-labs.de>
Date: Sun, 24 May 2009 10:00:42 +0200
Subject: keymap.xml: use break code instead of make code

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

(limited to 'data')

diff --git a/data/keymap.xml b/data/keymap.xml
index 8f708698..036ea467 100644
--- a/data/keymap.xml
+++ b/data/keymap.xml
@@ -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" />
@@ -412,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" />
-- 
cgit v1.2.3


From e638015385d7ef9b4dfd3b0a44e54fa32e4006bf Mon Sep 17 00:00:00 2001
From: Felix Domke <tmbinc@elitedvb.net>
Date: Mon, 25 May 2009 01:39:10 +0200
Subject: don't show display setup on hardware without LCD

---
 data/setup.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'data')

diff --git a/data/setup.xml b/data/setup.xml
index 583850da..d8d58369 100644
--- a/data/setup.xml
+++ b/data/setup.xml
@@ -98,7 +98,7 @@
 			<item text="Brightness">config.osd.bright</item>
 			<item text="Contrast">config.osd.contrast</item>
 		</setup>
-		<setup key="lcd" title="Display Setup">
+		<setup key="lcd" title="Display Setup" requires="FrontpanelDisplay">
 			<item level="0" text="Brightness">config.lcd.bright</item>
 			<item level="0" text="Contrast">config.lcd.contrast</item>
 			<item level="0" text="Standby">config.lcd.standby</item>
-- 
cgit v1.2.3