Author: titmuss
Date: Mon Apr 21 03:59:35 2008
New Revision: 2298
URL: http://svn.slimdevices.com?rev=2298&root=Jive&view=rev
Log:
[EMAIL PROTECTED] (orig r2296): titmuss | 2008-04-21 11:34:46 +0100
Bug: N/A
Description:
Remove debug.
[EMAIL PROTECTED] (orig r2297): titmuss | 2008-04-21 11:53:04 +0100
Bug: 7862
Description:
Fix "Music Source" menu to connect a receiver to SqueezeNetwork after your
SqueezeCenter has been turned off. This is a temporary work around for 7.0.1.
Modified:
7.1/trunk/ (props changed)
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua
7.1/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
Propchange: 7.1/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Mon Apr 21 03:59:35 2008
@@ -1,4 +1,4 @@
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.0/trunk:2287
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.0/trunk:2297
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.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=2298&root=Jive&r1=2297&r2=2298&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
Mon Apr 21 03:59:35 2008
@@ -72,6 +72,18 @@
if not self.sdApplet then
return window:tieAndShowWindow()
end
+
+
+ -- Bug 7862
+ -- Workaround to allow changing music source using udap until
+ -- refactoring for bug 6683
+ local current = self.sdApplet:getCurrentPlayer()
+ if current and not current:isConnected() and current:canUdap() and
appletManager:hasApplet("SetupSqueezebox") then
+ local setupSqueezebox =
appletManager:loadApplet("SetupSqueezebox")
+ setupSqueezebox:startSqueezeboxSetup(current:getMacAddress(),
nil)
+ return
+ end
+
self.serverMenu = menu
self.serverList = {}
Modified: 7.1/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua?rev=2298&root=Jive&r1=2297&r2=2298&view=diff
==============================================================================
--- 7.1/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua (original)
+++ 7.1/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua Mon Apr 21
03:59:35 2008
@@ -750,7 +750,7 @@
-- update our cache in one go
self.state = event.data
-debug.dump(event.data, -1)
+
-- used for calculating getTrackElapsed(), getTrackRemaining()
self.trackSeen = Framework:getTicks() / 1000
self.trackCorrection = 0
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
