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