diff --git a/common/JackNetAPI.cpp b/common/JackNetAPI.cpp index d4a87d35..a70466e1 100644 --- a/common/JackNetAPI.cpp +++ b/common/JackNetAPI.cpp @@ -475,6 +475,7 @@ struct JackNetExtSlave : public JackNetSlaveInterface, public JackRunnableInterf fParams.fNetworkMode = request->mode; fParams.fSampleEncoder = request->encoder; fParams.fKBps = request->kbps; + fParams.fSlaveSyncMode = 1; fConnectTimeOut = request->time_out; // Create name with hostname and client name @@ -517,8 +518,8 @@ struct JackNetExtSlave : public JackNetSlaveInterface, public JackRunnableInterf if (fShutdownCallback) fShutdownCallback(fShutdownArg); - // Init complete network connection - if (!JackNetSlaveInterface::Init()) + // Init network connection + if (!JackNetSlaveInterface::InitConnection(fConnectTimeOut)) return -1; // Then set global parameters @@ -695,7 +696,7 @@ struct JackNetExtSlave : public JackNetSlaveInterface, public JackRunnableInterf int Start() { - // Finish connection.. + // Finish connection... if (!JackNetSlaveInterface::InitRendering()) { return -1; } diff --git a/common/JackNetInterface.cpp b/common/JackNetInterface.cpp index 12aaac40..6833345e 100644 --- a/common/JackNetInterface.cpp +++ b/common/JackNetInterface.cpp @@ -647,7 +647,7 @@ namespace Jack bool JackNetSlaveInterface::InitConnection(int time_out) { jack_log("JackNetSlaveInterface::InitConnection()"); - int try_count = (time_out > 0) ? ((1000000 * time_out) / SLAVE_INIT_TIMEOUT) : LONG_MAX; + unsigned int try_count = (time_out > 0) ? ((1000000 * time_out) / SLAVE_INIT_TIMEOUT) : LONG_MAX; //set the parameters to send strcpy(fParams.fPacketType, "params");