mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-27 12:11:13 +00:00
update to new jack api
Original commit message from CVS: update to new jack api
This commit is contained in:
parent
14112a29f6
commit
4a6c33000c
4 changed files with 9 additions and 9 deletions
|
@ -455,7 +455,7 @@ GST_CHECK_FEATURE(HTTP, [http plugins], gsthttpsrc, [
|
||||||
|
|
||||||
dnl *** Jack ***
|
dnl *** Jack ***
|
||||||
translit(dnm, m, l) AM_CONDITIONAL(USE_JACK, true)
|
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")
|
PKG_CHECK_MODULES(JACK, jack, HAVE_JACK="yes", HAVE_JACK="no")
|
||||||
AC_SUBST(JACK_CFLAGS)
|
AC_SUBST(JACK_CFLAGS)
|
||||||
AC_SUBST(JACK_LIBS)
|
AC_SUBST(JACK_LIBS)
|
||||||
|
|
|
@ -410,7 +410,7 @@ gst_jack_loop (GstElement *element)
|
||||||
this = GST_JACK (element);
|
this = GST_JACK (element);
|
||||||
|
|
||||||
g_return_if_fail(this != NULL);
|
g_return_if_fail(this != NULL);
|
||||||
len = this->bin->nframes * sizeof (sample_t);
|
len = this->bin->nframes * sizeof (jack_default_audio_sample_t);
|
||||||
|
|
||||||
do {
|
do {
|
||||||
pads = this->pads;
|
pads = this->pads;
|
||||||
|
|
|
@ -109,7 +109,7 @@ struct _GstJackBin {
|
||||||
gchar *client_name;
|
gchar *client_name;
|
||||||
|
|
||||||
guint rate;
|
guint rate;
|
||||||
nframes_t nframes;
|
jack_nframes_t nframes;
|
||||||
|
|
||||||
/* the scheduler needs to be setup from within the jack client thread; this
|
/* 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 */
|
variable is to keep track of whether or not we have been set up yet */
|
||||||
|
|
|
@ -30,9 +30,9 @@ static void gst_jack_bin_class_init(GstJackBinClass *klass);
|
||||||
static GstElementStateReturn gst_jack_bin_change_state(GstElement *element);
|
static GstElementStateReturn gst_jack_bin_change_state(GstElement *element);
|
||||||
|
|
||||||
/* jack callbacks */
|
/* jack callbacks */
|
||||||
static int process (nframes_t nframes, void *arg);
|
static int process (jack_nframes_t nframes, void *arg);
|
||||||
static int buffer_size (nframes_t nframes, void *arg);
|
static int buffer_size (jack_nframes_t nframes, void *arg);
|
||||||
static int sample_rate (nframes_t nframes, void *arg);
|
static int sample_rate (jack_nframes_t nframes, void *arg);
|
||||||
static void shutdown (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? */
|
/* keep in mind that these run in another thread, mm-kay? */
|
||||||
|
|
||||||
static int
|
static int
|
||||||
process (nframes_t nframes, void *arg)
|
process (jack_nframes_t nframes, void *arg)
|
||||||
{
|
{
|
||||||
GstJackBin *bin = (GstJackBin*) arg;
|
GstJackBin *bin = (GstJackBin*) arg;
|
||||||
GstJackPad *pad;
|
GstJackPad *pad;
|
||||||
|
@ -293,14 +293,14 @@ process (nframes_t nframes, void *arg)
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
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);
|
printf ("the maximum buffer size is now %lu\n", nframes);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
sample_rate (nframes_t nframes, void *arg)
|
sample_rate (jack_nframes_t nframes, void *arg)
|
||||||
{
|
{
|
||||||
GstJackBin *bin = (GstJackBin*) arg;
|
GstJackBin *bin = (GstJackBin*) arg;
|
||||||
printf ("the sample rate is now %lu/sec\n", nframes);
|
printf ("the sample rate is now %lu/sec\n", nframes);
|
||||||
|
|
Loading…
Reference in a new issue