diff --git a/configure.ac b/configure.ac index 7b9b19c..b4d99dc 100644 --- a/configure.ac +++ b/configure.ac @@ -15,7 +15,7 @@ dnl changes are made dnl --- JACK_MAJOR_VERSION=0 JACK_MINOR_VERSION=99 -JACK_MICRO_VERSION=8 +JACK_MICRO_VERSION=9 dnl --- dnl HOWTO: updating the jack protocol version diff --git a/example-clients/intime.c b/example-clients/intime.c index da9f91d..2a43337 100644 --- a/example-clients/intime.c +++ b/example-clients/intime.c @@ -30,7 +30,7 @@ * signature is "march time": 4/4, 120bpm */ float time_beats_per_bar = 4.0; -float time_beat_type = 1.0 / 4.0; +float time_beat_type = 4.0; double time_ticks_per_beat = 1920.0; double time_beats_per_minute = 120.0; @@ -133,7 +133,6 @@ jack_initialize (jack_client_t *client, const char *arg) fprintf (stderr, "counting %.1f/%.1f at %.2f bpm\n", time_beats_per_bar, time_beat_type, time_beats_per_minute); - time_beat_type = 1.0 / time_beat_type; } else { int len = strlen(arg); if ((len > 0) && (strncmp(arg, "timecode", len) == 0)) diff --git a/example-clients/transport.c b/example-clients/transport.c index 3d33e16..20c07cd 100644 --- a/example-clients/transport.c +++ b/example-clients/transport.c @@ -38,7 +38,7 @@ jack_client_t *client; * The default time signature is: "march time", 4/4, 120bpm */ float time_beats_per_bar = 4.0; -float time_beat_type = 0.25; +float time_beat_type = 4.0; double time_ticks_per_beat = 1920.0; double time_beats_per_minute = 120.0; volatile int time_reset = 1; /* true when time values change */ diff --git a/jack/transport.h b/jack/transport.h index d4767ff..0693ea3 100644 --- a/jack/transport.h +++ b/jack/transport.h @@ -76,8 +76,8 @@ typedef struct { int32_t tick; /**< current tick-within-beat */ double bar_start_tick; - float beats_per_bar; - float beat_type; + float beats_per_bar; /**< time signature "numerator" */ + float beat_type; /**< time signature "denominator" */ double ticks_per_beat; double beats_per_minute; diff --git a/libjack/client.c b/libjack/client.c index 7d58d41..5e3a1ce 100644 --- a/libjack/client.c +++ b/libjack/client.c @@ -875,10 +875,11 @@ jack_internal_client_new (const char *client_name, const char *so_name, const ch { jack_client_connect_result_t res; int req_fd; + jack_status_t status; return jack_request_client (ClientInternal, client_name, so_name, so_data, &res, &req_fd, - 0, NULL, NULL, NULL); + 0, &status, NULL, NULL); } void