Author: bklaas
Date: Mon Sep 8 11:19:00 2008
New Revision: 2911
URL: http://svn.slimdevices.com?rev=2911&root=Jive&view=rev
Log:
Bug: 7873, 9345
Description: port as many loadApplet() calls to new service API as possible
also,
fix OS X build issue with portaudio
choose player only appears on home menu when more than one player available
choose player is added back after disconnecting from single player network
choose music source now will not appear when not connected to a player
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/BlankScreen/BlankScreenMeta.lua
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceMeta.lua
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/Clock/ClockMeta.lua
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/Flickr/FlickrMeta.lua
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/NowPlaying/NowPlayingMeta.lua
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/ScreenSavers/ScreenSaversMeta.lua
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/SelectPlayerApplet.lua
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupLanguage/SetupLanguageMeta.lua
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupSoundEffects/SetupSoundEffectsApplet.lua
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupSoundEffects/SetupSoundEffectsMeta.lua
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupSqueezebox/SetupSqueezeboxApplet.lua
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupSqueezebox/SetupSqueezeboxMeta.lua
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SqueezeNetworkPIN/SqueezeNetworkPINMeta.lua
7.3/trunk/squeezeplay/src/squeezeplay/share/jive/ui/HomeMenu.lua
7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_portaudio.c
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/SetupWelcome/SetupWelcomeApplet.lua
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/SetupWelcome/SetupWelcomeMeta.lua
7.3/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeMeta.lua
7.3/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupWelcome/SetupWelcomeApplet.lua
7.3/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupWelcome/SetupWelcomeMeta.lua
7.3/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupWireless/SetupWirelessMeta.lua
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/BlankScreen/BlankScreenMeta.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/applets/BlankScreen/BlankScreenMeta.lua?rev=2911&root=Jive&r1=2910&r2=2911&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/BlankScreen/BlankScreenMeta.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/BlankScreen/BlankScreenMeta.lua
Mon Sep 8 11:19:00 2008
@@ -41,13 +41,12 @@
function registerApplet(self)
-- BlankScreen implements a screensaver
- local ssMgr = appletManager:loadApplet("ScreenSavers")
-
- if ssMgr ~= nil then
- ssMgr:addScreenSaver(
- self:string("SCREENSAVER_BLANKSCREEN"), "BlankScreen",
"openScreensaver", _, _, 100, "closeScreensaver"
- )
- end
+ appletManager:callService("addScreenSaver",
+ self:string("SCREENSAVER_BLANKSCREEN"),
+ "BlankScreen",
+ "openScreensaver", _, _, 100,
+ "closeScreensaver"
+ )
end
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua?rev=2911&root=Jive&r1=2910&r2=2911&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua
Mon Sep 8 11:19:00 2008
@@ -126,8 +126,7 @@
function _addServerItem(self, server, address)
log:debug("_addServerItem ", server, " " , port)
- local id = server or address
-
+ local id = server:getIpPort() or address
-- remove existing entry
if self.serverList[id] then
@@ -166,6 +165,7 @@
item.style = 'checkedNoAction'
item.callback = nil
elseif not currentPlayer or not currentPlayer:canConnectToServer() then
+ --elseif not currentPlayer then
return
end
@@ -268,12 +268,10 @@
function connectPlayer(self, player, server)
-- if connecting to SqueezeNetwork, first check jive is linked
if server:getPin() then
- local snpin = appletManager:loadApplet("SqueezeNetworkPIN")
- snpin:enterPin(server, nil,
+ appletManager:callService("enterPin", server, nil,
function()
self:connectPlayer(player, server)
end)
-
return
end
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceMeta.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceMeta.lua?rev=2911&root=Jive&r1=2910&r2=2911&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceMeta.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceMeta.lua
Mon Sep 8 11:19:00 2008
@@ -2,11 +2,11 @@
--[[
=head1 NAME
-applets.SlimServers.SlimServersMeta - SlimServers meta-info
+applets.ChooseMusicSource.ChooseMusicSourceMeta
=head1 DESCRIPTION
-See L<applets.SlimServers.SlimServersApplet>.
+See L<applets.ChooseMusicSource.ChooseMusicSourceApplet>.
=head1 FUNCTIONS
@@ -22,7 +22,18 @@
local appletManager = appletManager
local jiveMain = jiveMain
+local jnt = jnt
+local _player = false
+local menuItem = {
+ id = 'appletSlimservers',
+ node = 'settings',
+ text = self:string("SLIMSERVER_SERVERS"),
+ callback = function(applet, ...)
+ applet:settingsShow(...)
+ end,
+ weight = 60
+ }
module(...)
oo.class(_M, AppletMeta)
@@ -49,10 +60,28 @@
-- set the poll list for discovery of slimservers based on our settings
if appletManager:hasService("setPollList") then
appletManager:callService("setPollList",
meta:getSettings().poll)
- jiveMain:addItem(meta:menuItem('appletSlimservers', 'settings',
"SLIMSERVER_SERVERS", function(applet, ...) applet:settingsShow(...) end, 60))
+ jiveMain:addItem(menuItem)
+
+end
+
+ jnt:subscribe(meta)
+
+end
+
+function notify_playerCurrent(self, player)
+ if player == nil then
+ jiveMain:removeItemById('appletSlimservers')
+ else
+ jiveMain:addItem(menuItem)
+ end
+ _player = player
+end
+
+function notify_playerDelete(self, player)
+ if player == _player then
+ jiveMain:removeItemById('appletSlimservers')
end
end
-
--[[
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/Clock/ClockMeta.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/applets/Clock/ClockMeta.lua?rev=2911&root=Jive&r1=2910&r2=2911&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay/share/applets/Clock/ClockMeta.lua
(original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay/share/applets/Clock/ClockMeta.lua Mon
Sep 8 11:19:00 2008
@@ -24,27 +24,23 @@
function registerApplet(self)
- -- Bounce implements a screensaver
- local ssMgr = appletManager:loadApplet("ScreenSavers")
- if ssMgr ~= nil then
- ssMgr:addScreenSaver(
- self:string("SCREENSAVER_CLOCK_STYLE_ANALOG"),
- "Clock",
- "openAnalogClock", _, _, 20
- )
+ appletManager:callService("addScreenSaver",
+ self:string("SCREENSAVER_CLOCK_STYLE_ANALOG"),
+ "Clock",
+ "openAnalogClock", _, _, 20
+ )
- ssMgr:addScreenSaver(
- self:string("SCREENSAVER_CLOCK_STYLE_DIGITALSTYLED"),
- "Clock",
- "openStyledClock", _, _, 24
- )
+ appletManager:callService("addScreenSaver",
+ self:string("SCREENSAVER_CLOCK_STYLE_DIGITALSTYLED"),
+ "Clock",
+ "openStyledClock", _, _, 24
+ )
- ssMgr:addScreenSaver(
- self:string("SCREENSAVER_CLOCK_STYLE_DIGITALDETAILED"),
- "Clock",
- "openDetailedClock", _, _, 26
- )
- end
+ appletManager:callService("addScreenSaver",
+ self:string("SCREENSAVER_CLOCK_STYLE_DIGITALDETAILED"),
+ "Clock",
+ "openDetailedClock", _, _, 26
+ )
end
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/Flickr/FlickrMeta.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/applets/Flickr/FlickrMeta.lua?rev=2911&root=Jive&r1=2910&r2=2911&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay/share/applets/Flickr/FlickrMeta.lua
(original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay/share/applets/Flickr/FlickrMeta.lua
Mon Sep 8 11:19:00 2008
@@ -47,16 +47,11 @@
function registerApplet(self)
- -- Flickr implements a screensaver
- local ssMgr = appletManager:loadApplet("ScreenSavers")
-
- if ssMgr ~= nil then
- ssMgr:addScreenSaver(self:string("SCREENSAVER_FLICKR"),
"Flickr",
+ appletManager:callService("addScreenSaver",
self:string("SCREENSAVER_FLICKR"), "Flickr",
"openScreensaver", self:string("SCREENSAVER_FLICKR_SETTINGS"), "openSettings",
90)
- -- load our skin
- jiveMain:loadSkin("Flickr", "skin")
- end
+ -- load our skin
+ jiveMain:loadSkin("Flickr", "skin")
end
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/NowPlaying/NowPlayingMeta.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/applets/NowPlaying/NowPlayingMeta.lua?rev=2911&root=Jive&r1=2910&r2=2911&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/NowPlaying/NowPlayingMeta.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/NowPlaying/NowPlayingMeta.lua
Mon Sep 8 11:19:00 2008
@@ -24,17 +24,14 @@
self:registerService('goNowPlaying')
- local ssMgr = appletManager:loadApplet("ScreenSavers")
- if ssMgr ~= nil then
- ssMgr:addScreenSaver(
- self:string("SCREENSAVER_NOWPLAYING"),
- "NowPlaying",
- "openScreensaver",
- _, _,
- 10
- )
+ appletManager:callService("addScreenSaver",
+ self:string("SCREENSAVER_NOWPLAYING"),
+ "NowPlaying",
+ "openScreensaver",
+ _, _,
+ 10
+ )
- end
appletManager:loadApplet("NowPlaying")
end
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/ScreenSavers/ScreenSaversMeta.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/applets/ScreenSavers/ScreenSaversMeta.lua?rev=2911&root=Jive&r1=2910&r2=2911&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/ScreenSavers/ScreenSaversMeta.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/ScreenSavers/ScreenSaversMeta.lua
Mon Sep 8 11:19:00 2008
@@ -42,13 +42,12 @@
end
-function registerApplet(self)
+function registerApplet(meta)
- -- ScreenSaver is a resident Applet
- appletManager:loadApplet("ScreenSavers")
-
+ meta:registerService("addScreenSaver")
+
-- Menu for configuration
- jiveMain:addItem(self:menuItem('appletScreenSavers', 'screenSettings',
"SCREENSAVERS", function(applet, ...) applet:openSettings(...) end))
+ jiveMain:addItem(meta:menuItem('appletScreenSavers', 'screenSettings',
"SCREENSAVERS", function(applet, ...) applet:openSettings(...) end))
end
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=2911&root=Jive&r1=2910&r2=2911&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
Mon Sep 8 11:19:00 2008
@@ -102,10 +102,8 @@
function notify_playerCurrent(self, player)
- if self.playerMenu then
- self.selectedPlayer = player
- self:manageSelectPlayerMenu()
- end
+ self.selectedPlayer = player
+ self:manageSelectPlayerMenu()
end
@@ -142,10 +140,10 @@
function manageSelectPlayerMenu(self)
local _numberOfPlayers = appletManager:callService("countPlayers") or 0
+ local currentPlayer = appletManager:callService("getCurrentPlayer")
or nil
-- if _numberOfPlayers is > 1 and selectPlayerMenuItem doesn't exist,
create it
-
- if _numberOfPlayers > 1 or not self.selectedPlayer then
+ if _numberOfPlayers > 1 or not currentPlayer then
if not self.selectPlayerMenuItem then
local menuItem = {
id = 'selectPlayer',
@@ -159,8 +157,8 @@
self.selectPlayerMenuItem = menuItem
end
- -- if numberOfPlayers < 2 and selectPlayerMenuItem exists, get rid of it
- elseif _numberOfPlayers < 2 and self.selectPlayerMenuItem then
+ -- if numberOfPlayers < 2 and we're connected to a player and
selectPlayerMenuItem exists, get rid of it
+ elseif _numberOfPlayers < 2 and currentPlayer and
self.selectPlayerMenuItem then
jiveMain:removeItemById('selectPlayer')
self.selectPlayerMenuItem = nil
end
@@ -256,8 +254,7 @@
text = server:getName(),
sound = "WINDOWSHOW",
callback = function()
- local auth = appletManager:loadApplet("HttpAuth")
- auth:squeezeCenterPassword(server)
+ appletManager:callService("squeezeCenterPassword",
server)
end,
weight = SERVER_WEIGHT,
}
@@ -299,13 +296,12 @@
end
-- Bug 6130 add a Set up Squeezebox option, only in Setup not Settings
- local sbsetup = appletManager:loadApplet("SetupSqueezebox")
- if sbsetup and setupNext then
+ if setupNext then
self.playerMenu:addItem({
text = self:string("SQUEEZEBOX_SETUP"),
sound = "WINDOWSHOW",
callback = function()
- sbsetup:settingsShow()
+
appletManager:callService("setupSqueezeboxSettingsShow")
end,
weight = 10,
})
@@ -337,8 +333,7 @@
if player:getPin() then
-- as we are not linked this is a dummy player, after we need
linked we
-- need to return to the choose player screen
- local snpin = appletManager:loadApplet("SqueezeNetworkPIN")
- snpin:enterPin(nil, player)
+ appletManager:callService("enterPin", nil, player)
return false
end
@@ -349,13 +344,13 @@
-- network configuration needed?
if player:needsNetworkConfig() then
- -- XXXX convert to applet service call
- local sbsetup = appletManager:loadApplet("SetupSqueezebox")
- sbsetup:startSqueezeboxSetup(player:getId(),
- player:getSSID(),
- function()
- jiveMain:closeToHome()
- end)
+ appletManager:callService("startSqueezeboxSetup",
+ player:getId(),
+ player:getSSID(),
+ function()
+ jiveMain:closeToHome()
+ end
+ )
return false
end
@@ -370,7 +365,6 @@
function free(self)
- jnt:unsubscribe(self)
-- load the correct wallpaper on exit
if self.selectedPlayer and self.selectedPlayer:getId() then
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupLanguage/SetupLanguageMeta.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupLanguage/SetupLanguageMeta.lua?rev=2911&root=Jive&r1=2910&r2=2911&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupLanguage/SetupLanguageMeta.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupLanguage/SetupLanguageMeta.lua
Mon Sep 8 11:19:00 2008
@@ -46,6 +46,8 @@
-- set the current locale from the applet settings
locale:setLocale(meta:getSettings().locale)
+ meta:registerService("SetupLanguage")
+
-- add ourselves to the main menu
-- setupLanguage is the function that gets called from
SetupLanguageApplet.lua when the menu item is selected
jiveMain:addItem(meta:menuItem('appletSetupLanguage',
'advancedSettings', "LANGUAGE", function(applet, ...) applet:settingsShow(...)
end))
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupSoundEffects/SetupSoundEffectsApplet.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupSoundEffects/SetupSoundEffectsApplet.lua?rev=2911&root=Jive&r1=2910&r2=2911&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupSoundEffects/SetupSoundEffectsApplet.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupSoundEffects/SetupSoundEffectsApplet.lua
Mon Sep 8 11:19:00 2008
@@ -400,7 +400,7 @@
settings["_CUSTOM"] = nil
end
- self:_loadSounds(sound)
+ self:loadSounds(sound)
end
@@ -447,7 +447,7 @@
end
-function _loadSounds(self, sound)
+function loadSounds(self, sound)
local settings = self:getSettings()
for k,v in pairs(sounds) do
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupSoundEffects/SetupSoundEffectsMeta.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupSoundEffects/SetupSoundEffectsMeta.lua?rev=2911&root=Jive&r1=2910&r2=2911&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupSoundEffects/SetupSoundEffectsMeta.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupSoundEffects/SetupSoundEffectsMeta.lua
Mon Sep 8 11:19:00 2008
@@ -48,16 +48,15 @@
Sample:setEffectVolume(settings["_VOLUME"])
-- load sounds
- local obj = appletManager:loadApplet("SetupSoundEffects")
+ meta:registerService("loadSounds")
-- The startup sound needs to be played with the minimum
-- delay, load and play it first
- obj:_loadSounds("STARTUP")
+ appletManager:callService("loadSounds", "STARTUP")
Framework:playSound("STARTUP")
-- Load all other sounds
- obj:_loadSounds(nil) -- nil is default from settings
- appletManager:freeApplet("SetupSoundEffects")
+ appletManager:callService("loadSounds", nil) -- nil is default from
settings
-- add a menu to load us
jiveMain:addItem(meta:menuItem('appletSetupSoundEffects',
'advancedSettings', "SOUND_EFFECTS", function(applet, ...)
applet:settingsShow(...) end))
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupSqueezebox/SetupSqueezeboxApplet.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupSqueezebox/SetupSqueezeboxApplet.lua?rev=2911&root=Jive&r1=2910&r2=2911&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupSqueezebox/SetupSqueezeboxApplet.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupSqueezebox/SetupSqueezeboxApplet.lua
Mon Sep 8 11:19:00 2008
@@ -127,7 +127,7 @@
-- setup squeezebox
-function settingsShow(self, keepOldEntries)
+function setupSqueezeboxSettingsShow(self, keepOldEntries)
local window = Window("window", self:string("SQUEEZEBOX_SETUP"),
setupsqueezeboxTitleStyle)
-- window to return to on completion of network settings
@@ -176,7 +176,7 @@
self.setupNext = setupNext
self.bridged = true
- local window = settingsShow(self, true)
+ local window = setupSqueezeboxSettingsShow(self, true)
window:setAllowScreensaver(false)
return window
@@ -187,7 +187,7 @@
function setupSqueezeboxShow(self, setupNext)
self.setupNext = setupNext
- local window = settingsShow(self, true)
+ local window = setupSqueezeboxSettingsShow(self, true)
window:setAllowScreensaver(false)
self.scanMenu:addItem({
@@ -1274,12 +1274,10 @@
-- if connecting to SqueezeNetwork, first check jive is linked
if slimserver:isSqueezeNetwork() then
if slimserver:getPin() then
- local snpin =
appletManager:loadApplet("SqueezeNetworkPIN")
- snpin:enterPin(slimserver, nil,
+ appletManager:callService("enterPin", slimserver, nil,
function()
self:_registerPlayer(slimserver)
end)
-
return
else
self:_registerPlayer(slimserver)
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupSqueezebox/SetupSqueezeboxMeta.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupSqueezebox/SetupSqueezeboxMeta.lua?rev=2911&root=Jive&r1=2910&r2=2911&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupSqueezebox/SetupSqueezeboxMeta.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupSqueezebox/SetupSqueezeboxMeta.lua
Mon Sep 8 11:19:00 2008
@@ -18,6 +18,7 @@
function registerApplet(meta)
meta:registerService("startSqueezeboxSetup")
+ meta:registerService("setupAdhocShow")
end
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SqueezeNetworkPIN/SqueezeNetworkPINMeta.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SqueezeNetworkPIN/SqueezeNetworkPINMeta.lua?rev=2911&root=Jive&r1=2910&r2=2911&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SqueezeNetworkPIN/SqueezeNetworkPINMeta.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SqueezeNetworkPIN/SqueezeNetworkPINMeta.lua
Mon Sep 8 11:19:00 2008
@@ -17,6 +17,10 @@
end
function registerApplet(meta)
+
+ meta:registerService("enterPin")
+ meta:registerService("forcedPin")
+
-- check for SN PIN when we connect to a new player
-- this is needed after upgrading from the MP firmware if
-- SqueezeNetwork was selected during Ray setup
@@ -27,8 +31,7 @@
function notify_playerCurrent(self, player)
if player and player:getPin() then
log:debug("SqueezeNetworkPIN: player has a PIN")
- local applet = appletManager:loadApplet("SqueezeNetworkPIN")
- applet:forcePin(player)
+ appletManager:callService("forcePin", player)
end
end
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=2911&root=Jive&r1=2910&r2=2911&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 Mon Sep 8
11:19:00 2008
@@ -351,7 +351,7 @@
end
--- remove an item from a menu by its index
+-- remove an item from a menu
function removeItem(self, item)
assert(item)
assert(item.node)
@@ -370,14 +370,7 @@
function removeItemById(self, id)
if self.menuTable[id] then
local item = self.menuTable[id]
- if self.nodeTable[item.node] then
- self.nodeTable[item.node].menu:removeItemById(id)
- self.nodeTable[item.node].items[id] = nil
- end
- self.menuTable[id] = nil
-
- self:_checkRemoveNode(item.node)
-
+ self:removeItem(item)
end
end
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_portaudio.c
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_portaudio.c?rev=2911&root=Jive&r1=2910&r2=2911&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_portaudio.c
(original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_portaudio.c
Mon Sep 8 11:19:00 2008
@@ -96,7 +96,7 @@
if (skip_bytes) {
size_t wrap;
- DEBUG_TRACE("Skipping %ld bytes", skip_bytes);
+ DEBUG_TRACE("Skipping %d bytes", (int) skip_bytes);
wrap = fifo_bytes_until_rptr_wrap(&decode_fifo);
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=2911&root=Jive&r1=2910&r2=2911&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
Mon Sep 8 11:19:00 2008
@@ -70,8 +70,7 @@
}
jiveMain:addItem(returnToSetup)
- local setupLanguage = assert(appletManager:loadApplet("SetupLanguage"))
- self._topWindow = setupLanguage:setupShow(function() self:step2() end)
+ self._topWindow = appletManager:callService("setupShow", function()
self:step2() end)
disableHomeKeyDuringSetup =
Framework:addListener(EVENT_KEY_PRESS,
function(event)
@@ -104,8 +103,7 @@
end
function step3(self)
- local setupPlayer = assert(appletManager:loadApplet("SelectPlayer"))
- return setupPlayer:setupShow(function() self:step4() end)
+ return appletManager:callService("setupShow", function() self:step4()
end)
end
function step4(self)
Modified:
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/SetupWelcome/SetupWelcomeMeta.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/SetupWelcome/SetupWelcomeMeta.lua?rev=2911&root=Jive&r1=2910&r2=2911&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/SetupWelcome/SetupWelcomeMeta.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/SetupWelcome/SetupWelcomeMeta.lua
Mon Sep 8 11:19:00 2008
@@ -40,8 +40,9 @@
function registerApplet(meta)
+ meta:registerService("step1")
if not meta:getSettings().setupDone then
- appletManager:loadApplet("SetupWelcome"):step1()
+ appletManager:callService("step1")
end
end
Modified:
7.3/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeMeta.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeMeta.lua?rev=2911&root=Jive&r1=2910&r2=2911&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeMeta.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeMeta.lua
Mon Sep 8 11:19:00 2008
@@ -30,6 +30,7 @@
function registerApplet(meta)
jiveMain:addItem(meta:menuItem('appletSetupFirmwareUpgrade',
'advancedSettings', "UPDATE", function(applet) applet:settingsShow() end))
+ meta:registerService("forceUpgrade")
-- check for firmware upgrades when we connect to a new player
-- we don't want the firmware upgrade applets always loaded so
-- do this in the meta class
@@ -88,8 +89,7 @@
-- are we offering or forcing an upgrade
if tonumber(chunk.data.firmwareUpgrade) == 1 then
log:info("Firmware upgrade")
- local applet =
appletManager:loadApplet("SetupFirmwareUpgrade")
-
applet:forceUpgrade(tonumber(chunk.data.firmwareOptional) == 1, upgradeUrl[1],
chunk.data.firmwareHelp)
+ appletManager:callService("forceUpgrade",
tonumber(chunk.data.firmwareOptional) == 1, upgradeUrl[1],
chunk.data.firmwareHelp)
meta.player:unsubscribe('/slim/firmwarestatus/'
.. meta.player:getId())
end
Modified:
7.3/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupWelcome/SetupWelcomeApplet.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupWelcome/SetupWelcomeApplet.lua?rev=2911&root=Jive&r1=2910&r2=2911&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupWelcome/SetupWelcomeApplet.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupWelcome/SetupWelcomeApplet.lua
Mon Sep 8 11:19:00 2008
@@ -103,8 +103,7 @@
end)
-- choose language
- self.setupLanguage = assert(appletManager:loadApplet("SetupLanguage"))
- self._topWindow = self.setupLanguage:setupShow(function() self:step2()
end)
+ self._topWindow = appletManager:callService("setupShow", function()
self:step2() end)
return self.topWindow
end
@@ -120,8 +119,7 @@
log:info("step3")
-- wireless region
- self.setupWireless = assert(appletManager:loadApplet("SetupWireless"))
- return self.setupWireless:setupRegionShow(function() self:step4() end)
+ return appletManager:callService("setupRegionShow", function()
self:step4() end)
end
function step4(self)
@@ -162,9 +160,7 @@
log:info("step51")
-- connect using squeezebox in adhoc mode
- self.setupSqueezebox =
assert(appletManager:loadApplet("SetupSqueezebox"))
-
- return self.setupSqueezebox:setupAdhocShow(function() self:step8() end)
+ return appletManager:callService("setupAdhocShow", function()
self:step8() end)
end
function step52(self)
@@ -195,9 +191,7 @@
log:info("step61")
-- setup squeezebox
- self.setupSqueezebox =
assert(appletManager:loadApplet("SetupSqueezebox"))
-
- return self.setupSqueezebox:setupSqueezeboxShow(function() self:step7()
end)
+ return appletManager:callService("setupSqueezeboxShow", function()
self:step7() end)
end
function step7(self)
@@ -209,8 +203,7 @@
end
-- select player
- self.setupPlayer = assert(appletManager:loadApplet("SelectPlayer"))
- return self.setupPlayer:setupShow(function() self:step8() end)
+ return appletManager:callService("setupShow", function() self:step8()
end)
end
function step8(self)
Modified:
7.3/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupWelcome/SetupWelcomeMeta.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupWelcome/SetupWelcomeMeta.lua?rev=2911&root=Jive&r1=2910&r2=2911&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupWelcome/SetupWelcomeMeta.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupWelcome/SetupWelcomeMeta.lua
Mon Sep 8 11:19:00 2008
@@ -41,8 +41,9 @@
function registerApplet(meta)
+ meta:registerService("step1")
if not meta:getSettings().setupDone then
- appletManager:loadApplet("SetupWelcome"):step1()
+ appletManager:callService("step1")
end
end
Modified:
7.3/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupWireless/SetupWirelessMeta.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupWireless/SetupWirelessMeta.lua?rev=2911&root=Jive&r1=2910&r2=2911&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupWireless/SetupWirelessMeta.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupWireless/SetupWirelessMeta.lua
Mon Sep 8 11:19:00 2008
@@ -22,6 +22,8 @@
-- defined here so that it can be changed using LogSettingsApplet
before the applet is run.
jul.addCategory("applet.wireless", jul.DEBUG)
+ meta:registerService("setupRegionShow")
+
jiveMain:addItem(meta:menuItem('networkSettings', 'advancedSettings',
"NETWORK", function(applet, ...) applet:settingsNetworksShow(...) end))
jiveMain:addItem(meta:menuItem('networkRegion', 'advancedSettings',
"NETWORK_REGION", function(applet, ...) applet:settingsRegionShow(...) end))
end
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
