servicemp3.cpp: more simple/flexible streaming detection

[enigma2.git] / lib / python / Plugins / Extensions / DVDPlayer / keymap.xml

diff --git a/lib/python/Plugins/Extensions/DVDPlayer/keymap.xml b/lib/python/Plugins/Extensions/DVDPlayer/keymap.xml
index b8b4994d712b52149399faa337b9d5d8639cd654..bf57e7534ce9e24ee8bcbf785c85d2d5dd37ea2b 100644 (file)
--- a/lib/python/Plugins/Extensions/DVDPlayer/keymap.xml
+++ b/lib/python/Plugins/Extensions/DVDPlayer/keymap.xml
@@ -2,28 +2,29 @@
        <map context="DVDPlayerActions">
                <key id="KEY_MENU" mapto="dvdMenu" flags="m" />
                <key id="KEY_INFO" mapto="toggleInfo" flags="m" />
+               <key id="KEY_CHANNELUP" mapto="nextTitle" flags="m" />
+               <key id="KEY_CHANNELDOWN" mapto="prevTitle" flags="m" />
                <device name="dreambox remote control (native)">
                        <key id="KEY_PREVIOUS" mapto="prevChapter" flags="m" />
                        <key id="KEY_NEXT" mapto="nextChapter" flags="m" />
                        <key id="KEY_TV" mapto="tv" flags="m" />
-                       <key id="KEY_AUDIO" mapto="dvdAudioMenu" flags="m" />
+                       <key id="KEY_AUDIO" mapto="AudioSelection" flags="m" />
+                       <key id="KEY_AUDIO" mapto="dvdAudioMenu" flags="l" />
                        <key id="KEY_RADIO" mapto="nextAudioTrack" flags="m" />
                        <key id="KEY_TEXT" mapto="nextSubtitleTrack" flags="m" />
-                       <key id="KEY_CHANNELUP" mapto="nextTitle" flags="m" />
-                       <key id="KEY_CHANNELDOWN" mapto="prevTitle" flags="m" />
-                       <key id="KEY_VIDEO" mapto="seekBeginning" flags="l" />
+                       <key id="KEY_VIDEO" mapto="nextAngle" flags="m" />
                </device>
-               <!--device name="dreambox advanced remote control (native)">
-                       <key id="KEY_PLAYPAUSE" mapto="pause" flags="m" />
-                       <key id="KEY_STOP" mapto="stop" flags="b" />
-                       <key id="KEY_STOP" mapto="shift_stop" flags="l" />
-                       <key id="KEY_RECORD" mapto="shift_record" flags="l" />
-                       <key id="KEY_PREVIOUS" mapto="previous" flags="m" />
-                       <key id="KEY_NEXT" mapto="next" flags="m" />
-                       <key id="KEY_RED" mapto="previous" flags="m" />
-                       <key id="KEY_BLUE" mapto="next" flags="m" />
+               <device name="dreambox advanced remote control (native)">
+                       <key id="KEY_PREVIOUS" mapto="prevChapter" flags="m" />
+                       <key id="KEY_NEXT" mapto="nextChapter" flags="m" />
+                       <key id="KEY_TV" mapto="tv" flags="m" />
+                       <key id="KEY_STOP" mapto="tv" flags="m" />
+                       <key id="KEY_RADIO" mapto="dvdAudioMenu" flags="l" />
+                       <key id="KEY_RADIO" mapto="nextAudioTrack" flags="m" />
+                       <key id="KEY_TEXT" mapto="nextSubtitleTrack" flags="m" />
+                       <key id="KEY_VIDEO" mapto="nextAngle" flags="m" />
                </device>
-               <device name="dreambox ir keyboard">
+               <!--device name="dreambox ir keyboard">
                        <key id="KEY_PAUSE" mapto="pause" flags="m" />
                        <key id="KEY_PLAY" mapto="play" flags="m" />
                        <key id="KEY_STOP" mapto="stop" flags="b" />