Merge branch 'vuplus_experimental' of code.vuplus.com:/opt/repository/dvbapp into...

diff --git a/data/keymap.xml b/data/keymap.xml
index bf96d05..8395222 100755 (executable)
--- a/data/keymap.xml
+++ b/data/keymap.xml
@@ -283,12 +283,12 @@
 
        <map context="InfobarSeekActions">
                <device name="dreambox remote control (native)">
-                       <key id="KEY_PAUSE" mapto="pauseService" flags="b" />
-                       <key id="KEY_PLAY" mapto="unPauseService" flags="b" />
-                       <key id="KEY_REWIND" mapto="seekBack" flags="b" />
-                       <key id="KEY_FORWARD" mapto="seekFwd" flags="b" />
-                       <key id="KEY_REWIND" mapto="seekBackManual" flags="l" />
-                       <key id="KEY_FORWARD" mapto="seekFwdManual" flags="l" />
+                       <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" />
+                       <key id="KEY_BLUE" mapto="seekFwdManual" flags="l" />
                        <key id="KEY_PAUSE" mapto="pauseService" flags="m" />
                        <key id="KEY_PLAY" mapto="playpauseService" flags="m" />
                </device>

diff --git a/data/rcpositions.xml b/data/rcpositions.xml
index 955358c..c21a506 100755 (executable)
--- a/data/rcpositions.xml
+++ b/data/rcpositions.xml
@@ -38,8 +38,6 @@
                <button name="BLUE" pos="110,206" />
                <button name="REWIND" pos="41,392" />
                <button name="PLAYPAUSE" pos="86,392" />
-               <button name="PAUSE" pos="86,392" />
-                <button name="PLAY" pos="64,392" />
                <button name="STOP" pos="86,412" />
                <button name="FORWARD" pos="109,392" />
                <button name="TV" pos="41,412" />

diff --git a/lib/python/Tools/KeyBindings.py b/lib/python/Tools/KeyBindings.py
index 582a3e4..d51c21e 100755 (executable)
--- a/lib/python/Tools/KeyBindings.py
+++ b/lib/python/Tools/KeyBindings.py
@@ -28,10 +28,7 @@ keyDescriptions = [{
                KEYIDS["KEY_PREVIOUS"]: ("ARROWLEFT",),
                KEYIDS["KEY_PREVIOUSSONG"]: ("BLUE", "SHIFT"),
                KEYIDS["KEY_PLAYPAUSE"]: ("PLAYPAUSE",),
-               KEYIDS["KEY_PLAY"]: ("PLAY",),
-               KEYIDS["KEY_PAUSE"]: ("PAUSE",),
-                KEYIDS["KEY_REWIND"]: ("REWIND",),
-                KEYIDS["KEY_FORWARD"]: ("FORWARD",),
+               KEYIDS["KEY_PLAY"]: ("PLAYPAUSE",),
                KEYIDS["KEY_NEXTSONG"]: ("RED", "SHIFT"),
                KEYIDS["KEY_CHANNELUP"]: ("BOUQUET+",),
                KEYIDS["KEY_CHANNELDOWN"]: ("BOUQUET-",),