smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-12 09:36:33 +01:00
Code Issues Projects Releases Wiki Activity

add conditional use of jack_port_rename(), a newly added public API for JACK

Browse source
This commit is contained in:
Paul Davis 2015-07-02 14:02:00 -04:00
parent 9e2048decf
commit aaab192436
4 changed files with 25 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
libs/backends/jack/jack_portengine.cc
View file

@ -106,7 +106,16 @@ JACKAudioBackend::when_connected_to_jack ()
int int
JACKAudioBackend::set_port_name (PortHandle port, const std::string& name) JACKAudioBackend::set_port_name (PortHandle port, const std::string& name)
{ {
#if HAVE_JACK_PORT_RENAME
jack_client_t* client = _jack_connection->jack();
if (client) {
return jack_port_rename (client, (jack_port_t*) port, name.c_str());
} else {
return -1;
}
#else
return jack_port_set_name ((jack_port_t*) port, name.c_str()); return jack_port_set_name ((jack_port_t*) port, name.c_str());
#endif
} }
string string

1
libs/backends/jack/weak_libjack.def
View file

@ -66,6 +66,7 @@ JPFUN(1, const char *, port_type, (const jack_port_t *p), (p), 0)
JPFUN(1, const char **, port_get_connections, (const jack_port_t *p), (p), 0) JPFUN(1, const char **, port_get_connections, (const jack_port_t *p), (p), 0)
JPFUN(1, const char **, port_get_all_connections, (const jack_client_t *c, const jack_port_t *p), (c,p), 0) JPFUN(1, const char **, port_get_all_connections, (const jack_client_t *c, const jack_port_t *p), (c,p), 0)
JPFUN(1, int, port_set_name, (jack_port_t *p, const char *n), (p,n), 0) JPFUN(1, int, port_set_name, (jack_port_t *p, const char *n), (p,n), 0)
JVFUN(1, port_set_rename, (jack_client_t*, jack_port_t *p, const char *n), (c, p,n))
JPFUN(1, int, port_disconnect, (jack_client_t *c, jack_port_t *p), (c,p), 0) JPFUN(1, int, port_disconnect, (jack_client_t *c, jack_port_t *p), (c,p), 0)
JPFUN(1, int, connect, (jack_client_t *c, const char *s, const char *d), (c,s,d), -1) JPFUN(1, int, connect, (jack_client_t *c, const char *s, const char *d), (c,s,d), -1)
JPFUN(1, int, disconnect, (jack_client_t *c, const char *s, const char *d), (c,s,d), -1) JPFUN(1, int, disconnect, (jack_client_t *c, const char *s, const char *d), (c,s,d), -1)

1
libs/backends/jack/weak_libjack.h
View file

@ -95,6 +95,7 @@ int have_libjack(void);
#define jack_port_by_name WJACK_port_by_name #define jack_port_by_name WJACK_port_by_name
#define jack_port_by_id WJACK_port_by_id #define jack_port_by_id WJACK_port_by_id
#define jack_port_set_name WJACK_port_set_name #define jack_port_set_name WJACK_port_set_name
#define jack_port_rename WJACK_port_rename
#define jack_port_disconnect WJACK_port_disconnect #define jack_port_disconnect WJACK_port_disconnect
#define jack_port_register WJACK_port_register #define jack_port_register WJACK_port_register
#define jack_port_unregister WJACK_port_unregister #define jack_port_unregister WJACK_port_unregister

13
libs/backends/jack/wscript
View file

@ -46,6 +46,15 @@ def configure(conf):
define_name = 'HAVE_JACK_METADATA', define_name = 'HAVE_JACK_METADATA',
uselib = 'JACK') uselib = 'JACK')
# Check to see if jack_port_rename() is available and working
conf.check_cxx(fragment = "#include <jack/jack.h>\nint main(void) { jack_client_t* c; jack_port_t* p; jack_port_rename (c, p, \"foo\"); return 0; }\n",
mandatory = False,
msg = 'Checking for jack_port_rename()',
okmsg = 'ok',
errmsg = 'not found (or broken). jack_port_rename() will not be used, and jack_port_set_name() will be used instead',
define_name = 'HAVE_JACK_PORT_RENAME',
uselib = 'JACK')
def build(bld): def build(bld):
obj = bld(features = 'c cxx cxxshlib') obj = bld(features = 'c cxx cxxshlib')
obj.source = [ obj.source = [
@ -73,6 +82,10 @@ def build(bld):
obj.cxxflags += [ '-DHAVE_JACK_METADATA' ] obj.cxxflags += [ '-DHAVE_JACK_METADATA' ]
obj.cflags += [ '-DHAVE_JACK_METADATA' ] obj.cflags += [ '-DHAVE_JACK_METADATA' ]
if bld.is_defined ('HAVE_JACK_PORT_RENAME'):
obj.cxxflags += [ '-DHAVE_JACK_PORT_RENAME' ]
obj.cflags += [ '-DHAVE_JACK_PORT_RENAME' ]
if (bld.env['build_target'] == 'mingw'): if (bld.env['build_target'] == 'mingw'):
obj.uselib = [ 'PORTAUDIO' ] obj.uselib = [ 'PORTAUDIO' ]
else: else: