Merge branch 'master' of /home/tmbinc/enigma2-git

[enigma2.git] / data / keymap.xml

diff --git a/data/keymap.xml b/data/keymap.xml
index 0a0dc867747f4475b6388593b220896d5a120bfa..8f70869893ed96a2f8f4058cf57801764d3aa8c2 100644 (file)
--- a/data/keymap.xml
+++ b/data/keymap.xml
@@ -197,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">
@@ -265,8 +265,8 @@
 
        <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" />
@@ -398,9 +398,6 @@
                        <key id="KEY_PREVIOUS" mapto="jumpPreviousMark" flags="m" />
                        <key id="KEY_0" mapto="toggleMark" flags="m" />
                        <key id="KEY_NEXT" mapto="jumpNextMark" flags="m" />
-                       <key id="KEY_RED" mapto="jumpPreviousMark" flags="m" />
-                       <key id="KEY_YELLOW" mapto="toggleMark" flags="m" />
-                       <key id="KEY_BLUE" mapto="jumpNextMark" flags="m" />
                </device>
                <device name="dreambox ir keyboard">
                        <key id="KEY_PREVIOUSSONG" mapto="jumpPreviousMark" flags="m" />
@@ -478,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">