From f9107702cf53df80fbf7b10a01ab611d795d63a7 Mon Sep 17 00:00:00 2001 From: paul Date: Thu, 23 Oct 2008 05:57:38 +0000 Subject: [PATCH] include post_process() call when freewheeling, to make transport state changes work; make internal client use system: not alsa_pcm: port names; do not munge backend MIDI port names into system: ; bump to 0.114.3 git-svn-id: svn+ssh://jackaudio.org/trunk/jack@3030 0c269be4-1314-0410-8aa9-9f06e86f4224 --- configure.ac | 2 +- example-clients/inprocess.c | 9 ++++----- jackd/engine.c | 6 ++++++ 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index 53b3f78..4284bb7 100644 --- a/configure.ac +++ b/configure.ac @@ -17,7 +17,7 @@ dnl changes are made dnl --- JACK_MAJOR_VERSION=0 JACK_MINOR_VERSION=114 -JACK_MICRO_VERSION=2 +JACK_MICRO_VERSION=3 dnl --- dnl HOWTO: updating the jack protocol version diff --git a/example-clients/inprocess.c b/example-clients/inprocess.c index 9b1e824..93258ca 100644 --- a/example-clients/inprocess.c +++ b/example-clients/inprocess.c @@ -77,17 +77,16 @@ jack_initialize (jack_client_t *client, const char *load_init) /* join the process() cycle */ jack_activate (client); - /* connect the ports. NOTE: this code only works with the - * ALSA backend. See simple_client.c for a better method that - * works with any backend. */ - if (jack_connect (client, "alsa_pcm:capture_1", + /* try to connect to the first physical input & output ports */ + + if (jack_connect (client, "system:capture_1", jack_port_name (pp->input_port))) { fprintf (stderr, "cannot connect input port\n"); return 1; /* terminate client */ } if (jack_connect (client, jack_port_name (pp->output_port), - "alsa_pcm:playback_1")) { + "system:playback_1")) { fprintf (stderr, "cannot connect output port\n"); return 1; /* terminate client */ } diff --git a/jackd/engine.c b/jackd/engine.c index ec2ac88..5428370 100644 --- a/jackd/engine.c +++ b/jackd/engine.c @@ -1987,6 +1987,8 @@ jack_engine_freewheel (void *arg) break; } + jack_engine_post_process (engine); + jack_unlock_graph (engine); } @@ -3783,6 +3785,9 @@ jack_port_do_register (jack_engine_t *engine, jack_request_t *req, int internal) goto next; } } + +#if 0 // do not do this for MIDI + else if (strcmp(req->x.port_info.type, JACK_DEFAULT_MIDI_TYPE) == 0) { if ((req->x.port_info.flags & (JackPortIsPhysical|JackPortIsInput)) == (JackPortIsPhysical|JackPortIsInput)) { snprintf (shared->name, sizeof (shared->name), JACK_BACKEND_ALIAS ":midi_playback_%d", ++engine->midi_out_cnt); @@ -3795,6 +3800,7 @@ jack_port_do_register (jack_engine_t *engine, jack_request_t *req, int internal) goto next; } } +#endif fallback: strcpy (shared->name, req->x.port_info.name);