diff --git a/configure.ac b/configure.ac index 6f3b50c455..cfc3bd96fe 100644 --- a/configure.ac +++ b/configure.ac @@ -455,7 +455,7 @@ GST_CHECK_FEATURE(HTTP, [http plugins], gsthttpsrc, [ dnl *** Jack *** translit(dnm, m, l) AM_CONDITIONAL(USE_JACK, true) -GST_CHECK_FEATURE(JACK, Jack, jack, [ +GST_CHECK_FEATURE(JACK, Jack, jack > 0.29.0, [ PKG_CHECK_MODULES(JACK, jack, HAVE_JACK="yes", HAVE_JACK="no") AC_SUBST(JACK_CFLAGS) AC_SUBST(JACK_LIBS) diff --git a/ext/jack/gstjack.c b/ext/jack/gstjack.c index 02696901b9..ab0e4a3c43 100644 --- a/ext/jack/gstjack.c +++ b/ext/jack/gstjack.c @@ -410,7 +410,7 @@ gst_jack_loop (GstElement *element) this = GST_JACK (element); g_return_if_fail(this != NULL); - len = this->bin->nframes * sizeof (sample_t); + len = this->bin->nframes * sizeof (jack_default_audio_sample_t); do { pads = this->pads; diff --git a/ext/jack/gstjack.h b/ext/jack/gstjack.h index 4801557eb1..d13a1dab7d 100644 --- a/ext/jack/gstjack.h +++ b/ext/jack/gstjack.h @@ -109,7 +109,7 @@ struct _GstJackBin { gchar *client_name; guint rate; - nframes_t nframes; + jack_nframes_t nframes; /* the scheduler needs to be setup from within the jack client thread; this variable is to keep track of whether or not we have been set up yet */ diff --git a/ext/jack/gstjackbin.c b/ext/jack/gstjackbin.c index 45ab94fd61..49ecca70a9 100644 --- a/ext/jack/gstjackbin.c +++ b/ext/jack/gstjackbin.c @@ -30,9 +30,9 @@ static void gst_jack_bin_class_init(GstJackBinClass *klass); static GstElementStateReturn gst_jack_bin_change_state(GstElement *element); /* jack callbacks */ -static int process (nframes_t nframes, void *arg); -static int buffer_size (nframes_t nframes, void *arg); -static int sample_rate (nframes_t nframes, void *arg); +static int process (jack_nframes_t nframes, void *arg); +static int buffer_size (jack_nframes_t nframes, void *arg); +static int sample_rate (jack_nframes_t nframes, void *arg); static void shutdown (void *arg); @@ -225,7 +225,7 @@ gst_jack_bin_change_state (GstElement *element) /* keep in mind that these run in another thread, mm-kay? */ static int -process (nframes_t nframes, void *arg) +process (jack_nframes_t nframes, void *arg) { GstJackBin *bin = (GstJackBin*) arg; GstJackPad *pad; @@ -293,14 +293,14 @@ process (nframes_t nframes, void *arg) } static int -buffer_size (nframes_t nframes, void *arg) +buffer_size (jack_nframes_t nframes, void *arg) { printf ("the maximum buffer size is now %lu\n", nframes); return 0; } static int -sample_rate (nframes_t nframes, void *arg) +sample_rate (jack_nframes_t nframes, void *arg) { GstJackBin *bin = (GstJackBin*) arg; printf ("the sample rate is now %lu/sec\n", nframes);