@@ -293,8 +293,9 @@ namespace Jack | |||||
int JackAudioAdapterInterface::PullAndPush(float** inputBuffer, float** outputBuffer, unsigned int frames) | int JackAudioAdapterInterface::PullAndPush(float** inputBuffer, float** outputBuffer, unsigned int frames) | ||||
{ | { | ||||
fPullAndPushTime = GetMicroSeconds(); | fPullAndPushTime = GetMicroSeconds(); | ||||
if (!fRunning) | |||||
if (!fRunning) { | |||||
return 0; | return 0; | ||||
} | |||||
int res = 0; | int res = 0; | ||||
@@ -418,7 +418,7 @@ struct JackNetExtMaster : public JackNetMasterInterface { | |||||
int res = SyncRecv(); | int res = SyncRecv(); | ||||
switch (res) { | switch (res) { | ||||
case 0: | |||||
case NET_SYNCHING: | |||||
case SOCKET_ERROR: | case SOCKET_ERROR: | ||||
return res; | return res; | ||||
@@ -494,7 +494,7 @@ namespace Jack | |||||
if (fCurrentCycleOffset < fMaxCycleOffset && !fSynched) { | if (fCurrentCycleOffset < fMaxCycleOffset && !fSynched) { | ||||
jack_info("Synching with latency = %d", fCurrentCycleOffset); | jack_info("Synching with latency = %d", fCurrentCycleOffset); | ||||
return 0; | |||||
return NET_SYNCHING; | |||||
} else { | } else { | ||||
if (fCurrentCycleOffset == fMaxCycleOffset) { | if (fCurrentCycleOffset == fMaxCycleOffset) { | ||||
// when the sync offset is reached | // when the sync offset is reached | ||||
@@ -520,7 +520,7 @@ namespace Jack | |||||
int res = SyncRecv(); | int res = SyncRecv(); | ||||
switch (res) { | switch (res) { | ||||
case 0: | |||||
case NET_SYNCHING: | |||||
case SOCKET_ERROR: | case SOCKET_ERROR: | ||||
return res; | return res; | ||||
@@ -41,6 +41,7 @@ using namespace std; | |||||
#define MASTER_PROTOCOL 6 | #define MASTER_PROTOCOL 6 | ||||
#define SLAVE_PROTOCOL 6 | #define SLAVE_PROTOCOL 6 | ||||
#define NET_SYNCHING 0 | |||||
#define NET_PACKET_ERROR -2 | #define NET_PACKET_ERROR -2 | ||||
#define OPTIMIZED_PROTOCOL 1 | #define OPTIMIZED_PROTOCOL 1 | ||||