Browse Source

Netjack2 code fixes.

tags/v1.9.10
Stephane Letz 12 years ago
parent
commit
450d884710
3 changed files with 4 additions and 4 deletions
  1. +2
    -2
      common/JackNetInterface.cpp
  2. +1
    -1
      common/JackNetInterface.h
  3. +1
    -1
      common/JackNetManager.cpp

+ 2
- 2
common/JackNetInterface.cpp View File

@@ -643,7 +643,7 @@ namespace Jack
bool JackNetSlaveInterface::InitConnection(int time_out_sec) bool JackNetSlaveInterface::InitConnection(int time_out_sec)
{ {
jack_log("JackNetSlaveInterface::InitConnection()"); 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 // set the parameters to send
strcpy(fParams.fPacketType, "params"); strcpy(fParams.fPacketType, "params");
@@ -681,7 +681,7 @@ namespace Jack
return true; return true;
} }


net_status_t JackNetSlaveInterface::SendAvailableToMaster(long try_count)
net_status_t JackNetSlaveInterface::SendAvailableToMaster(int try_count)
{ {
jack_log("JackNetSlaveInterface::SendAvailableToMaster()"); jack_log("JackNetSlaveInterface::SendAvailableToMaster()");
// utility // utility


+ 1
- 1
common/JackNetInterface.h View File

@@ -188,7 +188,7 @@ namespace Jack
bool InitConnection(int time_out_sec); bool InitConnection(int time_out_sec);
bool InitRendering(); 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(); net_status_t SendStartToMaster();


bool SetParams(); bool SetParams();


+ 1
- 1
common/JackNetManager.cpp View File

@@ -774,7 +774,7 @@ namespace Jack


JackNetMaster* JackNetMasterManager::InitMaster(session_params_t& params) 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 //check MASTER <<==> SLAVE network protocol coherency
if (params.fProtocolVersion != MASTER_PROTOCOL) { if (params.fProtocolVersion != MASTER_PROTOCOL) {


Loading…
Cancel
Save