Author: titmuss
Date: Sun Jan 20 03:27:49 2008
New Revision: 1524
URL: http://svn.slimdevices.com?rev=1524&root=Jive&view=rev
Log:
Bug: 5467
Description:
Fix ui flow when using choose players to configure a 'blue' receiver.
The error case is not handled very well yet. I think the Squeezebox Setup,
Choose Music
Source and Choose Player ui should be reviewed and corrections made post 7.0.
Some
refactoring should be done to allow for better code reuse and error handling.
Modified:
trunk/jive/src/pkg/jive/share/applets/SelectPlayer/SelectPlayerApplet.lua
trunk/jive/src/pkg/jive/share/applets/SetupSqueezebox/SetupSqueezeboxApplet.lua
trunk/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua
trunk/jive/src/pkg/jive/share/jive/slim/Player.lua
trunk/jive/src/pkg/jive/share/jive/slim/SlimServers.lua
Modified:
trunk/jive/src/pkg/jive/share/applets/SelectPlayer/SelectPlayerApplet.lua
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive/share/applets/SelectPlayer/SelectPlayerApplet.lua?rev=1524&root=Jive&r1=1523&r2=1524&view=diff
==============================================================================
--- trunk/jive/src/pkg/jive/share/applets/SelectPlayer/SelectPlayerApplet.lua
(original)
+++ trunk/jive/src/pkg/jive/share/applets/SelectPlayer/SelectPlayerApplet.lua
Sun Jan 20 03:27:49 2008
@@ -161,7 +161,12 @@
return
end
- sbsetup:startSqueezeboxSetup(mac, nil,
self.setupNext)
+ -- setup squeezebox, this will set current
+ -- player on completion
+ sbsetup:startSqueezeboxSetup(mac, nil,
+ function()
+
jiveMain:closeToHome()
+ end)
end,
focusGained = function(event)
self:_showWallpaper(nil)
@@ -304,8 +309,6 @@
function selectPlayer(self, player)
- log:info("Selected player=", player)
-
local manager = AppletManager:getAppletInstance("SlimDiscovery")
if manager then
manager:setCurrentPlayer(player)
Modified:
trunk/jive/src/pkg/jive/share/applets/SetupSqueezebox/SetupSqueezeboxApplet.lua
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive/share/applets/SetupSqueezebox/SetupSqueezeboxApplet.lua?rev=1524&root=Jive&r1=1523&r2=1524&view=diff
==============================================================================
---
trunk/jive/src/pkg/jive/share/applets/SetupSqueezebox/SetupSqueezeboxApplet.lua
(original)
+++
trunk/jive/src/pkg/jive/share/applets/SetupSqueezebox/SetupSqueezeboxApplet.lua
Sun Jan 20 03:27:49 2008
@@ -71,8 +71,8 @@
function free(self)
- log:warn("## removing udap sink")
self.udap:removeSink(self.udapSink)
+ return true
end
@@ -281,6 +281,13 @@
if not self.topWindow then
-- remember the top window
self.topWindow = Framework.windowStack[1]
+ end
+
+ -- disconnect from current player, if any. after a successful setup
+ -- we will be connected to mac
+ local manager = AppletManager:getAppletInstance("SlimDiscovery")
+ if manager then
+ manager:setCurrentPlayer(player)
end
if adhoc then
@@ -1235,7 +1242,6 @@
function notify_playerNew(self, player)
local playerId = string.gsub(player:getId(), ":", "")
- log:info("got new playerId ", playerId)
if string.lower(playerId) == string.lower(self.mac) then
-- wait until the player is connected before continuing
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=1524&root=Jive&r1=1523&r2=1524&view=diff
==============================================================================
--- trunk/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua
(original)
+++ trunk/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua Sun
Jan 20 03:27:49 2008
@@ -1865,6 +1865,9 @@
AppletManager:freeApplet("SetupWallpaper")
end
+ -- clear any errors, we may have changed servers
+ iconbar:setServerError("OK")
+
-- nothing to do if we don't have a player
-- NOTE don't move this, the code above needs to run when disconnecting
-- for all players.
Modified: trunk/jive/src/pkg/jive/share/jive/slim/Player.lua
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive/share/jive/slim/Player.lua?rev=1524&root=Jive&r1=1523&r2=1524&view=diff
==============================================================================
--- trunk/jive/src/pkg/jive/share/jive/slim/Player.lua (original)
+++ trunk/jive/src/pkg/jive/share/jive/slim/Player.lua Sun Jan 20 03:27:49 2008
@@ -343,6 +343,7 @@
log:info(self, " delete for ", self.slimServer)
self.jnt:notify('playerDelete', self)
self:offStage()
+ self.slimServer = nil
-- The global players table uses weak values, it will be removed
-- when all references are freed.
Modified: trunk/jive/src/pkg/jive/share/jive/slim/SlimServers.lua
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive/share/jive/slim/SlimServers.lua?rev=1524&root=Jive&r1=1523&r2=1524&view=diff
==============================================================================
--- trunk/jive/src/pkg/jive/share/jive/slim/SlimServers.lua (original)
+++ trunk/jive/src/pkg/jive/share/jive/slim/SlimServers.lua Sun Jan 20 03:27:49
2008
@@ -349,6 +349,7 @@
return -- no change
end
+ log:info("selected player: ", player)
self.currentPlayer = player
self.jnt:notify("playerCurrent", player)
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
