Author: pebender
Date: Fri Oct 17 17:24:47 2008
New Revision: 3846
Modified:
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.perl/init/conf/MM_THEME.pm
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/functions
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init.d/conf.d/MM_THEME
trunk/gar-minimyth/script/perl/perl-MiniMyth/checksums
trunk/gar-minimyth/script/perl/perl-MiniMyth/files/MiniMyth.pm
Log:
- Changed MM_THEMECACHE_URL='auto' so that it is 'confrw:themecache.sfs'.
- This was done to enable MiniMyth to save more than one cached theme
in the file as it is supported by MythTV 0.21.
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 Oct 17
17:24:47 2008
@@ -68,6 +68,9 @@
- Re-added MM_PLUGIN_DVD_ENABLED.
- Added support for running the 'stop' method if it is included in
'minimyth.pm'.
+ - Changed MM_THEMECACHE_URL='auto' so that it
is 'confrw:themecache.sfs'.
+ - This was done to enable MiniMyth to save more than one cached
theme
+ in the file as it is supported by MythTV 0.21.
Modified MiniMyth commands
- Changed mm_sleep so that is saves the system clock to the hardware
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 Oct
17
17:24:47 2008
@@ -1758,9 +1758,8 @@
If the value is 'auto',
then MiniMyth will assume that the MythTV themecache
directory is in a squashfs image file
located in the MiniMyth read-write configuration directory
and
- having the name "themecaches/${<a
href="#MM_THEME_NAME">MM_THEME_NAME</a>}.{GuiWidth}.{GuiHeight}.sfs".
- That is, MiniMyth will assume
- MM_THEMECACHE_URL="confrw:themecaches/${<a
href="#MM_THEME_NAME">MM_THEME_NAME</a>}.{GuiWidth}.{GuiHeight}.sfs",
+ having the name "themecache.sfs".
+ That is, MiniMyth will assume
MM_THEMECACHE_URL='confrw:themecache.sfs'.
</p>
<p>
The MythTV frontend menus contain
the 'MiniMyth Tools' menu
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.perl/init/conf/MM_THEME.pm
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.perl/init/conf/MM_THEME.pm
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.perl/init/conf/MM_THEME.pm
Fri Oct 17 17:24:47 2008
@@ -22,36 +22,7 @@
value_default => 'auto',
value_valid => 'auto|none|.+',
value_obsolete => 'default',
- value_auto => sub
- {
- my $minimyth = shift;
- my $name = shift;
-
- my $auto;
-
- my $resolution_x = $minimyth->mythdb_settings_get('GuiWidth') ||
0;
- if ($resolution_x == 0)
- {
- $resolution_x = $minimyth->var_get('MM_X_MODE');
- $resolution_x =~ s/^([0-9]+)x([0-9]+).*$/$1/;
- }
- my $resolution_y = $minimyth->mythdb_settings_get('GuiHeight') ||
0;
- if ($resolution_y == 0)
- {
- $resolution_y = $minimyth->var_get('MM_X_MODE');
- $resolution_y =~ s/^([0-9]+)x([0-9]+).*$/$2/;
- }
- my $themecache_name = $minimyth->var_get('MM_THEME_NAME') . '.' .
$resolution_x . '.' . $resolution_y;
- if (! -e "/home/minimyth/.mythtv/themecache/$themecache_name")
- {
- $auto = "confrw:themecaches/$themecache_name.sfs";
- }
- else
- {
- $auto = 'none';
- }
- return $auto;
- },
+ value_auto => 'confrw:themecache.sfs',
value_none => ''
};
$var_list{'MM_THEME_NAME'} =
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/functions
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/functions
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/functions
Fri Oct 17 17:24:47 2008
@@ -761,8 +761,8 @@
local LOCAL_DIR
local LOCAL_FILE
- FILE=`cd /home/minimyth/.mythtv/themecache ; /bin/ls`.sfs
- REMOTE_FILE="themecaches/${FILE}"
+ FILE='themecache.sfs'
+ REMOTE_FILE="${FILE}"
LOCAL_DIR="${HOME}/tmp"
LOCAL_FILE="${LOCAL_DIR}/${FILE}"
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init.d/conf.d/MM_THEME
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init.d/conf.d/MM_THEME
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init.d/conf.d/MM_THEME
Fri Oct 17 17:24:47 2008
@@ -90,20 +90,7 @@
fi
fi
if /usr/bin/test "${MM_THEMECACHE_URL}" = "auto" ; then
- RESOLUTION_X=`mm_mythdb_settings_get GuiWidth`
- if /usr/bin/test -z "${RESOLUTION_X}" || /usr/bin/test
${RESOLUTION_X} -eq 0 ; then
- RESOLUTION_X=`/bin/echo ${MM_X_RESOLUTION} | /bin/sed
-e 's%^\([0-9][0-9]*\)x\([0-9][0-9]*\)$%\1%'`
- fi
- RESOLUTION_Y=`mm_mythdb_settings_get GuiHeight`
- if /usr/bin/test -z "${RESOLUTION_Y}" || /usr/bin/test
${RESOLUTION_Y} -eq 0 ; then
- RESOLUTION_Y=`/bin/echo ${MM_X_RESOLUTION} | /bin/sed
-e 's%^\([0-9][0-9]*\)x\([0-9][0-9]*\)$%\2%'`
- fi
- THEMECACHE_NAME="${MM_THEME_NAME}.${RESOLUTION_X}.${RESOLUTION_Y}"
- if /usr/bin/test !
-e "/home/minimyth/.mythtv/themecache/${THEMECACHE_NAME}" ; then
- MM_THEMECACHE_URL="confrw:themecaches/${THEMECACHE_NAME}.sfs"
- else
- MM_THEMECACHE_URL="none"
- fi
+ MM_THEMECACHE_URL="confrw:themecache.sfs"
fi
# Convert 'none' to empty.
Modified: trunk/gar-minimyth/script/perl/perl-MiniMyth/checksums
==============================================================================
--- trunk/gar-minimyth/script/perl/perl-MiniMyth/checksums (original)
+++ trunk/gar-minimyth/script/perl/perl-MiniMyth/checksums Fri Oct 17
17:24:47 2008
@@ -1 +1 @@
-3b0fdfd1093ca66f53a5f0d550196888 download/MiniMyth.pm
+c2f3aec9cfa4ba27a920d7f4020e8fa6 download/MiniMyth.pm
Modified: trunk/gar-minimyth/script/perl/perl-MiniMyth/files/MiniMyth.pm
==============================================================================
--- trunk/gar-minimyth/script/perl/perl-MiniMyth/files/MiniMyth.pm
(original)
+++ trunk/gar-minimyth/script/perl/perl-MiniMyth/files/MiniMyth.pm Fri Oct
17 17:24:47 2008
@@ -2016,24 +2016,9 @@
$self->message_log('error', qq(failed to create the MythTV
themecache file because the MythTV themecache directory does not exist.));
return 0;
}
- my $file = '';
- my $file_found = 0;
- if (opendir(DIR, '/home/minimyth/.mythtv/themecache'))
- {
- foreach (grep(! /^\./, (readdir(DIR))))
- {
- $file = "$_.sfs";
- $file_found++;
- }
- closedir(DIR);
- }
- if ($file_found ne 1)
- {
- $self->message_log('error', qq(failed to create the MythTV
themecache file because the MythTV themecache directory does not contain
exactly one cached theme.));
- return 0;
- }
- my $remote_file = 'themecaches' . '/' . $file;
+ my $file = 'themecache.sfs';
+ my $remote_file = $file;
my $local_dir = $ENV{'HOME'} . '/' . 'tmp';
my $local_file = $local_dir . '/' . $file;
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
