Author: richard
Date: Fri Jan 16 07:30:09 2009
New Revision: 3857
URL: http://svn.slimdevices.com?rev=3857&root=Jive&view=rev
Log:
r3...@harrypotter (orig r3852): richard | 2009-01-16 10:38:30 +0000
Bug: 10296
Description:
Back-ported timer changes from 7.4. This may help address the random reboot
issues. Changes are:
3770:3771
3772:3773
3775:3776
3811:3812
r3...@harrypotter (orig r3853): richard | 2009-01-16 10:48:39 +0000
Bug: N/A
Description:
Fix windows build.
r3...@harrypotter (orig r3856): richard | 2009-01-16 15:22:16 +0000
Bug: 10236
Description:
slimproto fix, some packets were getting lost and that could make playback
stop.
Modified:
7.4/trunk/ (props changed)
7.4/trunk/squeezeplay/src/squeezeplay/Makefile.am
7.4/trunk/squeezeplay/src/squeezeplay/Makefile.in
7.4/trunk/squeezeplay/src/squeezeplay/VisualC/jive.vcproj
7.4/trunk/squeezeplay/src/squeezeplay/share/jive/net/SlimProto.lua
7.4/trunk/squeezeplay/src/squeezeplay/share/jive/ui/Framework.lua
7.4/trunk/squeezeplay/src/squeezeplay/src/ui/jive.h
7.4/trunk/squeezeplay/src/squeezeplay/src/ui/jive_framework.c
Propchange: 7.4/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Fri Jan 16 07:30:09 2009
@@ -3,7 +3,7 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/trunk:2920
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:3753
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:3856
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/trunk/squeezeplay/src/squeezeplay/Makefile.am
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/Makefile.am?rev=3857&root=Jive&r1=3856&r2=3857&view=diff
==============================================================================
(empty)
Modified: 7.4/trunk/squeezeplay/src/squeezeplay/Makefile.in
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/Makefile.in?rev=3857&root=Jive&r1=3856&r2=3857&view=diff
==============================================================================
(empty)
Modified: 7.4/trunk/squeezeplay/src/squeezeplay/VisualC/jive.vcproj
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/VisualC/jive.vcproj?rev=3857&root=Jive&r1=3856&r2=3857&view=diff
==============================================================================
(empty)
Modified: 7.4/trunk/squeezeplay/src/squeezeplay/share/jive/net/SlimProto.lua
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/share/jive/net/SlimProto.lua?rev=3857&root=Jive&r1=3856&r2=3857&view=diff
==============================================================================
--- 7.4/trunk/squeezeplay/src/squeezeplay/share/jive/net/SlimProto.lua
(original)
+++ 7.4/trunk/squeezeplay/src/squeezeplay/share/jive/net/SlimProto.lua Fri Jan
16 07:30:09 2009
@@ -62,6 +62,7 @@
local table = require("jive.utils.table")
local Framework = require("jive.ui.Framework")
+local Task = require("jive.ui.Task")
local Timer = require("jive.ui.Timer")
local SocketTcp = require("jive.net.SocketTcp")
@@ -315,6 +316,7 @@
-- connection state UNCONNECTED / CONNECTED
obj.state = UNCONNECTED
obj.capabilities = {}
+ obj.txqueue = {}
-- helo packet sent on connection
obj.heloPacket = heloPacket
@@ -430,6 +432,17 @@
self.reconnect = true
end
+ self.writePump = function(NetworkThreadErr)
+ if (NetworkThreadErr) then
+ return _handleDisconnect(NetworkThreadErr)
+ end
+
+ self.socket.t_sock:send(table.concat(self.txqueue))
+ self.socket:t_removeWrite()
+
+ self.txqueue = {}
+ end
+
if server then
self.server = server
self.reconnect = false
@@ -549,16 +562,9 @@
--_hexDump(packet.opcode, data)
- local pump = function(NetworkThreadErr)
- if (NetworkThreadErr) then
- return _handleDisconnect(NetworkThreadErr)
- end
-
- self.socket.t_sock:send(data)
- self.socket:t_removeWrite()
- end
-
- self.socket:t_addWrite(pump, WRITE_TIMEOUT)
+ table.insert(self.txqueue, data)
+
+ self.socket:t_addWrite(self.writePump, WRITE_TIMEOUT)
return true
end
Modified: 7.4/trunk/squeezeplay/src/squeezeplay/share/jive/ui/Framework.lua
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/share/jive/ui/Framework.lua?rev=3857&root=Jive&r1=3856&r2=3857&view=diff
==============================================================================
(empty)
Modified: 7.4/trunk/squeezeplay/src/squeezeplay/src/ui/jive.h
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/src/ui/jive.h?rev=3857&root=Jive&r1=3856&r2=3857&view=diff
==============================================================================
(empty)
Modified: 7.4/trunk/squeezeplay/src/squeezeplay/src/ui/jive_framework.c
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/src/ui/jive_framework.c?rev=3857&root=Jive&r1=3856&r2=3857&view=diff
==============================================================================
(empty)
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
