Author: bklaas
Date: Thu Nov 20 15:31:00 2008
New Revision: 3419

URL: http://svn.slimdevices.com?rev=3419&root=Jive&view=rev
Log:
Bug: 10093
Description: only install EVENT_WINDOW_ACTIVE window listener for browse window
set windowStyle to browse when that window becomes active

Modified:
    
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/NowPlaying/NowPlayingApplet.lua

Modified: 
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/NowPlaying/NowPlayingApplet.lua
URL: 
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/applets/NowPlaying/NowPlayingApplet.lua?rev=3419&root=Jive&r1=3418&r2=3419&view=diff
==============================================================================
--- 
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/NowPlaying/NowPlayingApplet.lua
 (original)
+++ 
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/NowPlaying/NowPlayingApplet.lua
 Thu Nov 20 15:31:00 2008
@@ -220,7 +220,6 @@
                return
        end
 
-       log:warn('you are here')
        self:freeAndClear()
 end
 
@@ -228,7 +227,6 @@
 function notify_playerCurrent(self, player)
 
        if self.player ~= player then
-       log:warn('you are here')
                self:freeAndClear()
        end
 
@@ -417,24 +415,19 @@
 
-----------------------------------------------------------------------------------------
 -- Settings
 --
-               
+
 function _installListeners(self, window)
 
-       window:addListener(
-               EVENT_WINDOW_ACTIVE,
-               function(event)
-                       local stack = Framework.windowStack
-                       if self['browse'] and self['browse'].window == stack[1] 
then
+       if windowStyle == 'browse' then
+               window:addListener(
+                       EVENT_WINDOW_ACTIVE,
+                       function(event)
                                windowStyle = 'browse'
-                       elseif self['ss'] and self['ss'].window == stack[1] then
-                               windowStyle = 'ss'
+                               self:_updateAll(self[windowStyle])
+                               return EVENT_UNUSED
                        end
-
-                       self:_updateAll(self[windowStyle])
-
-                       return EVENT_UNUSED
-               end
-       )
+               )
+       end
 
        local playlistSize = self.player and self.player:getPlaylistSize()
 
@@ -688,7 +681,6 @@
 end
 
 function setArtworkSize(self, size)
-       log:warn(size)
        self:getSettings()['screensaverArtworkSize'] = size
        self:storeSettings()
 end
@@ -733,7 +725,6 @@
        windowStyle = style
        if not self[windowStyle] then self[windowStyle] = {} end
 
-       log:debug("CREATING UI FOR NOWPLAYING")
        self[windowStyle].window = _createUI(self)
 
        self.player = appletManager:callService("getCurrentPlayer")

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

Reply via email to