Browse Source

Correct code for libjacknet.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@4378 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/1.9.8
sletz 14 years ago
parent
commit
50e718ad25
2 changed files with 5 additions and 4 deletions
  1. +4
    -3
      common/JackNetAPI.cpp
  2. +1
    -1
      common/JackNetInterface.cpp

+ 4
- 3
common/JackNetAPI.cpp View File

@@ -475,6 +475,7 @@ struct JackNetExtSlave : public JackNetSlaveInterface, public JackRunnableInterf
fParams.fNetworkMode = request->mode; fParams.fNetworkMode = request->mode;
fParams.fSampleEncoder = request->encoder; fParams.fSampleEncoder = request->encoder;
fParams.fKBps = request->kbps; fParams.fKBps = request->kbps;
fParams.fSlaveSyncMode = 1;
fConnectTimeOut = request->time_out; fConnectTimeOut = request->time_out;


// Create name with hostname and client name // Create name with hostname and client name
@@ -517,8 +518,8 @@ struct JackNetExtSlave : public JackNetSlaveInterface, public JackRunnableInterf
if (fShutdownCallback) if (fShutdownCallback)
fShutdownCallback(fShutdownArg); fShutdownCallback(fShutdownArg);


// Init complete network connection
if (!JackNetSlaveInterface::Init())
// Init network connection
if (!JackNetSlaveInterface::InitConnection(fConnectTimeOut))
return -1; return -1;


// Then set global parameters // Then set global parameters
@@ -695,7 +696,7 @@ struct JackNetExtSlave : public JackNetSlaveInterface, public JackRunnableInterf


int Start() int Start()
{ {
// Finish connection..
// Finish connection...
if (!JackNetSlaveInterface::InitRendering()) { if (!JackNetSlaveInterface::InitRendering()) {
return -1; return -1;
} }


+ 1
- 1
common/JackNetInterface.cpp View File

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


Loading…
Cancel
Save