Revision: 5897 Author: pebender Date: Wed Dec 2 17:22:57 2009 Log: - Simplified lircec by removing MCE shortcut key mapping from lircrc as they should be handled by either lircd or lircudevd.
http://code.google.com/p/minimyth/source/detail?r=5897 Modified: /trunk/gar-minimyth/html/minimyth/document-changelog.txt /trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc/lircrc.d/minimyth/optional/key.volume.external /trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc/lircrc.d/mplayer/base /trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc/lircrc.d/mplayer/optional/key.volume.internal /trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc/lircrc.d/mythtv/base /trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc/lircrc.d/mythtv/optional/key.volume.internal /trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc/lircrc.d/vlc/base /trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc/lircrc.d/vlc/optional/key.volume.internal /trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc/lircrc.d/xine/base /trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc/lircrc.d/xine/optional/key.volume.internal ======================================= --- /trunk/gar-minimyth/html/minimyth/document-changelog.txt Wed Dec 2 16:21:23 2009 +++ /trunk/gar-minimyth/html/minimyth/document-changelog.txt Wed Dec 2 17:22:57 2009 @@ -47,6 +47,8 @@ - Patched LIRC so that lircd's uinput output supports all keys and buttons. - Simplified lircrc by moving custom key mapping for MCE and Hauppauge remotes from lircrc to lircd.conf. + - Simplified lircec by removing MCE shortcut key mapping from lircrc as + they should be handled by either lircd or lircudevd. Fixed bugs - Fixed a bug that caused mm_sleep and mm_sleep_on_ss to output an error ======================================= --- /trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc/lircrc.d/minimyth/optional/key.volume.external Mon May 25 20:58:28 2009 +++ /trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc/lircrc.d/minimyth/optional/key.volume.external Wed Dec 2 17:22:57 2009 @@ -9,15 +9,6 @@ delay = 4 end -begin - prog = irexec - remote = devinput.mcekbd - button = KEY_F10 - config = /usr/bin/mm_external_volume_up - repeat = 2 - delay = 4 -end - begin prog = irexec button = KEY_VOLUMEDOWN @@ -26,24 +17,8 @@ delay = 4 end -begin - prog = irexec - remote = devinput.mcekbd - button = KEY_F9 - config = /usr/bin/mm_external_volume_down - repeat = 2 - delay = 4 -end - begin prog = irexec button = KEY_MUTE config = /usr/bin/mm_external_volume_mute end - -begin - prog = irexec - remote = devinput.mcekbd - button = KEY_F8 - config = /usr/bin/mm_external_volume_mute -end ======================================= --- /trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc/lircrc.d/mplayer/base Thu Nov 19 16:53:28 2009 +++ /trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc/lircrc.d/mplayer/base Wed Dec 2 17:22:57 2009 @@ -7,15 +7,6 @@ config = seek 0 1\npause end -begin - prog = mplayer - remote = devinput.mcekbd - button = KEY_LEFTCTRL - button = KEY_LEFTSHIFT - button = KEY_S - config = seek 0 1\npause -end - begin prog = mplayer button = KEY_PAUSE @@ -28,57 +19,24 @@ config = pause end -begin - prog = mplayer - remote = devinput.mcekbd - button = KEY_LEFTCTRL - button = KEY_P - config = pause -end - begin prog = mplayer button = KEY_PLAY config = backspace end -begin - prog = mplayer - remote = devinput.mcekbd - button = KEY_LEFTCTRL - button = KEY_LEFTSHIFT - button = KEY_P - config = backspace -end - begin prog = mplayer button = KEY_PREVIOUS config = seek -15 end -begin - prog = mplayer - remote = devinput.mcekbd - button = KEY_LEFTCTRL - button = KEY_B - config = seek -15 -end - begin prog = mplayer button = KEY_NEXT config = seek +15 end -begin - prog = mplayer - remote = devinput.mcekbd - button = KEY_LEFTCTRL - button = KEY_F - config = seek +15 -end - begin prog = mplayer button = KEY_BACK @@ -97,13 +55,6 @@ config = quit end -begin - prog = mplayer - remote = devinput.mcekbd - button = KEY_BACKSPACE - config = quit -end - begin prog = mplayer button = KEY_UP @@ -142,13 +93,6 @@ config = dvdnav 6 end -begin - prog = mplayer - remote = devinput.mcekbd - button = KEY_ENTER - config = dvdnav 6 -end - begin prog = mplayer button = KEY_MENU @@ -191,15 +135,6 @@ config = dvdnav 5 end -begin - prog = mplayer - remote = devinput.mcekbd - button = KEY_LEFTCTRL - button = KEY_LEFTSHIFT - button = KEY_M - config = dvdnav 5 -end - begin prog = mplayer button = KEY_1 ======================================= --- /trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc/lircrc.d/mplayer/optional/key.volume.internal Tue Dec 9 09:07:35 2008 +++ /trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc/lircrc.d/mplayer/optional/key.volume.internal Wed Dec 2 17:22:57 2009 @@ -9,15 +9,6 @@ delay = 4 end -begin - prog = mplayer - remote = devinput.mcekbd - button = KEY_F10 - config = volume +5 - repeat = 2 - delay = 4 -end - begin prog = mplayer button = KEY_VOLUMEDOWN @@ -26,24 +17,8 @@ delay = 4 end -begin - prog = mplayer - remote = devinput.mcekbd - button = KEY_F9 - config = volume -5 - repeat = 2 - delay = 4 -end - begin prog = mplayer button = KEY_MUTE config = mute end - -begin - prog = mplayer - remote = devinput.mcekbd - button = KEY_F8 - config = mute -end ======================================= --- /trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc/lircrc.d/mythtv/base Mon Nov 30 19:45:22 2009 +++ /trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc/lircrc.d/mythtv/base Wed Dec 2 17:22:57 2009 @@ -52,28 +52,12 @@ config = Alt+M end -begin - prog = mythtv - remote = devinput.mcekbd - button = KEY_LEFTCTRL - button = KEY_M - config = Alt+M -end - begin prog = mythtv button = KEY_MEDIA config = Alt+G end -begin - prog = mythtv - remote = devinput.mcekbd - button = KEY_LEFTCTRL - button = KEY_I - config = Alt+G -end - begin prog = mythtv button = KEY_DVD @@ -86,43 +70,18 @@ config = Alt+S end -begin - prog = mythtv - remote = devinput.mcekbd - button = KEY_LEFTCTRL - button = KEY_A - config = Alt+S -end - begin prog = mythtv button = KEY_RECORD config = R end -begin - prog = mythtv - remote = devinput.mcekbd - button = KEY_LEFTCTRL - button = KEY_R - config = R -end - begin prog = mythtv button = KEY_STOP config = O end -begin - prog = mythtv - remote = devinput.mcekbd - button = KEY_LEFTCTRL - button = KEY_LEFTSHIFT - button = KEY_S - config = O -end - begin prog = mythtv button = KEY_PAUSE @@ -135,29 +94,12 @@ config = P end -begin - prog = mythtv - remote = devinput.mcekbd - button = KEY_LEFTCTRL - button = KEY_P - config = P -end - begin prog = mythtv button = KEY_PLAY config = Space end -begin - prog = mythtv - remote = devinput.mcekbd - button = KEY_LEFTCTRL - button = KEY_LEFTSHIFT - button = KEY_P - config = Space -end - begin prog = mythtv button = KEY_REWIND @@ -166,17 +108,6 @@ delay = 4 end -begin - prog = mythtv - remote = devinput.mcekbd - button = KEY_LEFTCTRL - button = KEY_LEFTSHIFT - button = KEY_B - config = ( - repeat = 2 - delay = 4 -end - begin prog = mythtv button = KEY_FORWARD @@ -185,45 +116,18 @@ delay = 4 end -begin - prog = mythtv - remote = devinput.mcekbd - button = KEY_LEFTCTRL - button = KEY_LEFTSHIFT - button = KEY_F - config = ) - repeat = 2 - delay = 4 -end - begin prog = mythtv button = KEY_PREVIOUS config = Q end -begin - prog = mythtv - remote = devinput.mcekbd - button = KEY_LEFTCTRL - button = KEY_B - config = Q -end - begin prog = mythtv button = KEY_NEXT config = Z end -begin - prog = mythtv - remote = devinput.mcekbd - button = KEY_LEFTCTRL - button = KEY_F - config = Z -end - begin prog = mythtv button = KEY_BACK @@ -248,13 +152,6 @@ config = Esc end -begin - prog = mythtv - remote = devinput.mcekbd - button = KEY_BACKSPACE - config = Esc -end - begin prog = mythtv button = KEY_INFO @@ -323,14 +220,6 @@ config = M end -begin - prog = mythtv - remote = devinput.mcekbd - button = KEY_LEFTCTRL - button = KEY_D - config = M -end - begin prog = mythtv button = KEY_PROGRAM @@ -585,15 +474,6 @@ config = T end -begin - prog = mythtv - remote = devinput.mcekbd - button = KEY_LEFTCTRL - button = KEY_LEFTSHIFT - button = KEY_C - config = T -end - begin prog = mythtv button = KEY_DELETE ======================================= --- /trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc/lircrc.d/mythtv/optional/key.volume.internal Tue Dec 9 09:07:35 2008 +++ /trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc/lircrc.d/mythtv/optional/key.volume.internal Wed Dec 2 17:22:57 2009 @@ -13,15 +13,6 @@ delay = 4 end -begin - prog = mythtv - remote = devinput.mcekbd - button = KEY_F10 - config = ] - repeat = 2 - delay = 4 -end - begin prog = mythtv button = KEY_VOLUMEDOWN @@ -30,24 +21,8 @@ delay = 4 end -begin - prog = mythtv - remote = devinput.mcekbd - button = KEY_F9 - config = [ - repeat = 2 - delay = 4 -end - begin prog = mythtv button = KEY_MUTE config = | end - -begin - prog = mythtv - remote = devinput.mcekbd - button = KEY_F8 - config = | -end ======================================= --- /trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc/lircrc.d/vlc/base Mon Nov 30 19:45:22 2009 +++ /trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc/lircrc.d/vlc/base Wed Dec 2 17:22:57 2009 @@ -49,15 +49,6 @@ config = key-stop end -begin - prog = vlc - remote = devinput.mcekbd - button = KEY_LEFTCTRL - button = KEY_LEFTSHIFT - button = KEY_S - config = key-stop -end - begin prog = vlc button = KEY_PAUSE @@ -70,29 +61,12 @@ config = key-play-pause end -begin - prog = vlc - remote = devinput.mcekbd - button = KEY_LEFTCTRL - button = KEY_P - config = key-play-pause -end - begin prog = vlc button = KEY_PLAY config = key-play end -begin - prog = vlc - remote = devinput.mcekbd - button = KEY_LEFTCTRL - button = KEY_LEFTSHIFT - button = KEY_P - config = key-play -end - begin prog = vlc button = KEY_REWIND @@ -101,17 +75,6 @@ delay = 4 end -begin - prog = vlc - remote = devinput.mcekbd - button = KEY_LEFTCTRL - button = KEY_LEFTSHIFT - button = KEY_B - config = key-jump-short - repeat = 2 - delay = 4 -end - begin prog = vlc button = KEY_FORWARD @@ -120,45 +83,18 @@ delay = 4 end -begin - prog = vlc - remote = devinput.mcekbd - button = KEY_LEFTCTRL - button = KEY_LEFTSHIFT - button = KEY_F - config = key-jump+short - repeat = 2 - delay = 4 -end - begin prog = vlc button = KEY_PREVIOUS config = key-jump-medium end -begin - prog = vlc - remote = devinput.mcekbd - button = KEY_LEFTCTRL - button = KEY_B - config = key-jump-medium -end - begin prog = vlc button = KEY_NEXT config = key-jump+medium end -begin - prog = vlc - remote = devinput.mcekbd - button = KEY_LEFTCTRL - button = KEY_F - config = key-jump+medium -end - begin prog = vlc button = KEY_BACK @@ -183,13 +119,6 @@ config = key-quit end -begin - prog = vlc - remote = devinput.mcekbd - button = KEY_BACKSPACE - config = key-quit -end - #begin # prog = vlc # button = KEY_INFO @@ -234,13 +163,6 @@ config = key-nav-activate end -begin - prog = vlc - remote = devinput.mcekbd - button = KEY_ENTER - config = key-nav-activate -end - #begin # prog = vlc # button = KEY_ENTER ======================================= --- /trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc/lircrc.d/vlc/optional/key.volume.internal Thu Jul 2 21:43:37 2009 +++ /trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc/lircrc.d/vlc/optional/key.volume.internal Wed Dec 2 17:22:57 2009 @@ -9,15 +9,6 @@ delay = 4 end -begin - prog = xine - remote = devinput.mcekbd - button = KEY_F10 - config = key-vol-up - repeat = 2 - delay = 4 -end - begin prog = xine button = KEY_VOLUMEDOWN @@ -26,24 +17,8 @@ delay = 4 end -begin - prog = xine - remote = devinput.mcekbd - button = KEY_F9 - config = key-vol-down - repeat = 2 - delay = 4 -end - begin prog = xine button = KEY_MUTE config = key-vol-mute end - -begin - prog = xine - remote = devinput.mcekbd - button = KEY_F8 - config = key-vol-mute -end ======================================= --- /trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc/lircrc.d/xine/base Mon Nov 30 19:45:22 2009 +++ /trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc/lircrc.d/xine/base Wed Dec 2 17:22:57 2009 @@ -7,15 +7,6 @@ config = Stop end -begin - prog = xine - remote = devinput.mcekbd - button = KEY_LEFTCTRL - button = KEY_LEFTSHIFT - button = KEY_S - config = Stop -end - begin prog = xine button = KEY_PAUSE @@ -28,29 +19,12 @@ config = Pause end -begin - prog = xine - remote = devinput.mcekbd - button = KEY_LEFTCTRL - button = KEY_P - config = Pause -end - begin prog = xine button = KEY_PLAY config = Play end -begin - prog = xine - remote = devinput.mcekbd - button = KEY_LEFTCTRL - button = KEY_LEFTSHIFT - button = KEY_P - config = Play -end - begin prog = xine button = KEY_REWIND @@ -59,17 +33,6 @@ delay = 4 end -begin - prog = xine - remote = devinput.mcekbd - button = KEY_LEFTCTRL - button = KEY_LEFTSHIFT - button = KEY_B - config = SpeedSlower - repeat = 2 - delay = 4 -end - begin prog = xine button = KEY_FORWARD @@ -78,45 +41,18 @@ delay = 4 end -begin - prog = xine - remote = devinput.mcekbd - button = KEY_LEFTCTRL - button = KEY_LEFTSHIFT - button = KEY_F - config = SpeedFaster - repeat = 2 - delay = 4 -end - begin prog = xine button = KEY_PREVIOUS config = SeekRelative-15 end -begin - prog = xine - remote = devinput.mcekbd - button = KEY_LEFTCTRL - button = KEY_B - config = SeekRelative-15 -end - begin prog = xine button = KEY_NEXT config = SeekRelative+15 end -begin - prog = xine - remote = devinput.mcekbd - button = KEY_LEFTCTRL - button = KEY_F - config = SeekRelative+15 -end - begin prog = xine button = KEY_BACK @@ -135,13 +71,6 @@ config = Quit end -begin - prog = xine - remote = devinput.mcekbd - button = KEY_BACKSPACE - config = Quit -end - begin prog = xine button = KEY_INFO @@ -433,12 +362,3 @@ button = KEY_TEXT config = SpuNext end - -begin - prog = xine - remote = devinput.mcekbd - button = KEY_LEFTCTRL - button = KEY_LEFTSHIFT - button = KEY_C - config = SpuNext -end ======================================= --- /trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc/lircrc.d/xine/optional/key.volume.internal Tue Dec 9 09:07:35 2008 +++ /trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc/lircrc.d/xine/optional/key.volume.internal Wed Dec 2 17:22:57 2009 @@ -9,15 +9,6 @@ delay = 4 end -begin - prog = xine - remote = devinput.mcekbd - button = KEY_F10 - config = Volume+ - repeat = 2 - delay = 4 -end - begin prog = xine button = KEY_VOLUMEDOWN @@ -26,24 +17,8 @@ delay = 4 end -begin - prog = xine - remote = devinput.mcekbd - button = KEY_F9 - config = Volume- - repeat = 2 - delay = 4 -end - begin prog = xine button = KEY_MUTE config = Mute end - -begin - prog = xine - remote = devinput.mcekbd - button = KEY_F8 - config = Mute -end -- You received this message because you are subscribed to the Google Groups "minimyth-commits" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/minimyth-commits?hl=en.
