Browse Source

Merge pull request #277 from kmatheussen/master

Fix gcc7 build and JackDebugClient
tags/v1.9.12
Filipe Coelho GitHub 8 years ago
parent
commit
0f277def59
5 changed files with 3 additions and 5 deletions
  1. +0
    -3
      common/JackClient.cpp
  2. +0
    -1
      common/JackClient.h
  3. +1
    -0
      common/JackDebugClient.cpp
  4. +1
    -0
      example-clients/tw.c
  5. +1
    -1
      tests/test.cpp

+ 0
- 3
common/JackClient.cpp View File

@@ -39,9 +39,6 @@ namespace Jack

#define IsRealTime() ((fProcess != NULL) | (fThreadFun != NULL) | (fSync != NULL) | (fTimebase != NULL))

JackClient::JackClient():fThread(this)
{}

JackClient::JackClient(JackSynchro* table):fThread(this)
{
fSynchroTable = table;


+ 0
- 1
common/JackClient.h View File

@@ -124,7 +124,6 @@ class SERVER_EXPORT JackClient : public JackClientInterface, public JackRunnable

public:

JackClient();
JackClient(JackSynchro* table);
virtual ~JackClient();



+ 1
- 0
common/JackDebugClient.cpp View File

@@ -35,6 +35,7 @@ namespace Jack
{

JackDebugClient::JackDebugClient(JackClient * client)
: JackClient(client->fSynchroTable)
{
fTotalPortNumber = 1; // The total number of port opened and maybe closed. Historical view.
fOpenPortNumber = 0; // The current number of opened port.


+ 1
- 0
example-clients/tw.c View File

@@ -9,6 +9,7 @@
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
#include <signal.h>

#include <jack/jack.h>



+ 1
- 1
tests/test.cpp View File

@@ -479,7 +479,7 @@ int process4(jack_nframes_t nframes, void *arg)
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);
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);
}



Loading…
Cancel
Save