Author: titmuss
Date: Mon Feb 4 06:33:18 2008
New Revision: 1779
URL: http://svn.slimdevices.com?rev=1779&root=Jive&view=rev
Log:
[EMAIL PROTECTED] (orig r1773): titmuss | 2008-02-04 10:09:52 +0000
Bug: 6764
Description:
Fix entering the SN pin when upgrading from the MP firmware releases.
Modified:
trunk/ (props changed)
trunk/jive/src/pkg/jive/share/applets/SlimDiscovery/SlimDiscoveryMeta.lua
trunk/jive/src/pkg/jive/share/applets/SqueezeNetworkPIN/SqueezeNetworkPINMeta.lua
Propchange: trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Mon Feb 4 06:33:18 2008
@@ -1,3 +1,3 @@
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1770
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1773
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified:
trunk/jive/src/pkg/jive/share/applets/SlimDiscovery/SlimDiscoveryMeta.lua
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive/share/applets/SlimDiscovery/SlimDiscoveryMeta.lua?rev=1779&root=Jive&r1=1778&r2=1779&view=diff
==============================================================================
--- trunk/jive/src/pkg/jive/share/applets/SlimDiscovery/SlimDiscoveryMeta.lua
(original)
+++ trunk/jive/src/pkg/jive/share/applets/SlimDiscovery/SlimDiscoveryMeta.lua
Mon Feb 4 06:33:18 2008
@@ -15,12 +15,15 @@
=cut
--]]
-
local oo = require("loop.simple")
local AppletMeta = require("jive.AppletMeta")
+local debug = require("jive.utils.debug")
+local log = require("jive.utils.log").logger("applets.setup")
+
local appletManager = appletManager
+local jnt = jnt
module(...)
@@ -40,9 +43,47 @@
function registerApplet(self)
-
+ local settings = self:getSettings()
+
-- SlimDiscovery is a resident Applet
- appletManager:loadApplet("SlimDiscovery")
+ local slimDiscovery = appletManager:loadApplet("SlimDiscovery")
+
+ -- With the MP firmware when SqueezeNetwork is selected a dummy player
with an ff mac
+ -- address is selected, and then a firmware update starts. When this
mac address is seen
+ -- after the upgrade we need to push the choose player and
squeezenetwork pin menus
+ if settings.currentPlayer == "ff:ff:ff:ff:ff:ff" then
+ log:info("SqueezeNetwork dummy player found")
+
+ -- change to a non-existant player to prevent browser connecting
+ settings.currentPlayer = "ff:ff:ff:ff:ff:fe"
+
+ -- wait until SN is connected so we know the PIN
+ local monitor = {
+ notify_playerNew =
+ function(self, player)
+ if player:getId() ~=
"ff:ff:ff:ff:ff:ff" then
+ return
+ end
+
+ -- unsubscribe monitor from future
events
+ jnt:unsubscribe(self)
+
+ -- push Choose Player menu
+ local selectPlayer =
appletManager:loadApplet("SelectPlayer")
+ if selectPlayer then
+
selectPlayer:setupShow(function() end)
+ end
+
+ -- push Active Squeezenetwork
+ local snPin =
appletManager:loadApplet("SqueezeNetworkPIN")
+ if snPin then
+ snPin:forcePin(player)
+ end
+ end
+ }
+
+ jnt:subscribe(monitor)
+ end
end
Modified:
trunk/jive/src/pkg/jive/share/applets/SqueezeNetworkPIN/SqueezeNetworkPINMeta.lua
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive/share/applets/SqueezeNetworkPIN/SqueezeNetworkPINMeta.lua?rev=1779&root=Jive&r1=1778&r2=1779&view=diff
==============================================================================
---
trunk/jive/src/pkg/jive/share/applets/SqueezeNetworkPIN/SqueezeNetworkPINMeta.lua
(original)
+++
trunk/jive/src/pkg/jive/share/applets/SqueezeNetworkPIN/SqueezeNetworkPINMeta.lua
Mon Feb 4 06:33:18 2008
@@ -17,20 +17,7 @@
end
function registerApplet(meta)
- -- check for SN PIN when we connect to a new player
- local monitor = {
- notify_playerCurrent =
- function(self, player)
-
- if player and player:getPin() then
- log:debug("SqueezeNetworkPIN: player
has a PIN")
- local applet =
appletManager:loadApplet("SqueezeNetworkPIN")
- applet:forcePin(player)
- end
- end
- }
-
- jnt:subscribe(monitor)
+ -- do nothing
end
--[[
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
