Author: andy
Date: Wed Sep 17 13:13:38 2008
New Revision: 2921
URL: http://svn.slimdevices.com?rev=2921&root=Jive&view=rev
Log:
[EMAIL PROTECTED] (orig r2906): bklaas | 2008-09-04 11:38:54 -0400
Bug: 8655
Description: Pull 7.2 checkin r2746 into 7.1 branch
allows for two new menu item styles, albumitemplay and albumitemadd
[EMAIL PROTECTED] (orig r2907): bklaas | 2008-09-04 17:03:06 -0400
Bug: 9307
Description: allow other music sources to be selected from boom
[EMAIL PROTECTED] (orig r2918): bklaas | 2008-09-17 11:15:50 -0400
Bug: 9410
Description: vertical bar character '|' added to accepted strings for
textinput in SetupWireless as well as global_strings
[EMAIL PROTECTED] (orig r2920): bklaas | 2008-09-17 14:38:19 -0400
Bug: 9307
Description: fix problem caused by r2907 where server:getIpPort() was being
called in situations where server was nil
add a bunch of log:debug() flags for future use
Modified:
7.2/trunk/ (props changed)
7.2/trunk/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua
7.2/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua
7.2/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
7.2/trunk/squeezeplay/src/squeezeplay/share/jive/global_strings.txt
7.2/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
7.2/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupWireless/strings.txt
Propchange: 7.2/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Wed Sep 17 13:13:38 2008
@@ -1,6 +1,7 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.0/trunk:2502
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/branches/discovery-refactor:2596
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/trunk:2873
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/trunk:2920
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:2013
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/trunk:2187
Modified:
7.2/trunk/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua?rev=2921&root=Jive&r1=2920&r2=2921&view=diff
==============================================================================
---
7.2/trunk/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua
(original)
+++
7.2/trunk/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua
Wed Sep 17 13:13:38 2008
@@ -77,22 +77,27 @@
jnt:subscribe(self)
- -- Discover slimservers in this window
+ -- Discover players in this window
appletManager:callService("discoverPlayers")
window:addTimer(1000, function()
appletManager:callService("discoverPlayers") end)
- -- slimservers on the poll list
+ -- squeezecenter on the poll list
+ log:debug("*****Polled Server List:")
local poll = appletManager:callService("getPollList")
for address,_ in pairs(poll) do
+ log:debug('Found: ', address)
if address ~= "255.255.255.255" then
+ log:debug('Add to menu: ', address)
self:_addServerItem(nil, address)
end
end
- -- discovered slimservers
+ -- discovered squeezecenters
+ log:debug('*****Discovered Server List:')
for _,server in appletManager:callService("iterateSqueezeCenters") do
+ log:debug('discovered server: ', server)
self:_addServerItem(server)
end
@@ -124,10 +129,15 @@
function _addServerItem(self, server, address)
- log:debug("_addServerItem ", server, " " , port)
-
- local id = server or address
-
+ log:debug("\t_addServerItem ", server, " " , address)
+
+ local id
+ if server then
+ id = server:getIpPort()
+ else
+ id = address
+ end
+ log:debug("\tid for this server set to: ", id)
-- remove existing entry
if self.serverList[id] then
@@ -142,6 +152,7 @@
-- new entry
local item
if server and currentPlayer and currentPlayer:canConnectToServer() then
+ log:debug("\tadd menu item with callback")
local f = function()
self:connectPlayer(currentPlayer, server)
end
@@ -154,6 +165,7 @@
weight = 1
}
else
+ log:debug("\tadd menu item without callback")
item = {
text = server and server:getName() or address,
weight = 1,
@@ -163,10 +175,9 @@
-- check current player
if currentPlayer and currentPlayer:getSlimServer() and server ==
currentPlayer:getSlimServer() then
+ log:debug("\tthis is the connected server, so remove callback
for this item")
item.style = 'checkedNoAction'
item.callback = nil
- elseif not currentPlayer or not currentPlayer:canConnectToServer() then
- return
end
self.serverMenu:addItem(item)
Modified:
7.2/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua?rev=2921&root=Jive&r1=2920&r2=2921&view=diff
==============================================================================
(empty)
Modified:
7.2/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua?rev=2921&root=Jive&r1=2920&r2=2921&view=diff
==============================================================================
(empty)
Modified: 7.2/trunk/squeezeplay/src/squeezeplay/share/jive/global_strings.txt
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/squeezeplay/share/jive/global_strings.txt?rev=2921&root=Jive&r1=2920&r2=2921&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/squeezeplay/share/jive/global_strings.txt
(original)
+++ 7.2/trunk/squeezeplay/src/squeezeplay/share/jive/global_strings.txt Wed Sep
17 13:13:38 2008
@@ -147,40 +147,40 @@
SV Ta bort
ALLOWEDCHARS_NOCAPS
- DA [EMAIL PROTECTED]&*()_+{}:\"'<>?-=,./~`[];0123456789
- DE [EMAIL PROTECTED]&*()_+{}:\"'<>?-=,./~`[];0123456789
- EN [EMAIL PROTECTED]&*()_+{}:\"'<>?-=,./~`[];0123456789
- ES [EMAIL PROTECTED]&*()_+{}:\"'<>?-=,./~`[];0123456789
- FI [EMAIL PROTECTED]&*()_+{}:\"'<>?-=,./~`[];0123456789
- FR [EMAIL PROTECTED]&*()_+{}:\"'<>?-=,./~`[];0123456789
- IT [EMAIL PROTECTED]&*()_+{}:\"'<>?-=,./~`[];0123456789
- NL [EMAIL PROTECTED]&*()_+{}:\"'<>?-=,./~`[];0123456789
- NO [EMAIL PROTECTED]&*()_+{}:\"'<>?-=,./~`[];0123456789
- SV [EMAIL PROTECTED]&*()_+{}:\"'<>?-=,./~`[];0123456789
+ DA [EMAIL PROTECTED]&*()_+{}|:\"'<>?-=,./~`[];0123456789
+ DE [EMAIL PROTECTED]&*()_+{}|:\"'<>?-=,./~`[];0123456789
+ EN [EMAIL PROTECTED]&*()_+{}|:\"'<>?-=,./~`[];0123456789
+ ES [EMAIL PROTECTED]&*()_+{}|:\"'<>?-=,./~`[];0123456789
+ FI [EMAIL PROTECTED]&*()_+{}|:\"'<>?-=,./~`[];0123456789
+ FR [EMAIL PROTECTED]&*()_+{}|:\"'<>?-=,./~`[];0123456789
+ IT [EMAIL PROTECTED]&*()_+{}|:\"'<>?-=,./~`[];0123456789
+ NL [EMAIL PROTECTED]&*()_+{}|:\"'<>?-=,./~`[];0123456789
+ NO [EMAIL PROTECTED]&*()_+{}|:\"'<>?-=,./~`[];0123456789
+ SV [EMAIL PROTECTED]&*()_+{}|:\"'<>?-=,./~`[];0123456789
ALLOWEDCHARS_CAPS
- DA [EMAIL PROTECTED]&*()_+{}:\"'<>?-=,./~`[];0123456789
- DE [EMAIL PROTECTED]&*()_+{}:\"'<>?-=,./~`[];0123456789
- EN [EMAIL PROTECTED]&*()_+{}:\"'<>?-=,./~`[];0123456789
- ES [EMAIL PROTECTED]&*()_+{}:\"'<>?-=,./~`[];0123456789
- FI [EMAIL PROTECTED]&*()_+{}:\"'<>?-=,./~`[];0123456789
- FR [EMAIL PROTECTED]&*()_+{}:\"'<>?-=,./~`[];0123456789
- IT [EMAIL PROTECTED]&*()_+{}:\"'<>?-=,./~`[];0123456789
- NL [EMAIL PROTECTED]&*()_+{}:\"'<>?-=,./~`[];0123456789
- NO [EMAIL PROTECTED]&*()_+{}:\"'<>?-=,./~`[];0123456789
- SV [EMAIL PROTECTED]&*()_+{}:\"'<>?-=,./~`[];0123456789
+ DA [EMAIL PROTECTED]&*()_+{}|:\"'<>?-=,./~`[];0123456789
+ DE [EMAIL PROTECTED]&*()_+{}|:\"'<>?-=,./~`[];0123456789
+ EN [EMAIL PROTECTED]&*()_+{}|:\"'<>?-=,./~`[];0123456789
+ ES [EMAIL PROTECTED]&*()_+{}|:\"'<>?-=,./~`[];0123456789
+ FI [EMAIL PROTECTED]&*()_+{}|:\"'<>?-=,./~`[];0123456789
+ FR [EMAIL PROTECTED]&*()_+{}|:\"'<>?-=,./~`[];0123456789
+ IT [EMAIL PROTECTED]&*()_+{}|:\"'<>?-=,./~`[];0123456789
+ NL [EMAIL PROTECTED]&*()_+{}|:\"'<>?-=,./~`[];0123456789
+ NO [EMAIL PROTECTED]&*()_+{}|:\"'<>?-=,./~`[];0123456789
+ SV [EMAIL PROTECTED]&*()_+{}|:\"'<>?-=,./~`[];0123456789
ALLOWEDCHARS_WITHCAPS
- DA [EMAIL PROTECTED]&*()_+{}:\"'<>?-=,./~`[];0123456789
- DE [EMAIL PROTECTED]&*()_+{}:\"'<>?-=,./~`[];0123456789
- EN [EMAIL PROTECTED]&*()_+{}:\"'<>?-=,./~`[];0123456789
- ES [EMAIL PROTECTED]&*()_+{}:\"'<>?-=,./~`[];0123456789
- FI [EMAIL PROTECTED]&*()_+{}:\"'<>?-=,./~`[];0123456789
- FR [EMAIL PROTECTED]&*()_+{}:\"'<>?-=,./~`[];0123456789
- IT [EMAIL PROTECTED]&*()_+{}:\"'<>?-=,./~`[];0123456789
- NL [EMAIL PROTECTED]&*()_+{}:\"'<>?-=,./~`[];0123456789
- NO [EMAIL PROTECTED]&*()_+{}:\"'<>?-=,./~`[];0123456789
- SV [EMAIL PROTECTED]&*()_+{}:\"'<>?-=,./~`[];0123456789
+ DA [EMAIL PROTECTED]&*()_+{}|:\"'<>?-=,./~`[];0123456789
+ DE [EMAIL PROTECTED]&*()_+{}|:\"'<>?-=,./~`[];0123456789
+ EN [EMAIL PROTECTED]&*()_+{}|:\"'<>?-=,./~`[];0123456789
+ ES [EMAIL PROTECTED]&*()_+{}|:\"'<>?-=,./~`[];0123456789
+ FI [EMAIL PROTECTED]&*()_+{}|:\"'<>?-=,./~`[];0123456789
+ FR [EMAIL PROTECTED]&*()_+{}|:\"'<>?-=,./~`[];0123456789
+ IT [EMAIL PROTECTED]&*()_+{}|:\"'<>?-=,./~`[];0123456789
+ NL [EMAIL PROTECTED]&*()_+{}|:\"'<>?-=,./~`[];0123456789
+ NO [EMAIL PROTECTED]&*()_+{}|:\"'<>?-=,./~`[];0123456789
+ SV [EMAIL PROTECTED]&*()_+{}|:\"'<>?-=,./~`[];0123456789
RETURN_TO_SETUP
DA Tilbage til Konfiguration
Modified: 7.2/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua?rev=2921&root=Jive&r1=2920&r2=2921&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua (original)
+++ 7.2/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua Wed Sep 17
13:13:38 2008
@@ -81,7 +81,7 @@
[4] = "squeezebox2",
[5] = "transporter",
[7] = "receiver",
- [10] = "b",
+ [10] = "boom",
}
@@ -655,7 +655,7 @@
if self.info.model == "squeezebox2"
or self.info.model == "receiver"
or self.info.model == "transporter"
- or self.info.model == "b" then
+ or self.info.model == "boom" then
return string.gsub(self.id, "[^%x]", "")
end
@@ -1156,7 +1156,7 @@
return self.info.model == "squeezebox2"
or self.info.model == "receiver"
or self.info.model == "transporter"
- or self.info.model == "b"
+ or self.info.model == "boom"
end
@@ -1165,7 +1165,7 @@
return self.info.model == "squeezebox2"
or self.info.model == "receiver"
or self.info.model == "transporter"
- or self.info.model == "b"
+ or self.info.model == "boom"
end
Modified:
7.2/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupWireless/strings.txt
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupWireless/strings.txt?rev=2921&root=Jive&r1=2920&r2=2921&view=diff
==============================================================================
---
7.2/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupWireless/strings.txt
(original)
+++
7.2/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupWireless/strings.txt
Wed Sep 17 13:13:38 2008
@@ -934,14 +934,14 @@
SV Det går inte att ansluta fjärrkontrollen till %.
ALLOWEDCHARS_WPA
- DA [EMAIL PROTECTED]&*()_+{}:\"'<>?-=,./~`[];0123456789
- DE [EMAIL PROTECTED]&*()_+{}:\"'<>?-=,./~`[];0123456789
- EN [EMAIL PROTECTED]&*()_+{}:\"'<>?-=,./~`[];0123456789
- ES [EMAIL PROTECTED]&*()_+{}:\"'<>?-=,./~`[];0123456789
- FI [EMAIL PROTECTED]&*()_+{}:\"'<>?-=,./~`[];0123456789
- FR [EMAIL PROTECTED]&*()_+{}:\"'<>?-=,./~`[];0123456789
- IT [EMAIL PROTECTED]&*()_+{}:\"'<>?-=,./~`[];0123456789
- NL [EMAIL PROTECTED]&*()_+{}:\"'<>?-=,./~`[];0123456789
- NO [EMAIL PROTECTED]&*()_+{}:\"'<>?-=,./~`[];0123456789
- SV [EMAIL PROTECTED]&*()_+{}:\"'<>?-=,./~`[];0123456789
-
+ DA [EMAIL PROTECTED]&*()_+{}|:\"'<>?-=,./~`[];0123456789
+ DE [EMAIL PROTECTED]&*()_+{}|:\"'<>?-=,./~`[];0123456789
+ EN [EMAIL PROTECTED]&*()_+{}|:\"'<>?-=,./~`[];0123456789
+ ES [EMAIL PROTECTED]&*()_+{}|:\"'<>?-=,./~`[];0123456789
+ FI [EMAIL PROTECTED]&*()_+{}|:\"'<>?-=,./~`[];0123456789
+ FR [EMAIL PROTECTED]&*()_+{}|:\"'<>?-=,./~`[];0123456789
+ IT [EMAIL PROTECTED]&*()_+{}|:\"'<>?-=,./~`[];0123456789
+ NL [EMAIL PROTECTED]&*()_+{}|:\"'<>?-=,./~`[];0123456789
+ NO [EMAIL PROTECTED]&*()_+{}|:\"'<>?-=,./~`[];0123456789
+ SV [EMAIL PROTECTED]&*()_+{}|:\"'<>?-=,./~`[];0123456789
+
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
