Author: richard
Date: Thu Feb 26 09:10:31 2009
New Revision: 4490
URL: http://svn.slimdevices.com/jive?rev=4490&view=rev
Log:
r4...@harrypotter (orig r4481): tom | 2009-02-26 14:29:29 +0000
Bug: N/A
Description:
- Seg Fault on (at least) Ubuntu startup (wrong var name used in alternate eth
address calculation)
r4...@harrypotter (orig r4483): richard | 2009-02-26 16:05:22 +0000
Bug: N/A
Description:
I didn't mean to check this in.
r4...@harrypotter (orig r4488): richard | 2009-02-26 16:57:59 +0000
Bug: 9900
Description:
Add support for SN to squeezeplay. At the moment, only for Desktop
squeezeplay, and at
the moment only with the test squeezenetwork site.
r4...@harrypotter (orig r4489): richard | 2009-02-26 17:07:44 +0000
Bug: N/A
Description:
Fix bogus mac address, that wasn't meant to be checked in.
Modified:
7.4/branches/pango/ (props changed)
7.4/branches/pango/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua
7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/System.lua
7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/net/Comet.lua
7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/net/NetworkThread.lua
7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/net/SlimProto.lua
7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/platform_linux.c
7.4/branches/pango/squeezeplay/src/squeezeplay_desktop/share/applets/DesktopJive/DesktopJiveMeta.lua
Propchange: 7.4/branches/pango/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Thu Feb 26 09:10:31 2009
@@ -4,7 +4,7 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.2/trunk:2921
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/private-branches/jive-refresh:3653
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:4138
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:4472
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:4489
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
Modified:
7.4/branches/pango/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua
URL:
http://svn.slimdevices.com/jive/7.4/branches/pango/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua?rev=4490&r1=4489&r2=4490&view=diff
==============================================================================
---
7.4/branches/pango/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua
(original)
+++
7.4/branches/pango/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua
Thu Feb 26 09:10:31 2009
@@ -142,9 +142,10 @@
local currentPlayer = appletManager:callService("getCurrentPlayer")
- -- local players cannot connect to SN
- if server and server:isSqueezeNetwork() and
- currentPlayer and currentPlayer:isLocal() then
+ -- Bug 9900
+ -- squeezeplay cannot connect to production SN
+ if server and server:getIpPort() == "www.squeezenetwork.com" and
+ currentPlayer and currentPlayer:getModel() == "squeezeplay" then
return
end
Modified: 7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/System.lua
URL:
http://svn.slimdevices.com/jive/7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/System.lua?rev=4490&r1=4489&r2=4490&view=diff
==============================================================================
--- 7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/System.lua
(original)
+++ 7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/System.lua Thu
Feb 26 09:10:31 2009
@@ -43,6 +43,11 @@
oo.class(_M, System)
+function isHardware(class)
+ return (class:getMachine() ~= "squeezeplay")
+end
+
+
-- C implementation
Modified:
7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/net/Comet.lua
URL:
http://svn.slimdevices.com/jive/7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/net/Comet.lua?rev=4490&r1=4489&r2=4490&view=diff
==============================================================================
--- 7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/net/Comet.lua
(original)
+++ 7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/net/Comet.lua Thu
Feb 26 09:10:31 2009
@@ -582,10 +582,14 @@
supportedConnectionTypes = { 'streaming' },
ext = {
rev = JIVE_VERSION,
- mac = System:getMacAddress(),
uuid = System:getUUID(),
},
} }
+
+ -- only send the mac address for hardware devices
+ if System:isHardware() then
+ data.ext.mac = System:getMacAddress()
+ end
-- XXX: according to the spec this should be sent as
application/x-www-form-urlencoded
-- with message=<url-encoded json> but it works as straight JSON
Modified:
7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/net/NetworkThread.lua
URL:
http://svn.slimdevices.com/jive/7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/net/NetworkThread.lua?rev=4490&r1=4489&r2=4490&view=diff
==============================================================================
---
7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/net/NetworkThread.lua
(original)
+++
7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/net/NetworkThread.lua
Thu Feb 26 09:10:31 2009
@@ -60,6 +60,8 @@
-- jive.net.NetworkThread is a base class
module(..., oo.class)
+local squeezenetworkHostname = "www.squeezenetwork.com"
+
-- _add
-- adds a socket to the read or write list
@@ -369,7 +371,13 @@
=cut
--]]
function getSNHostname(self)
- return "www.squeezenetwork.com"
+ return squeezenetworkHostname
+end
+
+
+-- Set the squeezenetwork hostname, used with test.squeezenetwork.com
+function setSNHostname(self, hostname)
+ squeezenetworkHostname = hostname
end
Modified:
7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/net/SlimProto.lua
URL:
http://svn.slimdevices.com/jive/7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/net/SlimProto.lua?rev=4490&r1=4489&r2=4490&view=diff
==============================================================================
--- 7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/net/SlimProto.lua
(original)
+++ 7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/net/SlimProto.lua
Thu Feb 26 09:10:31 2009
@@ -452,8 +452,8 @@
self.serverip = self.server:getIpPort()
-- Bug 9900
- -- Don't allow connections to SN yet
- assert(not string.match(self.serverip, "squeezenetwork.com"))
+ -- Don't allow connections to production SN yet
+ assert(not string.match(self.serverip, "www.squeezenetwork.com"))
self.socket = SocketTcp(self.jnt, self.serverip, PORT, "SlimProto")
Modified: 7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/platform_linux.c
URL:
http://svn.slimdevices.com/jive/7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/platform_linux.c?rev=4490&r1=4489&r2=4490&view=diff
==============================================================================
--- 7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/platform_linux.c
(original)
+++ 7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/platform_linux.c Thu
Feb 26 09:10:31 2009
@@ -103,7 +103,7 @@
}
*s = '\0';
- macaddr = iface_mac_address(sock, iface[i]);
+ macaddr = iface_mac_address(sock, name);
if (macaddr) {
break;
}
Modified:
7.4/branches/pango/squeezeplay/src/squeezeplay_desktop/share/applets/DesktopJive/DesktopJiveMeta.lua
URL:
http://svn.slimdevices.com/jive/7.4/branches/pango/squeezeplay/src/squeezeplay_desktop/share/applets/DesktopJive/DesktopJiveMeta.lua?rev=4490&r1=4489&r2=4490&view=diff
==============================================================================
---
7.4/branches/pango/squeezeplay/src/squeezeplay_desktop/share/applets/DesktopJive/DesktopJiveMeta.lua
(original)
+++
7.4/branches/pango/squeezeplay/src/squeezeplay_desktop/share/applets/DesktopJive/DesktopJiveMeta.lua
Thu Feb 26 09:10:31 2009
@@ -53,6 +53,11 @@
settings.uuid = table.concat(uuid)
end
+ -- fix bogus mac addresses from bad check
+ if string.match(settings.mac, "00:04:20") then
+ settings.mac = nil
+ end
+
if not settings.mac then
settings.mac = System:getMacAddress()
store = true
@@ -69,11 +74,6 @@
settings.mac = table.concat(mac, ":")
end
- -- Set player device type
- --LocalPlayer:setDeviceType("controller", "Controller")
-
- settings.mac = "00:04:20:ff:ff:10"
-
if store then
log:debug("Mac Address: ", settings.mac)
meta:storeSettings()
@@ -85,6 +85,9 @@
uuid = settings.uuid,
})
+ -- Bug 9900
+ -- Use SN test during development
+ jnt:setSNHostname("test.squeezenetwork.com")
appletManager:addDefaultSetting("ScreenSavers", "whenStopped",
"false:false")
appletManager:addDefaultSetting("Playback", "enableAudio", 1)
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
