Commit 450d8847 authored by Stephane Letz's avatar Stephane Letz
Browse files

Netjack2 code fixes.

parent af438d25
......@@ -643,7 +643,7 @@ namespace Jack
bool JackNetSlaveInterface::InitConnection(int time_out_sec)
{
jack_log("JackNetSlaveInterface::InitConnection()");
uint try_count = (time_out_sec > 0) ? ((1000000 * time_out_sec) / SLAVE_INIT_TIMEOUT) : UINT_MAX;
int try_count = (time_out_sec > 0) ? ((1000000 * time_out_sec) / SLAVE_INIT_TIMEOUT) : INT_MAX;
// set the parameters to send
strcpy(fParams.fPacketType, "params");
......@@ -681,7 +681,7 @@ namespace Jack
return true;
}
net_status_t JackNetSlaveInterface::SendAvailableToMaster(long try_count)
net_status_t JackNetSlaveInterface::SendAvailableToMaster(int try_count)
{
jack_log("JackNetSlaveInterface::SendAvailableToMaster()");
// utility
......
......@@ -188,7 +188,7 @@ namespace Jack
bool InitConnection(int time_out_sec);
bool InitRendering();
net_status_t SendAvailableToMaster(long count = LONG_MAX); // long here (and not int...)
net_status_t SendAvailableToMaster(int count = INT_MAX);
net_status_t SendStartToMaster();
bool SetParams();
......
......@@ -774,7 +774,7 @@ namespace Jack
JackNetMaster* JackNetMasterManager::InitMaster(session_params_t& params)
{
jack_log("JackNetMasterManager::InitMaster, Slave : %s", params.fName);
jack_log("JackNetMasterManager::InitMaster slave : %s", params.fName);
//check MASTER <<==> SLAVE network protocol coherency
if (params.fProtocolVersion != MASTER_PROTOCOL) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment