Author: bklaas
Date: Wed Sep 17 11:38:19 2008
New Revision: 2920
URL: http://svn.slimdevices.com?rev=2920&root=Jive&view=rev
Log:
Bug: 9307
Description: fix problem caused by r2907 where server:getIpPort() was being
called in situations where server was nil
add a bunch of log:debug() flags for future use
Modified:
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua
Modified:
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua?rev=2920&root=Jive&r1=2919&r2=2920&view=diff
==============================================================================
---
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua
(original)
+++
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua
Wed Sep 17 11:38:19 2008
@@ -77,22 +77,27 @@
jnt:subscribe(self)
- -- Discover slimservers in this window
+ -- Discover players in this window
appletManager:callService("discoverPlayers")
window:addTimer(1000, function()
appletManager:callService("discoverPlayers") end)
- -- slimservers on the poll list
+ -- squeezecenter on the poll list
+ log:debug("*****Polled Server List:")
local poll = appletManager:callService("getPollList")
for address,_ in pairs(poll) do
+ log:debug('Found: ', address)
if address ~= "255.255.255.255" then
+ log:debug('Add to menu: ', address)
self:_addServerItem(nil, address)
end
end
- -- discovered slimservers
+ -- discovered squeezecenters
+ log:debug('*****Discovered Server List:')
for _,server in appletManager:callService("iterateSqueezeCenters") do
+ log:debug('discovered server: ', server)
self:_addServerItem(server)
end
@@ -124,9 +129,15 @@
function _addServerItem(self, server, address)
- log:debug("_addServerItem ", server, " " , port)
-
- local id = server:getIpPort() or address
+ log:debug("\t_addServerItem ", server, " " , address)
+
+ local id
+ if server then
+ id = server:getIpPort()
+ else
+ id = address
+ end
+ log:debug("\tid for this server set to: ", id)
-- remove existing entry
if self.serverList[id] then
@@ -141,6 +152,7 @@
-- new entry
local item
if server and currentPlayer and currentPlayer:canConnectToServer() then
+ log:debug("\tadd menu item with callback")
local f = function()
self:connectPlayer(currentPlayer, server)
end
@@ -153,6 +165,7 @@
weight = 1
}
else
+ log:debug("\tadd menu item without callback")
item = {
text = server and server:getName() or address,
weight = 1,
@@ -162,6 +175,7 @@
-- check current player
if currentPlayer and currentPlayer:getSlimServer() and server ==
currentPlayer:getSlimServer() then
+ log:debug("\tthis is the connected server, so remove callback
for this item")
item.style = 'checkedNoAction'
item.callback = nil
end
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
