Author: blblack
Date: Wed Feb 6 22:38:56 2008
New Revision: 1837
URL: http://svn.slimdevices.com?rev=1837&root=Jive&view=rev
Log:
Remove "use beta" setting, hardwire to use the new beta racks always
Removed:
branches/7.0/jive/src/pkg/jive/share/applets/SetupSN/
Modified:
branches/7.0/jive/src/pkg/jive/Makefile.am
branches/7.0/jive/src/pkg/jive/share/applets/SetupSqueezebox/SetupSqueezeboxApplet.lua
branches/7.0/jive/src/pkg/jive/share/applets/SqueezeNetworkPIN/SqueezeNetworkPINApplet.lua
branches/7.0/jive/src/pkg/jive/share/jive/net/NetworkThread.lua
branches/7.0/jive/src/pkg/jive/share/jive/slim/SlimServer.lua
branches/7.0/jive/src/pkg/jive/share/jive/slim/SlimServers.lua
branches/7.0/jive/src/pkg/jive/share/jive/ui/Framework.lua
Modified: branches/7.0/jive/src/pkg/jive/Makefile.am
URL:
http://svn.slimdevices.com/branches/7.0/jive/src/pkg/jive/Makefile.am?rev=1837&root=Jive&r1=1836&r2=1837&view=diff
==============================================================================
--- branches/7.0/jive/src/pkg/jive/Makefile.am (original)
+++ branches/7.0/jive/src/pkg/jive/Makefile.am Wed Feb 6 22:38:56 2008
@@ -265,12 +265,6 @@
share/applets/InfoBrowser/InfoBrowserApplet.lua \
share/applets/InfoBrowser/InfoBrowserMeta.lua \
share/applets/InfoBrowser/strings.txt
-
-applets_SetupSNdir = $(datadir)/jive/applets/SetupSN
-dist_applets_SetupSN_DATA = \
- share/applets/SetupSN/SetupSNApplet.lua \
- share/applets/SetupSN/SetupSNMeta.lua \
- share/applets/SetupSN/strings.txt
applets_nowplayingdir = $(pkgdatadir)/applets/NowPlaying
dist_applets_nowplaying_DATA = \
Modified:
branches/7.0/jive/src/pkg/jive/share/applets/SetupSqueezebox/SetupSqueezeboxApplet.lua
URL:
http://svn.slimdevices.com/branches/7.0/jive/src/pkg/jive/share/applets/SetupSqueezebox/SetupSqueezeboxApplet.lua?rev=1837&root=Jive&r1=1836&r2=1837&view=diff
==============================================================================
---
branches/7.0/jive/src/pkg/jive/share/applets/SetupSqueezebox/SetupSqueezeboxApplet.lua
(original)
+++
branches/7.0/jive/src/pkg/jive/share/applets/SetupSqueezebox/SetupSqueezeboxApplet.lua
Wed Feb 6 22:38:56 2008
@@ -1205,21 +1205,14 @@
-- set slimserver address to 0.0.0.1 to workaround a bug in
-- squeezebox firmware
--
- -- XXX this should be 1 or 2 depending on jnt:getSNBeta()
- -- this:
+ -- XXX this should be this when in production or post "serv 2"
firmware:
-- self.data2.server_address = Udap.packNumber(1, 4)
-- self.data2.slimserver_address =
Udap.packNumber(parseip("0.0.0.1"), 4)
-- or:
-- self.data2.server_address = Udap.packNumber(2, 4)
-- self.data2.slimserver_address =
Udap.packNumber(parseip("0.0.0.1"), 4)
--
- -- XXX but until that's in firmware and while using funny beta
addresses:
- local ip
- if jnt:getSNBeta() then
- ip = socket.dns.toip(jnt:getSNHostname())
- else
- ip = "207.7.156.11"
- end
+ local ip = socket.dns.toip(jnt:getSNHostname())
log:info("SN server_address=", ip)
self.data2.server_address = Udap.packNumber(parseip(ip), 4)
self.data2.slimserver_address =
Udap.packNumber(parseip("0.0.0.1"), 4)
Modified:
branches/7.0/jive/src/pkg/jive/share/applets/SqueezeNetworkPIN/SqueezeNetworkPINApplet.lua
URL:
http://svn.slimdevices.com/branches/7.0/jive/src/pkg/jive/share/applets/SqueezeNetworkPIN/SqueezeNetworkPINApplet.lua?rev=1837&root=Jive&r1=1836&r2=1837&view=diff
==============================================================================
---
branches/7.0/jive/src/pkg/jive/share/applets/SqueezeNetworkPIN/SqueezeNetworkPINApplet.lua
(original)
+++
branches/7.0/jive/src/pkg/jive/share/applets/SqueezeNetworkPIN/SqueezeNetworkPINApplet.lua
Wed Feb 6 22:38:56 2008
@@ -83,14 +83,7 @@
nil)
end)
- -- XXX this is temporary until the :3000 "production" beta goes away by
- -- some means or other
- local addport = "";
- if not jnt:getSNBeta() then
- addport = ":3000"
- end
-
- window:addWidget(Textarea("help",
self:string("SQUEEZENETWORK_PIN_HELP", jnt:getSNHostname() .. addport)))
+ window:addWidget(Textarea("help",
self:string("SQUEEZENETWORK_PIN_HELP", jnt:getSNHostname())))
window:addWidget(menu)
self:tieAndShowWindow(window)
Modified: branches/7.0/jive/src/pkg/jive/share/jive/net/NetworkThread.lua
URL:
http://svn.slimdevices.com/branches/7.0/jive/src/pkg/jive/share/jive/net/NetworkThread.lua?rev=1837&root=Jive&r1=1836&r2=1837&view=diff
==============================================================================
--- branches/7.0/jive/src/pkg/jive/share/jive/net/NetworkThread.lua (original)
+++ branches/7.0/jive/src/pkg/jive/share/jive/net/NetworkThread.lua Wed Feb 6
22:38:56 2008
@@ -280,63 +280,16 @@
self.mac = mac
end
-
---[[
-
-=head2 setSNBetaSetting(bool)
-
-Changes whether NetworkThread will use
-production or beta SqueezeNetwork servers on
-next reboot.
-
-=cut
---]]
-function setSNBetaSetting(self, use_sn_beta)
- Framework:setGlobalSetting("use_sn_beta", use_sn_beta)
-end
-
---[[
-
-=head2 getSNBetaSetting()
-
-Indicates whether NetworkThread will use
-production or beta SqueezeNetwork servers on
-next reboot.
-
-=cut
---]]
-function getSNBetaSetting(self)
- return Framework:getGlobalSetting("use_sn_beta");
-end
-
---[[
-
-=head2 getSNBeta()
-
-Boolean, indicates whether we're using the SqueezeNetwork
-Beta server (as opposed to production) Right Now
-
-=cut
---]]
-function getSNBeta(self)
- return self._use_sn_beta
-end
-
--[[
=head2 getSNHostname()
Retreive the hostname to be used to connect to SqueezeNetwork
-Right Now
=cut
--]]
function getSNHostname(self)
- if self._use_sn_beta then
- return "www.beta.squeezenetwork.com"
- else
- return "www.squeezenetwork.com"
- end
+ return "www.beta.squeezenetwork.com"
end
--[[
@@ -357,9 +310,6 @@
-- list of objects for notify
subscribers = {},
-
- -- SN Beta in use?
- _use_sn_beta = Framework:getGlobalSetting("use_sn_beta")
})
return obj
Modified: branches/7.0/jive/src/pkg/jive/share/jive/slim/SlimServer.lua
URL:
http://svn.slimdevices.com/branches/7.0/jive/src/pkg/jive/share/jive/slim/SlimServer.lua?rev=1837&root=Jive&r1=1836&r2=1837&view=diff
==============================================================================
--- branches/7.0/jive/src/pkg/jive/share/jive/slim/SlimServer.lua (original)
+++ branches/7.0/jive/src/pkg/jive/share/jive/slim/SlimServer.lua Wed Feb 6
22:38:56 2008
@@ -308,11 +308,7 @@
function isSqueezeNetwork(self)
- if self.jnt:getSNBeta() then
- return self.name == "SqueezeNetwork Beta"
- else
- return self.name == "SqueezeNetwork"
- end
+ return self.name == "SqueezeNetwork"
end
Modified: branches/7.0/jive/src/pkg/jive/share/jive/slim/SlimServers.lua
URL:
http://svn.slimdevices.com/branches/7.0/jive/src/pkg/jive/share/jive/slim/SlimServers.lua?rev=1837&root=Jive&r1=1836&r2=1837&view=diff
==============================================================================
--- branches/7.0/jive/src/pkg/jive/share/jive/slim/SlimServers.lua (original)
+++ branches/7.0/jive/src/pkg/jive/share/jive/slim/SlimServers.lua Wed Feb 6
22:38:56 2008
@@ -249,13 +249,7 @@
-- Special case Squeezenetwork
if self.jnt:getUUID() then
- local sn_name
- if self.jnt:getSNBeta() then
- sn_name = "SqueezeNetwork Beta"
- else
- sn_name = "SqueezeNetwork"
- end
- _cacheServer(self, self.jnt:getSNHostname(), 9000, sn_name)
+ _cacheServer(self, self.jnt:getSNHostname(), 9000,
"SqueezeNetwork")
end
-- Remove SqueezeCenters that have not been seen for a while
Modified: branches/7.0/jive/src/pkg/jive/share/jive/ui/Framework.lua
URL:
http://svn.slimdevices.com/branches/7.0/jive/src/pkg/jive/share/jive/ui/Framework.lua?rev=1837&root=Jive&r1=1836&r2=1837&view=diff
==============================================================================
--- branches/7.0/jive/src/pkg/jive/share/jive/ui/Framework.lua (original)
+++ branches/7.0/jive/src/pkg/jive/share/jive/ui/Framework.lua Wed Feb 6
22:38:56 2008
@@ -97,7 +97,6 @@
-- Put default global settings here
default_global_settings = {
- use_sn_beta = false,
}
-- To be filled in later when someone tries
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
