git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of /home/tmbinc/enigma2-git into tmbinc/FixTimingBugs
[enigma2.git]
/
data
/
keymap.xml
diff --git
a/data/keymap.xml
b/data/keymap.xml
index 96814b40b4ce7cb4bc714321b5d065cde6766540..264afccf78a6176fe76bd3d41089238315be96c5 100644
(file)
--- a/
data/keymap.xml
+++ b/
data/keymap.xml
@@
-78,7
+78,7
@@
<map context="InfobarEPGActions">
<key id="KEY_INFO" mapto="showEventInfo" flags="b" />
<map context="InfobarEPGActions">
<key id="KEY_INFO" mapto="showEventInfo" flags="b" />
- <key id="KEY_INFO" mapto="show
SingleServiceEPG
" flags="l" />
+ <key id="KEY_INFO" mapto="show
EventInfoPlugin
" flags="l" />
</map>
<map context="InfobarInstantRecord">
</map>
<map context="InfobarInstantRecord">
@@
-381,6
+381,7
@@
</device>
<device name="dreambox advanced remote control (native)">
<key id="KEY_TV" mapto="leavePlayer" flags="m" />
</device>
<device name="dreambox advanced remote control (native)">
<key id="KEY_TV" mapto="leavePlayer" flags="m" />
+ <key id="KEY_STOP" mapto="leavePlayer" flags="m" />
</device>
<device name="dreambox ir keyboard">
<key id="KEY_STOP" mapto="leavePlayer" flags="m" />
</device>
<device name="dreambox ir keyboard">
<key id="KEY_STOP" mapto="leavePlayer" flags="m" />
@@
-397,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_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" />
</device>
<device name="dreambox ir keyboard">
<key id="KEY_PREVIOUSSONG" mapto="jumpPreviousMark" flags="m" />
@@
-615,6
+613,7
@@
</device>
<device name="dreambox advanced remote control (native)">
<key id="KEY_PLAYPAUSE" mapto="pause" flags="m" />
</device>
<device name="dreambox advanced remote control (native)">
<key id="KEY_PLAYPAUSE" mapto="pause" flags="m" />
+ <key id="KEY_PLAY" 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_STOP" mapto="stop" flags="b" />
<key id="KEY_STOP" mapto="shift_stop" flags="l" />
<key id="KEY_RECORD" mapto="shift_record" flags="l" />
@@
-640,5
+639,6
@@
<key id="KEY_CHANNELUP" mapto="nextBouquet" flags="m" />
<key id="KEY_CHANNELDOWN" mapto="prevBouquet" flags="m" />
<key id="KEY_VIDEO" mapto="delete" flags="m" />
<key id="KEY_CHANNELUP" mapto="nextBouquet" flags="m" />
<key id="KEY_CHANNELDOWN" mapto="prevBouquet" flags="m" />
<key id="KEY_VIDEO" mapto="delete" flags="m" />
+ <key id="KEY_TEXT" mapto="subtitles" flags="m" />
</map>
</keymap>
</map>
</keymap>