update https://github.com/x42/weakjack/

3 files changed, 19 insertions, 4 deletions

diff --git a/libs/backends/jack/weak_libjack.def b/libs/backends/jack/weak_libjack.def
index 45b1dc94a5..b94854d8fa 100644
--- a/libs/backends/jack/weak_libjack.def
+++ b/libs/backends/jack/weak_libjack.def
@@ -115,10 +115,18 @@ JPFUN(0, int,            acquire_real_time_scheduling, (jack_native_thread_t t,
 JPFUN(0, int,            drop_real_time_scheduling, (jack_native_thread_t t), (t), 0)
 JPFUN(0, int,            client_stop_thread, (jack_client_t* c, jack_native_thread_t t), (c,t), 0)
 JPFUN(0, int,            client_kill_thread, (jack_client_t* c, jack_native_thread_t t), (c,t), 0)
+JVFUN(0,                 set_thread_creator, (jack_thread_creator_t c), (c),)
 JPFUN(1, int,            client_create_thread, \
 		(jack_client_t* c, jack_native_thread_t *t, int p, int r, void *(*f)(void*), void *a), (c,t,p,r,f,a), 0)
 
-#if 0
+#ifndef NO_JACK_METADATA
+/* <jack/uuid.h>  - TODO*/
+
+/* <jack/jack.h> */
+JPFUN(0, char *,         get_uuid_for_client_name, (jack_client_t* c, const char* n), (c,n), NULL)
+JPFUN(0, char *,         get_client_name_by_uuid, (jack_client_t* c, const char* u), (c,u), NULL)
+JPFUN(0, jack_uuid_t,    port_uuid, (const jack_port_t *p), (p), 0)
+
 /* <jack/metadata.h> */
 JPFUN(0, int,            set_property, (jack_client_t* c, jack_uuid_t s, const char* k, const char* v, const char* t), (c,s,k,v,t), -1)
 JXFUN(0, int,            get_property, (jack_uuid_t s, const char* k, char** v, char** t), (s,k,v,t), if (v) *v=NULL; if (t) *t=NULL; return -1;)
@@ -128,7 +136,7 @@ JXFUN(0, int,            get_all_properties, (jack_description_t** d), (d), if (
 JPFUN(0, int,            remove_property, (jack_client_t* c, jack_uuid_t s, const char* k), (c,s,k), -1)
 JPFUN(0, int,            remove_properties, (jack_client_t* c, jack_uuid_t s), (c,s), -1)
 JPFUN(0, int,            remove_all_properties, (jack_client_t* c), (c), -1)
-		(jack_client_t* c, jack_native_thread_t *t, int p, int r, void *(*f)(void*), void *a), (c,t,p,r,f,a), 0)
+JPFUN(0, int,            set_property_change_callback, (jack_client_t *c, JackPropertyChangeCallback s, void *a), (c,s,a), -1)
 #endif
 
 #endif // end USE_WEAK_JACK
diff --git a/libs/backends/jack/weak_libjack.h b/libs/backends/jack/weak_libjack.h
index 63439f0763..e18687b6c7 100644
--- a/libs/backends/jack/weak_libjack.h
+++ b/libs/backends/jack/weak_libjack.h
@@ -151,11 +151,16 @@ int have_libjack(void);
 #define jack_drop_real_time_scheduling      WJACK_drop_real_time_scheduling
 #define jack_client_stop_thread             WJACK_client_stop_thread
 #define jack_client_kill_thread             WJACK_client_kill_thread
+#define jack_set_thread_creator             WJACK_set_thread_creator
 
 #define jack_client_open                    WJACK_client_client_openXXX
 
-#if 0
+#ifndef NO_JACK_METADATA
 /* <jack/metadata.h> */
+#define jack_get_uuid_for_client_name       WJACK_get_uuid_for_client_name
+#define jack_get_client_name_by_uuid        WJACK_get_client_name_by_uuid
+#define jack_port_uuid                      WJACK_port_uuid
+
 #define jack_set_property                   WJACK_set_property
 #define jack_get_property                   WJACK_get_property
 #define jack_free_description               WJACK_free_description
@@ -175,7 +180,8 @@ int have_libjack(void);
 #include <jack/midiport.h>
 #include <jack/session.h>
 #include <jack/thread.h>
-#if 0
+
+#ifndef NO_JACK_METADATA
 #include <jack/metadata.h>
 #endif
 
diff --git a/libs/backends/jack/wscript b/libs/backends/jack/wscript
index d9e3146e7c..6b44611ae9 100644
--- a/libs/backends/jack/wscript
+++ b/libs/backends/jack/wscript
@@ -62,6 +62,7 @@ def build(bld):
 
     if (bld.env['build_target'] == 'mingw'):
         obj.uselib   = [ 'PORTAUDIO' ]
+        obj.defines += [ 'NO_JACK_METADATA' ] # TODO bug stephane to at least update the headers
     else:
         obj.uselib   = [ ]