Author: bklaas
Date: Wed Mar 16 19:26:36 2011
New Revision: 9371
URL: http://svn.slimdevices.com/jive?rev=9371&view=rev
Log:
Move notify_firmwareAvailable() from meta to applet file, because is wasn't
firing from the meta file
Should be harmless, but I will test this a little further in the coming 24h
Modified:
7.6/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeApplet.lua
7.6/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeMeta.lua
Modified:
7.6/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeApplet.lua
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeApplet.lua?rev=9371&r1=9370&r2=9371&view=diff
==============================================================================
---
7.6/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeApplet.lua
(original)
+++
7.6/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeApplet.lua
Wed Mar 16 19:26:36 2011
@@ -63,6 +63,28 @@
oo.class(_M, Applet)
+function init(self)
+ jnt:subscribe(self)
+
+end
+
+
+function notify_firmwareAvailable(self, server)
+ local url, force = server:getUpgradeUrl()
+
+ if force and not url then
+ log:warn("sometimes force is true but url is nil, seems like a
server bug: server:", server)
+ end
+ if force and url then
+ local player = appletManager:callService("getCurrentPlayer")
+
+ if player and player:getSlimServer() == server then
+ self:firmwareUpgrade(server)
+ end
+ end
+end
+
+
function _firmwareVersion(self, url)
local machine = System:getMachine()
Modified:
7.6/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeMeta.lua
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeMeta.lua?rev=9371&r1=9370&r2=9371&view=diff
==============================================================================
---
7.6/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeMeta.lua
(original)
+++
7.6/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeMeta.lua
Wed Mar 16 19:26:36 2011
@@ -66,23 +66,6 @@
end
-function notify_firmwareAvailable(meta, server)
- local url, force = server:getUpgradeUrl()
-
-
- if force and not url then
- log:warn("sometimes force is true but url is nil, seems like a
server bug: server:", server)
- end
- if force and url then
- local player = appletManager:callService("getCurrentPlayer")
-
- if player and player:getSlimServer() == server then
- appletManager:callService("firmwareUpgrade",
player:getSlimServer())
- end
- end
-end
-
-
--[[
=head1 LICENSE
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
