Author: bklaas
Date: Wed Nov 19 11:26:34 2008
New Revision: 3407
URL: http://svn.slimdevices.com?rev=3407&root=Jive&view=rev
Log:
Bug: 10068
Description: add jive.slim.Player.isLocal method for determining if player
object represents a local player
fix a few instances in applets where that method could be used
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/SetupWelcome/SetupWelcomeApplet.lua
7.3/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
Modified: 7.3/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua?rev=3407&root=Jive&r1=3406&r2=3407&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua (original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua Wed Nov 19
11:26:34 2008
@@ -75,8 +75,9 @@
module(..., oo.class)
--- we must load this after the module declartion to dependancy loops
+-- we must load these after the module declartion to avoid dependancy loops
local SlimServer = require("jive.slim.SlimServer")
+local LocalPlayer = require("jive.slim.LocalPlayer")
local DEVICE_IDS = {
@@ -129,6 +130,15 @@
-- class method, returns the current player
function getCurrentPlayer(self)
return currentPlayer
+end
+
+-- class method, returns whether the player is local
+function isLocal(self)
+ if oo.instanceof(self, LocalPlayer) then
+ return true
+ end
+
+ return false
end
-- class method, sets the current player
Modified:
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/SetupWelcome/SetupWelcomeApplet.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/SetupWelcome/SetupWelcomeApplet.lua?rev=3407&root=Jive&r1=3406&r2=3407&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/SetupWelcome/SetupWelcomeApplet.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/SetupWelcome/SetupWelcomeApplet.lua
Wed Nov 19 11:26:34 2008
@@ -122,10 +122,10 @@
function step3(self)
for i, player in Player.iterate() do
- if oo.instanceof(player, LocalPlayer) then
- --auto select local player
- return appletManager:callService("selectPlayer", player)
- end
+ --auto select local player
+ if player:isLocal() then
+ return appletManager:callService("selectPlayer", player)
+ end
end
return appletManager:callService("setupShowSelectPlayer", function()
end, 'setuptitle')
end
Modified:
7.3/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua?rev=3407&root=Jive&r1=3406&r2=3407&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
Wed Nov 19 11:26:34 2008
@@ -263,7 +263,7 @@
function notify_playerCurrent(self, player)
-- track changes to the remote player selection for headphone jack
- if not oo.instanceof(player, LocalPlayer) then
+ if not player:isLocal() then
self.remotePlayer = player
end
@@ -375,7 +375,7 @@
if appletManager:hasService("iteratePlayers") then
for _, player in
appletManager:callService("iteratePlayers") do
- if oo.instanceof(player, LocalPlayer) then
+ if player:isLocal() then
localPlayer = player
break
end
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
