Author: tom
Date: Tue Nov 18 13:49:31 2008
New Revision: 3403
URL: http://svn.slimdevices.com?rev=3403&root=Jive&view=rev
Log:
Bug: 9826
Description:
- desktop: local playback enabled by default
- desktop: local player auto-selected during setup
- desktop: local player appears at top of "Choose Player" list (bug 9952)
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/SelectPlayerApplet.lua
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/SelectPlayerMeta.lua
7.3/trunk/squeezeplay/src/squeezeplay/share/jive/ui/HomeMenu.lua
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/DesktopJive/DesktopJiveMeta.lua
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/SetupWelcome/SetupWelcomeApplet.lua
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/SetupWelcome/strings.txt
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/SelectPlayerApplet.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/SelectPlayerApplet.lua?rev=3403&root=Jive&r1=3402&r2=3403&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/SelectPlayerApplet.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/SelectPlayerApplet.lua
Tue Nov 18 13:49:31 2008
@@ -34,6 +34,7 @@
local Label = require("jive.ui.Label")
local Framework = require("jive.ui.Framework")
local Surface = require("jive.ui.Surface")
+local LocalPlayer = require("jive.slim.LocalPlayer")
local hasWireless, Wireless = pcall(require, "jive.net.Wireless")
@@ -50,7 +51,8 @@
oo.class(_M, Applet)
-local PLAYER_WEIGHT = 1
+local LOCAL_PLAYER_WEIGHT = 1
+local PLAYER_WEIGHT = 5
local SERVER_WEIGHT = 10
local ACTIVATE_WEIGHT = 20
@@ -192,6 +194,10 @@
playerModel = 'softsqueeze'
end
+ if oo.instanceof(player, LocalPlayer) then
+ playerWeight = LOCAL_PLAYER_WEIGHT
+ end
+
-- if waiting for a SN pin modify name
if player:getPin() then
if not self.setupMode then
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/SelectPlayerMeta.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/SelectPlayerMeta.lua?rev=3403&root=Jive&r1=3402&r2=3403&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/SelectPlayerMeta.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/SelectPlayerMeta.lua
Tue Nov 18 13:49:31 2008
@@ -39,6 +39,7 @@
function registerApplet(meta)
meta:registerService('setupShowSelectPlayer')
+ meta:registerService('selectPlayer')
-- SelectPlayer is a resident Applet, Applet loads all menus necessary
appletManager:loadApplet("SelectPlayer")
Modified: 7.3/trunk/squeezeplay/src/squeezeplay/share/jive/ui/HomeMenu.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/jive/ui/HomeMenu.lua?rev=3403&root=Jive&r1=3402&r2=3403&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay/share/jive/ui/HomeMenu.lua (original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay/share/jive/ui/HomeMenu.lua Tue Nov 18
13:49:31 2008
@@ -131,7 +131,7 @@
are not hidden.
--]]
-function closeToHome(self, hideAlwaysOnTop)
+function closeToHome(self, hideAlwaysOnTop, transition)
local stack = Framework.windowStack
local k = 1
@@ -142,7 +142,7 @@
if stack[i] == self.window then
for j = i - 1, k, -1 do
- stack[j]:hide()
+ stack[j]:hide(transition)
end
end
end
Modified:
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/DesktopJive/DesktopJiveMeta.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/DesktopJive/DesktopJiveMeta.lua?rev=3403&root=Jive&r1=3402&r2=3403&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/DesktopJive/DesktopJiveMeta.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/DesktopJive/DesktopJiveMeta.lua
Tue Nov 18 13:49:31 2008
@@ -79,6 +79,7 @@
jnt:setUUID(settings.uuid, settings.mac)
appletManager:addDefaultSetting("ScreenSavers", "whenStopped",
"false:false")
+ appletManager:addDefaultSetting("Playback", "enableAudio", 1)
jiveMain:setDefaultSkin("FullscreenSkin")
end
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=3403&root=Jive&r1=3402&r2=3403&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
Tue Nov 18 13:49:31 2008
@@ -31,11 +31,14 @@
local Surface = require("jive.ui.Surface")
local Textarea = require("jive.ui.Textarea")
local Window = require("jive.ui.Window")
+local Player = require("jive.slim.Player")
+local LocalPlayer = require("jive.slim.LocalPlayer")
local log = require("jive.utils.log").logger("applets.setup")
local locale = require("jive.utils.locale")
local table = require("jive.utils.table")
+local jnt = jnt
local appletManager = appletManager
local EVENT_KEY_PRESS = jive.ui.EVENT_KEY_PRESS
local EVENT_KEY_HOLD = jive.ui.EVENT_KEY_HOLD
@@ -56,6 +59,20 @@
module(...)
oo.class(_M, Applet)
+
+function init(self, ...)
+ jnt:subscribe(self)
+end
+
+function notify_playerCurrent(self, player)
+ if not self:getSettings().setupDone then
+ if player and not player:needsMusicSource() then
+ log:debug("notify_playerCurrent called with a source, so finishing
setup")
+ self:step4()
+ end
+ end
+end
+
function step1(self)
-- put Return to Setup menu item on jiveMain menu
@@ -104,16 +121,23 @@
end
function step3(self)
- return appletManager:callService("setupShowSelectPlayer", function()
self:step4() end, 'setuptitle')
+ for i, player in Player.iterate() do
+ if oo.instanceof(player, LocalPlayer) then
+ --auto select local player
+ return appletManager:callService("selectPlayer", player)
+ end
+ end
+ return appletManager:callService("setupShowSelectPlayer", function()
end, 'setuptitle')
end
function step4(self)
return self:setupDone(function()
- self._topWindow:hideToTop(Window.transitionPushLeft)
self:getSettings().setupDone = true
jiveMain:removeItemById('returnToSetup')
self:storeSettings()
+
+ jiveMain:closeToHome(true, Window.transitionPushLeft)
end)
end
Modified:
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/SetupWelcome/strings.txt
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/SetupWelcome/strings.txt?rev=3403&root=Jive&r1=3402&r2=3403&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/SetupWelcome/strings.txt
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/SetupWelcome/strings.txt
Tue Nov 18 13:49:31 2008
@@ -38,7 +38,7 @@
WELCOME_HELP
DA Tryk på midterknappen når du er klar til at gå videre.
DE Drücken Sie die mittlere Taste, wenn Sie so weit sind.
- EN Press the center button when you are ready to move on.
+ EN Press the right arrow key when you are ready to move on.
ES Pulse el botón central cuando esté listo para continuar.
FI Paina keskipainiketta, kun olet valmis jatkamaan.
FR Appuyez sur le bouton central pour continuer.
@@ -74,7 +74,7 @@
DONE_HELP
DA Nu kan du bruge Squeezebox Controller til at håndtere al din
musik. Tryk på midterknappen for at fortsætte.
DE Jetzt können Sie mit der Squeezebox Controller auf Ihre Musik
zugreifen. Drücken Sie zum Fortfahren die mittlere Taste.
- EN Now you can use your Squeezebox Controller to access all your
music. Press the center button to continue.
+ EN Now you can use SqueezePlay to access all your music. Press the
right arrow key to continue.
ES Ya puede usar Squeezebox Controller para acceder a toda su
música. Pulse el botón central para continuar.
FI Voit nyt ohjata kaikkia musiikkitiedostojasi
Squeezebox-kaukosäätimelläsi. Jatka painamalla keskipainiketta.
FR Vous pouvez maintenant accéder à votre musique avec la
Squeezebox Controller. Appuyez sur le bouton central pour continuer.
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
