summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2007-02-10 03:39:10 +0000
committerDavid Robillard <d@drobilla.net>2007-02-10 03:39:10 +0000
commit5b1eb53ffcfddac397a6cf261a4ec491bfb0d22b (patch)
tree8a9b7cc4e74788f26fc12db55bf253f863952a30
parent042ae95935253f5e41d5c29313296280aeabeb35 (diff)
downloadraul-5b1eb53ffcfddac397a6cf261a4ec491bfb0d22b.tar.gz
raul-5b1eb53ffcfddac397a6cf261a4ec491bfb0d22b.tar.bz2
raul-5b1eb53ffcfddac397a6cf261a4ec491bfb0d22b.zip
Machine GUI talking to Jack engine, running machines made in GUI, etc.
git-svn-id: http://svn.drobilla.net/lad/raul@297 a436a847-0d15-0410-975c-d299462d15a1
-rw-r--r--raul/JackDriver.h2
-rw-r--r--src/JackDriver.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/raul/JackDriver.h b/raul/JackDriver.h
index d1ccc9b..512bce7 100644
--- a/raul/JackDriver.h
+++ b/raul/JackDriver.h
@@ -39,7 +39,7 @@ public:
JackDriver();
virtual ~JackDriver();
- void attach(const string& client_name);
+ void attach(const string& client_name, string server_name="default");
void detach();
bool is_attached() const { return (_client != NULL); }
diff --git a/src/JackDriver.cpp b/src/JackDriver.cpp
index d14a802..fb529eb 100644
--- a/src/JackDriver.cpp
+++ b/src/JackDriver.cpp
@@ -50,7 +50,7 @@ JackDriver::~JackDriver()
/** Connect to Jack.
*/
void
-JackDriver::attach(const string& client_name)
+JackDriver::attach(const string& client_name, string server_name)
{
// Already connected
if (_client)
@@ -58,7 +58,7 @@ JackDriver::attach(const string& client_name)
jack_set_error_function(error_cb);
- _client = jack_client_open(client_name.c_str(), JackNullOption, NULL);
+ _client = jack_client_open(client_name.c_str(), JackServerName, NULL, server_name.c_str(), NULL);
if (_client == NULL) {
//_app->status_message("[JACK] Unable to create client");
_is_activated = false;