Browse Source

Add NET_SYNCHING flag.

tags/v1.9.10
Stephane Letz 12 years ago
parent
commit
12b20854be
5 changed files with 6 additions and 4 deletions
  1. +2
    -1
      common/JackAudioAdapterInterface.cpp
  2. +1
    -1
      common/JackNetAPI.cpp
  3. +1
    -1
      common/JackNetInterface.cpp
  4. +1
    -1
      common/JackNetManager.cpp
  5. +1
    -0
      common/JackNetTool.h

+ 2
- 1
common/JackAudioAdapterInterface.cpp View File

@@ -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;



+ 1
- 1
common/JackNetAPI.cpp View File

@@ -418,7 +418,7 @@ struct JackNetExtMaster : public JackNetMasterInterface {
int res = SyncRecv();
switch (res) {
case 0:
case NET_SYNCHING:
case SOCKET_ERROR:
return res;


+ 1
- 1
common/JackNetInterface.cpp View File

@@ -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


+ 1
- 1
common/JackNetManager.cpp View File

@@ -520,7 +520,7 @@ namespace Jack
int res = SyncRecv();
switch (res) {
case 0:
case NET_SYNCHING:
case SOCKET_ERROR:
return res;


+ 1
- 0
common/JackNetTool.h View File

@@ -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…
Cancel
Save