Author: titmuss
Date: Thu Nov 20 04:57:13 2008
New Revision: 3412
URL: http://svn.slimdevices.com?rev=3412&root=Jive&view=rev
Log:
Bug: 10073
Description:
Fixed squeezeplay audio playback to re-connect to a server when the ip address
changes.
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/jive/net/SlimProto.lua
7.3/trunk/squeezeplay/src/squeezeplay/share/jive/slim/LocalPlayer.lua
Modified: 7.3/trunk/squeezeplay/src/squeezeplay/share/jive/net/SlimProto.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/jive/net/SlimProto.lua?rev=3412&root=Jive&r1=3411&r2=3412&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay/share/jive/net/SlimProto.lua
(original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay/share/jive/net/SlimProto.lua Thu Nov
20 04:57:13 2008
@@ -371,7 +371,7 @@
-- Open the slimproto connection to SqueezeCenter.
-function connect(self, serverip)
+function connect(self, server)
local pump = function(NetworkThreadErr)
if NetworkThreadErr then
return _handleDisconnect(self, NetworkThreadErr)
@@ -431,10 +431,13 @@
self.reconnect = true
end
- if serverip then
- self.serverip = serverip
+ if server then
+ self.server = server
self.reconnect = false
end
+
+ -- the server may have moved, get a fresh ip address
+ self.serverip = server:getIpPort()
-- Bug 9900
-- Don't allow connections to SN yet
Modified: 7.3/trunk/squeezeplay/src/squeezeplay/share/jive/slim/LocalPlayer.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/jive/slim/LocalPlayer.lua?rev=3412&root=Jive&r1=3411&r2=3412&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay/share/jive/slim/LocalPlayer.lua
(original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay/share/jive/slim/LocalPlayer.lua Thu
Nov 20 04:57:13 2008
@@ -120,8 +120,7 @@
server:wakeOnLan()
if server then
- local serverip = server:getIpPort()
- self.slimproto:connect(serverip)
+ self.slimproto:connect(server)
end
end
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
