Browse Source

fix compile errors. which showed up from the rebase.

tags/1.9.7
Torben Hohn 16 years ago
parent
commit
4bd4f5b1bb
3 changed files with 3 additions and 2 deletions
  1. +1
    -1
      common/JackLibAPI.cpp
  2. +1
    -0
      common/JackNetOneDriver.cpp
  3. +1
    -1
      common/JackServerAPI.cpp

+ 1
- 1
common/JackLibAPI.cpp View File

@@ -149,7 +149,7 @@ jack_client_t* jack_client_open_aux(const char* client_name, jack_options_t opti
client = new JackLibClient(GetSynchroTable());
}

int res = client->Open(va.server_name, client_name, options, status);
int res = client->Open(va.server_name, client_name, options, status, va.session_id);
if (res < 0) {
delete client;
JackLibGlobals::Destroy(); // jack library destruction


+ 1
- 0
common/JackNetOneDriver.cpp View File

@@ -989,6 +989,7 @@ JackNetOneDriver::render_jack_ports_to_payload (int bitdepth, JSList *playback_p
unsigned int latency = 5;
unsigned int redundancy = 1;
unsigned int mtu = 1400;
unsigned int resample_factor_up = 1;
int dont_htonl_floats = 0;
int always_deadline = 0;
int jitter_val = 0;


+ 1
- 1
common/JackServerAPI.cpp View File

@@ -141,7 +141,7 @@ jack_client_t* jack_client_open_aux(const char* client_name, jack_options_t opti
client = new JackInternalClient(JackServerGlobals::fInstance, GetSynchroTable());
}

int res = client->Open(va.server_name, client_name, options, status);
int res = client->Open(va.server_name, client_name, options, status, va.session_id);
if (res < 0) {
delete client;
JackServerGlobals::Destroy(); // jack server destruction


Loading…
Cancel
Save