Browse Source

Correct NetJack2 time out handling.

tags/v1.9.11-RC1
Stephane Letz 10 years ago
parent
commit
40341d16fb
2 changed files with 3 additions and 3 deletions
  1. +2
    -2
      common/JackNetAPI.cpp
  2. +1
    -1
      common/JackNetInterface.h

+ 2
- 2
common/JackNetAPI.cpp View File

@@ -863,9 +863,9 @@ struct JackNetExtSlave : public JackNetSlaveInterface, public JackRunnableInterf
// One cycle
Process();
// Then use PACKET_TIMEOUT * fParams.fNetworkLatency for next cycles
SetPacketTimeOut(PACKET_TIMEOUT * fParams.fNetworkLatency);
SetPacketTimeOut(std::max(int(PACKET_TIMEOUT), int(PACKET_TIMEOUT * fParams.fNetworkLatency)));
}

int Process()


+ 1
- 1
common/JackNetInterface.h View File

@@ -36,7 +36,7 @@ namespace Jack
#define MANAGER_INIT_TIMEOUT 1000000 * 2 // in usec
#define MASTER_INIT_TIMEOUT 1000000 * 10 // in usec
#define SLAVE_INIT_TIMEOUT 1000000 * 1 // in usec
#define PACKET_TIMEOUT 500000 // in usec
#define PACKET_TIMEOUT 1000000 // in usec

#define NETWORK_DEFAULT_LATENCY 2
#define NETWORK_MAX_LATENCY 30 // maximum possible latency in network master/slave loop


Loading…
Cancel
Save