Author: titmuss
Date: Fri Feb 1 13:57:15 2008
New Revision: 1754
URL: http://svn.slimdevices.com?rev=1754&root=Jive&view=rev
Log:
[EMAIL PROTECTED] (orig r1740): titmuss | 2008-02-01 20:53:18 +0000
Bug: 6764
Description:
More cases that need to use a monotonic clock.
Modified:
trunk/ (props changed)
trunk/jive/src/pkg/jive/share/jive/slim/Player.lua
trunk/jive/src/pkg/jive/share/jive/slim/SlimServer.lua
trunk/jive/src/pkg/jive/share/jive/slim/SlimServers.lua
Propchange: trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Fri Feb 1 13:57:15 2008
@@ -1,3 +1,3 @@
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1739
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1740
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified: trunk/jive/src/pkg/jive/share/jive/slim/Player.lua
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive/share/jive/slim/Player.lua?rev=1754&root=Jive&r1=1753&r2=1754&view=diff
==============================================================================
--- trunk/jive/src/pkg/jive/share/jive/slim/Player.lua (original)
+++ trunk/jive/src/pkg/jive/share/jive/slim/Player.lua Fri Feb 1 13:57:15 2008
@@ -219,8 +219,6 @@
local obj = oo.rawnew(self,{
- lastSeen = os.time(),
-
slimServer = slimServer,
jnt = jnt,
@@ -336,7 +334,7 @@
end
if self.state.mode == "play" then
- local now = os.time()
+ local now = Framework:getTicks() / 1000
-- multiply by rate to allow for trick modes
self.trackCorrection = tonumber(self.state.rate) * (now -
self.trackSeen)
@@ -716,7 +714,7 @@
self.state = event.data
-- used for calculating getTrackElapsed(), getTrackRemaining()
- self.trackSeen = os.time()
+ self.trackSeen = Framework:getTicks() / 1000
self.trackCorrection = 0
self.trackTime = event.data.time
self.trackDuration = event.data.duration
@@ -815,7 +813,7 @@
if paused == 'stop' or paused == 'pause' then
-- reset the elapsed time epoch
- self.trackSeen = os.time()
+ self.trackSeen = Framework:getTicks() / 1000
self:call({'pause', '0'})
self.state["mode"] = 'play'
@@ -865,7 +863,7 @@
if self.state.mode ~= 'play' then
-- reset the elapsed time epoch
- self.trackSeen = os.time()
+ self.trackSeen = Framework:getTicks()
end
self:call({'mode', 'play'})
Modified: trunk/jive/src/pkg/jive/share/jive/slim/SlimServer.lua
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive/share/jive/slim/SlimServer.lua?rev=1754&root=Jive&r1=1753&r2=1754&view=diff
==============================================================================
--- trunk/jive/src/pkg/jive/share/jive/slim/SlimServer.lua (original)
+++ trunk/jive/src/pkg/jive/share/jive/slim/SlimServer.lua Fri Feb 1 13:57:15
2008
@@ -113,7 +113,7 @@
-- update in one shot
self.state = data
- self.plumbing.lastSeen = os.time()
+ self.plumbing.lastSeen = Framework:getTicks()
-- manage rescan
-- use tostring to handle nil case (in either server of self data)
@@ -216,7 +216,7 @@
-- connection stuff
plumbing = {
- lastSeen = os.time(),
+ lastSeen = Framework:getTicks(),
ip = ip,
port = port,
},
@@ -426,7 +426,7 @@
self.name = name
end
- self.plumbing.lastSeen = os.time()
+ self.plumbing.lastSeen = Framework:getTicks()
end
Modified: trunk/jive/src/pkg/jive/share/jive/slim/SlimServers.lua
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive/share/jive/slim/SlimServers.lua?rev=1754&root=Jive&r1=1753&r2=1754&view=diff
==============================================================================
--- trunk/jive/src/pkg/jive/share/jive/slim/SlimServers.lua (original)
+++ trunk/jive/src/pkg/jive/share/jive/slim/SlimServers.lua Fri Feb 1 13:57:15
2008
@@ -41,6 +41,7 @@
local SocketUdp = require("jive.net.SocketUdp")
local SlimServer = require("jive.slim.SlimServer")
local strings = require("jive.utils.strings")
+local Framework = require("jive.ui.Framework")
local Timer = require("jive.ui.Timer")
local log = require("jive.utils.log").logger("slimserver")
@@ -51,7 +52,7 @@
-- constants
local PORT = 3483 -- port used to discover servers
-local TIMEOUT = 60 -- timeout (in seconds) before removing servers
+local TIMEOUT = 60000 -- timeout (in milliseconds) before removing
servers
-- t_source
@@ -157,7 +158,7 @@
local function _cacheCleanup(self)
log:debug("_cacheCleanup()")
- local now = os.time()
+ local now = Framework:getTicks()
for ss_id, server in pairs(self._servers) do
if not server:isConnected() and
now - server:getLastSeen() > TIMEOUT then
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
