Author: pebender
Date: Fri Jun 5 13:50:52 2009
New Revision: 4892
Modified:
trunk/gar-minimyth/html/minimyth/conf/minimyth.conf
trunk/gar-minimyth/html/minimyth/document-changelog.txt
trunk/gar-minimyth/html/minimyth/document-minimyth_conf.html
trunk/gar-minimyth/script/meta/minimyth/files/source/lists/minimyth-bin-list
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_LIRC.pm
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/lirc.pm
Log:
- Added irxevent support.
Modified: trunk/gar-minimyth/html/minimyth/conf/minimyth.conf
==============================================================================
--- trunk/gar-minimyth/html/minimyth/conf/minimyth.conf (original)
+++ trunk/gar-minimyth/html/minimyth/conf/minimyth.conf Fri Jun 5 13:50:52
2009
@@ -257,6 +257,7 @@
# MM_LIRC_KERNEL_MODULE
# MM_LIRC_KERNEL_MODULE_OPTIONS
# MM_LIRC_IREXEC_ENABLED
+# MM_LIRC_IRXEVENT_ENABLED
# MM_LIRC_SLEEP_ENABLED
# MM_LIRC_WAKEUP_ENABLED
# MM_LIRC_FETCH_LIRCD_CONF
Modified: trunk/gar-minimyth/html/minimyth/document-changelog.txt
==============================================================================
--- trunk/gar-minimyth/html/minimyth/document-changelog.txt (original)
+++ trunk/gar-minimyth/html/minimyth/document-changelog.txt Fri Jun 5
13:50:52 2009
@@ -95,6 +95,7 @@
Improved LIRC
- Patched lircmd so that it creates in uinput based event device.
+ - Added irxevent support.
- Added lircmd support.
Modified LCDproc
Modified: trunk/gar-minimyth/html/minimyth/document-minimyth_conf.html
==============================================================================
--- trunk/gar-minimyth/html/minimyth/document-minimyth_conf.html
(original)
+++ trunk/gar-minimyth/html/minimyth/document-minimyth_conf.html Fri Jun
5
13:50:52 2009
@@ -2382,6 +2382,7 @@
<li><a
href="#MM_LIRC_KERNEL_MODULE">MM_LIRC_KERNEL_MODULE</a></li>
<li><a
href="#MM_LIRC_KERNEL_MODULE_OPTIONS">MM_LIRC_KERNEL_MODULE_OPTIONS</a></li>
<li><a
href="#MM_LIRC_IREXEC_ENABLED">MM_LIRC_IREXEC_ENABLED</a></li>
+ <li><a
href="#MM_LIRC_IRXEVENT_ENABLED">MM_LIRC_IRXEVENT_ENABLED</a></li>
<li><a
href="#MM_LIRC_SLEEP_ENABLED">MM_LIRC_SLEEP_ENABLED</a></li>
<li><a
href="#MM_LIRC_WAKEUP_ENABLED">MM_LIRC_WAKEUP_ENABLED</a></li>
<li><a
href="#MM_LIRC_FETCH_LIRCD_CONF">MM_LIRC_FETCH_LIRCD_CONF</a></li>
@@ -2547,8 +2548,22 @@
</p>
<p>
If the value is 'auto',
- Then MiniMyth will enable or disable the irexec daemon
depending on whether irexec is
- used or not used in the lircrc file.
+ then MiniMyth will enable or disable the irexec daemon
depending on
+ whether or not the irexec binary is present and
+ whether or not irexec is used the lircrc file.
+ </p>
+ </dd>
+ <dt
id="MM_LIRC_IRXEVENT_ENABLED"><strong>MM_LIRC_IRXEVENT_ENABLED</strong></dt>
+ <dd>
+ <p>
+ Indicate whether or not the irxevent daemon runs.
+ Valid values are 'yes', 'no' and 'auto', with 'auto' the
default.
+ </p>
+ <p>
+ If the value is 'auto',
+ then MiniMyth will enable or disable the irxevent daemon
depending on
+ whether or not the irxevent binary is present and
+ whether or not irxevent is used the lircrc file.
</p>
</dd>
<dt
id="MM_LIRC_SLEEP_ENABLED"><strong>MM_LIRC_SLEEP_ENABLED</strong></dt>
@@ -3278,7 +3293,7 @@
alt="Valid CSS!" height="31" width="88" /></a>
</div>
<div class="version">
- Last Updated on 2009-06-03
+ Last Updated on 2009-06-05
<br />
< mailto : webmaster at minimyth dot org >
</div>
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/lists/minimyth-bin-list
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/lists/minimyth-bin-list
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/lists/minimyth-bin-list
Fri Jun 5 13:50:52 2009
@@ -29,6 +29,7 @@
insmod
irclient
irexec
+irxevent
irrecord
irsend
irserver
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_LIRC.pm
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_LIRC.pm
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_LIRC.pm
Fri Jun 5 13:50:52 2009
@@ -152,7 +152,34 @@
$var_list{'MM_LIRC_IREXEC_ENABLED'} =
{
value_default => 'auto',
- value_valid => 'auto|no|yes'
+ value_valid => 'auto|no|yes',
+ value_auto => sub
+ {
+ if (-e '/usr/bin/irexec')
+ {
+ return 'auto';
+ }
+ else
+ {
+ return 'no';
+ }
+ }
+};
+$var_list{'MM_LIRC_IRXEVENT_ENABLED'} =
+{
+ value_default => 'auto',
+ value_valid => 'auto|no|yes',
+ value_auto => sub
+ {
+ if (-e '/usr/bin/irxevent')
+ {
+ return 'auto';
+ }
+ else
+ {
+ return 'no';
+ }
+ }
};
$var_list{'MM_LIRC_SLEEP_ENABLED'} =
{
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/lirc.pm
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/lirc.pm
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/lirc.pm
Fri Jun 5 13:50:52 2009
@@ -391,6 +391,56 @@
system(qq(/usr/bin/irexec -d /etc/lircrc));
}
+ my $irxevent_enabled = $minimyth->var_get('MM_LIRC_IRXEVENT_ENABLED');
+
+ # Auto-configure usage of 'irxevent'.
+ if ($irxevent_enabled eq 'auto')
+ {
+ $minimyth->message_log('info', "attempting to auto-configure usage
of 'irxevent'.");
+ $irxevent_enabled = 'no';
+ if (-e '/etc/lircrc')
+ {
+ # Only one level of includes is supported.
+ my @lircrc_list = ();
+ push(@lircrc_list, '/etc/lircrc');
+ if (open(FILE, '<', '/etc/lircrc'))
+ {
+ foreach (grep(s/^include +(.*)$/$1/, (<FILE>)))
+ {
+ chomp;
+ push(@lircrc_list, $_);
+ }
+ close(FILE);
+ }
+ foreach my $lircrc_file (@lircrc_list)
+ {
+ if (open(FILE, '<', $lircrc_file))
+ {
+ foreach (grep(/^ *prog *= *irxevent *$/, (<FILE>)))
+ {
+ $irxevent_enabled = 'yes';
+ if ($irxevent_enabled eq 'yes')
+ {
+ last;
+ }
+ }
+ close(FILE);
+ }
+ if ($irxevent_enabled eq 'yes')
+ {
+ last;
+ }
+ }
+ }
+ $minimyth->message_log('info', "auto-configured usage
of 'irxevent' as '$irxevent_enabled'.");
+ }
+
+ # Start the irxevent daemon.
+ if ($irxevent_enabled eq 'yes')
+ {
+ system(qq(/usr/bin/irxevent -d /etc/lircrc));
+ }
+
# Start the lircmd daemon.
if (-e '/etc/lircmd.conf')
{
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
