Author: titmuss
Date: Tue Dec 9 12:37:01 2008
New Revision: 3478
URL: http://svn.slimdevices.com?rev=3478&root=Jive&view=rev
Log:
[EMAIL PROTECTED] (orig r3474): tom | 2008-12-02 20:43:15 +0000
Bug: 10196
Description:
- squeezeplay can now connect to password protected servers.
[EMAIL PROTECTED] (orig r3475): tom | 2008-12-02 20:48:00 +0000
Bug: 10196
Description:
- squeezeplay can now connect to password protected servers. - slight cleanup
[EMAIL PROTECTED] (orig r3476): bklaas | 2008-12-04 00:50:58 +0000
Bug: 10209
Description: add SB3 to DEVICE_ID table so canConnectToServer() returns true
for SB3 & SN
Modified:
7.4/trunk/ (props changed)
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua
7.4/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
Propchange: 7.4/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Tue Dec 9 12:37:01 2008
@@ -2,7 +2,7 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/branches/discovery-refactor:2596
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/trunk:2920
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.2/trunk:2921
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:3464
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:3476
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.4/trunk/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua?rev=3478&root=Jive&r1=3477&r2=3478&view=diff
==============================================================================
---
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua
(original)
+++
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua
Tue Dec 9 12:37:01 2008
@@ -162,9 +162,13 @@
if server and currentPlayer and currentPlayer:canConnectToServer() then
log:debug("\tadd menu item with callback")
local f = function()
- self:connectPlayer(currentPlayer, server)
- end
-
+ if server:isPasswordProtected() then
+ appletManager:callService("squeezeCenterPassword",
server)
+ else
+ self:connectPlayer(currentPlayer, server)
+ end
+ end
+
item = {
text = server:getName(),
sound = "WINDOWSHOW",
Modified: 7.4/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua?rev=3478&root=Jive&r1=3477&r2=3478&view=diff
==============================================================================
--- 7.4/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua (original)
+++ 7.4/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua Tue Dec 9
12:37:01 2008
@@ -97,6 +97,7 @@
[ "squeezebox" ] = "ip2k",
[ "softsqueeze" ] = "softsqueeze",
[ "squeezebox2" ] = "ip3k",
+ [ "squeezebox3" ] = "ip3k",
[ "transporter" ] = "ip3k",
[ "softsqueeze3" ] = "softsqueeze",
[ "receiver" ] = "ip3k",
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
