Author: bklaas
Date: Tue Feb 8 10:26:29 2011
New Revision: 9307
URL: http://svn.slimdevices.com/jive?rev=9307&view=rev
Log:
r49200@DaddyMac (orig r9299): blblack | 2011-01-26 10:30:31 -0500
squeezeplay should obey SERV as a command to reconnect, even if already
connected to the same source
r49203@DaddyMac (orig r9302): agrundman | 2011-02-06 08:46:49 -0500
Bump version to 7.5.4
Modified:
7.6/trunk/ (props changed)
7.6/trunk/squeezeos/poky/meta-squeezeos/conf/distro/squeezeos.conf
7.6/trunk/squeezeplay/src/squeezeplay/share/jive/net/SlimProto.lua
Propchange: 7.6/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Tue Feb 8 10:26:29 2011
@@ -14,7 +14,7 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/private-branches/new-alsa:6567
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:8423
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.5/private-branches/7.5.3-rc:9282
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.5/trunk:9283
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.5/trunk:9302
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:2013
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified: 7.6/trunk/squeezeos/poky/meta-squeezeos/conf/distro/squeezeos.conf
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeos/poky/meta-squeezeos/conf/distro/squeezeos.conf?rev=9307&r1=9306&r2=9307&view=diff
==============================================================================
(empty)
Modified: 7.6/trunk/squeezeplay/src/squeezeplay/share/jive/net/SlimProto.lua
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay/share/jive/net/SlimProto.lua?rev=9307&r1=9306&r2=9307&view=diff
==============================================================================
--- 7.6/trunk/squeezeplay/src/squeezeplay/share/jive/net/SlimProto.lua
(original)
+++ 7.6/trunk/squeezeplay/src/squeezeplay/share/jive/net/SlimProto.lua Tue Feb
8 10:26:29 2011
@@ -553,11 +553,6 @@
self.txqueue = {}
end
- if self.state == CONNECTED and self.serverip == serverip then
- log:debug("already connected to ", self.serverip)
- return
- end
-
-- disconnect from previous server
self:disconnect()
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
