Author: titmuss
Date: Thu Jan 17 07:32:41 2008
New Revision: 1480
URL: http://svn.slimdevices.com?rev=1480&root=Jive&view=rev
Log:
Bug: N/A
Description:
Move the SetupSqueezebox applet to the jive core application.
Make the wireless connectivity in SetupSqueezebox optional, and provide an
entry point
for other applets to start setting up a squeezebox.
Make Udap a singleton, and move the udap socket into that class.
Allow Choose Player to connect a disconnected Squeezebox to a server.
Note: The ui flow is not yet correct after the squeezebox has been connected to
the
server. This is untested on the hardware and may break squeezebox setup.
Added:
trunk/jive/src/pkg/jive/share/applets/SetupSqueezebox/
- copied from r1474,
trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SetupSqueezebox/
trunk/jive/src/pkg/jive/share/applets/SetupSqueezebox/SetupSqueezeboxApplet.lua
- copied, changed from r1479,
trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SetupSqueezebox/SetupSqueezeboxApplet.lua
trunk/jive/src/pkg/jive/share/applets/SetupSqueezebox/SetupSqueezeboxMeta.lua
- copied unchanged from r1479,
trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SetupSqueezebox/SetupSqueezeboxMeta.lua
trunk/jive/src/pkg/jive/share/applets/SetupSqueezebox/strings.txt
- copied unchanged from r1479,
trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SetupSqueezebox/strings.txt
Removed:
trunk/jive/src/pkg/jive/share/applets/SetupSqueezebox/udap.lua
trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SetupSqueezebox/
Modified:
trunk/jive/src/pkg/jive/Makefile.am
trunk/jive/src/pkg/jive/Makefile.in
trunk/jive/src/pkg/jive/share/applets/SelectPlayer/SelectPlayerApplet.lua
trunk/jive/src/pkg/jive/share/jive/net/Udap.lua
trunk/jive/src/pkg/jive_squeezeboxjive/Makefile.am
trunk/jive/src/pkg/jive_squeezeboxjive/Makefile.in
Modified: trunk/jive/src/pkg/jive/Makefile.am
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive/Makefile.am?rev=1480&root=Jive&r1=1479&r2=1480&view=diff
==============================================================================
--- trunk/jive/src/pkg/jive/Makefile.am (original)
+++ trunk/jive/src/pkg/jive/Makefile.am Thu Jan 17 07:32:41 2008
@@ -142,7 +142,8 @@
share/jive/net/SocketTcp.lua \
share/jive/net/RequestHttp.lua \
share/jive/net/RequestJsonRpc.lua \
- share/jive/net/HttpPool.lua
+ share/jive/net/HttpPool.lua \
+ share/jive/net/Udap.lua
luaslimdir = $(pkgdatadir)/jive/slim
dist_luaslim_DATA = \
@@ -318,6 +319,11 @@
share/applets/SetupWallpaper/wallpaper/sunlight.png \
share/applets/SetupWallpaper/wallpaper/sunrise.png
+applets_setupSqueezeboxdir = $(datadir)/jive/applets/SetupSqueezebox
+dist_applets_setupSqueezebox_DATA = \
+ share/applets/SetupSqueezebox/SetupSqueezeboxApplet.lua \
+ share/applets/SetupSqueezebox/SetupSqueezeboxMeta.lua \
+ share/applets/SetupSqueezebox/strings.txt
# Default skin
applets_defaultskindir = $(pkgdatadir)/applets/DefaultSkin
Modified: trunk/jive/src/pkg/jive/Makefile.in
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive/Makefile.in?rev=1480&root=Jive&r1=1479&r2=1480&view=diff
==============================================================================
--- trunk/jive/src/pkg/jive/Makefile.in (original)
+++ trunk/jive/src/pkg/jive/Makefile.in Thu Jan 17 07:32:41 2008
@@ -50,6 +50,7 @@
$(dist_applets_screensavers_DATA) \
$(dist_applets_screenshot_DATA) \
$(dist_applets_selectplayer_DATA) \
+ $(dist_applets_setupSqueezebox_DATA) \
$(dist_applets_setupappletinstaller_DATA) \
$(dist_applets_setupdatetime_DATA) \
$(dist_applets_setuplanguage_DATA) \
@@ -98,6 +99,7 @@
"$(DESTDIR)$(applets_screensaversdir)" \
"$(DESTDIR)$(applets_screenshotdir)" \
"$(DESTDIR)$(applets_selectplayerdir)" \
+ "$(DESTDIR)$(applets_setupSqueezeboxdir)" \
"$(DESTDIR)$(applets_setupappletinstallerdir)" \
"$(DESTDIR)$(applets_setupdatetimedir)" \
"$(DESTDIR)$(applets_setuplanguagedir)" \
@@ -152,6 +154,7 @@
dist_applets_screensaversDATA_INSTALL = $(INSTALL_DATA)
dist_applets_screenshotDATA_INSTALL = $(INSTALL_DATA)
dist_applets_selectplayerDATA_INSTALL = $(INSTALL_DATA)
+dist_applets_setupSqueezeboxDATA_INSTALL = $(INSTALL_DATA)
dist_applets_setupappletinstallerDATA_INSTALL = $(INSTALL_DATA)
dist_applets_setupdatetimeDATA_INSTALL = $(INSTALL_DATA)
dist_applets_setuplanguageDATA_INSTALL = $(INSTALL_DATA)
@@ -176,6 +179,7 @@
$(dist_applets_screensavers_DATA) \
$(dist_applets_screenshot_DATA) \
$(dist_applets_selectplayer_DATA) \
+ $(dist_applets_setupSqueezebox_DATA) \
$(dist_applets_setupappletinstaller_DATA) \
$(dist_applets_setupdatetime_DATA) \
$(dist_applets_setuplanguage_DATA) \
@@ -418,7 +422,8 @@
share/jive/net/SocketTcp.lua \
share/jive/net/RequestHttp.lua \
share/jive/net/RequestJsonRpc.lua \
- share/jive/net/HttpPool.lua
+ share/jive/net/HttpPool.lua \
+ share/jive/net/Udap.lua
luaslimdir = $(pkgdatadir)/jive/slim
dist_luaslim_DATA = \
@@ -593,6 +598,12 @@
share/applets/SetupWallpaper/wallpaper/fade_to_black.png \
share/applets/SetupWallpaper/wallpaper/sunlight.png \
share/applets/SetupWallpaper/wallpaper/sunrise.png
+
+applets_setupSqueezeboxdir = $(datadir)/jive/applets/SetupSqueezebox
+dist_applets_setupSqueezebox_DATA = \
+ share/applets/SetupSqueezebox/SetupSqueezeboxApplet.lua \
+ share/applets/SetupSqueezebox/SetupSqueezeboxMeta.lua \
+ share/applets/SetupSqueezebox/strings.txt
# Default skin
@@ -1350,6 +1361,23 @@
echo " rm -f '$(DESTDIR)$(applets_selectplayerdir)/$$f'"; \
rm -f "$(DESTDIR)$(applets_selectplayerdir)/$$f"; \
done
+install-dist_applets_setupSqueezeboxDATA: $(dist_applets_setupSqueezebox_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(applets_setupSqueezeboxdir)" || $(mkdir_p)
"$(DESTDIR)$(applets_setupSqueezeboxdir)"
+ @list='$(dist_applets_setupSqueezebox_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+ echo " $(dist_applets_setupSqueezeboxDATA_INSTALL) '$$d$$p'
'$(DESTDIR)$(applets_setupSqueezeboxdir)/$$f'"; \
+ $(dist_applets_setupSqueezeboxDATA_INSTALL) "$$d$$p"
"$(DESTDIR)$(applets_setupSqueezeboxdir)/$$f"; \
+ done
+
+uninstall-dist_applets_setupSqueezeboxDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(dist_applets_setupSqueezebox_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(applets_setupSqueezeboxdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(applets_setupSqueezeboxdir)/$$f"; \
+ done
install-dist_applets_setupappletinstallerDATA:
$(dist_applets_setupappletinstaller_DATA)
@$(NORMAL_INSTALL)
test -z "$(applets_setupappletinstallerdir)" || $(mkdir_p)
"$(DESTDIR)$(applets_setupappletinstallerdir)"
@@ -1657,7 +1685,7 @@
distdir: $(DISTFILES)
$(am__remove_distdir)
mkdir $(distdir)
- $(mkdir_p) $(distdir)/config $(distdir)/share/applets/Clock
$(distdir)/share/applets/DefaultSkin
$(distdir)/share/applets/DefaultSkin/images
$(distdir)/share/applets/DefaultSkin/sounds $(distdir)/share/applets/Flickr
$(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/SetupSlimServers
$(distdir)/share/applets/SetupSoundEffects
$(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/Clock
$(distdir)/share/applets/DefaultSkin
$(distdir)/share/applets/DefaultSkin/images
$(distdir)/share/applets/DefaultSkin/sounds $(distdir)/share/applets/Flickr
$(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/SetupSlimServers
$(distdir)/share/applets/SetupSoundEffects
$(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 \
@@ -1786,7 +1814,7 @@
$(MAKE) $(AM_MAKEFLAGS) check-am
all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA)
installdirs:
- for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(testdir)"
"$(DESTDIR)$(applets_clockdir)" "$(DESTDIR)$(applets_defaultskindir)"
"$(DESTDIR)$(applets_defaultskin_imagesdir)"
"$(DESTDIR)$(applets_defaultskin_soundsdir)" "$(DESTDIR)$(applets_flickrdir)"
"$(DESTDIR)$(applets_infobrowserdir)" "$(DESTDIR)$(applets_logdir)"
"$(DESTDIR)$(applets_nowplayingdir)"
"$(DESTDIR)$(applets_nowplaying_imagesdir)"
"$(DESTDIR)$(applets_screensaversdir)" "$(DESTDIR)$(applets_screenshotdir)"
"$(DESTDIR)$(applets_selectplayerdir)"
"$(DESTDIR)$(applets_setupappletinstallerdir)"
"$(DESTDIR)$(applets_setupdatetimedir)" "$(DESTDIR)$(applets_setuplanguagedir)"
"$(DESTDIR)$(applets_setupslimserversdir)"
"$(DESTDIR)$(applets_setupsoundeffectsdir)"
"$(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_clockdir)" "$(DESTDIR)$(applets_defaultskindir)"
"$(DESTDIR)$(applets_defaultskin_imagesdir)"
"$(DESTDIR)$(applets_defaultskin_soundsdir)" "$(DESTDIR)$(applets_flickrdir)"
"$(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_setupslimserversdir)"
"$(DESTDIR)$(applets_setupsoundeffectsdir)"
"$(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)
@@ -1849,6 +1877,7 @@
install-dist_applets_screensaversDATA \
install-dist_applets_screenshotDATA \
install-dist_applets_selectplayerDATA \
+ install-dist_applets_setupSqueezeboxDATA \
install-dist_applets_setupappletinstallerDATA \
install-dist_applets_setupdatetimeDATA \
install-dist_applets_setuplanguageDATA \
@@ -1903,6 +1932,7 @@
uninstall-dist_applets_screensaversDATA \
uninstall-dist_applets_screenshotDATA \
uninstall-dist_applets_selectplayerDATA \
+ uninstall-dist_applets_setupSqueezeboxDATA \
uninstall-dist_applets_setupappletinstallerDATA \
uninstall-dist_applets_setupdatetimeDATA \
uninstall-dist_applets_setuplanguageDATA \
@@ -1938,6 +1968,7 @@
install-dist_applets_screensaversDATA \
install-dist_applets_screenshotDATA \
install-dist_applets_selectplayerDATA \
+ install-dist_applets_setupSqueezeboxDATA \
install-dist_applets_setupappletinstallerDATA \
install-dist_applets_setupdatetimeDATA \
install-dist_applets_setuplanguageDATA \
@@ -1968,6 +1999,7 @@
uninstall-dist_applets_screensaversDATA \
uninstall-dist_applets_screenshotDATA \
uninstall-dist_applets_selectplayerDATA \
+ uninstall-dist_applets_setupSqueezeboxDATA \
uninstall-dist_applets_setupappletinstallerDATA \
uninstall-dist_applets_setupdatetimeDATA \
uninstall-dist_applets_setuplanguageDATA \
@@ -1987,12 +2019,12 @@
$(TOLUA) $(TOLUAFLAGS) $(AM_TOLUAFLAGS) -n jive -o $@ $^
src/version.h: FORCE
- @${ECHO} '/* This file is automatically generated */' > src/version.h
- @${ECHO} -n '#define JIVE_VERSION "' >> src/version.h
- @${ECHO} -n `cat ../jive.version` >> src/version.h
- @${ECHO} -n ' r' >> src/version.h
+ @echo '/* This file is automatically generated */' > src/version.h
+ @echo -n '#define JIVE_VERSION "' >> src/version.h
+ @echo -n `cat ../jive.version` >> src/version.h
+ @echo -n ' r' >> src/version.h
@svnversion -n .. >> src/version.h
- @${ECHO} '"' >> src/version.h
+ @echo '"' >> src/version.h
FORCE:
# Tell versions [3.59,3.63) of GNU make to not export all variables.
Modified:
trunk/jive/src/pkg/jive/share/applets/SelectPlayer/SelectPlayerApplet.lua
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive/share/applets/SelectPlayer/SelectPlayerApplet.lua?rev=1480&root=Jive&r1=1479&r2=1480&view=diff
==============================================================================
--- trunk/jive/src/pkg/jive/share/applets/SelectPlayer/SelectPlayerApplet.lua
(original)
+++ trunk/jive/src/pkg/jive/share/applets/SelectPlayer/SelectPlayerApplet.lua
Thu Jan 17 07:32:41 2008
@@ -34,8 +34,7 @@
local Label = require("jive.ui.Label")
local Framework = require("jive.ui.Framework")
-local SocketUdp = require("jive.net.SocketUdp")
-local udap = require("jive.net.Udap")
+local Udap = require("jive.net.Udap")
local log = require("jive.utils.log").logger("applets.setup")
local debug = require("jive.utils.debug")
@@ -157,8 +156,12 @@
text = name or self:string("SQUEEZEBOX_NAME", string.sub(mac,
7)),
sound = "WINDOWSHOW",
callback = function()
- log:error("SETUP SQUEEZEBOX")
- --self.setupNext()
+ local sbsetup =
AppletManager:loadApplet("SetupSqueezebox")
+ if not sbsetup then
+ return
+ end
+
+ sbsetup:startSqueezeboxSetup(mac, nil,
self.setupNext)
end,
focusGained = function(event)
self:_showWallpaper(nil)
@@ -236,17 +239,20 @@
function _scanActive(self)
-- socket for udap discovery
- if not self.socket then
- self.socket = assert(SocketUdp(jnt, function(chunk, err)
-
self:_udapSink(chunk, err)
- end))
+ self.udap = Udap(jnt)
+ if not self.udapSink then
+ self.udapSink = self.udap:addSink(function(chunk, err)
+ self:_udapSink(chunk,
err)
+ end)
end
end
function _scanInactive(self)
- self.socket:close()
- self.socket = nil
+ if self.udapSink then
+ self.udap:removeSink(self.udapSink)
+ self.udapSink = nil
+ end
end
@@ -255,17 +261,17 @@
return -- ignore errors
end
- local pkt = udap.parseUdap(chunk.data)
+ local pkt = Udap.parseUdap(chunk.data)
if pkt.uapMethod ~= "adv_discover"
- or pkt.ucp.device_status ~= "wait_slimserver"
+-- or pkt.ucp.device_status ~= "wait_slimserver"
or pkt.ucp.type ~= "squeezebox" then
-- we are only looking for squeezeboxen trying to connect to SC
return
end
local mac = pkt.source
- local name = pkt.ucp.name
+ local name = pkt.ucp.name ~= "" and pkt.ucp.name
if not self.scanResults[mac] then
self.scanResults[mac] = {
lastScan = os.time(),
@@ -282,8 +288,8 @@
self.discovery:discover()
-- udap discovery
- local packet = udap.createAdvancedDiscover(nil, 1)
- self.socket:send(function() return packet end, "255.255.255.255",
udap.port)
+ local packet = Udap.createAdvancedDiscover(nil, 1)
+ self.udap:send(function() return packet end, "255.255.255.255")
-- remove squeezeboxen not seen for 10 seconds
local now = os.time()
Copied:
trunk/jive/src/pkg/jive/share/applets/SetupSqueezebox/SetupSqueezeboxApplet.lua
(from r1479,
trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SetupSqueezebox/SetupSqueezeboxApplet.lua)
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive/share/applets/SetupSqueezebox/SetupSqueezeboxApplet.lua?p2=trunk/jive/src/pkg/jive/share/applets/SetupSqueezebox/SetupSqueezeboxApplet.lua&p1=trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SetupSqueezebox/SetupSqueezeboxApplet.lua&r1=1479&r2=1480&rev=1480&root=Jive&view=diff
==============================================================================
---
trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SetupSqueezebox/SetupSqueezeboxApplet.lua
(original)
+++
trunk/jive/src/pkg/jive/share/applets/SetupSqueezebox/SetupSqueezeboxApplet.lua
Thu Jan 17 07:32:41 2008
@@ -25,14 +25,11 @@
local Window = require("jive.ui.Window")
local Popup = require("jive.ui.Popup")
-local Wireless = require("jive.net.Wireless")
+local Udap = require("jive.net.Udap")
+local hasWireless, Wireless = pcall(require, "jive.net.Wireless")
local log =
require("jive.utils.log").logger("applets.setup")
-local SocketUdp = require("jive.net.SocketUdp")
-local socket = require("socket")
-
-local udap = require("applets.SetupSqueezebox.udap")
local jnt = jnt
@@ -61,13 +58,20 @@
error("No slimdiscovery applet")
end
-
- self.wireless = Wireless(jnt, "eth0")
+ if hasWireless then
+ self.wireless = Wireless(jnt, "eth0")
+ end
-- socket for udap discovery
- self.socket = assert(SocketUdp(jnt, function(chunk, err)
- self:t_udapSink(chunk, err)
- end))
+ self.udap = Udap(jnt)
+ self.udapSink = self.udap:addSink(function(chunk, err)
+ self:t_udapSink(chunk, err)
+ end)
+end
+
+
+function free(self)
+ self.udap:removeSink(self.udapSink)
end
@@ -88,7 +92,12 @@
-- note we keep old entries so this list the window is not empty
-- during initial setup. if this becomes a problem a "finding
-- squeezeboxen" screen will need to be added.
- self:_scanComplete(self.wireless:scanResults(), keepOldEntries)
+ if self.hasWireless then
+ self:_scanComplete(self.wireless:scanResults(), keepOldEntries)
+
+ -- find jive network configuration
+ Task("readConfig", self, t_readJiveConfig):addTask()
+ end
window:addListener(EVENT_WINDOW_ACTIVE,
function()
@@ -105,9 +114,6 @@
_scan(self)
end)
- -- find jive network configuration
- Task("readConfig", self, t_readJiveConfig):addTask()
-
local help = Textarea("help", self:string("SQUEEZEBOX_HELP"))
window:addWidget(help)
window:addWidget(self.scanMenu)
@@ -149,17 +155,24 @@
function _scan(self)
- self.wireless:scan(function(scanTable)
- _scanComplete(self, scanTable)
- end)
+ if self.hasWireless then
+ self.wireless:scan(function(scanTable)
+ _scanComplete(self, scanTable)
+ end)
+ end
self.seqno = self.seqno + 1
- local packet = udap.createAdvancedDiscover(nil, self.seqno)
- self.socket:send(function() return packet end, "255.255.255.255",
udap.port)
+ local packet = Udap.createAdvancedDiscover(nil, self.seqno)
+ self.udap:send(function() return packet end, "255.255.255.255")
end
function t_scanDiscover(self, pkt)
+ if not self.scanResults then
+ -- we are not scanning
+ return
+ end
+
if pkt.uapMethod ~= "adv_discover"
or pkt.ucp.device_status ~= "wait_slimserver"
or pkt.ucp.type ~= "squeezebox" then
@@ -174,7 +187,7 @@
sound = "WINDOWSHOW",
icon = Icon("icon"),
callback = function()
- _selectSqueezebox(self, mac)
+ startSqueezeboxSetup(self, mac)
end,
weight = 1
}
@@ -196,7 +209,7 @@
local now = os.time()
for ssid, entry in pairs(scanTable) do
- local ether,mac = string.match(ssid,
"logitech([%-%+])squeezebox[%-%+](%x+)")
+ local mac, ether = self:ssidIsSqueezebox(ssid)
log:debug("ether=", ether, " mac=", mac)
if mac ~= nil then
@@ -208,7 +221,7 @@
sound = "WINDOWSHOW",
icon = Icon("icon"),
callback = function()
-
_selectSqueezebox(self, mac)
+
startSqueezeboxSetup(self, mac, ssid)
end,
weight = 1
}
@@ -239,15 +252,45 @@
end
-function _selectSqueezebox(self, mac)
-
- -- prefer setup via wireless
- if self.scanResults[mac].adhoc then
- -- adhoc setup
- _setupInit(self, mac, self.scanResults[mac].ether)
+--[[
+Return the Squeezebox mac address from the ssid, or nil if the ssid is
+not from a Squeezebox in setup mode.
+--]]
+function ssidIsSqueezebox(self, ssid)
+ local hasEthernet, mac = string.match(ssid,
"logitech([%-%+])squeezebox[%-%+](%x+)")
+
+ return mac, hasEthernet
+end
+
+
+--[[
+This function is the entry point after a squeezebox has been choosen
+for setup, may be called from outside this applet.
+
+I<mac> is the mac address of the squeezebox
+I<adhoc> is the ad-hoc ssid for setup, or nil if already on the network
+I<setupNext> if given, is a function to call once setup is complete
+
+--]]
+function startSqueezeboxSetup(self, mac, adhoc, setupNext)
+ if setupNext then
+ self.setupNext = setupNext
+ end
+
+ if not self.topWindow then
+ -- remember the top window
+ self.topWindow = Framework.windowStack[1]
+ end
+
+ if adhoc then
+ -- full configuration via adhoc network
+ local hasEthernet = self:ssidIsSqueezebox(adhoc)[1]
+ assert(hasEthernet)
+
+ _setupInit(self, mac, hasEthernet)
_setupConfig(self)
else
- -- udap setup
+ -- SqueezeCenter configuration with udap
_setupInit(self, mac, nil)
self.interface = ''
@@ -258,8 +301,10 @@
end
-- remove squeezebox from scan results
- self.scanMenu:removeItem(self.scanResults[self.mac].item)
- self.scanResults[self.mac] = nil
+ if self.scanMenu then
+ self.scanMenu:removeItem(self.scanResults[mac].item)
+ self.scanResults[mac] = nil
+ end
end
@@ -462,15 +507,15 @@
local data = self.data1
-- no slimserver
- data.server_address = udap.packNumber(0, 4)
- data.slimserver_address = udap.packNumber(0, 4) -- none existant server
-
- data.interface = udap.packNumber(0, 1) -- wireless
- data.bridging = udap.packNumber(0, 1) -- off
+ data.server_address = Udap.packNumber(0, 4)
+ data.slimserver_address = Udap.packNumber(0, 4) -- none existant server
+
+ data.interface = Udap.packNumber(0, 1) -- wireless
+ data.bridging = Udap.packNumber(0, 1) -- off
if self.networkMode == 0 then
- data.wireless_mode = udap.packNumber(0, 1) -- infrastructure
+ data.wireless_mode = Udap.packNumber(0, 1) -- infrastructure
else
- data.wireless_mode = udap.packNumber(1, 1) -- adhoc
+ data.wireless_mode = Udap.packNumber(1, 1) -- adhoc
end
self:_ipConfig(data) -- ip config
@@ -480,42 +525,42 @@
-- wireless region
local region = self.wireless:getAtherosRegionCode()
log:info("data.region_id=", data.region)
- data.region_id = udap.packNumber(region, 1)
+ data.region_id = Udap.packNumber(region, 1)
-- default to encryption disabled
- data.wepon = udap.packNumber(0, 1)
- data.wpa_enabled = udap.packNumber(0, 1)
+ data.wepon = Udap.packNumber(0, 1)
+ data.wpa_enabled = Udap.packNumber(0, 1)
if status.key_mgmt == "WPA2-PSK" then
- data.wpa_enabled = udap.packNumber(1, 1)
- data.wpa_mode = udap.packNumber(2, 1)
+ data.wpa_enabled = Udap.packNumber(1, 1)
+ data.wpa_mode = Udap.packNumber(2, 1)
data.wpa_psk = _readPSK(self, status.ssid)
elseif status.key_mgmt == "WPA-PSK" then
- data.wpa_enabled = udap.packNumber(1, 1)
- data.wpa_mode = udap.packNumber(1, 1)
+ data.wpa_enabled = Udap.packNumber(1, 1)
+ data.wpa_mode = Udap.packNumber(1, 1)
data.wpa_psk = _readPSK(self, status.ssid)
end
if status.pairwise_cipher == "CCMP" then
- data.wpa_cipher = udap.packNumber(2, 1) -- CCMP
+ data.wpa_cipher = Udap.packNumber(2, 1) -- CCMP
elseif status.pairwise_cipher == "TKIP" then
- data.wpa_cipher = udap.packNumber(1, 1) -- TKIP
+ data.wpa_cipher = Udap.packNumber(1, 1) -- TKIP
end
if status.pairwise_cipher == "WEP-104" then
- data.wepon = udap.packNumber(1, 1)
- data.keylen = udap.packNumber(1, 1)
+ data.wepon = Udap.packNumber(1, 1)
+ data.keylen = Udap.packNumber(1, 1)
data.wep_key = _readWepKey(self, status.ssid)
elseif status.pairwise_cipher == "WEP-40" then
- data.wepon = udap.packNumber(1, 1)
- data.keylen = udap.packNumber(0, 1)
+ data.wepon = Udap.packNumber(1, 1)
+ data.keylen = Udap.packNumber(0, 1)
data.wep_key = _readWepKey(self, status.ssid)
end
end
@@ -597,11 +642,11 @@
local data = self.data1
-- no slimserver
- data.server_address = udap.packNumber(0, 4)
- data.slimserver_address = udap.packNumber(0, 4)
-
- data.interface = udap.packNumber(1, 1) -- wired
- data.bridging = udap.packNumber(0, 1) -- off
+ data.server_address = Udap.packNumber(0, 4)
+ data.slimserver_address = Udap.packNumber(0, 4)
+
+ data.interface = Udap.packNumber(1, 1) -- wired
+ data.bridging = Udap.packNumber(0, 1) -- off
self:_ipConfig(data) -- ip config
end
@@ -639,27 +684,27 @@
-- Squeezebox config:
-- no slimserver
- data.server_address = udap.packNumber(0, 4)
- data.slimserver_address = udap.packNumber(0, 4)
-
- data.interface = udap.packNumber(0, 1) -- wireless
- data.bridging = udap.packNumber(1, 1) -- on
- data.wireless_mode = udap.packNumber(1, 1) -- adhoc
--- data.channel = udap.packNumber(6, 1) -- fixed channel
-
- data.lan_ip_mode = udap.packNumber(1, 1) -- 1 dhcp
+ data.server_address = Udap.packNumber(0, 4)
+ data.slimserver_address = Udap.packNumber(0, 4)
+
+ data.interface = Udap.packNumber(0, 1) -- wireless
+ data.bridging = Udap.packNumber(1, 1) -- on
+ data.wireless_mode = Udap.packNumber(1, 1) -- adhoc
+-- data.channel = Udap.packNumber(6, 1) -- fixed channel
+
+ data.lan_ip_mode = Udap.packNumber(1, 1) -- 1 dhcp
data.SSID = ssid
-- wireless region
local region = self.wireless:getAtherosRegionCode()
log:info("data.region_id=", data.region)
- data.region_id = udap.packNumber(region, 1)
+ data.region_id = Udap.packNumber(region, 1)
-- secure network
- data.wpa_enabled = udap.packNumber(0, 1)
- data.wepon = udap.packNumber(1, 1)
- data.keylen = udap.packNumber(1, 1)
+ data.wpa_enabled = Udap.packNumber(0, 1)
+ data.wepon = Udap.packNumber(1, 1)
+ data.keylen = Udap.packNumber(1, 1)
data.wep_key = table.concat(binkey)
end
@@ -671,13 +716,13 @@
log:info("gateway=", self.networkOption.gateway)
log:info("dns=", self.networkOption.dns)
- data.lan_ip_mode = udap.packNumber(0, 1) -- 0 static ip
- data.lan_network_address =
udap.packNumber(_parseip(self.ipAddress), 4)
- data.lan_subnet_mask =
udap.packNumber(_parseip(self.networkOption.netmask), 4)
- data.lan_gateway =
udap.packNumber(_parseip(self.networkOption.gateway), 4)
- data.primary_dns =
udap.packNumber(_parseip(self.networkOption.dns), 4)
+ data.lan_ip_mode = Udap.packNumber(0, 1) -- 0 static ip
+ data.lan_network_address =
Udap.packNumber(_parseip(self.ipAddress), 4)
+ data.lan_subnet_mask =
Udap.packNumber(_parseip(self.networkOption.netmask), 4)
+ data.lan_gateway =
Udap.packNumber(_parseip(self.networkOption.gateway), 4)
+ data.primary_dns =
Udap.packNumber(_parseip(self.networkOption.dns), 4)
else
- data.lan_ip_mode = udap.packNumber(1, 1) -- 1 dhcp
+ data.lan_ip_mode = Udap.packNumber(1, 1) -- 1 dhcp
end
end
@@ -827,9 +872,9 @@
function t_udapSend(self, packet)
-- send three udp packets in case the wireless network drops them
- self.socket:send(function() return packet end, "255.255.255.255",
udap.port)
- self.socket:send(function() return packet end, "255.255.255.255",
udap.port)
- self.socket:send(function() return packet end, "255.255.255.255",
udap.port)
+ self.udap:send(function() return packet end, "255.255.255.255")
+ self.udap:send(function() return packet end, "255.255.255.255")
+ self.udap:send(function() return packet end, "255.255.255.255")
end
@@ -841,7 +886,7 @@
-- check squeezebox exists via udap
self.seqno = self.seqno + 1
- local packet = udap.createDiscover(self.mac, self.seqno)
+ local packet = Udap.createDiscover(self.mac, self.seqno)
self:t_udapSend(packet)
end
@@ -865,7 +910,7 @@
-- configure squeezebox network
self.seqno = self.seqno + 1
- local packet = udap.createSetData(self.mac, self.seqno, self.data1)
+ local packet = Udap.createSetData(self.mac, self.seqno, self.data1)
self:t_udapSend(packet)
end
@@ -878,7 +923,7 @@
-- reset squeezebox
self.seqno = self.seqno + 1
- local packet = udap.createReset(self.mac, self.seqno)
+ local packet = Udap.createReset(self.mac, self.seqno)
self:t_udapSend(packet)
-- if the reset udp reply is lost we won't know the squeezebox has
reset ok
@@ -898,7 +943,7 @@
self.errorMsg = "SQUEEZEBOX_PROBLEM_LOST_SQUEEZEBOX"
self.seqno = self.seqno + 1
- local packet = udap.createGetUUID(self.mac, self.seqno)
+ local packet = Udap.createGetUUID(self.mac, self.seqno)
self:t_udapSend(packet)
end
@@ -910,22 +955,20 @@
self.errorMsg = "SQUEEZEBOX_PROBLEM_LOST_SQUEEZEBOX"
self.seqno = self.seqno + 1
- local packet = udap.createGetIPAddr(self.mac, self.seqno)
+ local packet = Udap.createGetIPAddr(self.mac, self.seqno)
self:t_udapSend(packet)
end
-- sink for udap replies. based on the replies this sets up the next action to
call.
function t_udapSink(self, chunk, err)
- log:info("udapSink chunk=", chunk, " err=", err)
-
if chunk == nil then
-- ignore errors, and try again
return
end
- local pkt = udap.parseUdap(chunk.data)
- log:info("seqno=", self.seqno, " pkt=", udap.tostringUdap(pkt))
+ local pkt = Udap.parseUdap(chunk.data)
+ log:info("seqno=", self.seqno, " pkt=", Udap.tostringUdap(pkt))
if self.seqno ~= pkt.seqno then
log:info("discarding old packet")
@@ -1051,7 +1094,7 @@
-- check squeezebox status via udap
self.seqno = self.seqno + 1
- local packet = udap.createAdvancedDiscover(self.mac, self.seqno)
+ local packet = Udap.createAdvancedDiscover(self.mac, self.seqno)
self:t_udapSend(packet)
end
@@ -1145,15 +1188,15 @@
if slimserver:isSqueezeNetwork() then
log:info("slimserver_address=www.squeezenetwork.com")
- self.data2.server_address = udap.packNumber(1, 4)
+ self.data2.server_address = Udap.packNumber(1, 4)
-- set slimserver address to 0.0.0.1 to workaround a bug in
-- squeezebox firmware
- self.data2.slimserver_address =
udap.packNumber(parseip("0.0.0.1"), 4)
+ self.data2.slimserver_address =
Udap.packNumber(parseip("0.0.0.1"), 4)
else
log:info("slimserver_address=", serverip)
- self.data2.server_address = udap.packNumber(0, 4)
- self.data2.slimserver_address =
udap.packNumber(parseip(serverip), 4)
+ self.data2.server_address = Udap.packNumber(0, 4)
+ self.data2.slimserver_address =
Udap.packNumber(parseip(serverip), 4)
end
@@ -1177,7 +1220,7 @@
-- configure squeezebox network
self.seqno = self.seqno + 1
- local packet = udap.createSetData(self.mac, self.seqno, self.data2)
+ local packet = Udap.createSetData(self.mac, self.seqno, self.data2)
self:t_udapSend(packet)
end
Modified: trunk/jive/src/pkg/jive/share/jive/net/Udap.lua
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive/share/jive/net/Udap.lua?rev=1480&root=Jive&r1=1479&r2=1480&view=diff
==============================================================================
--- trunk/jive/src/pkg/jive/share/jive/net/Udap.lua (original)
+++ trunk/jive/src/pkg/jive/share/jive/net/Udap.lua Thu Jan 17 07:32:41 2008
@@ -5,13 +5,20 @@
local socket = require("socket")
local string = require("string")
-local table = require("table")
+local table = require("jive.utils.table")
+
+local SocketUdp = require("jive.net.SocketUdp")
+local log = require("jive.utils.log").logger("net.socket")
module(..., oo.class)
-port = 0x4578
+local PORT = 0x4578
+
+
+-- singleton wireless instance per interface
+local _instance = nil
-- Squeezebox nvram settings
@@ -75,6 +82,45 @@
}
+function __init(self, jnt)
+ if _instance then
+ return _instance
+ end
+
+ local obj = oo.rawnew(self, {})
+ obj.sinks = {}
+
+ obj.socket = SocketUdp(jnt,
+ function(chunk, err)
+ -- forward to all sinks
+ for i, sink in ipairs(obj.sinks) do
+ sink(chunk, err)
+ end
+ return 1
+ end)
+
+ return obj
+end
+
+
+function addSink(self, sink)
+ log:warn("ADD SINK ", sink)
+ table.insert(self.sinks, sink)
+ return sink
+end
+
+
+function removeSink(self, sink)
+ log:warn("REMOVE SINK ", sink)
+ table.delete(self.sinks, sink)
+end
+
+
+function send(self, pkt, addr, port)
+ self.socket:send(pkt, addr, port or PORT)
+end
+
+
function packNumber(v, len)
local t = {}
Modified: trunk/jive/src/pkg/jive_squeezeboxjive/Makefile.am
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive_squeezeboxjive/Makefile.am?rev=1480&root=Jive&r1=1479&r2=1480&view=diff
==============================================================================
--- trunk/jive/src/pkg/jive_squeezeboxjive/Makefile.am (original)
+++ trunk/jive/src/pkg/jive_squeezeboxjive/Makefile.am Thu Jan 17 07:32:41 2008
@@ -71,7 +71,7 @@
dist_applets_testDisplay_DATA = \
share/applets/TestDisplay/TestDisplayApplet.lua \
share/applets/TestDisplay/TestDisplayMeta.lua \
- share/applets/TestDisplay/strings.txt \
+ share/applets/TestDisplay/strings.txt \
share/applets/TestDisplay/circle.jpg
@@ -89,14 +89,6 @@
share/applets/TestIR/TestIRMeta.lua \
share/applets/TestIR/strings.txt \
share/applets/TestIR/TestIR.png
-
-
-applets_setupSqueezeboxdir = $(datadir)/jive/applets/SetupSqueezebox
-dist_applets_setupSqueezebox_DATA = \
- share/applets/SetupSqueezebox/SetupSqueezeboxApplet.lua \
- share/applets/SetupSqueezebox/SetupSqueezeboxMeta.lua \
- share/applets/SetupSqueezebox/udap.lua \
- share/applets/SetupSqueezebox/strings.txt
applets_SetupFactoryResetdir = $(datadir)/jive/applets/SetupFactoryReset
Modified: trunk/jive/src/pkg/jive_squeezeboxjive/Makefile.in
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive_squeezeboxjive/Makefile.in?rev=1480&root=Jive&r1=1479&r2=1480&view=diff
==============================================================================
--- trunk/jive/src/pkg/jive_squeezeboxjive/Makefile.in (original)
+++ trunk/jive/src/pkg/jive_squeezeboxjive/Makefile.in Thu Jan 17 07:32:41 2008
@@ -43,7 +43,6 @@
$(dist_applets_SetupWelcome_DATA) \
$(dist_applets_aboutJive_DATA) \
$(dist_applets_setupSetupFirmwareUpgrade_DATA) \
- $(dist_applets_setupSqueezebox_DATA) \
$(dist_applets_setupWireless_DATA) \
$(dist_applets_squeezeboxjive_DATA) \
$(dist_applets_testDisplay_DATA) $(dist_applets_testIR_DATA) \
@@ -76,7 +75,6 @@
"$(DESTDIR)$(applets_SetupWelcomedir)" \
"$(DESTDIR)$(applets_aboutJivedir)" \
"$(DESTDIR)$(applets_setupSetupFirmwareUpgradedir)" \
- "$(DESTDIR)$(applets_setupSqueezeboxdir)" \
"$(DESTDIR)$(applets_setupWirelessdir)" \
"$(DESTDIR)$(applets_squeezeboxjivedir)" \
"$(DESTDIR)$(applets_testDisplaydir)" \
@@ -115,7 +113,6 @@
dist_applets_SetupWelcomeDATA_INSTALL = $(INSTALL_DATA)
dist_applets_aboutJiveDATA_INSTALL = $(INSTALL_DATA)
dist_applets_setupSetupFirmwareUpgradeDATA_INSTALL = $(INSTALL_DATA)
-dist_applets_setupSqueezeboxDATA_INSTALL = $(INSTALL_DATA)
dist_applets_setupWirelessDATA_INSTALL = $(INSTALL_DATA)
dist_applets_squeezeboxjiveDATA_INSTALL = $(INSTALL_DATA)
dist_applets_testDisplayDATA_INSTALL = $(INSTALL_DATA)
@@ -128,7 +125,6 @@
$(dist_applets_SetupWelcome_DATA) \
$(dist_applets_aboutJive_DATA) \
$(dist_applets_setupSetupFirmwareUpgrade_DATA) \
- $(dist_applets_setupSqueezebox_DATA) \
$(dist_applets_setupWireless_DATA) \
$(dist_applets_squeezeboxjive_DATA) \
$(dist_applets_testDisplay_DATA) $(dist_applets_testIR_DATA) \
@@ -323,13 +319,6 @@
share/applets/TestIR/strings.txt \
share/applets/TestIR/TestIR.png
-applets_setupSqueezeboxdir = $(datadir)/jive/applets/SetupSqueezebox
-dist_applets_setupSqueezebox_DATA = \
- share/applets/SetupSqueezebox/SetupSqueezeboxApplet.lua \
- share/applets/SetupSqueezebox/SetupSqueezeboxMeta.lua \
- share/applets/SetupSqueezebox/udap.lua \
- share/applets/SetupSqueezebox/strings.txt
-
applets_SetupFactoryResetdir = $(datadir)/jive/applets/SetupFactoryReset
dist_applets_SetupFactoryReset_DATA = \
share/applets/SetupFactoryReset/SetupFactoryResetApplet.lua \
@@ -589,23 +578,6 @@
f=$(am__strip_dir) \
echo " rm -f
'$(DESTDIR)$(applets_setupSetupFirmwareUpgradedir)/$$f'"; \
rm -f "$(DESTDIR)$(applets_setupSetupFirmwareUpgradedir)/$$f"; \
- done
-install-dist_applets_setupSqueezeboxDATA: $(dist_applets_setupSqueezebox_DATA)
- @$(NORMAL_INSTALL)
- test -z "$(applets_setupSqueezeboxdir)" || $(mkdir_p)
"$(DESTDIR)$(applets_setupSqueezeboxdir)"
- @list='$(dist_applets_setupSqueezebox_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
- echo " $(dist_applets_setupSqueezeboxDATA_INSTALL) '$$d$$p'
'$(DESTDIR)$(applets_setupSqueezeboxdir)/$$f'"; \
- $(dist_applets_setupSqueezeboxDATA_INSTALL) "$$d$$p"
"$(DESTDIR)$(applets_setupSqueezeboxdir)/$$f"; \
- done
-
-uninstall-dist_applets_setupSqueezeboxDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(dist_applets_setupSqueezebox_DATA)'; for p in $$list; do \
- f=$(am__strip_dir) \
- echo " rm -f '$(DESTDIR)$(applets_setupSqueezeboxdir)/$$f'"; \
- rm -f "$(DESTDIR)$(applets_setupSqueezeboxdir)/$$f"; \
done
install-dist_applets_setupWirelessDATA: $(dist_applets_setupWireless_DATA)
@$(NORMAL_INSTALL)
@@ -778,7 +750,7 @@
distdir: $(DISTFILES)
$(am__remove_distdir)
mkdir $(distdir)
- $(mkdir_p) $(distdir)/config $(distdir)/share/applets/AboutJive
$(distdir)/share/applets/SetupFactoryReset
$(distdir)/share/applets/SetupFirmwareUpgrade $(distdir)/share/applets/SetupSSH
$(distdir)/share/applets/SetupSqueezebox $(distdir)/share/applets/SetupWelcome
$(distdir)/share/applets/SetupWireless $(distdir)/share/applets/SqueezeboxJive
$(distdir)/share/applets/TestDisplay $(distdir)/share/applets/TestIR
$(distdir)/share/applets/TestKeypad $(distdir)/share/applets/TestMotion
$(distdir)/share/jive/net $(distdir)/src
+ $(mkdir_p) $(distdir)/config $(distdir)/share/applets/AboutJive
$(distdir)/share/applets/SetupFactoryReset
$(distdir)/share/applets/SetupFirmwareUpgrade $(distdir)/share/applets/SetupSSH
$(distdir)/share/applets/SetupWelcome $(distdir)/share/applets/SetupWireless
$(distdir)/share/applets/SqueezeboxJive $(distdir)/share/applets/TestDisplay
$(distdir)/share/applets/TestIR $(distdir)/share/applets/TestKeypad
$(distdir)/share/applets/TestMotion $(distdir)/share/jive/net $(distdir)/src
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
@@ -906,7 +878,7 @@
check: check-am
all-am: Makefile $(LTLIBRARIES) $(DATA)
installdirs:
- for dir in "$(DESTDIR)$(libdir)"
"$(DESTDIR)$(applets_SetupFactoryResetdir)" "$(DESTDIR)$(applets_SetupSSHdir)"
"$(DESTDIR)$(applets_SetupWelcomedir)" "$(DESTDIR)$(applets_aboutJivedir)"
"$(DESTDIR)$(applets_setupSetupFirmwareUpgradedir)"
"$(DESTDIR)$(applets_setupSqueezeboxdir)"
"$(DESTDIR)$(applets_setupWirelessdir)"
"$(DESTDIR)$(applets_squeezeboxjivedir)" "$(DESTDIR)$(applets_testDisplaydir)"
"$(DESTDIR)$(applets_testIRdir)" "$(DESTDIR)$(applets_testKeypaddir)"
"$(DESTDIR)$(applets_testMotiondir)" "$(DESTDIR)$(jive_netdir)"; do \
+ for dir in "$(DESTDIR)$(libdir)"
"$(DESTDIR)$(applets_SetupFactoryResetdir)" "$(DESTDIR)$(applets_SetupSSHdir)"
"$(DESTDIR)$(applets_SetupWelcomedir)" "$(DESTDIR)$(applets_aboutJivedir)"
"$(DESTDIR)$(applets_setupSetupFirmwareUpgradedir)"
"$(DESTDIR)$(applets_setupWirelessdir)"
"$(DESTDIR)$(applets_squeezeboxjivedir)" "$(DESTDIR)$(applets_testDisplaydir)"
"$(DESTDIR)$(applets_testIRdir)" "$(DESTDIR)$(applets_testKeypaddir)"
"$(DESTDIR)$(applets_testMotiondir)" "$(DESTDIR)$(jive_netdir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: install-am
@@ -960,7 +932,6 @@
install-dist_applets_SetupWelcomeDATA \
install-dist_applets_aboutJiveDATA \
install-dist_applets_setupSetupFirmwareUpgradeDATA \
- install-dist_applets_setupSqueezeboxDATA \
install-dist_applets_setupWirelessDATA \
install-dist_applets_squeezeboxjiveDATA \
install-dist_applets_testDisplayDATA \
@@ -1001,7 +972,6 @@
uninstall-dist_applets_SetupWelcomeDATA \
uninstall-dist_applets_aboutJiveDATA \
uninstall-dist_applets_setupSetupFirmwareUpgradeDATA \
- uninstall-dist_applets_setupSqueezeboxDATA \
uninstall-dist_applets_setupWirelessDATA \
uninstall-dist_applets_squeezeboxjiveDATA \
uninstall-dist_applets_testDisplayDATA \
@@ -1023,7 +993,6 @@
install-dist_applets_SetupWelcomeDATA \
install-dist_applets_aboutJiveDATA \
install-dist_applets_setupSetupFirmwareUpgradeDATA \
- install-dist_applets_setupSqueezeboxDATA \
install-dist_applets_setupWirelessDATA \
install-dist_applets_squeezeboxjiveDATA \
install-dist_applets_testDisplayDATA \
@@ -1041,7 +1010,6 @@
uninstall-dist_applets_SetupWelcomeDATA \
uninstall-dist_applets_aboutJiveDATA \
uninstall-dist_applets_setupSetupFirmwareUpgradeDATA \
- uninstall-dist_applets_setupSqueezeboxDATA \
uninstall-dist_applets_setupWirelessDATA \
uninstall-dist_applets_squeezeboxjiveDATA \
uninstall-dist_applets_testDisplayDATA \
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
