Author: titmuss
Date: Tue Jun 10 14:20:04 2008
New Revision: 2555
URL: http://svn.slimdevices.com?rev=2555&root=Jive&view=rev
Log:
Bug: 7873, 6683
Description:
Working towards removing the SlimDiscovery applet, by adding a service api (see
Bug 7873).
This is the first stage towards refactoring Player discovery (see Bug 6683)
that will fix
several bugs.
This is work in progress, and this code won't run.
Modified:
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceMeta.lua
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/InfoBrowser/InfoBrowserApplet.lua
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/NowPlaying/NowPlayingApplet.lua
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/ScreenSavers/ScreenSaversApplet.lua
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/SelectPlayerApplet.lua
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SetupAppletInstaller/SetupAppletInstallerApplet.lua
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SetupLanguage/SetupLanguageApplet.lua
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SetupNetTest/SetupNetTestApplet.lua
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SetupSoundEffects/SetupSoundEffectsApplet.lua
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SetupSqueezebox/SetupSqueezeboxApplet.lua
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SetupWallpaper/SetupWallpaperApplet.lua
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/jive/JiveMain.lua
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay_desktop/share/applets/Quit/QuitMeta.lua
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay_jive/share/applets/SetupFactoryReset/SetupFactoryResetApplet.lua
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay_jive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeApplet.lua
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay_jive/share/applets/SetupWelcome/SetupWelcomeApplet.lua
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
Modified:
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua
URL:
http://svn.slimdevices.com/7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua?rev=2555&root=Jive&r1=2554&r2=2555&view=diff
==============================================================================
---
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua
(original)
+++
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua
Tue Jun 10 14:20:04 2008
@@ -64,16 +64,10 @@
window:addWidget(menu)
- self.sdApplet = appletManager:getAppletInstance("SlimDiscovery")
- if not self.sdApplet then
- return window:tieAndShowWindow()
- end
-
-
-- Bug 7862
-- Workaround to allow changing music source using udap until
-- refactoring for bug 6683
- local current = self.sdApplet:getCurrentPlayer()
+ local current = AppletManager:callService("getCurrentPlayer")
if current and not current:isConnected() and current:canUdap() and
appletManager:hasApplet("SetupSqueezebox") then
local setupSqueezebox =
appletManager:loadApplet("SetupSqueezebox")
setupSqueezebox:startSqueezeboxSetup(current:getMacAddress(),
nil)
@@ -89,12 +83,12 @@
-- Discover slimservers in this window
- self.sdApplet:discover()
- window:addTimer(1000, function() self.sdApplet:discover() end)
+ AppletManager:callService("discoverPlayers")
+ window:addTimer(1000, function()
AppletManager:callService("discoverPlayers") end)
-- slimservers on the poll list
- local poll = self.sdApplet:pollList()
+ local poll = AppletManager:callService("getPollList")
for address,_ in pairs(poll) do
if address ~= "255.255.255.255" then
self:_addServerItem(nil, address)
@@ -103,7 +97,7 @@
-- discovered slimservers
- for _,server in self.sdApplet:allServers() do
+ for _,server in AppletManager:callService("iterateSqueezeCenters") do
self:_addServerItem(server)
end
@@ -147,7 +141,7 @@
self.serverMenu:removeItem(self.serverList[server:getIpPort()])
end
- local currentPlayer = self.sdApplet:getCurrentPlayer()
+ local currentPlayer = AppletManager:callService("getCurrentPlayer")
-- new entry
local item
@@ -198,7 +192,7 @@
-- new entry if server is on poll list
if server then
- local poll = self.sdApplet:pollList()
+ local poll = AppletManager:callService("getPollList")
local address = server:getIpPort()
if poll[address] then
self:_addServerItem(nil, address)
@@ -250,7 +244,7 @@
jiveMain:closeToHome()
end
- local currentPlayer = self.sdApplet:getCurrentPlayer()
+ local currentPlayer = AppletManager:callService("getCurrentPlayer")
if player ~= currentPlayer then
return
end
@@ -260,7 +254,7 @@
function notify_playerDelete(self, player)
- local currentPlayer = self.sdApplet:getCurrentPlayer()
+ local currentPlayer = AppletManager:callService("getCurrentPlayer")
if player ~= currentPlayer then
return
end
@@ -305,7 +299,7 @@
window:addTimer(1000,
function()
-- scan all servers waiting for the player
- self.sdApplet:discover()
+ AppletManager:callService("discoverPlayers")
-- we detect when the connect to the new server
-- with notify_playerNew
@@ -413,7 +407,7 @@
function _getOtherServer(self)
- local list = self.sdApplet:pollList()
+ local list = AppletManager:callService("getPollList")
for i,v in pairs(list) do
if i ~= "255.255.255.255" then
return i
@@ -437,7 +431,7 @@
[address] = address
}
- self.sdApplet:pollList(list)
+ AppletManager:callService("setPollList", list)
self:getSettings().poll = list
end
Modified:
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceMeta.lua
URL:
http://svn.slimdevices.com/7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceMeta.lua?rev=2555&root=Jive&r1=2554&r2=2555&view=diff
==============================================================================
---
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceMeta.lua
(original)
+++
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceMeta.lua
Tue Jun 10 14:20:04 2008
@@ -41,12 +41,9 @@
function registerApplet(self)
-
-- set the poll list for discovery of slimservers based on our settings
- local sdApplet = appletManager:loadApplet("SlimDiscovery")
-
- if sdApplet then
- sdApplet:pollList(self:getSettings().poll)
+ if AppletManager:hasService("setPollList") then
+ AppletManager:callService("setPollList",
self:getSettings().poll)
jiveMain:addItem(self:menuItem('appletSlimservers', 'settings',
"SLIMSERVER_SERVERS", function(applet, ...) applet:settingsShow(...) end, 60))
end
end
Modified:
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/InfoBrowser/InfoBrowserApplet.lua
URL:
http://svn.slimdevices.com/7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/InfoBrowser/InfoBrowserApplet.lua?rev=2555&root=Jive&r1=2554&r2=2555&view=diff
==============================================================================
---
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/InfoBrowser/InfoBrowserApplet.lua
(original)
+++
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/InfoBrowser/InfoBrowserApplet.lua
Tue Jun 10 14:20:04 2008
@@ -52,18 +52,14 @@
self:tieAndShowWindow(window)
-- find a server: server for current player, else first server
- sd = AppletManager:getAppletInstance("SlimDiscovery")
-
- if sd then
- if sd:getCurrentPlayer() then
- self.player = sd:getCurrentPlayer()
- self.server = self.player:getSlimServer()
- else
- for _, server in sd:allServers() do
- if server:isConnected() then
- self.server = server
- break
- end
+ self.player = AppletManager:callService("getCurrentPlayer")
+ if self.player then
+ self.server = self.player:getSlimServer()
+ else
+ for _, server in
AppletManager:callService("iterateSqueezeCenters") do
+ if server:isConnected() then
+ self.server = server
+ break
end
end
end
Modified:
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/NowPlaying/NowPlayingApplet.lua
URL:
http://svn.slimdevices.com/7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/NowPlaying/NowPlayingApplet.lua?rev=2555&root=Jive&r1=2554&r2=2555&view=diff
==============================================================================
---
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/NowPlaying/NowPlayingApplet.lua
(original)
+++
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/NowPlaying/NowPlayingApplet.lua
Tue Jun 10 14:20:04 2008
@@ -255,8 +255,7 @@
function _isThisPlayer(self, player)
if not self.player and not self.player:getId() then
- local discovery =
appletManager:getAppletInstance("SlimDiscovery")
- self.player = discovery:getCurrentPlayer()
+ self.player = AppletManager:callService("getCurrentPlayer")
end
if player.id ~= self.player:getId() then
@@ -563,8 +562,7 @@
log:debug("CREATING UI FOR NOWPLAYING")
self[windowStyle].window = _createUI(self)
- local discovery = appletManager:getAppletInstance("SlimDiscovery")
- self.player = discovery:getCurrentPlayer()
+ self.player = AppletManager:callService("getCurrentPlayer")
local transitionOn
if transition then
Modified:
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/ScreenSavers/ScreenSaversApplet.lua
URL:
http://svn.slimdevices.com/7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/ScreenSavers/ScreenSaversApplet.lua?rev=2555&root=Jive&r1=2554&r2=2555&view=diff
==============================================================================
---
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/ScreenSavers/ScreenSaversApplet.lua
(original)
+++
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/ScreenSavers/ScreenSaversApplet.lua
Tue Jun 10 14:20:04 2008
@@ -116,9 +116,9 @@
-- what screensaver, check the playmode of the current player
if the_screensaver == nil then
- local sd = AppletManager:getAppletInstance("SlimDiscovery")
-
- if sd and sd:getCurrentPlayer() and
sd:getCurrentPlayer():getPlayMode() == "play" then
+ local player = AppletManager:callService("getCurrentPlayer")
+
+ if player and player:getPlayMode() == "play" then
the_screensaver = self:getSettings()["whenPlaying"]
else
the_screensaver = self:getSettings()["whenStopped"]
Modified:
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/SelectPlayerApplet.lua
URL:
http://svn.slimdevices.com/7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/SelectPlayerApplet.lua?rev=2555&root=Jive&r1=2554&r2=2555&view=diff
==============================================================================
---
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/SelectPlayerApplet.lua
(original)
+++
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/SelectPlayerApplet.lua
Tue Jun 10 14:20:04 2008
@@ -139,8 +139,7 @@
function manageSelectPlayerMenu(self)
- local sdApplet = AppletManager:getAppletInstance("SlimDiscovery")
- local _numberOfPlayers = sdApplet and sdApplet:countPlayers() or 0
+ local _numberOfPlayers = AppletManager:callService("countPlayers") or 0
-- if _numberOfPlayers is > 1 and selectPlayerMenuItem doesn't exist,
create it
@@ -326,20 +325,15 @@
window:hide(Window.transitionPushLeft)
end
- self.discovery = AppletManager:getAppletInstance("SlimDiscovery")
- if not self.discovery then
- return
- end
-
- self.selectedPlayer = self.discovery:getCurrentPlayer()
- for mac, player in self.discovery:allPlayers() do
+ self.selectedPlayer = AppletManager:callService("getCurrentPlayer")
+ for mac, player in AppletManager:callService("iteratePlayers") do
if player:isConnected() then
_addPlayerItem(self, player)
end
end
-- Display password protected servers
- for id, server in self.discovery:allServers() do
+ for id, server in AppletManager:callService("iterateSqueezeCenters") do
_updateServerItem(self, server)
end
@@ -425,7 +419,7 @@
function _scan(self)
-- SqueezeCenter and player discovery
- self.discovery:discover()
+ AppletManager:callService("discoverPlayers")
-- udap discovery
local packet = Udap.createAdvancedDiscover(nil, 1)
@@ -485,10 +479,7 @@
end
-- set the current player
- local manager = AppletManager:getAppletInstance("SlimDiscovery")
- if manager then
- manager:setCurrentPlayer(player)
- end
+ AppletManager:callService("setCurrentPlayer", player)
return true
end
Modified:
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SetupAppletInstaller/SetupAppletInstallerApplet.lua
URL:
http://svn.slimdevices.com/7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SetupAppletInstaller/SetupAppletInstallerApplet.lua?rev=2555&root=Jive&r1=2554&r2=2555&view=diff
==============================================================================
---
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SetupAppletInstaller/SetupAppletInstallerApplet.lua
(original)
+++
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SetupAppletInstaller/SetupAppletInstallerApplet.lua
Tue Jun 10 14:20:04 2008
@@ -64,17 +64,14 @@
self.window = Window("window", menuItem.text)
self.title = menuItem.text
- sd = AppletManager:getAppletInstance("SlimDiscovery")
-
-- find a server
- if sd then
- if sd:getCurrentPlayer() then
- self.server = sd:getCurrentPlayer():getSlimServer()
- else
- for _, server in sd:allServers() do
- self.server = server
- break
- end
+ local player = AppletManager:callService("getCurrentPlayer")
+ if player then
+ self.server = player:getSlimServer()
+ else
+ for _, server in
AppletManager:callService("iterateSqueezeCenters") do
+ self.server = server
+ break
end
end
Modified:
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SetupLanguage/SetupLanguageApplet.lua
URL:
http://svn.slimdevices.com/7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SetupLanguage/SetupLanguageApplet.lua?rev=2555&root=Jive&r1=2554&r2=2555&view=diff
==============================================================================
---
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SetupLanguage/SetupLanguageApplet.lua
(original)
+++
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SetupLanguage/SetupLanguageApplet.lua
Tue Jun 10 14:20:04 2008
@@ -165,7 +165,7 @@
-- FIXME SlimBrowser should use notification
-- if connected to a player, ask for the menu again
- local player = _getCurrentPlayer(self)
+ local player = AppletManager:callService("getCurrentPlayer")
if player then
local server = player:getSlimServer()
if server then
@@ -210,14 +210,6 @@
):addTask()
end
-function _getCurrentPlayer(self)
- local manager = AppletManager:getAppletInstance("SlimDiscovery")
-
- if manager and manager:getCurrentPlayer() then
- return manager:getCurrentPlayer()
- end
- return false
-end
--[[
Modified:
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SetupNetTest/SetupNetTestApplet.lua
URL:
http://svn.slimdevices.com/7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SetupNetTest/SetupNetTestApplet.lua?rev=2555&root=Jive&r1=2554&r2=2555&view=diff
==============================================================================
---
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SetupNetTest/SetupNetTestApplet.lua
(original)
+++
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SetupNetTest/SetupNetTestApplet.lua
Tue Jun 10 14:20:04 2008
@@ -62,10 +62,8 @@
function open(self, menuItem)
-- find a server: server for current player, else first server
- sd = AppletManager:getAppletInstance("SlimDiscovery")
-
- if sd and sd:getCurrentPlayer() then
- self.player = sd:getCurrentPlayer()
+ self.player = AppletManager:callService("getCurrentPlayer")
+ if self.player then
self.server = self.player:getSlimServer()
end
Modified:
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SetupSoundEffects/SetupSoundEffectsApplet.lua
URL:
http://svn.slimdevices.com/7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SetupSoundEffects/SetupSoundEffectsApplet.lua?rev=2555&root=Jive&r1=2554&r2=2555&view=diff
==============================================================================
---
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SetupSoundEffects/SetupSoundEffectsApplet.lua
(original)
+++
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SetupSoundEffects/SetupSoundEffectsApplet.lua
Tue Jun 10 14:20:04 2008
@@ -279,15 +279,14 @@
function _getCurrentServer(self)
- local manager = AppletManager:getAppletInstance("SlimDiscovery")
- local server
- if manager and manager:getCurrentPlayer() then
- server = manager:getCurrentPlayer():getSlimServer()
- if server:isSqueezeNetwork() then
- server = nil
+ local player = AppletManager:callService("getCurrentPlayer")
+ if player then
+ local server = player:getSlimServer()
+ if not server:isSqueezeNetwork() then
+ return server
end
end
- return server
+ return nil
end
Modified:
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SetupSqueezebox/SetupSqueezeboxApplet.lua
URL:
http://svn.slimdevices.com/7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SetupSqueezebox/SetupSqueezeboxApplet.lua?rev=2555&root=Jive&r1=2554&r2=2555&view=diff
==============================================================================
---
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SetupSqueezebox/SetupSqueezeboxApplet.lua
(original)
+++
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SetupSqueezebox/SetupSqueezeboxApplet.lua
Tue Jun 10 14:20:04 2008
@@ -73,10 +73,7 @@
if evtCode == KEY_BACK then
-- disconnect from player and go home
- local manager =
AppletManager:getAppletInstance("SlimDiscovery")
- if manager then
- manager:setCurrentPlayer(nil)
- end
+ AppletManager:callService("setCurrentPlayer",
nil)
popup:hide()
end
-- other keys are disabled when this popup is on screen
@@ -106,9 +103,8 @@
self.seqno = math.random(65535)
self.lastActionTicks = Framework:getTicks()
- self.slimdiscovery = AppletManager:getAppletInstance("SlimDiscovery")
- if not self.slimdiscovery then
- error("No slimdiscovery applet")
+ if not AppletManager:hasService("discoverPlayers") then
+ error("No player discovery")
end
if hasWireless then
@@ -335,10 +331,7 @@
-- disconnect from current player, if any. after a successful setup
-- we will be connected to mac
- local manager = AppletManager:getAppletInstance("SlimDiscovery")
- if manager then
- manager:setCurrentPlayer(player)
- end
+ AppletManager:callService("setCurrentPlayer", nil)
if adhoc then
-- full configuration via adhoc network
@@ -870,8 +863,8 @@
-- access point or bridged.
assert(self.networkId, "jive not connected to network")
- -- disconnect to slimserver
- self.slimdiscovery.serversObj:disconnect()
+ -- disconnect from Player/SqueezeCenter
+ AppletManager:callService("disconnectPlayer")
_setAction(self, t_waitDisconnectSlimserver)
end
@@ -883,7 +876,7 @@
local connected = false
- for i,server in self.slimdiscovery:allServers() do
+ for i,server in AppletManager:callService("iterateSqueezeCenters") do
connected = connected or server:isConnected()
log:info("server=", server:getName(), " connected=", connected)
end
@@ -1144,8 +1137,8 @@
return
end
- -- reconnect to slimserver
- self.slimdiscovery.serversObj:connect()
+ -- reconnect to Player/SqueezeCenter
+ AppletManager:callService("connectPlayer")
_setAction(self, t_waitSqueezeboxNetwork)
end
@@ -1216,10 +1209,10 @@
function _scanSlimservers(self)
-- scan for slimservers
log:info("in _scanSlimservers calling discover")
- self.slimdiscovery:discover()
+ AppletManager:callService("discoverPlayers")
-- update slimserver list
- for i,v in self.slimdiscovery:allServers() do
+ for i,v in AppletManager:callService("iterateSqueezeCenters") do
if self.slimservers[i] == nil then
local item = {
text = v:getName(),
@@ -1366,7 +1359,7 @@
end
-- player is connected to slimserver, set as current player
- self.slimdiscovery:setCurrentPlayer(player)
+ AppletManager:callService("setCurrentPlayer", player)
-- and then we're done
_setupOK(self)
Modified:
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SetupWallpaper/SetupWallpaperApplet.lua
URL:
http://svn.slimdevices.com/7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SetupWallpaper/SetupWallpaperApplet.lua?rev=2555&root=Jive&r1=2554&r2=2555&view=diff
==============================================================================
---
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SetupWallpaper/SetupWallpaperApplet.lua
(original)
+++
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SetupWallpaper/SetupWallpaperApplet.lua
Tue Jun 10 14:20:04 2008
@@ -121,7 +121,7 @@
local _playerName = false
if not self.player then
- self.player = _getCurrentPlayer()
+ self.player = AppletManager:callService("getCurrentPlayer")
end
if self.player then
@@ -200,14 +200,6 @@
return window
end
-function _getCurrentPlayer(self)
- local manager = AppletManager:getAppletInstance("SlimDiscovery")
-
- if manager and manager:getCurrentPlayer() then
- return manager:getCurrentPlayer()
- end
- return false
-end
function _getCurrentServer(self)
@@ -215,8 +207,7 @@
if self.player then
server = self.player:getSlimServer()
else
- local manager = AppletManager:getAppletInstance("SlimDiscovery")
- for _, s in manager:allServers() do
+ for _, s in AppletManager:callService("iterateSqueezeCenters")
do
server = s
break
end
Modified:
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
URL:
http://svn.slimdevices.com/7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua?rev=2555&root=Jive&r1=2554&r2=2555&view=diff
==============================================================================
---
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
(original)
+++
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
Tue Jun 10 14:20:04 2008
@@ -519,10 +519,7 @@
if evtCode == KEY_BACK then
-- disconnect from player and go home
- local manager =
AppletManager:getAppletInstance("SlimDiscovery")
- if manager then
- manager:setCurrentPlayer(nil)
- end
+ AppletManager:callService("setCurrentPlayer",
nil)
popup:hide()
end
-- other keys are disabled when this popup is on screen
@@ -561,10 +558,7 @@
if evtCode == KEY_BACK and type == EVENT_KEY_HOLD then
-- disconnect from player and go home
- local manager =
AppletManager:getAppletInstance("SlimDiscovery")
- if manager then
- manager:setCurrentPlayer(nil)
- end
+ AppletManager:callService("setCurrentPlayer",
nil)
window:hide()
end
-- other keys are disabled when this window is on screen
@@ -608,10 +602,7 @@
if evtCode == KEY_BACK then
-- disconnect from player and go home
- local manager =
AppletManager:getAppletInstance("SlimDiscovery")
- if manager then
- manager:setCurrentPlayer(nil)
- end
+ AppletManager:callService("setCurrentPlayer",
nil)
popup:hide()
end
-- other keys are disabled when this popup is on screen
@@ -2309,9 +2300,7 @@
text = self:string("SLIMBROWSER_TRY_AGAIN"),
callback = function()
server:connect()
-
- local slimDiscovery =
appletManager:loadApplet("SlimDiscovery")
-
slimDiscovery:setCurrentPlayer(player)
+
AppletManager:callService("setCurrentPlayer", player)
end,
})
@@ -2331,8 +2320,7 @@
menu:addItem({
text =
self:string("SLIMBROWSER_CHOOSE_MUSIC_SOURCE"),
callback = function()
- local slimDiscovery =
appletManager:loadApplet("SlimDiscovery")
-
slimDiscovery:setCurrentPlayer(nil)
+
AppletManager:callService("setCurrentPlayer", nil)
local setupSqueezebox =
appletManager:loadApplet("SetupSqueezebox")
setupSqueezebox:startSqueezeboxSetup(player:getMacAddress(), nil)
@@ -2341,12 +2329,12 @@
end
-- change player, only if multiple players
- local slimDiscovery = appletManager:loadApplet("SlimDiscovery")
- if slimDiscovery:countConnectedPlayers() > 1 and
appletManager:hasApplet("SelectPlayer") then
+ local numPlayers = appletManager:callService("countConnectedPlayers")
+ if numPlayers > 1 and appletManager:hasApplet("SelectPlayer") then
menu:addItem({
text =
self:string("SLIMBROWSER_CHOOSE_PLAYER"),
callback = function()
-
slimDiscovery:setCurrentPlayer(nil)
+
AppletManager:callService("setCurrentPlayer", nil)
local selectPlayer =
appletManager:loadApplet("SelectPlayer")
selectPlayer:setupShow()
Modified:
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/jive/JiveMain.lua
URL:
http://svn.slimdevices.com/7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/jive/JiveMain.lua?rev=2555&root=Jive&r1=2554&r2=2555&view=diff
==============================================================================
---
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/jive/JiveMain.lua
(original)
+++
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/jive/JiveMain.lua
Tue Jun 10 14:20:04 2008
@@ -94,10 +94,7 @@
-- disconnect from player on press and hold left
if type == EVENT_KEY_HOLD then
- local manager =
AppletManager:getAppletInstance("SlimDiscovery")
- if manager then
- manager:setCurrentPlayer(nil)
- end
+ AppletManager:callService("setCurrentPlayer", nil)
end
local windowStack = Framework.windowStack
Modified:
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay_desktop/share/applets/Quit/QuitMeta.lua
URL:
http://svn.slimdevices.com/7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay_desktop/share/applets/Quit/QuitMeta.lua?rev=2555&root=Jive&r1=2554&r2=2555&view=diff
==============================================================================
---
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay_desktop/share/applets/Quit/QuitMeta.lua
(original)
+++
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay_desktop/share/applets/Quit/QuitMeta.lua
Tue Jun 10 14:20:04 2008
@@ -43,9 +43,8 @@
node = 'home',
text = self:string("QUIT"),
callback = function()
- -- disconnect from SqueezeCenter
- local slimDiscovery =
appletManager:loadApplet("SlimDiscovery")
- slimDiscovery.serversObj:disconnect()
+ -- disconnect from Player/SqueezeCenter
+ AppletManager:callService("disconnectPlayer")
return (EVENT_CONSUME | EVENT_QUIT)
end,
Modified:
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay_jive/share/applets/SetupFactoryReset/SetupFactoryResetApplet.lua
URL:
http://svn.slimdevices.com/7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay_jive/share/applets/SetupFactoryReset/SetupFactoryResetApplet.lua?rev=2555&root=Jive&r1=2554&r2=2555&view=diff
==============================================================================
---
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay_jive/share/applets/SetupFactoryReset/SetupFactoryResetApplet.lua
(original)
+++
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay_jive/share/applets/SetupFactoryReset/SetupFactoryResetApplet.lua
Tue Jun 10 14:20:04 2008
@@ -50,9 +50,8 @@
function _factoryReset(self)
- -- disconnect from SqueezeCenter
- local slimDiscovery = appletManager:loadApplet("SlimDiscovery")
- slimDiscovery.serversObj:disconnect()
+ -- disconnect from Player/SqueezeCenter
+ AppletManager:callService("disconnectPlayer")
local popup = Popup("popupIcon")
popup:addWidget(Icon("iconConnected"))
Modified:
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay_jive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeApplet.lua
URL:
http://svn.slimdevices.com/7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay_jive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeApplet.lua?rev=2555&root=Jive&r1=2554&r2=2555&view=diff
==============================================================================
---
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay_jive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeApplet.lua
(original)
+++
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay_jive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeApplet.lua
Tue Jun 10 14:20:04 2008
@@ -295,8 +295,7 @@
-- disconnect from SqueezeCenter, we don't want to up
-- interrupted during the firmware upgrade.
- local slimDiscovery = appletManager:loadApplet("SlimDiscovery")
- slimDiscovery.serversObj:disconnect()
+ AppletManager:callService("disconnectPlayer")
-- start the upgrade
self.upgrade = Upgrade(self.url)
@@ -313,8 +312,7 @@
self.upgradeListener = nil
-- reconnect to server
- local slimDiscovery = appletManager:loadApplet("SlimDiscovery")
- slimDiscovery.serversObj:connect()
+ AppletManager:callService("connectPlayer")
local window = Window("window", self:string("UPDATE_FAILURE"))
Modified:
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay_jive/share/applets/SetupWelcome/SetupWelcomeApplet.lua
URL:
http://svn.slimdevices.com/7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay_jive/share/applets/SetupWelcome/SetupWelcomeApplet.lua?rev=2555&root=Jive&r1=2554&r2=2555&view=diff
==============================================================================
---
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay_jive/share/applets/SetupWelcome/SetupWelcomeApplet.lua
(original)
+++
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay_jive/share/applets/SetupWelcome/SetupWelcomeApplet.lua
Tue Jun 10 14:20:04 2008
@@ -205,8 +205,7 @@
log:info("step7")
-- skip this step if a player has been selected
- local manager = AppletManager:getAppletInstance("SlimDiscovery")
- if manager and manager:getCurrentPlayer() ~= nil then
+ if AppletManager:callService("getCurrentPlayer") then
return self:step8()
end
Modified:
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
URL:
http://svn.slimdevices.com/7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua?rev=2555&root=Jive&r1=2554&r2=2555&view=diff
==============================================================================
---
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
(original)
+++
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
Tue Jun 10 14:20:04 2008
@@ -821,8 +821,7 @@
function settingsSleep(self)
-- disconnect from SqueezeCenter
- local slimDiscovery = appletManager:loadApplet("SlimDiscovery")
- slimDiscovery.serversObj:disconnect()
+ AppletManager:callService("disconnectPlayer")
self.popup = Popup("popupIcon")
@@ -849,8 +848,7 @@
function settingsPowerOff(self)
-- disconnect from SqueezeCenter
- local slimDiscovery = appletManager:loadApplet("SlimDiscovery")
- slimDiscovery.serversObj:disconnect()
+ AppletManager:callService("disconnectPlayer")
local popup = Popup("popupIcon")
@@ -1043,12 +1041,6 @@
local settings = self:getSettings()
local wakeAfter = settings.suspendWake and settings.suspendWake or ""
- local slimDiscovery = appletManager:getAppletInstance("SlimDiscovery")
- local slimServers
- if slimDiscovery then
- slimServers = slimDiscovery.serversObj
- end
-
-- start timer to resume this task every second
self.suspendPopup:addTimer(1000,
function()
@@ -1057,22 +1049,19 @@
end
end)
- -- disconnect from all SlimServers
- if slimServers then
- local connected
- repeat
- slimServers:disconnect()
-
- connected = false
- for i,server in slimServers:allServers() do
- connected = connected or server:isConnected()
- log:info("server=", server:getName(), "
connected=", connected)
- end
-
- Task:yield(false)
- until not connected
- end
-
+ -- disconnect from all Players/SqueezeCenters
+ local connected
+ repeat
+ AppletManager:callService("disconnectPlayer")
+
+ connected = false
+ for i,server in
AppletManager:callService("iterateSqueezeCenters") do
+ connected = connected or server:isConnected()
+ log:info("server=", server:getName(), " connected=",
connected)
+ end
+
+ Task:yield(false)
+ until not connected
-- suspend
os.execute("/etc/init.d/suspend " .. wakeAfter)
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
