move CutListEditorActions into cutlist, and provide own CutlistSeekActions

diff --git a/data/keymap.xml b/data/keymap.xml
index 5c0cb54..21643fa 100644 (file)
--- a/data/keymap.xml
+++ b/data/keymap.xml
@@ -455,17 +455,6 @@
                <!--key id="KEY_BLUE" mapto="settings" flags="mr" /-->
                
        </map>  
-       <map context="CutListEditorActions">
-               <key id="KEY_NEXT" mapto="setIn" flags="m" />
-               <key id="KEY_PREVIOUS" mapto="setOut" flags="m" />
-               <key id="KEY_0" mapto="setMark" flags="m" />
-               <key id="KEY_CHANNELUP" mapto="addMark" flags="m" />
-               <key id="KEY_CHANNELDOWN" mapto="removeMark" flags="m" />
-               <key id="KEY_EXIT" mapto="leave" flags="m" />
-               <key id="KEY_ESC" mapto="leave" flags="m" />
-               <key id="KEY_OK" mapto="showMenu" flags="m" />
-               <key id="KEY_ENTER" mapto="showMenu" flags="m" />
-       </map>
        
        <map context="CiSelectionActions">
                <key id="KEY_LEFT" mapto="left" flags="mr" />

diff --git a/lib/python/Plugins/Extensions/CutListEditor/Makefile.am b/lib/python/Plugins/Extensions/CutListEditor/Makefile.am
index 0048024..1646c01 100644 (file)
--- a/lib/python/Plugins/Extensions/CutListEditor/Makefile.am
+++ b/lib/python/Plugins/Extensions/CutListEditor/Makefile.am
@@ -3,4 +3,5 @@ installdir = $(LIBDIR)/enigma2/python/Plugins/Extensions/CutListEditor
 install_PYTHON =       \
        __init__.py \
        plugin.py
- 
+
+install_DATA = keymap.xml

diff --git a/lib/python/Plugins/Extensions/CutListEditor/keymap.xml b/lib/python/Plugins/Extensions/CutListEditor/keymap.xml
new file mode 100644 (file)
index 0000000..5fc014b
--- /dev/null
+++ b/lib/python/Plugins/Extensions/CutListEditor/keymap.xml
@@ -0,0 +1,44 @@
+<keymap>
+       <map context="CutlistSeekActions">
+               <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_RED" mapto="seekBackDown" flags="m" />
+                       <key id="KEY_RED" mapto="seekBackUp" flags="b" />
+                       <key id="KEY_BLUE" mapto="seekFwdDown" flags="m" />
+                       <key id="KEY_BLUE" mapto="seekFwdUp" flags="b" />
+               </device>
+               <device name="dreambox advanced remote control (native)">
+                       <key id="KEY_PLAY" mapto="playpauseService" flags="m" />
+                       <!--key id="KEY_GREEN" mapto="unPauseService" flags="m" /-->
+                       <key id="KEY_PREVIOUSSONG" mapto="seekBackDown" flags="m" />
+                       <key id="KEY_PREVIOUSSONG" mapto="seekBackUp" flags="b" />
+                       <key id="KEY_NEXTSONG" mapto="seekFwdDown" flags="m" />
+                       <key id="KEY_NEXTSONG" mapto="seekFwdUp" flags="b" />
+               </device>
+               
+               <key id="KEY_LEFT" mapto="seek:-1" flags="m" />
+               <key id="KEY_RIGHT" mapto="seek:1" flags="m" />
+
+               <key id="KEY_1" mapto="seek:-10" flags="m" />
+               <key id="KEY_3" mapto="seek:10" flags="m" />
+               <key id="KEY_4" mapto="seek:-30" flags="m" />
+               <key id="KEY_6" mapto="seek:30" flags="m" />
+               <key id="KEY_7" mapto="seek:-90" flags="m" />
+               <key id="KEY_9" mapto="seek:90" flags="m" />
+               <key id="KEY_PREVIOUS" mapto="seek:-300" flags="m" />
+               <key id="KEY_NEXT" mapto="seek:300" flags="m" />
+       </map>
+
+       <map context="CutListEditorActions">
+<!--           <key id="KEY_NEXT" mapto="setIn" flags="m" />
+               <key id="KEY_PREVIOUS" mapto="setOut" flags="m" /> -->
+               <key id="KEY_0" mapto="setMark" flags="m" />
+<!--           <key id="KEY_CHANNELUP" mapto="addMark" flags="m" />
+               <key id="KEY_CHANNELDOWN" mapto="removeMark" flags="m" /> -->
+               <key id="KEY_EXIT" mapto="leave" flags="m" />
+               <key id="KEY_ESC" mapto="leave" flags="m" />
+               <key id="KEY_OK" mapto="showMenu" flags="m" />
+               <key id="KEY_ENTER" mapto="showMenu" flags="m" />
+       </map>
+</keymap>