Author: titmuss
Date: Tue Apr 22 06:37:49 2008
New Revision: 2312
URL: http://svn.slimdevices.com?rev=2312&root=Jive&view=rev
Log:
Bug: N/A
Description:
Install the MacroPlay applet.
Minor fixes to work on the Controller with the macro files on an SD card.
Modified:
7.1/trunk/squeezeplay/src/squeezeplay/Makefile.am
7.1/trunk/squeezeplay/src/squeezeplay/Makefile.in
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/MacroPlay/MacroPlayApplet.lua
Modified: 7.1/trunk/squeezeplay/src/squeezeplay/Makefile.am
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay/Makefile.am?rev=2312&root=Jive&r1=2311&r2=2312&view=diff
==============================================================================
--- 7.1/trunk/squeezeplay/src/squeezeplay/Makefile.am (original)
+++ 7.1/trunk/squeezeplay/src/squeezeplay/Makefile.am Tue Apr 22 06:37:49 2008
@@ -296,6 +296,12 @@
share/applets/NowPlaying/progressbar_fill.png \
share/applets/NowPlaying/progressbar_fill_l.png \
share/applets/NowPlaying/progressbar_fill_r.png
+
+applets_macroplaydir = $(pkgdatadir)/applets/MacroPlay
+dist_applets_macroplay_DATA = \
+ share/applets/MacroPlay/MacroPlayApplet.lua \
+ share/applets/MacroPlay/MacroPlayMeta.lua \
+ share/applets/MacroPlay/strings.txt
# Data: now playing
applets_nowplaying_imagesdir = $(pkgdatadir)/applets/NowPlaying/images
Modified: 7.1/trunk/squeezeplay/src/squeezeplay/Makefile.in
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay/Makefile.in?rev=2312&root=Jive&r1=2311&r2=2312&view=diff
==============================================================================
--- 7.1/trunk/squeezeplay/src/squeezeplay/Makefile.in (original)
+++ 7.1/trunk/squeezeplay/src/squeezeplay/Makefile.in Tue Apr 22 06:37:49 2008
@@ -46,7 +46,7 @@
$(dist_applets_defaultskin_images_DATA) \
$(dist_applets_flickr_DATA) $(dist_applets_httpauth_DATA) \
$(dist_applets_infobrowser_DATA) $(dist_applets_log_DATA) \
- $(dist_applets_nowplaying_DATA) \
+ $(dist_applets_macroplay_DATA) $(dist_applets_nowplaying_DATA) \
$(dist_applets_nowplaying_images_DATA) \
$(dist_applets_screensavers_DATA) \
$(dist_applets_screenshot_DATA) \
@@ -99,6 +99,7 @@
"$(DESTDIR)$(applets_httpauthdir)" \
"$(DESTDIR)$(applets_infobrowserdir)" \
"$(DESTDIR)$(applets_logdir)" \
+ "$(DESTDIR)$(applets_macroplaydir)" \
"$(DESTDIR)$(applets_nowplayingdir)" \
"$(DESTDIR)$(applets_nowplaying_imagesdir)" \
"$(DESTDIR)$(applets_screensaversdir)" \
@@ -156,6 +157,7 @@
dist_applets_httpauthDATA_INSTALL = $(INSTALL_DATA)
dist_applets_infobrowserDATA_INSTALL = $(INSTALL_DATA)
dist_applets_logDATA_INSTALL = $(INSTALL_DATA)
+dist_applets_macroplayDATA_INSTALL = $(INSTALL_DATA)
dist_applets_nowplayingDATA_INSTALL = $(INSTALL_DATA)
dist_applets_nowplaying_imagesDATA_INSTALL = $(INSTALL_DATA)
dist_applets_screensaversDATA_INSTALL = $(INSTALL_DATA)
@@ -182,7 +184,7 @@
$(dist_applets_defaultskin_images_DATA) \
$(dist_applets_flickr_DATA) $(dist_applets_httpauth_DATA) \
$(dist_applets_infobrowser_DATA) $(dist_applets_log_DATA) \
- $(dist_applets_nowplaying_DATA) \
+ $(dist_applets_macroplay_DATA) $(dist_applets_nowplaying_DATA) \
$(dist_applets_nowplaying_images_DATA) \
$(dist_applets_screensavers_DATA) \
$(dist_applets_screenshot_DATA) \
@@ -582,6 +584,12 @@
share/applets/NowPlaying/progressbar_fill.png \
share/applets/NowPlaying/progressbar_fill_l.png \
share/applets/NowPlaying/progressbar_fill_r.png
+
+applets_macroplaydir = $(pkgdatadir)/applets/MacroPlay
+dist_applets_macroplay_DATA = \
+ share/applets/MacroPlay/MacroPlayApplet.lua \
+ share/applets/MacroPlay/MacroPlayMeta.lua \
+ share/applets/MacroPlay/strings.txt
# Data: now playing
@@ -1326,6 +1334,23 @@
echo " rm -f '$(DESTDIR)$(applets_logdir)/$$f'"; \
rm -f "$(DESTDIR)$(applets_logdir)/$$f"; \
done
+install-dist_applets_macroplayDATA: $(dist_applets_macroplay_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(applets_macroplaydir)" || $(mkdir_p)
"$(DESTDIR)$(applets_macroplaydir)"
+ @list='$(dist_applets_macroplay_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+ echo " $(dist_applets_macroplayDATA_INSTALL) '$$d$$p'
'$(DESTDIR)$(applets_macroplaydir)/$$f'"; \
+ $(dist_applets_macroplayDATA_INSTALL) "$$d$$p"
"$(DESTDIR)$(applets_macroplaydir)/$$f"; \
+ done
+
+uninstall-dist_applets_macroplayDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(dist_applets_macroplay_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(applets_macroplaydir)/$$f'"; \
+ rm -f "$(DESTDIR)$(applets_macroplaydir)/$$f"; \
+ done
install-dist_applets_nowplayingDATA: $(dist_applets_nowplaying_DATA)
@$(NORMAL_INSTALL)
test -z "$(applets_nowplayingdir)" || $(mkdir_p)
"$(DESTDIR)$(applets_nowplayingdir)"
@@ -1735,7 +1760,7 @@
distdir: $(DISTFILES)
$(am__remove_distdir)
mkdir $(distdir)
- $(mkdir_p) $(distdir)/config $(distdir)/share/applets/ChooseMusicSource
$(distdir)/share/applets/Clock $(distdir)/share/applets/DefaultSkin
$(distdir)/share/applets/DefaultSkin/images $(distdir)/share/applets/Flickr
$(distdir)/share/applets/HttpAuth $(distdir)/share/applets/InfoBrowser
$(distdir)/share/applets/LogSettings $(distdir)/share/applets/NowPlaying
$(distdir)/share/applets/NowPlaying/images
$(distdir)/share/applets/ScreenSavers $(distdir)/share/applets/Screenshot
$(distdir)/share/applets/SelectPlayer
$(distdir)/share/applets/SetupAppletInstaller
$(distdir)/share/applets/SetupDateTime $(distdir)/share/applets/SetupLanguage
$(distdir)/share/applets/SetupSoundEffects
$(distdir)/share/applets/SetupSoundEffects/sounds
$(distdir)/share/applets/SetupSqueezebox
$(distdir)/share/applets/SetupWallpaper
$(distdir)/share/applets/SetupWallpaper/wallpaper
$(distdir)/share/applets/SlimBrowser $(distdir)/share/applets/SlimDiscovery
$(distdir)/share/applets/SqueezeNetworkPIN $(distdir)/share/jive
$(distdir)/share/jive/net $(distdir)/share/jive/slim $(distdir)/share/jive/ui
$(distdir)/share/jive/utils $(distdir)/src
+ $(mkdir_p) $(distdir)/config $(distdir)/share/applets/ChooseMusicSource
$(distdir)/share/applets/Clock $(distdir)/share/applets/DefaultSkin
$(distdir)/share/applets/DefaultSkin/images $(distdir)/share/applets/Flickr
$(distdir)/share/applets/HttpAuth $(distdir)/share/applets/InfoBrowser
$(distdir)/share/applets/LogSettings $(distdir)/share/applets/MacroPlay
$(distdir)/share/applets/NowPlaying $(distdir)/share/applets/NowPlaying/images
$(distdir)/share/applets/ScreenSavers $(distdir)/share/applets/Screenshot
$(distdir)/share/applets/SelectPlayer
$(distdir)/share/applets/SetupAppletInstaller
$(distdir)/share/applets/SetupDateTime $(distdir)/share/applets/SetupLanguage
$(distdir)/share/applets/SetupSoundEffects
$(distdir)/share/applets/SetupSoundEffects/sounds
$(distdir)/share/applets/SetupSqueezebox
$(distdir)/share/applets/SetupWallpaper
$(distdir)/share/applets/SetupWallpaper/wallpaper
$(distdir)/share/applets/SlimBrowser $(distdir)/share/applets/SlimDiscovery
$(distdir)/share/applets/SqueezeNetworkPIN $(distdir)/share/jive
$(distdir)/share/jive/net $(distdir)/share/jive/slim $(distdir)/share/jive/ui
$(distdir)/share/jive/utils $(distdir)/src
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
@@ -1864,7 +1889,7 @@
$(MAKE) $(AM_MAKEFLAGS) check-am
all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA)
installdirs:
- for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(testdir)"
"$(DESTDIR)$(applets_choosemusicsourcedir)" "$(DESTDIR)$(applets_clockdir)"
"$(DESTDIR)$(applets_defaultskindir)"
"$(DESTDIR)$(applets_defaultskin_imagesdir)" "$(DESTDIR)$(applets_flickrdir)"
"$(DESTDIR)$(applets_httpauthdir)" "$(DESTDIR)$(applets_infobrowserdir)"
"$(DESTDIR)$(applets_logdir)" "$(DESTDIR)$(applets_nowplayingdir)"
"$(DESTDIR)$(applets_nowplaying_imagesdir)"
"$(DESTDIR)$(applets_screensaversdir)" "$(DESTDIR)$(applets_screenshotdir)"
"$(DESTDIR)$(applets_selectplayerdir)"
"$(DESTDIR)$(applets_setupSqueezeboxdir)"
"$(DESTDIR)$(applets_setupappletinstallerdir)"
"$(DESTDIR)$(applets_setupdatetimedir)" "$(DESTDIR)$(applets_setuplanguagedir)"
"$(DESTDIR)$(applets_setupsoundeffectsdir)"
"$(DESTDIR)$(applets_setupsoundeffects_soundsdir)"
"$(DESTDIR)$(applets_setupwallpaperdir)"
"$(DESTDIR)$(applets_setupwallpaper_wallpaperdir)"
"$(DESTDIR)$(applets_slimbrowserdir)" "$(DESTDIR)$(applets_slimdiscoverydir)"
"$(DESTDIR)$(applets_squeezenetworkpindir)" "$(DESTDIR)$(jivedir)"
"$(DESTDIR)$(jiveuidir)" "$(DESTDIR)$(luanetdir)" "$(DESTDIR)$(luaslimdir)"
"$(DESTDIR)$(luautildir)"; do \
+ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(testdir)"
"$(DESTDIR)$(applets_choosemusicsourcedir)" "$(DESTDIR)$(applets_clockdir)"
"$(DESTDIR)$(applets_defaultskindir)"
"$(DESTDIR)$(applets_defaultskin_imagesdir)" "$(DESTDIR)$(applets_flickrdir)"
"$(DESTDIR)$(applets_httpauthdir)" "$(DESTDIR)$(applets_infobrowserdir)"
"$(DESTDIR)$(applets_logdir)" "$(DESTDIR)$(applets_macroplaydir)"
"$(DESTDIR)$(applets_nowplayingdir)"
"$(DESTDIR)$(applets_nowplaying_imagesdir)"
"$(DESTDIR)$(applets_screensaversdir)" "$(DESTDIR)$(applets_screenshotdir)"
"$(DESTDIR)$(applets_selectplayerdir)"
"$(DESTDIR)$(applets_setupSqueezeboxdir)"
"$(DESTDIR)$(applets_setupappletinstallerdir)"
"$(DESTDIR)$(applets_setupdatetimedir)" "$(DESTDIR)$(applets_setuplanguagedir)"
"$(DESTDIR)$(applets_setupsoundeffectsdir)"
"$(DESTDIR)$(applets_setupsoundeffects_soundsdir)"
"$(DESTDIR)$(applets_setupwallpaperdir)"
"$(DESTDIR)$(applets_setupwallpaper_wallpaperdir)"
"$(DESTDIR)$(applets_slimbrowserdir)" "$(DESTDIR)$(applets_slimdiscoverydir)"
"$(DESTDIR)$(applets_squeezenetworkpindir)" "$(DESTDIR)$(jivedir)"
"$(DESTDIR)$(jiveuidir)" "$(DESTDIR)$(luanetdir)" "$(DESTDIR)$(luaslimdir)"
"$(DESTDIR)$(luautildir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: $(BUILT_SOURCES)
@@ -1923,6 +1948,7 @@
install-dist_applets_httpauthDATA \
install-dist_applets_infobrowserDATA \
install-dist_applets_logDATA \
+ install-dist_applets_macroplayDATA \
install-dist_applets_nowplayingDATA \
install-dist_applets_nowplaying_imagesDATA \
install-dist_applets_screensaversDATA \
@@ -1980,6 +2006,7 @@
uninstall-dist_applets_httpauthDATA \
uninstall-dist_applets_infobrowserDATA \
uninstall-dist_applets_logDATA \
+ uninstall-dist_applets_macroplayDATA \
uninstall-dist_applets_nowplayingDATA \
uninstall-dist_applets_nowplaying_imagesDATA \
uninstall-dist_applets_screensaversDATA \
@@ -2017,6 +2044,7 @@
install-dist_applets_httpauthDATA \
install-dist_applets_infobrowserDATA \
install-dist_applets_logDATA \
+ install-dist_applets_macroplayDATA \
install-dist_applets_nowplayingDATA \
install-dist_applets_nowplaying_imagesDATA \
install-dist_applets_screensaversDATA \
@@ -2050,6 +2078,7 @@
uninstall-dist_applets_httpauthDATA \
uninstall-dist_applets_infobrowserDATA \
uninstall-dist_applets_logDATA \
+ uninstall-dist_applets_macroplayDATA \
uninstall-dist_applets_nowplayingDATA \
uninstall-dist_applets_nowplaying_imagesDATA \
uninstall-dist_applets_screensaversDATA \
Modified:
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/MacroPlay/MacroPlayApplet.lua
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay/share/applets/MacroPlay/MacroPlayApplet.lua?rev=2312&root=Jive&r1=2311&r2=2312&view=diff
==============================================================================
---
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/MacroPlay/MacroPlayApplet.lua
(original)
+++
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/MacroPlay/MacroPlayApplet.lua
Tue Apr 22 06:37:49 2008
@@ -36,6 +36,8 @@
local debug = require("jive.utils.debug")
local log = require("jive.utils.log").logger("applets.misc")
+local LAYER_ALL = jive.ui.LAYER_ALL
+
local jive = jive
@@ -76,7 +78,7 @@
window:addWidget(menu)
-- Load macro configuration
- local f = loadmacro("applets/MacroPlay/Macros.lua")
+ local f = loadmacro("Macros.lua")
if f then
-- Defines self.macros
f()
@@ -183,7 +185,7 @@
local window = Framework.windowStack[1]
local screen = Surface:newRGB(w, h)
- window:draw(screen, JIVE_LAYER_ALL)
+ window:draw(screen, LAYER_ALL)
local reffile = macrodir .. file .. ".bmp"
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
