Author: titmuss
Date: Wed Jun 18 04:51:49 2008
New Revision: 2587
URL: http://svn.slimdevices.com?rev=2587&root=Jive&view=rev
Log:
Bug: 6683
Description:
When switching between servers multiple firmware update subscriptions were made.
SlimBrowser should use player:subscribe() for player subscriptions.
Modified:
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay_jive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeMeta.lua
Modified:
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
URL:
http://svn.slimdevices.com/7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua?rev=2587&root=Jive&r1=2586&r2=2587&view=diff
==============================================================================
---
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
(original)
+++
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
Wed Jun 18 04:51:49 2008
@@ -2149,7 +2149,7 @@
log:info('Subscribing to /slim/menustatus/', _playerId)
local cmd = { 'menustatus' }
- _server.comet:subscribe(
+ _player:subscribe(
'/slim/menustatus/' .. _playerId,
_menuSink(sink, cmd),
_playerId,
@@ -2363,8 +2363,8 @@
-- unsubscribe from this player's menustatus
log:info("Unsubscribe /slim/menustatus/", _player:getId())
- if _server and _player then
- _server.comet:unsubscribe('/slim/menustatus/' ..
_player:getId())
+ if _player then
+ _player:unsubscribe('/slim/menustatus/' .. _player:getId())
end
if _player then
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=2587&root=Jive&r1=2586&r2=2587&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
Wed Jun 18 04:51:49 2008
@@ -37,12 +37,22 @@
end
-function notify_playerCurrent(meta, player)
- if not player then
+function notify_playerDelete(meta, player)
+ if meta.player ~= player then
return
end
- if meta.player and meta.player ~= player then
+ meta.player:unsubscribe('/slim/firmwarestatus/' .. meta.player:getId())
+ meta.player = false
+end
+
+
+function notify_playerCurrent(meta, player)
+ if not player or meta.player == player then
+ return
+ end
+
+ if meta.player then
meta.player:unsubscribe('/slim/firmwarestatus/' ..
meta.player:getId())
end
@@ -81,7 +91,7 @@
end
end
-
+
local fwcmd = { 'firmwareupgrade', 'firmwareVersion:' .. JIVE_VERSION,
'subscribe:0' }
player:subscribe(
'/slim/firmwarestatus/' .. player:getId(),
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
