Author: titmuss
Date: Tue Jan 29 09:57:49 2008
New Revision: 1676
URL: http://svn.slimdevices.com?rev=1676&root=Jive&view=rev
Log:
[EMAIL PROTECTED] (orig r1674): titmuss | 2008-01-29 17:52:51 +0000
Bug: N/A
Description:
Firmware upgrade fixes.
Minor fixes when switching between players.
Modified:
trunk/ (props changed)
trunk/jive/src/pkg/jive/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua
trunk/jive/src/pkg/jive/share/jive/slim/Player.lua
trunk/jive/src/pkg/jive/share/jive/slim/SlimServer.lua
trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeApplet.lua
trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeMeta.lua
Propchange: trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Tue Jan 29 09:57:49 2008
@@ -1,3 +1,3 @@
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1673
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1674
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified:
trunk/jive/src/pkg/jive/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua?rev=1676&root=Jive&r1=1675&r2=1676&view=diff
==============================================================================
---
trunk/jive/src/pkg/jive/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua
(original)
+++
trunk/jive/src/pkg/jive/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua
Tue Jan 29 09:57:49 2008
@@ -112,12 +112,16 @@
-- Store the applet settings when the window is closed
window:addListener(EVENT_WINDOW_POP,
function()
- jnt:unsubscribe(self)
self:storeSettings()
end
)
self:tieAndShowWindow(window)
+end
+
+
+function free(self)
+ jnt:unsubscribe(self)
end
@@ -222,6 +226,12 @@
function notify_playerNew(self, player)
+ log:warn("waitForConnect=", self.waitForConnect)
+ if self.waitForConnect then
+ log:warn(" server=", self.waitForConnect.server)
+ log:warn(" player=", self.waitForConnect.player)
+ end
+
if self.waitForConnect and self.waitForConnect.player == player
and self.waitForConnect.server == player:getSlimServer() then
Modified: trunk/jive/src/pkg/jive/share/jive/slim/Player.lua
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive/share/jive/slim/Player.lua?rev=1676&root=Jive&r1=1675&r2=1676&view=diff
==============================================================================
--- trunk/jive/src/pkg/jive/share/jive/slim/Player.lua (original)
+++ trunk/jive/src/pkg/jive/share/jive/slim/Player.lua Tue Jan 29 09:57:49 2008
@@ -283,6 +283,28 @@
end
end
+
+-- Subscribe to events for this player
+function subscribe(self, ...)
+ if not self.slimServer then
+ return
+ end
+
+ self.slimServer.comet:subscribe(...)
+end
+
+
+-- Unsubscribe to events for this player
+function unsubscribe(self, ...)
+ if not self.slimServer then
+ return
+ end
+
+ self.slimServer.comet:unsubscribe(...)
+end
+
+
+
--[[
=head2 jive.slim.Player:getTrackElapsed()
Modified: trunk/jive/src/pkg/jive/share/jive/slim/SlimServer.lua
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive/share/jive/slim/SlimServer.lua?rev=1676&root=Jive&r1=1675&r2=1676&view=diff
==============================================================================
--- trunk/jive/src/pkg/jive/share/jive/slim/SlimServer.lua (original)
+++ trunk/jive/src/pkg/jive/share/jive/slim/SlimServer.lua Tue Jan 29 09:57:49
2008
@@ -261,14 +261,14 @@
-- notify we're gone by caller in SlimServers
-- clear cache
- self.artworkThumbCache = nil
- self.artworkThumbIcons = nil
+ self.artworkThumbCache = {}
+ self.artworkThumbIcons = {}
-- delete players
for id, player in pairs(self.players) do
player:free(self)
end
- self.players = nil
+ self.players = {}
-- delete connections
if self.artworkPool then
Modified:
trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeApplet.lua
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeApplet.lua?rev=1676&root=Jive&r1=1675&r2=1676&view=diff
==============================================================================
---
trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeApplet.lua
(original)
+++
trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeApplet.lua
Tue Jan 29 09:57:49 2008
@@ -175,7 +175,7 @@
function _checkBattery()
if hasBSP then
- return BSP.ioctl(23) == 0 or bsp.ioctl(17) > 830
+ return BSP.ioctl(23) == 0 or BSP.ioctl(17) > 830
else
return true
end
Modified:
trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeMeta.lua
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeMeta.lua?rev=1676&root=Jive&r1=1675&r2=1676&view=diff
==============================================================================
---
trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeMeta.lua
(original)
+++
trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeMeta.lua
Tue Jan 29 09:57:49 2008
@@ -62,7 +62,7 @@
local applet =
appletManager:loadApplet("SetupFirmwareUpgrade")
applet:forceUpgrade(upgradeUrl[1])
-
meta.player.slimServer.comet:unsubscribe('/slim/firmwarestatus/' ..
meta.player.id)
+ meta.player:unsubscribe('/slim/firmwarestatus/'
.. meta.player.id)
end
end
@@ -75,13 +75,13 @@
end
if meta.player and meta.player ~= player then
-
meta.player.slimServer.comet:unsubscribe('/slim/firmwarestatus/' ..
meta.player.id)
+
meta.player:unsubscribe('/slim/firmwarestatus/' .. meta.player.id)
end
meta.player = player
-
+
local fwcmd = { 'firmwareupgrade',
'firmwareVersion:' .. JIVE_VERSION, 'subscribe:3600' }
- player.slimServer.comet:subscribe(
+ player:subscribe(
'/slim/firmwarestatus/' .. player.id,
firmwareUpgradeSink,
player.id,
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
