diff --git a/configure.in b/configure.in index 190fd2a..fac0997 100644 --- a/configure.in +++ b/configure.in @@ -5,7 +5,7 @@ AC_CONFIG_AUX_DIR(.) JACK_MAJOR_VERSION=0 JACK_MINOR_VERSION=26 -JACK_MICRO_VERSION=0 +JACK_MICRO_VERSION=1 BETA= diff --git a/engine.c b/engine.c index 9f8f7ca..8d3279b 100644 --- a/engine.c +++ b/engine.c @@ -450,7 +450,7 @@ jack_process (jack_engine_t *engine, nframes_t nframes) } ctl = client->control; - ctl->timed_out; + ctl->timed_out = 0; if (jack_client_is_inprocess (client)) { @@ -500,7 +500,7 @@ jack_process (jack_engine_t *engine, nframes_t nframes) pfd[0].fd = client->subgraph_wait_fd; pfd[0].events = POLLERR|POLLIN|POLLHUP|POLLNVAL; - if (poll (pfd, 1, engine->driver->period_usecs) < 0) { + if (poll (pfd, 1, engine->driver->period_usecs/1000) < 0) { jack_error ("poll on subgraph processing failed (%s)", strerror (errno)); status = -1; }