Author: titmuss
Date: Mon Jun 16 08:42:21 2008
New Revision: 2568

URL: http://svn.slimdevices.com?rev=2568&root=Jive&view=rev
Log:
Bug: 6683
Description:
Fixed firmware upgrades.


Modified:
    
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay_jive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeMeta.lua

Modified: 
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay_jive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeMeta.lua
URL: 
http://svn.slimdevices.com/7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay_jive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeMeta.lua?rev=2568&root=Jive&r1=2567&r2=2568&view=diff
==============================================================================
--- 
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay_jive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeMeta.lua
 (original)
+++ 
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay_jive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeMeta.lua
 Mon Jun 16 08:42:21 2008
@@ -32,7 +32,22 @@
 
        -- check for firmware upgrades when we connect to a new player
        -- we don't want the firmware upgrade applets always loaded so
-       -- do this in a closure
+       -- do this in the meta class
+       jnt:subscribe(meta)
+end
+
+
+function notify_playerCurrent(meta, player)
+       if not player then
+               return
+       end
+
+       if meta.player and meta.player ~= player then
+               meta.player:unsubscribe('/slim/firmwarestatus/' .. 
meta.player.id)
+       end
+
+       meta.player = player
+       
        local firmwareUpgradeSink =
                function(chunk, err)
                        if err then
@@ -66,22 +81,6 @@
                        end
 
                end
-
-       jnt:subscribe(meta)
-
-end
-
-
-function notify_playerCurrent(meta, player)
-       if not player then
-               return
-       end
-
-       if meta.player and meta.player ~= player then
-               meta.player:unsubscribe('/slim/firmwarestatus/' .. 
meta.player.id)
-       end
-
-       meta.player = player
                                
        local fwcmd = { 'firmwareupgrade', 'firmwareVersion:' .. JIVE_VERSION, 
'subscribe:0' }
        player:subscribe(

_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins

Reply via email to