[Playerstage-commit] SF.net SVN: playerstage: [6600] code/player/trunk/libplayercore/driver.h

[<th...@us...>]

Revision: 6600
          http://playerstage.svn.sourceforge.net/playerstage/?rev=6600&view=rev
Author:   thjc
Date:     2008-06-16 17:52:14 -0700 (Mon, 16 Jun 2008)

Log Message:
-----------
merged 6538 from 2-1 (fixed timeout on driver Wait)

Modified Paths:
--------------
    code/player/trunk/libplayercore/driver.h

Modified: code/player/trunk/libplayercore/driver.h
===================================================================
--- code/player/trunk/libplayercore/driver.h	2008-06-17 00:49:32 UTC (rev 6599)
+++ code/player/trunk/libplayercore/driver.h	2008-06-17 00:52:14 UTC (rev 6600)
@@ -159,7 +159,7 @@
     If TimeOut is set to a positive value this method will return false if the
     timeout occurs before and update is recieved.
     */
-    bool Wait(double TimeOut=0.0) { return this->InQueue->Wait(); }
+    bool Wait(double TimeOut=0.0) { return this->InQueue->Wait(TimeOut); }
 
     /** @brief Wake up the driver if the specified event occurs on the file descriptor */
     int AddFileWatch(int fd, bool ReadWatch = true, bool WriteWatch = false, bool ExceptWatch = true);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.