Author: pebender
Date: Sat Dec 27 09:41:32 2008
New Revision: 4130
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/rootfs/etc/rc.d.sh/init.d/conf.d/MM_WIIMOTE
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/conf.d/obsolete
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/wiimote
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_WIIMOTE.pm
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/obsolete
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/wiimote.pm
Log:
- Obsoleted MM_WIIMOTE_ENABLED.
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 Sat Dec 27 09:41:32
2008
@@ -231,7 +231,6 @@
################################################################################
# Wii remote control configuration variables.
#
-# MM_WIIMOTE_ENABLED
# MM_WIIMOTE_ADDRESS_0
# MM_WIIMOTE_ADDRESS_1
# MM_WIIMOTE_ADDRESS_2
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 Sat Dec 27
09:41:32 2008
@@ -12,6 +12,9 @@
MythTV 0.21: version 0.21.0, release-0-21-fixes branch
svn 19443.
MythTV trunk: version trunk.19442 trunk svn 19442.
+Modified MiniMyth configuration
+ - Obsoleted MM_WIIMOTE_ENABLED.
+
Modified mediaplayers
- Modified init so that it configures MythTV to use xv rather than
vdpau
when MM_VIDEO_DECODER='vdpau' and MythTV is either version 0.20.x or
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 Sat Dec
27
09:41:32 2008
@@ -2195,7 +2195,6 @@
<li><a href="#MM_WIIMOTE-overview">Overview</a></li>
</ul>
<ul>
- <li><a href="#MM_WIIMOTE_ENABLED">MM_WIIMOTE_ENABLED</a></li>
<li><a href="#MM_WIIMOTE_ADDRESS_n">MM_WIIMOTE_ADDRESS_0,
MM_WIIMOTE_ADDRESS_1, MM_WIIMOTE_ADDRESS_2 and MM_WIIMOTE_ADDRESS_3</a></li>
</ul>
<dl>
@@ -2208,17 +2207,11 @@
Wii remote control functionality is not included in the
binary distributation.
</p>
</dd>
- <dt
id="MM_WIIMOTE_ENABLED"><strong>MM_WIIMOTE_ENABLED</strong></dt>
+ <dt id="MM_WIIMOTE_ADDRESS_n"><strong>MM_WIIMOTE_ADDRESS_0,
MM_WIIMOTE_ADDRESS_1 MM_WIIMOTE_ADDRESS_2 and
MM_WIIMOTE_ADDRESS_3</strong></dt>
<dd>
<p>
- Indicate whether or not you want to enable use of a Wii
remote control.
- Valid values are 'yes' and 'no', with the default being
either 'yes' or 'no' depending on whether or not
- any of the '<a
href="#MM_WIIMOTE_ADDRESS_n">MM_WIIMOTE_ADDRESS_n</a>'
- variables are set.
+ Provide the address(es) of the Wii remote control(s).
</p>
- </dd>
- <dt id="MM_WIIMOTE_ADDRESS_n"><strong>MM_WIIMOTE_ADDRESS_0,
MM_WIIMOTE_ADDRESS_1 MM_WIIMOTE_ADDRESS_2 and
MM_WIIMOTE_ADDRESS_3</strong></dt>
- <dd>
<p>
MiniMyth uses the
<a href="http://abstrakraft.org/cwiid/";>CWiid</a>'s
@@ -2226,17 +2219,10 @@
user space driver in conjuction with the uinput kernel
driver
to map Wii remote control inputs to Linux input device
events.
For Wii remote control number n={0,1,2,3},
- MiniMyth prefers the input mapping
file '/etc/cwiid/wminput/default_n'.
+ MiniMyth prefers the input mapping
file '/etc/cwiid/wminput/default_n'.
If this mapping file is not present,
then MiniMyth falls back to the input mapping
file '/etc/cwiid/wminput/default'.
</p>
- <p>
- Provide the address(es) of the Wii remote control(s).
- If '<a href="#MM_WIIMOTE_ENABLED">MM_WIIMOTE_ENABLED</a>'
is 'yes'
- and no Wii remote control addresses are provided,
- then MiniMyth uses the first Wii remote control that it
finds.
- In this case, MiniMyth uses the input mapping
file '/etc/cwiid/wminput/default'.
- </p>
</dd>
</dl>
</div>
@@ -2904,7 +2890,7 @@
alt="Valid CSS!" height="31" width="88" /></a>
</div>
<div class="version">
- Last Updated on 2008-12-23
+ Last Updated on 2008-12-24
<br />
< mailto : webmaster at minimyth dot org >
</div>
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/conf.d/MM_WIIMOTE
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/conf.d/MM_WIIMOTE
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/conf.d/MM_WIIMOTE
Sat Dec 27 09:41:32 2008
@@ -9,48 +9,17 @@
conf_check_MM_WIIMOTE() {
- if /usr/bin/test ! -z "${MM_WIIMOTE_ENABLED}" && \
- /usr/bin/test ! "${MM_WIIMOTE_ENABLED}" = "yes" && \
- /usr/bin/test ! "${MM_WIIMOTE_ENABLED}" = "no" ; then
- mm_message_output err "error:
MM_WIIMOTE_ENABLED='${MM_WIIMOTE_ENABLED}' is not valid."
- fi
-
- if /usr/bin/test "${MM_WIIMOTE_ENABLED}" = "no" && /usr/bin/test
-n "${MM_WIIMOTE_ADDRESS_0}" ; then
- mm_message_output err "error: MM_WIIMOTE_ADDRESS_0 is set and
MM_WIIMOTE_ENABLED='no'."
- fi
- if /usr/bin/test "${MM_WIIMOTE_ENABLED}" = "no" && /usr/bin/test
-n "${MM_WIIMOTE_ADDRESS_1}" ; then
- mm_message_output err "error: MM_WIIMOTE_ADDRESS_1 is set and
MM_WIIMOTE_ENABLED='no'."
- fi
- if /usr/bin/test "${MM_WIIMOTE_ENABLED}" = "no" && /usr/bin/test
-n "${MM_WIIMOTE_ADDRESS_2}" ; then
- mm_message_output err "error: MM_WIIMOTE_ADDRESS_2 is set and
MM_WIIMOTE_ENABLED='no'."
- fi
- if /usr/bin/test "${MM_WIIMOTE_ENABLED}" = "no" && /usr/bin/test
-n "${MM_WIIMOTE_ADDRESS_3}" ; then
- mm_message_output err "error: MM_WIIMOTE_ADDRESS_3 is set and
MM_WIIMOTE_ENABLED='no'."
- fi
-
return 0
}
conf_default_MM_WIIMOTE() {
- if /usr/bin/test -z "${MM_WIIMOTE_ENABLED}" ; then
- if /usr/bin/test -n "${MM_WIIMOTE_ADDRESS_0}" || \
- /usr/bin/test -n "${MM_WIIMOTE_ADDRESS_1}" || \
- /usr/bin/test -n "${MM_WIIMOTE_ADDRESS_2}" || \
- /usr/bin/test -n "${MM_WIIMOTE_ADDRESS_3}" ; then
- MM_WIIMOTE_ENABLED='yes'
- else
- MM_WIIMOTE_ENABLED='no'
- fi
- fi
-
return 0
}
conf_write_MM_WIIMOTE() {
local conf_file=$1
- conf_variable_write "${conf_file}"
MM_WIIMOTE_ENABLED "${MM_WIIMOTE_ENABLED}"
conf_variable_write "${conf_file}"
MM_WIIMOTE_ADDRESS_0 "${MM_WIIMOTE_ADDRESS_0}"
conf_variable_write "${conf_file}"
MM_WIIMOTE_ADDRESS_1 "${MM_WIIMOTE_ADDRESS_1}"
conf_variable_write "${conf_file}"
MM_WIIMOTE_ADDRESS_2 "${MM_WIIMOTE_ADDRESS_2}"
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/conf.d/obsolete
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/conf.d/obsolete
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/conf.d/obsolete
Sat Dec 27 09:41:32 2008
@@ -99,6 +99,7 @@
MM_UPDATE_URL
MM_VIDEO_DEINTERLACE_ENABLED
MM_VIDEO_MPEG2_DECODER
+MM_WIIMOTE_ENABLED
MM_X_DISPLAYSIZE_X
MM_X_DISPLAYSIZE_Y
MM_X_DVI_ENABLED
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/wiimote
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/wiimote
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/wiimote
Sat Dec 27 09:41:32 2008
@@ -11,7 +11,10 @@
local device_configured
local devices
- if /usr/bin/test "${MM_WIIMOTE_ENABLED}" = "yes" ; then
+ if /usr/bin/test ! -z "${MM_WIIMOTE_ADDRESS_0}" ||
+ /usr/bin/test ! -z "${MM_WIIMOTE_ADDRESS_1}" ||
+ /usr/bin/test ! -z "${MM_WIIMOTE_ADDRESS_2}" ||
+ /usr/bin/test ! -z "${MM_WIIMOTE_ADDRESS_3}" ; then
mm_message_output info 'starting bluetooth ...'
@@ -52,23 +55,6 @@
done
fi
- if /usr/bin/test -z "${MM_WIIMOTE_ADDRESS_0}" &&
- /usr/bin/test -z "${MM_WIIMOTE_ADDRESS_1}" &&
- /usr/bin/test -z "${MM_WIIMOTE_ADDRESS_2}" &&
- /usr/bin/test -z "${MM_WIIMOTE_ADDRESS_3}" ; then
- config=''
- /usr/bin/test -z "${config}" \
- && /usr/bin/test -e /etc/cwiid/wminput/default \
- && config='/etc/cwiid/wminput/default'
- if /usr/bin/test -z "${config}" ; then
- mm_message_output err "error: no 'wminput' config file
found."
- exit 1
- fi
- if ! /usr/bin/wminput -d -c ${config} > /dev/null 2>&1 ; then
- mm_message_output err "error: failed to start 'wminput'."
- exit 1
- fi
- fi
if /usr/bin/test -n "${MM_WIIMOTE_ADDRESS_0}" ; then
config=''
/usr/bin/test -z "${config}" \
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_WIIMOTE.pm
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_WIIMOTE.pm
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_WIIMOTE.pm
Sat Dec 27 09:41:32 2008
@@ -14,44 +14,6 @@
return \%var_list;
}
-$var_list{'MM_WIIMOTE_ENABLED'} =
-{
- prerequisite =>
['MM_WIIMOTE_ADDRESS_0', 'MM_WIIMOTE_ADDRESS_1', 'MM_WIIMOTE_ADDRESS_2',
'MM_WIIMOTE_ADDRESS_3'],
- value_default => sub
- {
- my $minimyth = shift;
- my $name = shift;
-
- if (($minimyth->var_get('MM_WIIMOTE_ADDRESS_0')) ||
- ($minimyth->var_get('MM_WIIMOTE_ADDRESS_1')) ||
- ($minimyth->var_get('MM_WIIMOTE_ADDRESS_2')) ||
- ($minimyth->var_get('MM_WIIMOTE_ADDRESS_3')))
- {
- return 'yes';
- }
- else
- {
- return 'no';
- }
- },
- value_valid => sub
- {
- my $minimyth = shift;
- my $name = shift;
-
- if (($minimyth->var_get('MM_WIIMOTE_ADDRESS_0')) ||
- ($minimyth->var_get('MM_WIIMOTE_ADDRESS_1')) ||
- ($minimyth->var_get('MM_WIIMOTE_ADDRESS_2')) ||
- ($minimyth->var_get('MM_WIIMOTE_ADDRESS_3')))
- {
- return 'yes';
- }
- else
- {
- return 'no|yes';
- }
- }
-};
$var_list{'MM_WIIMOTE_ADDRESS_0'} =
{
value_default => ''
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/obsolete
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/obsolete
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/obsolete
Sat Dec 27 09:41:32 2008
@@ -100,6 +100,7 @@
MM_UPDATE_URL
MM_VIDEO_DEINTERLACE_ENABLED
MM_VIDEO_MPEG2_DECODER
+MM_WIIMOTE_ENABLED
MM_X_DISPLAYSIZE_X
MM_X_DISPLAYSIZE_Y
MM_X_DVI_ENABLED
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/wiimote.pm
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/wiimote.pm
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/wiimote.pm
Sat Dec 27 09:41:32 2008
@@ -15,7 +15,12 @@
my $self = shift;
my $minimyth = shift;
- if ($minimyth->var_get('MM_WIIMOTE_ENABLED') eq 'yes')
+ my $address_0 = $minimyth->var_get('MM_WIIMOTE_ADDRESS_0');
+ my $address_1 = $minimyth->var_get('MM_WIIMOTE_ADDRESS_1');
+ my $address_2 = $minimyth->var_get('MM_WIIMOTE_ADDRESS_2');
+ my $address_3 = $minimyth->var_get('MM_WIIMOTE_ADDRESS_3');
+
+ if ((defined($address_0)) || (defined($address_1)) ||
(defined($address_2)) || (defined($address_3)))
{
$minimyth->message_output('info', "starting bluetooth ...");
@@ -75,29 +80,6 @@
}
}
- my $address_0 = $minimyth->var_get('MM_WIIMOTE_ADDRESS_0');
- my $address_1 = $minimyth->var_get('MM_WIIMOTE_ADDRESS_1');
- my $address_2 = $minimyth->var_get('MM_WIIMOTE_ADDRESS_2');
- my $address_3 = $minimyth->var_get('MM_WIIMOTE_ADDRESS_3');
-
- if ((! $address_0) && (! $address_1) && (! $address_2) && (!
$address_3))
- {
- my $config = undef;
- if (-e '/etc/cwiid/wminput/default')
- {
- $config = '/etc/cwiid/wminput/default';
- }
- if (! defined($config))
- {
- $minimyth->message_output('err', "error: no 'wminput'
config file found.");
- return 0;
- }
- if ( system(qq(/usr/bin/wminput -d -c $config > $devnull 2>&1
&)) != 0)
- {
- $minimyth->message_output('err', "error: failed to
start 'wminput'.");
- return 0;
- }
- }
if ($address_0)
{
my $config = undef;
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
