Author: titmuss
Date: Mon Jun 16 14:14:03 2008
New Revision: 2570
URL: http://svn.slimdevices.com?rev=2570&root=Jive&view=rev
Log:
Bug: 2569
Description:
Clean up access to Player and Server objects. This is just the ack'able
instances, some days
i wish lua was strongly typed but not often :).
Modified:
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/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/SetupAppletInstaller/SetupAppletInstallerMeta.lua
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SetupNetTest/SetupNetTestApplet.lua
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SetupNetTest/SetupNetTestMeta.lua
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SetupSoundEffects/SetupSoundEffectsApplet.lua
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SetupWallpaper/SetupWallpaperApplet.lua
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SqueezeNetworkPIN/SqueezeNetworkPINApplet.lua
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/jive/slim/SlimServer.lua
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay_jive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeMeta.lua
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay_jive/specialProjects/sbcPosSlideshow/SqueezeboxJiveApplet.lua
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=2570&root=Jive&r1=2569&r2=2570&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
Mon Jun 16 14:14:03 2008
@@ -71,7 +71,7 @@
-- request for items
function request(self, index, start, window, widget, list, prevmenu, locked)
- self.server.comet:request(
+ self.server:request(
function(chunk, err)
if err then
log:debug(err)
@@ -79,7 +79,7 @@
self:response(chunk.data, window, widget, list,
prevmenu, locked)
end
end,
- self.player and self.player.id,
+ self.player and self.player:getId(),
{ 'infobrowser', 'items', start, gulp, index and ("item_id:" ..
index) }
)
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=2570&root=Jive&r1=2569&r2=2570&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
Mon Jun 16 14:14:03 2008
@@ -258,7 +258,7 @@
self.player = appletManager:callService("getCurrentPlayer")
end
- if player.id ~= self.player:getId() then
+ if player:getId() ~= self.player:getId() then
log:warn("notification was not for this player")
log:warn("notification: ", player:getId(), "your player: ",
self.player:getId())
return false
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=2570&root=Jive&r1=2569&r2=2570&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
Mon Jun 16 14:14:03 2008
@@ -71,7 +71,7 @@
function notify_playerDelete(self, player)
- local mac = player.id
+ local mac = player:getId()
manageSelectPlayerMenu(self)
@@ -90,7 +90,7 @@
function notify_playerNew(self, player)
-- get number of players. if number of players is > 1, add menu item
- local mac = player.id
+ local mac = player:getId()
manageSelectPlayerMenu(self)
@@ -182,7 +182,7 @@
return
end
- playerName = self:string("SQUEEZEBOX_ACTIVATE", player.name)
+ playerName = self:string("SQUEEZEBOX_ACTIVATE",
player:getName())
playerWeight = ACTIVATE_WEIGHT
end
@@ -215,7 +215,7 @@
function _refreshPlayerItem(self, player)
- local mac = player.id
+ local mac = player:getId()
-- XXXX
if player:isAvailable() then
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=2570&root=Jive&r1=2569&r2=2570&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
Mon Jun 16 14:14:03 2008
@@ -76,7 +76,7 @@
-- ask about its applets
if self.server then
- self.server.comet:request(
+ self.server:request(
function(chunk, err)
if err then
log:debug(err)
Modified:
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SetupAppletInstaller/SetupAppletInstallerMeta.lua
URL:
http://svn.slimdevices.com/7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SetupAppletInstaller/SetupAppletInstallerMeta.lua?rev=2570&root=Jive&r1=2569&r2=2570&view=diff
==============================================================================
---
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SetupAppletInstaller/SetupAppletInstallerMeta.lua
(original)
+++
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SetupAppletInstaller/SetupAppletInstallerMeta.lua
Mon Jun 16 14:14:03 2008
@@ -43,7 +43,7 @@
end
function notify_playerCurrent(self, player)
- if player == nil or player.slimServer:isSqueezeNetwork() then
+ if player == nil or player:getSlimServer():isSqueezeNetwork() then
jiveMain:removeItem(self.menu)
else
jiveMain:addItem(self.menu)
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=2570&root=Jive&r1=2569&r2=2570&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
Mon Jun 16 14:14:03 2008
@@ -94,7 +94,7 @@
self.window:addWidget(Label("graphaxis", "0
100 %"))
- self.window:addWidget(Textarea("help",
tostring(self:string('SETUPNETTEST_TESTINGTO')) .. ' ' .. self.player.name ..
"\n" .. tostring(self:string('SETUPNETTEST_INFO'))))
+ self.window:addWidget(Textarea("help",
tostring(self:string('SETUPNETTEST_TESTINGTO')) .. ' ' .. self.player:getName()
.. "\n" .. tostring(self:string('SETUPNETTEST_INFO'))))
self.window:setAllowScreensaver(false)
@@ -166,7 +166,7 @@
-- request status
function requestStatus(self, sink)
- self.server.comet:request(
+ self.server:request(
function(chunk, err)
if err then
log:debug(err)
@@ -174,7 +174,7 @@
sink(self, chunk.data)
end
end,
- self.player.id,
+ self.player:getId(),
{ 'nettest', self.rates and nil or 'rates' }
)
end
@@ -212,14 +212,14 @@
function startTest(self, rate)
- self.server.comet:request(nil, self.player.id, { 'nettest', 'start',
rate })
+ self.server:request(nil, self.player:getId(), { 'nettest', 'start',
rate })
self.timer.callback()
self.timer:restart()
end
function stopTest(self)
- self.server.comet:request(nil, self.player.id, { 'nettest', 'stop' })
+ self.server:request(nil, self.player:getId(), { 'nettest', 'stop' })
end
Modified:
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SetupNetTest/SetupNetTestMeta.lua
URL:
http://svn.slimdevices.com/7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SetupNetTest/SetupNetTestMeta.lua?rev=2570&root=Jive&r1=2569&r2=2570&view=diff
==============================================================================
---
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SetupNetTest/SetupNetTestMeta.lua
(original)
+++
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SetupNetTest/SetupNetTestMeta.lua
Mon Jun 16 14:14:03 2008
@@ -34,7 +34,7 @@
function notify_playerCurrent(meta, player)
- if player == nil or player.slimServer:isSqueezeNetwork() then
+ if player == nil or player:getSlimServer():isSqueezeNetwork() then
jiveMain:removeItem(meta.menu)
else
jiveMain:addItem(meta.menu)
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=2570&root=Jive&r1=2569&r2=2570&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
Mon Jun 16 14:14:03 2008
@@ -208,7 +208,7 @@
-- look for any server based sounds
if self.server then
log:info("found server - requesting sounds list")
- self.server.comet:request(
+ self.server:request(
function(chunk, err)
if err then
log:debug(err)
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=2570&root=Jive&r1=2569&r2=2570&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
Mon Jun 16 14:14:03 2008
@@ -174,7 +174,7 @@
-- look for any server based wallpapers
if self.server then
log:info("found server - requesting wallpapers list")
- self.server.comet:request(
+ self.server:request(
function(chunk, err)
if err then
log:debug(err)
Modified:
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SqueezeNetworkPIN/SqueezeNetworkPINApplet.lua
URL:
http://svn.slimdevices.com/7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SqueezeNetworkPIN/SqueezeNetworkPINApplet.lua?rev=2570&root=Jive&r1=2569&r2=2570&view=diff
==============================================================================
---
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SqueezeNetworkPIN/SqueezeNetworkPINApplet.lua
(original)
+++
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SqueezeNetworkPIN/SqueezeNetworkPINApplet.lua
Mon Jun 16 14:14:03 2008
@@ -124,9 +124,9 @@
end
-- make sure the server is connected
- server.comet:connect()
+ server:connect()
- server.comet:request( checkLinkedSink, nil, cmd )
+ server:request( checkLinkedSink, nil, cmd )
end
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=2570&root=Jive&r1=2569&r2=2570&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
Mon Jun 16 14:14:03 2008
@@ -527,8 +527,8 @@
end
for id, player in pairs(self.players) do
- if player.pin == pin then
- player.pin = nil
+ if player:getPin() == pin then
+ player:getPin() = nil
end
end
end
Modified:
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay_jive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeMeta.lua
URL:
http://svn.slimdevices.com/7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay_jive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeMeta.lua?rev=2570&root=Jive&r1=2569&r2=2570&view=diff
==============================================================================
---
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay_jive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeMeta.lua
(original)
+++
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay_jive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeMeta.lua
Mon Jun 16 14:14:03 2008
@@ -43,7 +43,7 @@
end
if meta.player and meta.player ~= player then
- meta.player:unsubscribe('/slim/firmwarestatus/' ..
meta.player.id)
+ meta.player:unsubscribe('/slim/firmwarestatus/' ..
meta.player:getId())
end
meta.player = player
@@ -63,7 +63,7 @@
-- store firmware upgrade url
-- Bug 6828, use a relative URL from SC to handle
dual-homed servers
if chunk.data.relativeFirmwareUrl then
- local ip, port =
meta.player.slimServer:getIpPort()
+ local ip, port =
meta.player:getSlimServer():getIpPort()
upgradeUrl[1] = 'http://' .. ip .. ':' .. port
.. chunk.data.relativeFirmwareUrl
log:info("Relative Firmware URL=",
upgradeUrl[1])
elseif chunk.data.firmwareUrl then
@@ -77,16 +77,16 @@
local applet =
appletManager:loadApplet("SetupFirmwareUpgrade")
applet:forceUpgrade(tonumber(chunk.data.firmwareOptional) == 1, upgradeUrl[1],
chunk.data.firmwareHelp)
- meta.player:unsubscribe('/slim/firmwarestatus/'
.. meta.player.id)
+ meta.player:unsubscribe('/slim/firmwarestatus/'
.. meta.player:getId())
end
end
local fwcmd = { 'firmwareupgrade', 'firmwareVersion:' .. JIVE_VERSION,
'subscribe:0' }
player:subscribe(
- '/slim/firmwarestatus/' .. player.id,
+ '/slim/firmwarestatus/' .. player:getId(),
firmwareUpgradeSink,
- player.id,
+ player:getId(),
fwcmd
)
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=2570&root=Jive&r1=2569&r2=2570&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
Mon Jun 16 14:14:03 2008
@@ -287,7 +287,7 @@
self:setDate(chunk.data.date)
end
- self.server.comet:request(sink,
+ self.server:request(sink,
player:getId(),
{ 'date' }
)
@@ -296,7 +296,7 @@
self.clockTimer = Timer(6000000, -- 1 hour
function()
if self.player and self.server then
- self.server.comet:request(sink,
+ self.server:request(sink,
self.player:getId(),
{ 'date' }
)
Modified:
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay_jive/specialProjects/sbcPosSlideshow/SqueezeboxJiveApplet.lua
URL:
http://svn.slimdevices.com/7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay_jive/specialProjects/sbcPosSlideshow/SqueezeboxJiveApplet.lua?rev=2570&root=Jive&r1=2569&r2=2570&view=diff
==============================================================================
---
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay_jive/specialProjects/sbcPosSlideshow/SqueezeboxJiveApplet.lua
(original)
+++
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay_jive/specialProjects/sbcPosSlideshow/SqueezeboxJiveApplet.lua
Mon Jun 16 14:14:03 2008
@@ -267,7 +267,7 @@
end
if player then
- player.slimServer.comet:request(sink,
+ player:getSlimServer().comet:request(sink,
player:getId(),
{ 'date' }
)
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
