Revision: 5872
Author: pebender
Date: Mon Nov 30 19:45:22 2009
Log: - Changed some of hte key names in lircd.conf and lircrc files so that
they are valid linux/input.h key names:
- Changed KEY_ASPECTRATIO (which is not in linux/input.h) to KEY_ZOOM.
KEY_ZOOM maps to both the "Aspect Ratio" and "Zoom" buttons. KEY_ZOOM
controls the aspect ratio.
- Changed KEY_IMAGE (which is not in linux/input.h) to KEY_MEDIA.
KEY_MEDIA maps to the "My Pictures" key.
- Changed KEY_AUDIO to KEY_MP3.
http://code.google.com/p/minimyth/source/detail?r=5872
Modified:
/trunk/gar-minimyth/html/minimyth/document-changelog.txt
/trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc/lircd.conf.d/atiusb
/trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc/lircd.conf.d/atiusb.x10_or23e
/trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc/lircd.conf.d/dvico.usb_0fe9_9010
/trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc/lircd.conf.d/imon
/trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc/lircd.conf.d/imon_64
/trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc/lircd.conf.d/irman.hauppauge_A415
/trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc/lircd.conf.d/mceusb.mceusb
/trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc/lircd.conf.d/optional/devinput.usb_147a_e02d
/trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc/lircd.conf.d/serial.hauppauge_A415
/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/vlc/base
/trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc/lircrc.d/xine/base
=======================================
--- /trunk/gar-minimyth/html/minimyth/document-changelog.txt Mon Nov 30
19:36:38 2009
+++ /trunk/gar-minimyth/html/minimyth/document-changelog.txt Mon Nov 30
19:45:22 2009
@@ -28,6 +28,14 @@
Modified LIRC
- Added support for the Sony PlayStation 3 Blu-ray Disc remote control.
- Changed LIRC to use syslog rather than its own log file.
+ - Changed some of hte key names in lircd.conf and lircrc files so that
+ they are valid linux/input.h key names:
+ - Changed KEY_ASPECTRATIO (which is not in linux/input.h) to
KEY_ZOOM.
+ KEY_ZOOM maps to both the "Aspect Ratio" and "Zoom" buttons.
KEY_ZOOM
+ controls the aspect ratio.
+ - Changed KEY_IMAGE (which is not in linux/input.h) to KEY_MEDIA.
+ KEY_MEDIA maps to the "My Pictures" key.
+ - Changed KEY_AUDIO to KEY_MP3.
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/lircd.conf.d/atiusb
Thu Jul 2 19:23:11 2009
+++
/trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc/lircd.conf.d/atiusb
Mon Nov 30 19:45:22 2009
@@ -671,7 +671,7 @@
KEY_RIGHT 0xF41F
KEY_LEFT 0xF21D
KEY_WEB 0xDC07
- KEY_AUDIO 0xDB06
+ KEY_MP3 0xDB06
KYE_IMAGE 0xDA05
KEY_DVD 0xD904
KEY_PVR 0xD803
@@ -682,14 +682,14 @@
txt 0xEB16
snapshots 0xED18
setup 0xF01B
- KEY_AUDIO 0xF11C
+ KEY_MP3 0xF11C
slow 0xF520
KEY_OK 0xF31E
KEY_VOLUMEUP 0xDE09
KEY_VOLUMEDOWN 0xDD08
KEY_CHANNELDOWN 0xE10C
KEY_CHANNELUP 0xE00B
- KYE_ZOOM 0xFF2A
+ KEY_ZOOM 0xFF2A
angle 0x002B
end codes
@@ -729,9 +729,9 @@
KEY_TV 0x012C
VCR 0x022D
KEY_DVD 0xD904
- KEY_AUDIO 0xDB06
+ KEY_MP3 0xDB06
KEY_RADIO 0x032E
- KEY_IMAGE 0xDA05
+ KEY_MEDIA 0xDA05
TV_PREVIEW 0x042F
CHANNEL_LIST 0x0530
SETUP 0xF01B
@@ -777,7 +777,7 @@
FULL 0x0E39
KEY_NEXT 0xF823
DVD_MENU 0xEE19
- DVD_AUDIO 0x0F3A
+ DVD_MP3 0x0F3A
KEY_POWER 0xD702
end codes
@@ -825,7 +825,7 @@
KEY_TV 0x0239
help 0x02BE
KEY_PC 0x023F
- KEY_ASPECTRATIO 0x02D5
+ KEY_ZOOM 0x02D5 # Aspect Ratio
hand 0x02D0
KEY_MENU 0x028E
KEY_VOLUMEUP 0x0210
@@ -1031,14 +1031,14 @@
KEY_DVD 0xd904
KEY_TEXT 0x6b96
KEY_TEXT 0xeb16
- KEY_AUDIO 0x5b86
- KEY_AUDIO 0xdb06
+ KEY_MP3 0x5b86
+ KEY_MP3 0xdb06
KEY_RADIO 0x83ae
KEY_RADIO 0x032e
- KEY_GUIDE 0x86b1
- KEY_GUIDE 0x0631
- KEY_IMAGE 0x5a85
- KEY_IMAGE 0xda05
+ KEY_PROGRAM 0x86b1
+ KEY_PROGRAM 0x0631
+ KEY_MEDIA 0x5a85
+ KEY_MEDIA 0xda05
KEY_INFO 0x84af
KEY_INFO 0x042f
KEY_MENU 0x6e99
@@ -1160,9 +1160,9 @@
KEY_TV 0x012C
vcr 0x022D
KEY_DVD 0x0904
- KEY_AUDIO 0x0B06
+ KEY_MP3 0x0B06
KEY_RADIO 0x032E
- KEY_IMAGE 0x0A05
+ KEY_MEDIA 0x0A05
tvpreview 0x042F
channellist 0x0530
setup 0x001B
@@ -1246,8 +1246,8 @@
begin codes
TV_DVD 0x1481AC0000
KEY_VIDEO 0x1482AD0000
- KEY_IMAGE 0x1459840000
- KEY_AUDIO 0x145B860000
+ KEY_MEDIA 0x1459840000
+ KEY_MP3 0x145B860000
KEY_PC 0x1483AE0000
KEY_MUTE 0x1455800000
KEY_OK 0x14739E0000
@@ -1321,14 +1321,14 @@
cd 0x14D9040000
txt 0x146B960000
txt 0x14EB160000
- KEY_AUDIO 0x145B860000
- KEY_AUDIO 0x14DB060000
+ KEY_MP3 0x145B860000
+ KEY_MP3 0x14DB060000
KEY_RADIO 0x1483AE0000
KEY_RADIO 0x14032E0000
book 0x1486B10000
book 0x1406310000
- KEY_IMAGE 0x145A850000
- KEY_IMAGE 0x14DA050000
+ KEY_MEDIA 0x145A850000
+ KEY_MEDIA 0x14DA050000
KEY_INFO 0x1484AF0000
KEY_INFO 0x14042F0000
KEY_MENU 0x146E990000
@@ -1442,12 +1442,12 @@
KEY_TV 0x6D98
KEY_TV 0xED18
KEY_POWER 0xD702
- KEY_IMAGE 0x5A85
- KEY_IMAGE 0xDA05
- KEY_AUDIO 0x5B86
- KEY_AUDIO 0xDB06
- KEY_GUIDE 0x0631
- KEY_GUIDE 0x86B1
+ KEY_MEDIA 0x5A85
+ KEY_MEDIA 0xDA05
+ KEY_MP3 0x5B86
+ KEY_MP3 0xDB06
+ KEY_PROGRAM 0x0631
+ KEY_PROGRAM 0x86B1
DVD_Menu 0x5984
DVD_Menu 0xD904
KEY_VIDEO 0x022D
=======================================
---
/trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc/lircd.conf.d/atiusb.x10_or23e
Thu Jul 2 19:23:11 2009
+++
/trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc/lircd.conf.d/atiusb.x10_or23e
Mon Nov 30 19:45:22 2009
@@ -59,8 +59,8 @@
KEY_OK 0xF31E
KEY_PVR 0xED18
KEY_PVR 0x6D98
- KEY_GUIDE 0x86B1
- KEY_GUIDE 0x0631
+ KEY_PROGRAM 0x86B1
+ KEY_PROGRAM 0x0631
KEY_TV 0xF11C
KEY_TV 0x719C
KEY_DVD 0x5984
=======================================
---
/trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc/lircd.conf.d/dvico.usb_0fe9_9010
Thu Jul 2 19:23:11 2009
+++
/trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc/lircd.conf.d/dvico.usb_0fe9_9010
Mon Nov 30 19:45:22 2009
@@ -47,7 +47,7 @@
KEY_MODE 0x00000000000006F9 # ATVDTV button
KEY_VCR 0x00000000000041F9
KEY_MENU 0x00000000000008F9
- KEY_ASPECTRATIO 0x00000000000007F9
+ KEY_ZOOM 0x00000000000007F9 # Aspect Ratio
KEY_ZOOM 0x00000000000004F9
KEY_EPG 0x0000000000000BF9
KEY_MUTE 0x0000000000000DF9
@@ -84,12 +84,12 @@
begin codes
KEY_OK 0x0000000000FE5E00
DTV 0x0000000000FE0200
- KEY_AUDIO 0x0000000000FE0E00
+ KEY_MP3 0x0000000000FE0E00
KEY_DVD 0x0000000000FE1A00
KEY_CONFIG 0x0000000000FE1E00
KEY_SETUP 0x0000000000FE1600
KEY_POWER2 0x0000000000FE4600 # TV button
- KEY_GUIDE 0x0000000000FE0A00
+ KEY_PROGRAM 0x0000000000FE0A00
KEY_BACK 0x0000000000FE4900
KEY_INFO 0x0000000000FE5900 # MORE (i) button
DVD_MENU 0x0000000000FE4D00
@@ -118,7 +118,7 @@
KEY_NUMERIC_8 0x0000000000FE4C00
KEY_NUMERIC_9 0x0000000000FE5800
KEY_NUMERIC_0 0x0000000000FE0300
- KEY_ASPECTRATIO 0x0000000000FE1300
+ KEY_ZOOM 0x0000000000FE1300 # Aspect Ratio
KEY_ZOOM 0x0000000000FE1F00
KEY_REWIND 0x0000000000FE4300
KEY_PLAYPAUSE 0x0000000000FE4700
@@ -159,9 +159,9 @@
KEY_RIGHT 0x5F
KEY_SETUP 0x16
KEY_POWER2 0x46 # TV button
- KEY_GUIDE 0x0A
+ KEY_PROGRAM 0x0A
DTV 0x02
- KEY_AUDIO 0x0E
+ KEY_MP3 0x0E
KEY_DVD 0x1A
KEY_CONFIG 0x1E
KEY_BACK 0x49
@@ -188,7 +188,7 @@
KEY_NUMERIC_8 0x4C
KEY_NUMERIC_9 0x58
KEY_NUMERIC_0 0x03
- KEY_ASPECTRATIO 0x13
+ KEY_ZOOM 0x13 # Aspect Ratio
KEY_ZOOM 0x1F
KEY_REWIND 0x43
KEY_PLAYPAUSE 0x47
@@ -236,7 +236,7 @@
KEY_NUMERIC_8 0x32CD
KEY_NUMERIC_9 0x1AE5
KEY_NUMERIC_0 0xC03F
- KEY_ASPECTRATIO 0xC837
+ KEY_ZOOM 0xC837 # Aspect Ratio
KEY_ZOOM 0xF807
KEY_REWIND 0xC23D
KEY_FORWARD 0xF20D
@@ -261,14 +261,14 @@
KEY_INFO 0x9A65 # MORE (i) button
KEY_SETUP 0x6897
KEY_POWER2 0x629D # TV button
- KEY_GUIDE 0x50AF
+ KEY_PROGRAM 0x50AF
KEY_OK 0x7A85
KEY_LEFT 0xDA25
KEY_RIGHT 0xFA05
KEY_UP 0x8A75
KEY_DOWN 0xCA35
DTV 0x40BF
- KEY_AUDIO 0x708F
+ KEY_MP3 0x708F
KEY_DVD 0x58A7
KEY_CONFIG 0x7887
end codes
=======================================
---
/trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc/lircd.conf.d/imon
Thu Jul 2 19:23:11 2009
+++
/trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc/lircd.conf.d/imon
Mon Nov 30 19:45:22 2009
@@ -51,8 +51,8 @@
ShiftTab 0x28B515B7
Tab 0x29A115B7
KEY_VIDEO 0x2B8515B7 # MyMovie button
- KEY_AUDIO 0x299195B7 # MyMusic button
- KEY_IMAGE 0x2BA115B7 # MyPhoto button
+ KEY_MP3 0x299195B7 # MyMusic button
+ KEY_MEDIA 0x2BA115B7 # MyPhoto button
KEY_TV 0x28A515B7 # MyTV button
Bookmark 0x288515B7
Thumbnail 0x2AB715B7
=======================================
---
/trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc/lircd.conf.d/imon_64
Thu Jul 2 19:23:11 2009
+++
/trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc/lircd.conf.d/imon_64
Mon Nov 30 19:45:22 2009
@@ -81,7 +81,7 @@
KEY_BACKSPACE 0x0200002A00000000
KEY_SELECT 0x0200002C00000000
KEY_INFO 0x0280000000000000 # LeftMenu
- KEY_GUIDE 0x0200006500000000 # RightMenu
+ KEY_PROGRAM 0x0200006500000000 # RightMenu
KEY_ENTER 0x0200002800000000
KEY_ESC 0x0200002900000000
MouseLeftClick 0x0101000000000000
@@ -131,13 +131,13 @@
KEY_CHANNELDOWN 0x288795B700000101
Timer 0x2B8395B700000101
KEY_VIDEO 0x2B8515B700000101
- KEY_AUDIO 0x299195B700000101
- KEY_IMAGE 0x2BA115B700000101
+ KEY_MP3 0x299195B700000101
+ KEY_MEDIA 0x2BA115B700000101
KEY_TV 0x28A515B700000101
KEY_BOOKMARKS 0x288515B700000101
Thumbnail 0x2AB715B700000101
KEY_ZOOM 0x29A595B700000101
- KEY_ASPECTRATIO 0x2AA395B700000101
+ KEY_ZOOM 0x2AA395B700000101 # Aspect Ratio
KEY_DVD 0x29A395B700000101
KEY_MENU 0x2BA395B700000101
KEY_SUBTITLE 0x298595B700000101
=======================================
---
/trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc/lircd.conf.d/irman.hauppauge_A415
Thu Jul 2 19:23:11 2009
+++
/trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc/lircd.conf.d/irman.hauppauge_A415
Mon Nov 30 19:45:22 2009
@@ -21,11 +21,11 @@
begin codes
KEY_GOTO 0x1806
KEY_POWER 0x0606
- KEY_GUIDE 0x9804
+ KEY_PROGRAM 0x9804
KEY_TV 0x8404
KEY_VIDEO 0x9004 # VIDEOS button
- KEY_AUDIO 0x9204 # MUSIC button
- KEY_IMAGE 0x2701 # PICTURES button
+ KEY_MP3 0x9204 # MUSIC button
+ KEY_MEDIA 0x2701 # PICTURES button
KEY_RADIO 0x2404
KEY_UP 0x3C01
KEY_DOWN 0x3E01
=======================================
---
/trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc/lircd.conf.d/mceusb.mceusb
Thu Jul 2 19:23:11 2009
+++
/trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc/lircd.conf.d/mceusb.mceusb
Mon Nov 30 19:45:22 2009
@@ -31,12 +31,12 @@
KEY_RADIO 0x00007BAF
KEY_PRINT 0x00007BB1
KEY_VIDEO 0x00007BB5 # VIDEOS button
- KEY_IMAGE 0x00007BB6 # PICTURES button
+ KEY_MEDIA 0x00007BB6 # PICTURES button
KEY_PVR 0x00007BB7 # RECORDED TV button
- KEY_AUDIO 0x00007BB8 # MUSIC button
+ KEY_MP3 0x00007BB8 # MUSIC button
KEY_TV 0x00007BB9
# no BA - D8
- KEY_GUIDE 0x00007BD9
+ KEY_PROGRAM 0x00007BD9
KEY_TV 0x00007BDA # LIVE TV button
KEY_DVD 0x00007BDB
KEY_BACK 0x00007BDC
=======================================
---
/trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc/lircd.conf.d/optional/devinput.usb_147a_e02d
Thu Jul 2 19:23:11 2009
+++
/trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc/lircd.conf.d/optional/devinput.usb_147a_e02d
Mon Nov 30 19:45:22 2009
@@ -40,14 +40,14 @@
KEY_DOWN 0x006c
KEY_LEFT 0x0069
KEY_RIGHT 0x006a
- KEY_GUIDE 0x0012 # EPG
+ KEY_PROGRAM 0x0012 # EPG
KEY_EXIT 0x0021
KEY_INFO 0x0017
KEY_TV 0x0043
KEY_MENU 0x003c
KEY_TEXT 0x0014
KEY_PAUSE 0x0019
- KEY_ASPECTRATIO 0x002f # EXT
+ KEY_ZOOM 0x002f # EXT
end codes
end remote
=======================================
---
/trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc/lircd.conf.d/serial.hauppauge_A415
Thu Jul 2 19:23:11 2009
+++
/trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc/lircd.conf.d/serial.hauppauge_A415
Mon Nov 30 19:45:22 2009
@@ -22,9 +22,9 @@
KEY_POWER 0x00000000000017BD
KEY_TV 0x000000000000179C
KEY_VIDEO 0x0000000000001798 # VIDEOS button
- KEY_AUDIO 0x0000000000001799 # MUSIC button
- KEY_IMAGE 0x000000000000179A # PICTURES button
- KEY_GUIDE 0x000000000000179B
+ KEY_MP3 0x0000000000001799 # MUSIC button
+ KEY_MEDIA 0x000000000000179A # PICTURES button
+ KEY_PROGRAM 0x000000000000179B
KEY_RADIO 0x000000000000178C
KEY_UP 0x0000000000001794
KEY_LEFT 0x0000000000001796
=======================================
---
/trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc/lircrc.d/mythtv/base
Thu Nov 19 16:53:28 2009
+++
/trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc/lircrc.d/mythtv/base
Mon Nov 30 19:45:22 2009
@@ -6,7 +6,7 @@
# should not cause any loss of functionality since 'Up' and 'Down' also
act as
# channel up and channel down within MythTV.
#
-# The KEY_PVR, KEY_VIDEO, KEY_AUDIO, KEY_IMAGE and KEY_RADIO buttons have
been
+# The KEY_PVR, KEY_VIDEO, KEY_MP3, KEY_MEDIA and KEY_RADIO buttons have
been
# mapped to the keys 'Alt+T', 'Alt+V', 'Alt+M', 'Alt+G' and 'Alt+S', with
the
# expectation that the keys will be mapped to the following MythTV
jumppoints:
# destination | keylist
@@ -31,7 +31,8 @@
# TV Playback | SEEKRWND | (
#
# Non-obvious key mappings:
-# KEY_TV : Switch tuner
+# KEY_TV : Switch tuner
+# KEY_ZOOM: Switch aspect ratio
################################################################################
begin
prog = mythtv
@@ -45,12 +46,6 @@
config = Alt+V
end
-begin
- prog = mythtv
- button = KEY_AUDIO
- config = Alt+M
-end
-
begin
prog = mythtv
button = KEY_MP3
@@ -67,7 +62,7 @@
begin
prog = mythtv
- button = KEY_IMAGE
+ button = KEY_MEDIA
config = Alt+G
end
@@ -338,7 +333,7 @@
begin
prog = mythtv
- button = KEY_GUIDE
+ button = KEY_PROGRAM
config = O
end
@@ -388,7 +383,7 @@
begin
prog = mythtv
- button = KEY_CHANNELPREVIOUS
+ button = KEY_LAST
config = H
end
@@ -574,7 +569,7 @@
begin
prog = mythtv
- button = KEY_ASPECTRATIO
+ button = KEY_ZOOM
config = W
end
=======================================
---
/trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc/lircrc.d/vlc/base
Thu Nov 19 16:53:28 2009
+++
/trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc/lircrc.d/vlc/base
Mon Nov 30 19:45:22 2009
@@ -13,12 +13,6 @@
# config =
#end
-#begin
-# prog = vlc
-# button = KEY_AUDIO
-# config =
-#end
-
#begin
# prog = vlc
# button = KEY_MP3
@@ -27,7 +21,7 @@
#begin
# prog = vlc
-# button = KEY_IMAGE
+# button = KEY_MEDIA
# config =
#end
@@ -273,7 +267,7 @@
#begin
# prog = vlc
-# button = KEY_GUIDE
+# button = KEY_PROGRAM
# config = osd
#end
@@ -323,7 +317,7 @@
#begin
# prog = vlc
-# button = KEY_CHANNELPREVIOUS
+# button = KEY_LAST
# config =
#end
@@ -509,7 +503,7 @@
#begin
# prog = vlc
-# button = KEY_ASPECTRATIO
+# button = KEY_ZOOM
# config =
#end
=======================================
---
/trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc/lircrc.d/xine/base
Thu Jul 2 19:23:11 2009
+++
/trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc/lircrc.d/xine/base
Mon Nov 30 19:45:22 2009
@@ -418,7 +418,7 @@
begin
prog = xine
- button = KEY_ASPECTRATIO
+ button = KEY_ZOOM
config = ToggleAspectRatio
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.
