Author: titmuss
Date: Wed Jun 11 08:43:52 2008
New Revision: 2557
URL: http://svn.slimdevices.com?rev=2557&root=Jive&view=rev
Log:
Bug: N/A
Description:
Minor cleanup.
Modified:
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/InfoBrowser/InfoBrowserApplet.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/applets/SqueezeDiscovery/SqueezeDiscoveryApplet.lua
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/jive/JiveMain.lua
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/jive/slim/SlimServer.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=2557&root=Jive&r1=2556&r2=2557&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
Wed Jun 11 08:43:52 2008
@@ -66,7 +66,7 @@
-- Bug 7862
-- Workaround to allow changing music source using udap until
-- refactoring for bug 6683
- local current = AppletManager:callService("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)
@@ -82,12 +82,12 @@
-- Discover slimservers in this window
- AppletManager:callService("discoverPlayers")
- window:addTimer(1000, function()
AppletManager:callService("discoverPlayers") end)
+ appletManager:callService("discoverPlayers")
+ window:addTimer(1000, function()
appletManager:callService("discoverPlayers") end)
-- slimservers on the poll list
- local poll = AppletManager:callService("getPollList")
+ local poll = appletManager:callService("getPollList")
for address,_ in pairs(poll) do
if address ~= "255.255.255.255" then
self:_addServerItem(nil, address)
@@ -96,7 +96,7 @@
-- discovered slimservers
- for _,server in AppletManager:callService("iterateSqueezeCenters") do
+ for _,server in appletManager:callService("iterateSqueezeCenters") do
self:_addServerItem(server)
end
@@ -140,7 +140,7 @@
self.serverMenu:removeItem(self.serverList[server:getIpPort()])
end
- local currentPlayer = AppletManager:callService("getCurrentPlayer")
+ local currentPlayer = appletManager:callService("getCurrentPlayer")
-- new entry
local item
@@ -191,7 +191,7 @@
-- new entry if server is on poll list
if server then
- local poll = AppletManager:callService("getPollList")
+ local poll = appletManager:callService("getPollList")
local address = server:getIpPort()
if poll[address] then
self:_addServerItem(nil, address)
@@ -243,7 +243,7 @@
jiveMain:closeToHome()
end
- local currentPlayer = AppletManager:callService("getCurrentPlayer")
+ local currentPlayer = appletManager:callService("getCurrentPlayer")
if player ~= currentPlayer then
return
end
@@ -253,7 +253,7 @@
function notify_playerDelete(self, player)
- local currentPlayer = AppletManager:callService("getCurrentPlayer")
+ local currentPlayer = appletManager:callService("getCurrentPlayer")
if player ~= currentPlayer then
return
end
@@ -298,7 +298,7 @@
window:addTimer(1000,
function()
-- scan all servers waiting for the player
- AppletManager:callService("discoverPlayers")
+ appletManager:callService("discoverPlayers")
-- we detect when the connect to the new server
-- with notify_playerNew
@@ -406,7 +406,7 @@
function _getOtherServer(self)
- local list = AppletManager:callService("getPollList")
+ local list = appletManager:callService("getPollList")
for i,v in pairs(list) do
if i ~= "255.255.255.255" then
return i
@@ -430,7 +430,7 @@
[address] = address
}
- AppletManager:callService("setPollList", list)
+ appletManager:callService("setPollList", list)
self:getSettings().poll = list
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=2557&root=Jive&r1=2556&r2=2557&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
Wed Jun 11 08:43:52 2008
@@ -19,8 +19,6 @@
local string = require("string")
local Applet = require("jive.Applet")
-
-local AppletManager = require("jive.AppletManager")
local Framework = require("jive.ui.Framework")
local SimpleMenu = require("jive.ui.SimpleMenu")
@@ -51,11 +49,11 @@
self:tieAndShowWindow(window)
-- find a server: server for current player, else first server
- self.player = AppletManager:callService("getCurrentPlayer")
+ self.player = appletManager:callService("getCurrentPlayer")
if self.player then
self.server = self.player:getSlimServer()
else
- for _, server in
AppletManager:callService("iterateSqueezeCenters") do
+ for _, server in
appletManager:callService("iterateSqueezeCenters") do
if server:isConnected() then
self.server = server
break
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=2557&root=Jive&r1=2556&r2=2557&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
Wed Jun 11 08:43:52 2008
@@ -24,7 +24,6 @@
local oo = require("loop.simple")
local Applet = require("jive.Applet")
-local AppletManager = require("jive.AppletManager")
local Timer = require("jive.ui.Timer")
local Framework = require("jive.ui.Framework")
local Window = require("jive.ui.Window")
@@ -116,7 +115,7 @@
-- what screensaver, check the playmode of the current player
if the_screensaver == nil then
- local player = AppletManager:callService("getCurrentPlayer")
+ local player = appletManager:callService("getCurrentPlayer")
if player and player:getPlayMode() == "play" then
the_screensaver = self:getSettings()["whenPlaying"]
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=2557&root=Jive&r1=2556&r2=2557&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
Wed Jun 11 08:43:52 2008
@@ -24,7 +24,6 @@
local string = require("string")
local Applet = require("jive.Applet")
-local AppletManager = require("jive.AppletManager")
local SimpleMenu = require("jive.ui.SimpleMenu")
local RadioGroup = require("jive.ui.RadioGroup")
local RadioButton = require("jive.ui.RadioButton")
@@ -47,7 +46,7 @@
local appletManager = appletManager
-- load SetupWallpaper for use in previewing Wallpapers
-local SetupWallpaper = AppletManager:loadApplet("SetupWallpaper")
+local SetupWallpaper = appletManager:loadApplet("SetupWallpaper")
module(..., Framework.constants)
oo.class(_M, Applet)
@@ -139,7 +138,7 @@
function manageSelectPlayerMenu(self)
- local _numberOfPlayers = AppletManager:callService("countPlayers") or 0
+ local _numberOfPlayers = appletManager:callService("countPlayers") or 0
-- if _numberOfPlayers is > 1 and selectPlayerMenuItem doesn't exist,
create it
@@ -249,7 +248,7 @@
text = name or self:string("SQUEEZEBOX_NAME", string.sub(mac,
7)),
sound = "WINDOWSHOW",
callback = function()
- local sbsetup =
AppletManager:loadApplet("SetupSqueezebox")
+ local sbsetup =
appletManager:loadApplet("SetupSqueezebox")
if not sbsetup then
return
end
@@ -293,7 +292,7 @@
text = server:getName(),
sound = "WINDOWSHOW",
callback = function()
- local auth = AppletManager:loadApplet("HttpAuth")
+ local auth = appletManager:loadApplet("HttpAuth")
auth:squeezeCenterPassword(server)
end,
weight = SERVER_WEIGHT,
@@ -325,20 +324,20 @@
window:hide(Window.transitionPushLeft)
end
- self.selectedPlayer = AppletManager:callService("getCurrentPlayer")
- for mac, player in AppletManager:callService("iteratePlayers") 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 AppletManager:callService("iterateSqueezeCenters") do
+ for id, server in appletManager:callService("iterateSqueezeCenters") do
_updateServerItem(self, server)
end
-- Bug 6130 add a Set up Squeezebox option, only in Setup not Settings
- local sbsetup = AppletManager:loadApplet("SetupSqueezebox")
+ local sbsetup = appletManager:loadApplet("SetupSqueezebox")
if sbsetup and setupNext then
self.playerMenu:addItem({
text = self:string("SQUEEZEBOX_SETUP"),
@@ -419,7 +418,7 @@
function _scan(self)
-- SqueezeCenter and player discovery
- AppletManager:callService("discoverPlayers")
+ appletManager:callService("discoverPlayers")
-- udap discovery
local packet = Udap.createAdvancedDiscover(nil, 1)
@@ -479,7 +478,7 @@
end
-- set the current player
- AppletManager:callService("setCurrentPlayer", player)
+ appletManager:callService("setCurrentPlayer", player)
return true
end
@@ -494,7 +493,7 @@
self:_showWallpaper('wallpaper')
end
- AppletManager:freeApplet("SetupWallpaper")
+ appletManager:freeApplet("SetupWallpaper")
-- Never free this applet
return false
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=2557&root=Jive&r1=2556&r2=2557&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
Wed Jun 11 08:43:52 2008
@@ -32,7 +32,6 @@
local lfs = require("lfs")
local Applet = require("jive.Applet")
-local AppletManager = require("jive.AppletManager")
local SlimServer = require("jive.slim.SlimServer")
local RequestHttp = require("jive.net.RequestHttp")
@@ -65,11 +64,11 @@
self.title = menuItem.text
-- find a server
- local player = AppletManager:callService("getCurrentPlayer")
+ local player = appletManager:callService("getCurrentPlayer")
if player then
self.server = player:getSlimServer()
else
- for _, server in
AppletManager:callService("iterateSqueezeCenters") do
+ for _, server in
appletManager:callService("iterateSqueezeCenters") do
self.server = server
break
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=2557&root=Jive&r1=2556&r2=2557&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
Wed Jun 11 08:43:52 2008
@@ -22,7 +22,6 @@
local oo = require("loop.simple")
local Applet = require("jive.Applet")
-local AppletManager = require("jive.AppletManager")
local RadioGroup = require("jive.ui.RadioGroup")
local RadioButton = require("jive.ui.RadioButton")
local Framework = require("jive.ui.Framework")
@@ -165,7 +164,7 @@
-- FIXME SlimBrowser should use notification
-- if connected to a player, ask for the menu again
- local player = AppletManager:callService("getCurrentPlayer")
+ local player = appletManager:callService("getCurrentPlayer")
if player then
local server = player:getSlimServer()
if server then
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=2557&root=Jive&r1=2556&r2=2557&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
Wed Jun 11 08:43:52 2008
@@ -19,8 +19,6 @@
local string = require("string")
local Applet = require("jive.Applet")
-
-local AppletManager = require("jive.AppletManager")
local Framework = require("jive.ui.Framework")
local SimpleMenu = require("jive.ui.SimpleMenu")
@@ -61,7 +59,7 @@
function open(self, menuItem)
-- find a server: server for current player, else first server
- self.player = AppletManager:callService("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=2557&root=Jive&r1=2556&r2=2557&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
Wed Jun 11 08:43:52 2008
@@ -27,7 +27,6 @@
local io = require("io")
local lfs = require("lfs")
-local AppletManager = require("jive.AppletManager")
local Applet = require("jive.Applet")
local Audio = require("jive.ui.Audio")
local Checkbox = require("jive.ui.Checkbox")
@@ -279,7 +278,7 @@
function _getCurrentServer(self)
- local player = AppletManager:callService("getCurrentPlayer")
+ local player = appletManager:callService("getCurrentPlayer")
if player then
local server = player:getSlimServer()
if not server:isSqueezeNetwork() then
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=2557&root=Jive&r1=2556&r2=2557&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
Wed Jun 11 08:43:52 2008
@@ -14,7 +14,6 @@
local debug = require("jive.utils.debug")
local Applet = require("jive.Applet")
-local AppletManager = require("jive.AppletManager")
local Framework = require("jive.ui.Framework")
local Icon = require("jive.ui.Icon")
local Label = require("jive.ui.Label")
@@ -73,7 +72,7 @@
if evtCode == KEY_BACK then
-- disconnect from player and go home
- AppletManager:callService("setCurrentPlayer",
nil)
+ appletManager:callService("setCurrentPlayer",
nil)
popup:hide()
end
-- other keys are disabled when this popup is on screen
@@ -103,7 +102,7 @@
self.seqno = math.random(65535)
self.lastActionTicks = Framework:getTicks()
- if not AppletManager:hasService("discoverPlayers") then
+ if not appletManager:hasService("discoverPlayers") then
error("No player discovery")
end
@@ -331,7 +330,7 @@
-- disconnect from current player, if any. after a successful setup
-- we will be connected to mac
- AppletManager:callService("setCurrentPlayer", nil)
+ appletManager:callService("setCurrentPlayer", nil)
if adhoc then
-- full configuration via adhoc network
@@ -864,7 +863,7 @@
assert(self.networkId, "jive not connected to network")
-- disconnect from Player/SqueezeCenter
- AppletManager:callService("disconnectPlayer")
+ appletManager:callService("disconnectPlayer")
_setAction(self, t_waitDisconnectSlimserver)
end
@@ -876,7 +875,7 @@
local connected = false
- for i,server in AppletManager:callService("iterateSqueezeCenters") do
+ for i,server in appletManager:callService("iterateSqueezeCenters") do
connected = connected or server:isConnected()
log:info("server=", server:getName(), " connected=", connected)
end
@@ -1138,7 +1137,7 @@
end
-- reconnect to Player/SqueezeCenter
- AppletManager:callService("connectPlayer")
+ appletManager:callService("connectPlayer")
_setAction(self, t_waitSqueezeboxNetwork)
end
@@ -1209,10 +1208,10 @@
function _scanSlimservers(self)
-- scan for slimservers
log:info("in _scanSlimservers calling discover")
- AppletManager:callService("discoverPlayers")
+ appletManager:callService("discoverPlayers")
-- update slimserver list
- for i,v in AppletManager:callService("iterateSqueezeCenters") do
+ for i,v in appletManager:callService("iterateSqueezeCenters") do
if self.slimservers[i] == nil then
local item = {
text = v:getName(),
@@ -1359,7 +1358,7 @@
end
-- player is connected to slimserver, set as current player
- AppletManager:callService("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=2557&root=Jive&r1=2556&r2=2557&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
Wed Jun 11 08:43:52 2008
@@ -30,7 +30,6 @@
local lfs = require("lfs")
local Applet = require("jive.Applet")
-local AppletManager = require("jive.AppletManager")
local Framework = require("jive.ui.Framework")
local RadioButton = require("jive.ui.RadioButton")
local RadioGroup = require("jive.ui.RadioGroup")
@@ -121,7 +120,7 @@
local _playerName = false
if not self.player then
- self.player = AppletManager:callService("getCurrentPlayer")
+ self.player = appletManager:callService("getCurrentPlayer")
end
if self.player then
@@ -207,7 +206,7 @@
if self.player then
server = self.player:getSlimServer()
else
- for _, s in AppletManager:callService("iterateSqueezeCenters")
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=2557&root=Jive&r1=2556&r2=2557&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
Wed Jun 11 08:43:52 2008
@@ -27,7 +27,6 @@
local string = require("string")
local Applet = require("jive.Applet")
-local AppletManager = require("jive.AppletManager")
local Player = require("jive.slim.Player")
local SlimServer = require("jive.slim.SlimServer")
local Framework = require("jive.ui.Framework")
@@ -253,12 +252,12 @@
-- _getTimeFormat
-- loads SetupDateTime and returns current setting for date time format
local function _getTimeFormat()
- local SetupDateTime = AppletManager:loadApplet("SetupDateTime")
+ local SetupDateTime = appletManager:loadApplet("SetupDateTime")
local format = '12'
if SetupDateTime and SetupDateTime:getSettings()['hours'] then
format = SetupDateTime:getSettings()['hours']
end
- AppletManager:freeApplet("SetupDateTime")
+ appletManager:freeApplet("SetupDateTime")
return format
end
@@ -519,7 +518,7 @@
if evtCode == KEY_BACK then
-- disconnect from player and go home
- AppletManager:callService("setCurrentPlayer",
nil)
+ appletManager:callService("setCurrentPlayer",
nil)
popup:hide()
end
-- other keys are disabled when this popup is on screen
@@ -558,7 +557,7 @@
if evtCode == KEY_BACK and type == EVENT_KEY_HOLD then
-- disconnect from player and go home
- AppletManager:callService("setCurrentPlayer",
nil)
+ appletManager:callService("setCurrentPlayer",
nil)
window:hide()
end
-- other keys are disabled when this window is on screen
@@ -602,7 +601,7 @@
if evtCode == KEY_BACK then
-- disconnect from player and go home
- AppletManager:callService("setCurrentPlayer",
nil)
+ appletManager:callService("setCurrentPlayer",
nil)
popup:hide()
end
-- other keys are disabled when this popup is on screen
@@ -702,7 +701,7 @@
transition = Window.transitionPushRight
end
Framework:playSound("WINDOWSHOW")
- local NowPlaying = AppletManager:loadApplet("NowPlaying")
+ local NowPlaying = appletManager:loadApplet("NowPlaying")
NowPlaying:openScreensaver('browse', transition)
end
@@ -2300,7 +2299,7 @@
text = self:string("SLIMBROWSER_TRY_AGAIN"),
callback = function()
server:connect()
-
AppletManager:callService("setCurrentPlayer", player)
+
appletManager:callService("setCurrentPlayer", player)
end,
})
@@ -2309,7 +2308,7 @@
menu:addItem({
text = self:string("SLIMBROWSER_ENTER_PASSWORD"),
callback = function()
- local auth =
AppletManager:loadApplet("HttpAuth")
+ local auth =
appletManager:loadApplet("HttpAuth")
auth:squeezeCenterPassword(server)
end,
})
@@ -2320,7 +2319,7 @@
menu:addItem({
text =
self:string("SLIMBROWSER_CHOOSE_MUSIC_SOURCE"),
callback = function()
-
AppletManager:callService("setCurrentPlayer", nil)
+
appletManager:callService("setCurrentPlayer", nil)
local setupSqueezebox =
appletManager:loadApplet("SetupSqueezebox")
setupSqueezebox:startSqueezeboxSetup(player:getMacAddress(), nil)
@@ -2334,7 +2333,7 @@
menu:addItem({
text =
self:string("SLIMBROWSER_CHOOSE_PLAYER"),
callback = function()
-
AppletManager:callService("setCurrentPlayer", nil)
+
appletManager:callService("setCurrentPlayer", nil)
local selectPlayer =
appletManager:loadApplet("SelectPlayer")
selectPlayer:setupShow()
Modified:
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SqueezeDiscovery/SqueezeDiscoveryApplet.lua
URL:
http://svn.slimdevices.com/7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SqueezeDiscovery/SqueezeDiscoveryApplet.lua?rev=2557&root=Jive&r1=2556&r2=2557&view=diff
==============================================================================
---
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SqueezeDiscovery/SqueezeDiscoveryApplet.lua
(original)
+++
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SqueezeDiscovery/SqueezeDiscoveryApplet.lua
Wed Jun 11 08:43:52 2008
@@ -10,7 +10,7 @@
connected: we are connected to a player, only a connection to our
SC (or SN) is maintained. udp scanning is still performed in the
- background to update the SqueezeCentre list.
+ background to update the SqueezeCenter list.
probing: we are connected to a player, but we must probe all SC/SN
update our internal state. this is used for example in the choose
@@ -50,13 +50,13 @@
-- constants
-local PORT = 3483 -- port used to discover SqueezeCentres
-local DISCOVERY_TIMEOUT = 120000 -- timeout (in milliseconds) before removing
SqueezeCentres and Players
+local PORT = 3483 -- port used to discover SqueezeCenters
+local DISCOVERY_TIMEOUT = 120000 -- timeout (in milliseconds) before removing
SqueezeCenters and Players
local DISCOVERY_PERIOD = 10000 -- discovery period
--- a ltn12 source that crafts a datagram suitable to discover SqueezeCentres
+-- a ltn12 source that crafts a datagram suitable to discover SqueezeCenters
local function _slimDiscoverySource()
return table.concat {
"e",
-- new discovery packet
@@ -112,7 +112,7 @@
-- removes old servers
-local function _squeezeCentreCleanup(self)
+local function _squeezeCenterCleanup(self)
local now = Framework:getTicks()
local activeServer = self.currentPlayer and
self.currentPlayer:getSlimServer()
@@ -170,7 +170,7 @@
function _discover(self)
log:warn("#### DISCOVER")
- -- Broadcast SqueezeCentre discovery
+ -- Broadcast SqueezeCenter discovery
for i, address in pairs(self.poll) do
log:debug("sending to address ", address)
self.socket:send(_slimDiscoverySource, address, PORT)
@@ -183,7 +183,7 @@
end
-- Remove SqueezeCenters that have not been seen for a while
- _squeezeCentreCleanup(self)
+ _squeezeCenterCleanup(self)
if self.state == 'probing' and
@@ -280,7 +280,7 @@
end
--- restart discovery if the player is disconnect from SqueezeCentre
+-- restart discovery if the player is disconnect from SqueezeCenter
function notify_playerDelete(self, player)
log:info("playerDelete")
@@ -289,7 +289,7 @@
end
--- restart discovery if SqueezeCentre disconnects
+-- restart discovery if SqueezeCenter disconnects
function notify_serverDisconnected(self, slimserver)
log:info("serverDisconnected")
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=2557&root=Jive&r1=2556&r2=2557&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
Wed Jun 11 08:43:52 2008
@@ -94,7 +94,7 @@
-- disconnect from player on press and hold left
if type == EVENT_KEY_HOLD then
- AppletManager:callService("setCurrentPlayer", nil)
+ appletManager:callService("setCurrentPlayer", nil)
end
local windowStack = Framework.windowStack
Modified:
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/jive/slim/SlimServer.lua
URL:
http://svn.slimdevices.com/7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/jive/slim/SlimServer.lua?rev=2557&root=Jive&r1=2556&r2=2557&view=diff
==============================================================================
---
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/jive/slim/SlimServer.lua
(original)
+++
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/jive/slim/SlimServer.lua
Wed Jun 11 08:43:52 2008
@@ -74,7 +74,7 @@
local credentials = {}
--- class function to iterate over all SqueezeCentres
+-- class function to iterate over all SqueezeCenters
function iterate(class)
return pairs(servers)
end
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=2557&root=Jive&r1=2556&r2=2557&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
Wed Jun 11 08:43:52 2008
@@ -44,7 +44,7 @@
text = self:string("QUIT"),
callback = function()
-- disconnect from Player/SqueezeCenter
- AppletManager:callService("disconnectPlayer")
+ 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=2557&root=Jive&r1=2556&r2=2557&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
Wed Jun 11 08:43:52 2008
@@ -51,7 +51,7 @@
function _factoryReset(self)
-- disconnect from Player/SqueezeCenter
- AppletManager:callService("disconnectPlayer")
+ 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=2557&root=Jive&r1=2556&r2=2557&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
Wed Jun 11 08:43:52 2008
@@ -295,7 +295,7 @@
-- disconnect from SqueezeCenter, we don't want to up
-- interrupted during the firmware upgrade.
- AppletManager:callService("disconnectPlayer")
+ appletManager:callService("disconnectPlayer")
-- start the upgrade
self.upgrade = Upgrade(self.url)
@@ -312,7 +312,7 @@
self.upgradeListener = nil
-- reconnect to server
- AppletManager:callService("connectPlayer")
+ 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=2557&root=Jive&r1=2556&r2=2557&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
Wed Jun 11 08:43:52 2008
@@ -22,7 +22,6 @@
local oo = require("loop.simple")
local Applet = require("jive.Applet")
-local AppletManager = require("jive.AppletManager")
local RadioGroup = require("jive.ui.RadioGroup")
local RadioButton = require("jive.ui.RadioButton")
local Framework = require("jive.ui.Framework")
@@ -205,7 +204,7 @@
log:info("step7")
-- skip this step if a player has been selected
- if AppletManager:callService("getCurrentPlayer") 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=2557&root=Jive&r1=2556&r2=2557&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
Wed Jun 11 08:43:52 2008
@@ -821,7 +821,7 @@
function settingsSleep(self)
-- disconnect from SqueezeCenter
- AppletManager:callService("disconnectPlayer")
+ appletManager:callService("disconnectPlayer")
self.popup = Popup("popupIcon")
@@ -848,7 +848,7 @@
function settingsPowerOff(self)
-- disconnect from SqueezeCenter
- AppletManager:callService("disconnectPlayer")
+ appletManager:callService("disconnectPlayer")
local popup = Popup("popupIcon")
@@ -1052,10 +1052,10 @@
-- disconnect from all Players/SqueezeCenters
local connected
repeat
- AppletManager:callService("disconnectPlayer")
+ appletManager:callService("disconnectPlayer")
connected = false
- for i,server in
AppletManager:callService("iterateSqueezeCenters") do
+ for i,server in
appletManager:callService("iterateSqueezeCenters") do
connected = connected or server:isConnected()
log:info("server=", server:getName(), " connected=",
connected)
end
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
