Correct wrapper

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@1285 0c269be4-1314-0410-8aa9-9f06e86f4224

1 files changed, 19 insertions, 11 deletions

diff --git a/common/JackLibAPI.cpp b/common/JackLibAPI.cpp
index 87730d53..69823553 100644
--- a/common/JackLibAPI.cpp
+++ b/common/JackLibAPI.cpp
@@ -57,17 +57,7 @@ static inline bool CheckPort(jack_port_id_t port_index)
     return (port_index < PORT_NUM);
 }
 
-EXPORT jack_client_t* jack_client_new(const char* client_name)
-{
-    int options = JackUseExactName;
-    if (getenv("JACK_START_SERVER") == NULL)
-        options |= JackNoStartServer;
-
-    return jack_client_open(client_name, (jack_options_t)options, NULL);
-}
-
-// TO BE IMPLEMENTED PROPERLY
-EXPORT jack_client_t* jack_client_open(const char* client_name, jack_options_t options, jack_status_t* status, ...)
+static jack_client_t* jack_client_open_aux(const char* client_name, jack_options_t options, jack_status_t* status, ...)
 {
     va_list ap;				/* variable argument pointer */
     jack_varargs_t va;		/* variable arguments */
@@ -115,6 +105,24 @@ EXPORT jack_client_t* jack_client_open(const char* client_name, jack_options_t o
     return NULL;
 }
 
+EXPORT jack_client_t* jack_client_new(const char* client_name)
+{
+    int options = JackUseExactName;
+    if (getenv("JACK_START_SERVER") == NULL)
+        options |= JackNoStartServer;
+
+    return jack_client_open_aux(client_name, (jack_options_t)options, NULL);
+}
+
+EXPORT jack_client_t* jack_client_open(const char* client_name, jack_options_t options, jack_status_t* status, ...)
+{
+    va_list ap;
+	va_start(ap, status);
+	jack_client_t* res = jack_client_open_aux(client_name, options, status, ap);
+	va_end(ap);
+	return res;
+}
+
 EXPORT int jack_client_close(jack_client_t* ext_client)
 {
     JackLog("jack_client_close\n");