Author: titmuss
Date: Thu Jan 24 03:28:40 2008
New Revision: 1597
URL: http://svn.slimdevices.com?rev=1597&root=Jive&view=rev
Log:
[EMAIL PROTECTED] (orig r1590): bklaas | 2008-01-23 21:16:55 +0000
Bug: 6138
Description: remove notify_playerPower which is no longer needed
wipe _playerMenus table after removing items from jiveMain in free
Modified:
trunk/ (props changed)
trunk/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua
Propchange: trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Thu Jan 24 03:28:40 2008
@@ -1,3 +1,3 @@
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1589
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1590
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified:
trunk/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua?rev=1597&root=Jive&r1=1596&r2=1597&view=diff
==============================================================================
--- trunk/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua
(original)
+++ trunk/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua Thu
Jan 24 03:28:40 2008
@@ -799,7 +799,7 @@
local function _statusSink(step, chunk, err)
log:debug("_statusSink()")
- -- currently we're not going anywhere with Now Playing...
+ -- currently we're not going anywhere with current playlist...
_assert(step == _statusStep)
local data = chunk.data
@@ -823,7 +823,7 @@
-- if we have a data.item_loop[1].text == 'READ ME',
-- we've hit the SC upgrade message and shouldn't be dropping
it into NOW PLAYING
if data.item_loop and data.item_loop[1].text == 'READ ME' then
- log:debug('This is not a message suitable for the Now
Playing list')
+ log:debug('This is not a message suitable for the
current playlist')
return
end
@@ -1648,7 +1648,6 @@
end
-
function notify_playerModeChange(self, player, mode)
if _player ~= player then
return
@@ -1696,19 +1695,6 @@
end
--- notify_playerPower
--- we refresh the main menu after playerPower changes
-function notify_playerPower(self, player, power)
- log:debug("SlimBrowserApplet:notify_playerPower(", player, ")")
- -- only if this concerns our player
- if _player == player then
- -- refresh the main menu
- for id, v in pairs(_playerMenus) do
- jiveMain:addItem(v)
- end
- end
-end
-
-- notify_playerNewName
-- this is called when the player name changes
-- we update our main window title
@@ -1789,7 +1775,7 @@
cmd
)
- -- create a window for Now Playing, this is our _statusStep
+ -- create a window for the current playlist, this is our _statusStep
local step, sink = _newDestination(
nil,
nil,
@@ -1822,6 +1808,7 @@
_installPlayerKeyHandler(self)
end
+
function notify_serverConnected(self, server)
if _server ~= server then
return
@@ -1936,6 +1923,7 @@
for id, v in pairs(_playerMenus) do
jiveMain:removeItem(v)
end
+ _playerMenus = {}
_player = false
_server = false
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
