Correct timeout settings in netjack2

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@2753 0c269be4-1314-0410-8aa9-9f06e86f4224

2 files changed, 4 insertions, 4 deletions

diff --git a/windows/JackNetWinSocket.cpp b/windows/JackNetWinSocket.cpp
index a511614d..08bf71a6 100644
--- a/windows/JackNetWinSocket.cpp
+++ b/windows/JackNetWinSocket.cpp
@@ -263,12 +263,12 @@ namespace Jack
     }
 
     //tiemout************************************************************************************************************
-    int JackNetWinSocket::SetTimeOut ( float& msec )
+    int JackNetWinSocket::SetTimeOut ( int& usec )
     {
         //negative timeout, or exceeding 10s, return
-        if ( ( msec < 0 ) || ( msec > 10000 ) )
+        if ( ( msec < 0 ) || ( usec > 10000000 ) )
             return -1;
-		int time = ( int ) msec;
+		int time = usec / 1000;
         return SetOption ( SOL_SOCKET, SO_RCVTIMEO, &time, sizeof ( time ) );
     }
 
diff --git a/windows/JackNetWinSocket.h b/windows/JackNetWinSocket.h
index 51c9fd58..044a01cd 100644
--- a/windows/JackNetWinSocket.h
+++ b/windows/JackNetWinSocket.h
@@ -81,7 +81,7 @@ namespace Jack
         int GetOption ( int level, int optname, void* optval, SOCKLEN* optlen );
 
         //timeout
-        int SetTimeOut ( float& msec );
+        int SetTimeOut ( int& usec );
 
         //local loop
         int SetLocalLoop();