Author: titmuss
Date: Thu Jan 8 08:08:54 2009
New Revision: 3730
URL: http://svn.slimdevices.com?rev=3730&root=Jive&view=rev
Log:
r3...@harrypotter (orig r3726): bklaas | 2009-01-08 15:06:47 +0000
Bug: n/a
Description: make image filename search pattern more flexible
r3...@harrypotter (orig r3727): bklaas | 2009-01-08 15:25:37 +0000
Bug: n/a
Description: SD card path has changed: replace /mnt/mmc/ path with /media/*/
Modified:
7.4/branches/pango/ (props changed)
7.4/branches/pango/squeezeplay/src/squeezeplay_jive/specialProjects/sbcPosSlideshow/Slideshow/SlideshowApplet.lua
7.4/branches/pango/squeezeplay/src/squeezeplay_jive/specialProjects/sbcPosSlideshow/jiveboot.sh
7.4/branches/pango/squeezeplay/src/squeezeplay_jive/specialProjects/sbcPosSlideshow/squeezeos-boot.sh
Propchange: 7.4/branches/pango/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Thu Jan 8 08:08:54 2009
@@ -4,7 +4,7 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.2/trunk:2921
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/private-branches/jive-refresh:3653
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:3698
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:3721
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:3727
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:2013
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified:
7.4/branches/pango/squeezeplay/src/squeezeplay_jive/specialProjects/sbcPosSlideshow/Slideshow/SlideshowApplet.lua
URL:
http://svn.slimdevices.com/7.4/branches/pango/squeezeplay/src/squeezeplay_jive/specialProjects/sbcPosSlideshow/Slideshow/SlideshowApplet.lua?rev=3730&root=Jive&r1=3729&r2=3730&view=diff
==============================================================================
---
7.4/branches/pango/squeezeplay/src/squeezeplay_jive/specialProjects/sbcPosSlideshow/Slideshow/SlideshowApplet.lua
(original)
+++
7.4/branches/pango/squeezeplay/src/squeezeplay_jive/specialProjects/sbcPosSlideshow/Slideshow/SlideshowApplet.lua
Thu Jan 8 08:08:54 2009
@@ -71,7 +71,11 @@
local relPath = 'applets/Slideshow/images/'
local cmd = 'ls ' .. imageDir .. '/*.*'
- local filePattern = '%d%d%d_%a%a%p%a%a%a'
+ -- filename search format:
+ -- two or more digits, followed by an _,
+ -- followed by two or more alphanumeric chars,
+ -- followed by a file extension, e.g. ".png"
+ local filePattern = '%d%d+_%a%a+%p%a%a%a'
local proc = Process(jnt, cmd)
proc:read(
function(chunk, err)
Modified:
7.4/branches/pango/squeezeplay/src/squeezeplay_jive/specialProjects/sbcPosSlideshow/jiveboot.sh
URL:
http://svn.slimdevices.com/7.4/branches/pango/squeezeplay/src/squeezeplay_jive/specialProjects/sbcPosSlideshow/jiveboot.sh?rev=3730&root=Jive&r1=3729&r2=3730&view=diff
==============================================================================
---
7.4/branches/pango/squeezeplay/src/squeezeplay_jive/specialProjects/sbcPosSlideshow/jiveboot.sh
(original)
+++
7.4/branches/pango/squeezeplay/src/squeezeplay_jive/specialProjects/sbcPosSlideshow/jiveboot.sh
Thu Jan 8 08:08:54 2009
@@ -2,10 +2,10 @@
# note: jiveboot.sh is deprecated in deference to squeezeos-boot.sh from 7.1
forward
rm -rf /usr/share/jive/applets/Slideshow
-cp -rf /mnt/mmc/Slideshow /usr/share/jive/applets/.
-cp -rf /mnt/mmc/popImages /usr/share/jive/applets/Slideshow/images
-cp -f /mnt/mmc/screenSettings.lua
/usr/share/jive/applets/SqueezeboxJive/settings.lua
-cp -f /mnt/mmc/setupWelcomeSettings.lua
/usr/share/jive/applets/SetupWelcome/settings.lua
-cp -f /mnt/mmc/screensaverSettings.lua
/usr/share/jive/applets/ScreenSavers/settings.lua
-cp -f /mnt/mmc/SqueezeboxJiveApplet.lua
/usr/share/jive/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
+cp -rf /media/*/Slideshow /usr/share/jive/applets/.
+cp -rf /media/*/popImages /usr/share/jive/applets/Slideshow/images
+cp -f /media/*/screenSettings.lua
/usr/share/jive/applets/SqueezeboxJive/settings.lua
+cp -f /media/*/setupWelcomeSettings.lua
/usr/share/jive/applets/SetupWelcome/settings.lua
+cp -f /media/*/screensaverSettings.lua
/usr/share/jive/applets/ScreenSavers/settings.lua
+cp -f /media/*/SqueezeboxJiveApplet.lua
/usr/share/jive/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
Modified:
7.4/branches/pango/squeezeplay/src/squeezeplay_jive/specialProjects/sbcPosSlideshow/squeezeos-boot.sh
URL:
http://svn.slimdevices.com/7.4/branches/pango/squeezeplay/src/squeezeplay_jive/specialProjects/sbcPosSlideshow/squeezeos-boot.sh?rev=3730&root=Jive&r1=3729&r2=3730&view=diff
==============================================================================
---
7.4/branches/pango/squeezeplay/src/squeezeplay_jive/specialProjects/sbcPosSlideshow/squeezeos-boot.sh
(original)
+++
7.4/branches/pango/squeezeplay/src/squeezeplay_jive/specialProjects/sbcPosSlideshow/squeezeos-boot.sh
Thu Jan 8 08:08:54 2009
@@ -8,15 +8,15 @@
fi
# copy Slideshow applet to squeezeplay subdir
-cp -rf /mnt/mmc/Slideshow /usr/share/jive/applets/.
+cp -rf /media/*/Slideshow /usr/share/jive/applets/.
# copy popImages to images directory
-cp -rf /mnt/mmc/popImages /usr/share/jive/applets/Slideshow/images
+cp -rf /media/*/popImages /usr/share/jive/applets/Slideshow/images
# make sure some default settings in core applets are set how we want them
-cp -f /mnt/mmc/screenSettings.lua
/usr/share/jive/applets/SqueezeboxJive/settings.lua
-cp -f /mnt/mmc/setupWelcomeSettings.lua
/usr/share/jive/applets/SetupWelcome/settings.lua
-cp -f /mnt/mmc/screensaverSettings.lua
/usr/share/jive/applets/ScreenSavers/settings.lua
+cp -f /media/*/screenSettings.lua
/usr/share/jive/applets/SqueezeboxJive/settings.lua
+cp -f /media/*/setupWelcomeSettings.lua
/usr/share/jive/applets/SetupWelcome/settings.lua
+cp -f /media/*/screensaverSettings.lua
/usr/share/jive/applets/ScreenSavers/settings.lua
# FIXME: copy a hacked SqueezeboxJiveApplet until code is in SlideshowApplet
to remove the home key = power off listener through a service
-cp -f /mnt/mmc/SqueezeboxJiveApplet.lua
/usr/share/jive/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
+cp -f /media/*/SqueezeboxJiveApplet.lua
/usr/share/jive/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
