Author: titmuss
Date: Wed Apr 2 05:38:14 2008
New Revision: 2165
URL: http://svn.slimdevices.com?rev=2165&root=Jive&view=rev
Log:
Bug: 5378
Description:
Add UI changes required for WOL.
Modified:
trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/strings.txt
trunk/squeezeplay/src/squeezeplay/share/jive/net/Comet.lua
trunk/squeezeplay/src/squeezeplay/share/jive/net/SocketHttp.lua
trunk/squeezeplay/src/squeezeplay/share/jive/slim/SlimServers.lua
Modified:
trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
URL:
http://svn.slimdevices.com/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua?rev=2165&root=Jive&r1=2164&r2=2165&view=diff
==============================================================================
---
trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
(original)
+++
trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
Wed Apr 2 05:38:14 2008
@@ -2194,6 +2194,31 @@
return
end
+ -- attempt to reconnect, this may send WOL
+ server:connect()
+
+ -- popup
+ local popup = Popup("popupIcon")
+ popup:addWidget(Icon("iconConnecting"))
+ popup:addWidget(Label("text", self:string("SLIMBROWSER_CONNECTING_TO",
server:getName())))
+
+ local count = 0
+ popup:addTimer(1000,
+ function()
+ count = count + 1
+ if count == 20 then
+ self:_problemConnecting(server)
+ end
+ end)
+
+ -- once the server is connected the popup is closed in
+ -- notify_serverConnected
+ self.serverErrorWindow = popup
+ popup:show()
+end
+
+
+function _problemConnecting(self, server)
-- open connection error window
local window = Window("window",
self:string("SLIMBROWSER_PROBLEM_CONNECTING"), 'settingstitle')
@@ -2240,13 +2265,13 @@
})
end
- window:addWidget(Textarea("help",
self:string("SLIMBROWSER_PROBLEM_CONNECTING_HELP", tostring(_player:getName()),
tostring(_server:getName()))))
+ window:addWidget(Textarea("help",
self:string("SLIMBROWSER_PROBLEM_CONNECTING_HELP",
tostring(_server:getName()))))
window:addWidget(menu)
self.serverErrorWindow = window
window:addListener(EVENT_WINDOW_POP,
function()
- self.serverErrorWindow = nil
+ self.serverErrorWindow = false
end)
window:show()
Modified:
trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/strings.txt
URL:
http://svn.slimdevices.com/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/strings.txt?rev=2165&root=Jive&r1=2164&r2=2165&view=diff
==============================================================================
--- trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/strings.txt
(original)
+++ trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/strings.txt Wed
Apr 2 05:38:14 2008
@@ -84,13 +84,7 @@
NL Speler kiezen
SLIMBROWSER_PROBLEM_CONNECTING_HELP
- DA %s har problemer med at tilslutte til %s
- DE Probleme beim Verbinden von %s mit %s
- EN %s is having trouble connecting to %s
- ES %s tiene problemas para conectarse a %s
- FR %s ne peut se connecter à %s
- IT Problema di connessione di %s a %s
- NL %s kan geen verbinding maken met %s
+ EN There is a problem connecting to %s
SLIMBROWSER_NOTHING
DA Intet
Modified: trunk/squeezeplay/src/squeezeplay/share/jive/net/Comet.lua
URL:
http://svn.slimdevices.com/trunk/squeezeplay/src/squeezeplay/share/jive/net/Comet.lua?rev=2165&root=Jive&r1=2164&r2=2165&view=diff
==============================================================================
--- trunk/squeezeplay/src/squeezeplay/share/jive/net/Comet.lua (original)
+++ trunk/squeezeplay/src/squeezeplay/share/jive/net/Comet.lua Wed Apr 2
05:38:14 2008
@@ -507,9 +507,6 @@
return
end
- log:debug(self, ": state is ", state)
- self.state = state
-
-- Stop reconnect timer
self.reconnect_timer:stop()
@@ -526,6 +523,9 @@
self.jnt:notify('cometDisconnected', self, #self.pending_reqs +
#self.sent_reqs)
end
+
+ log:debug(self, ": state is ", state)
+ self.state = state
end
@@ -691,6 +691,11 @@
clientId = self.clientId,
connectionType = 'streaming',
} }
+
+ -- Add any un-acknowledged requests to the outgoing data
+ for i, v in ipairs(self.sent_reqs) do
+ table.insert(data, v)
+ end
local req = CometRequest(
_getEventSink(self),
@@ -887,7 +892,7 @@
-- Decide what to do if we get disconnected or get an error while
handshaking/connecting
_handleAdvice = function(self)
- log:warn(self, ": handleAdvice state=", self.state)
+ log:info(self, ": handleAdvice state=", self.state)
if self.state == UNCONNECTED then
-- do nothing
Modified: trunk/squeezeplay/src/squeezeplay/share/jive/net/SocketHttp.lua
URL:
http://svn.slimdevices.com/trunk/squeezeplay/src/squeezeplay/share/jive/net/SocketHttp.lua?rev=2165&root=Jive&r1=2164&r2=2165&view=diff
==============================================================================
--- trunk/squeezeplay/src/squeezeplay/share/jive/net/SocketHttp.lua (original)
+++ trunk/squeezeplay/src/squeezeplay/share/jive/net/SocketHttp.lua Wed Apr 2
05:38:14 2008
@@ -293,7 +293,6 @@
log:debug(self, ":t_sendRequest()")
local source = function()
-
local line1 = string.format("%s HTTP/%s",
self.t_httpSendRequest:t_getRequestString(), self.t_httpProtocol)
local t = {}
@@ -357,7 +356,7 @@
function t_sendComplete(self)
if self.t_httpSendRequest then
table.insert(self.t_httpRecvRequests, self.t_httpSendRequest)
- self.t_httpSendRequest = nil
+ self.t_httpSendRequest = false
end
self:t_nextSendState(true, 't_sendDequeue')
@@ -828,7 +827,7 @@
if errorSink then
errorSink(nil, err)
end
- self.t_httpSendRequest = nil
+ self.t_httpSendRequest = false
end
-- error for pipelined requests
@@ -846,7 +845,7 @@
if errorSink then
errorSink(nil, err)
end
- self.t_httpRecvRequest = nil
+ self.t_httpRecvRequest = false
end
-- close the socket
Modified: trunk/squeezeplay/src/squeezeplay/share/jive/slim/SlimServers.lua
URL:
http://svn.slimdevices.com/trunk/squeezeplay/src/squeezeplay/share/jive/slim/SlimServers.lua?rev=2165&root=Jive&r1=2164&r2=2165&view=diff
==============================================================================
--- trunk/squeezeplay/src/squeezeplay/share/jive/slim/SlimServers.lua (original)
+++ trunk/squeezeplay/src/squeezeplay/share/jive/slim/SlimServers.lua Wed Apr
2 05:38:14 2008
@@ -160,6 +160,7 @@
local now = Framework:getTicks()
for ss_id, server in pairs(self._servers) do
if not server:isConnected() and
+ (not self.currentPlayer or
self.currentPlayer:getSlimServer() ~= server) and
now - server:getLastSeen() > TIMEOUT then
log:info("Removing server ", server:getName(), " (",
ss_id, ")")
@@ -330,7 +331,7 @@
--]]
function idleDisconnect(self)
for ss_id, server in pairs(self._servers) do
- if self.currentPlayer and self.currentPlayer:getSlimServer() ~=
server then
+ if not self.currentPlayer or self.currentPlayer:getSlimServer()
~= server then
server:disconnect()
end
end
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
