From 4bd4f5b1bb4819dea97f6d9fe5b18bc057cc27a9 Mon Sep 17 00:00:00 2001 From: Torben Hohn Date: Wed, 5 May 2010 13:00:48 +0200 Subject: [PATCH] fix compile errors. which showed up from the rebase. --- common/JackLibAPI.cpp | 2 +- common/JackNetOneDriver.cpp | 1 + common/JackServerAPI.cpp | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/common/JackLibAPI.cpp b/common/JackLibAPI.cpp index 5a7b9219..4af8b218 100644 --- a/common/JackLibAPI.cpp +++ b/common/JackLibAPI.cpp @@ -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 diff --git a/common/JackNetOneDriver.cpp b/common/JackNetOneDriver.cpp index 539c05a4..4364606b 100644 --- a/common/JackNetOneDriver.cpp +++ b/common/JackNetOneDriver.cpp @@ -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; diff --git a/common/JackServerAPI.cpp b/common/JackServerAPI.cpp index b7d65c84..0b3779f9 100644 --- a/common/JackServerAPI.cpp +++ b/common/JackServerAPI.cpp @@ -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