Fix gcc7 build and JackDebugClienttags/v1.9.12
| @@ -39,9 +39,6 @@ namespace Jack | |||||
| #define IsRealTime() ((fProcess != NULL) | (fThreadFun != NULL) | (fSync != NULL) | (fTimebase != NULL)) | #define IsRealTime() ((fProcess != NULL) | (fThreadFun != NULL) | (fSync != NULL) | (fTimebase != NULL)) | ||||
| JackClient::JackClient():fThread(this) | |||||
| {} | |||||
| JackClient::JackClient(JackSynchro* table):fThread(this) | JackClient::JackClient(JackSynchro* table):fThread(this) | ||||
| { | { | ||||
| fSynchroTable = table; | fSynchroTable = table; | ||||
| @@ -124,7 +124,6 @@ class SERVER_EXPORT JackClient : public JackClientInterface, public JackRunnable | |||||
| public: | public: | ||||
| JackClient(); | |||||
| JackClient(JackSynchro* table); | JackClient(JackSynchro* table); | ||||
| virtual ~JackClient(); | virtual ~JackClient(); | ||||
| @@ -35,6 +35,7 @@ namespace Jack | |||||
| { | { | ||||
| JackDebugClient::JackDebugClient(JackClient * client) | JackDebugClient::JackDebugClient(JackClient * client) | ||||
| : JackClient(client->fSynchroTable) | |||||
| { | { | ||||
| fTotalPortNumber = 1; // The total number of port opened and maybe closed. Historical view. | fTotalPortNumber = 1; // The total number of port opened and maybe closed. Historical view. | ||||
| fOpenPortNumber = 0; // The current number of opened port. | fOpenPortNumber = 0; // The current number of opened port. | ||||
| @@ -9,6 +9,7 @@ | |||||
| #include <unistd.h> | #include <unistd.h> | ||||
| #include <stdlib.h> | #include <stdlib.h> | ||||
| #include <string.h> | #include <string.h> | ||||
| #include <signal.h> | |||||
| #include <jack/jack.h> | #include <jack/jack.h> | ||||
| @@ -479,7 +479,7 @@ int process4(jack_nframes_t nframes, void *arg) | |||||
| jack_nframes_t delta_time = cur_time - last_time; | jack_nframes_t delta_time = cur_time - last_time; | ||||
| Log("calling process4 callback : jack_frame_time = %ld delta_time = %ld\n", cur_time, delta_time); | Log("calling process4 callback : jack_frame_time = %ld delta_time = %ld\n", cur_time, delta_time); | ||||
| if (delta_time > 0 && (jack_nframes_t)abs(delta_time - cur_buffer_size) > tolerance) { | |||||
| if (delta_time > 0 && abs((int64_t)delta_time - (int64_t)cur_buffer_size) > (int64_t)tolerance) { | |||||
| printf("!!! ERROR !!! jack_frame_time seems to return incorrect values cur_buffer_size = %d, delta_time = %d tolerance %d\n", cur_buffer_size, delta_time, tolerance); | printf("!!! ERROR !!! jack_frame_time seems to return incorrect values cur_buffer_size = %d, delta_time = %d tolerance %d\n", cur_buffer_size, delta_time, tolerance); | ||||
| } | } | ||||