diff options
| -rw-r--r-- | configure.ac | 16 | ||||
| -rw-r--r-- | ext/Makefile.am | 10 | ||||
| -rw-r--r-- | ext/jack/gstjack.c | 4 |
3 files changed, 19 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index 28a72cc3..b4181171 100644 --- a/configure.ac +++ b/configure.ac @@ -432,14 +432,6 @@ GST_CHECK_FEATURE(HTTP, [http plugins], gsthttpsrc, [ AC_SUBST(GST_HTTPSRC_GET_TYPE) ]) -dnl *** libcolorspace *** -translit(dnm, m, l) AM_CONDITIONAL(USE_LCS, true) -GST_CHECK_FEATURE(LCS, Lcs, lcs, [ - PKG_CHECK_MODULES(LCS, lcs, HAVE_LCS="yes", HAVE_LCS="no") - AC_SUBST(LCS_CFLAGS) - AC_SUBST(LCS_LIBS) -]) - dnl *** Jack *** translit(dnm, m, l) AM_CONDITIONAL(USE_JACK, true) GST_CHECK_FEATURE(JACK, Jack, jack, [ @@ -464,6 +456,14 @@ GST_CHECK_LIBHEADER(LAME, mp3lame, lame_init, -lm, lame/lame.h, HAVE_LAME="yes" ]) AC_SUBST(LAME_LIBS) +dnl *** libcolorspace *** +translit(dnm, m, l) AM_CONDITIONAL(USE_LCS, true) +GST_CHECK_FEATURE(LCS, Lcs, lcs, [ + PKG_CHECK_MODULES(LCS, lcs, HAVE_LCS="yes", HAVE_LCS="no") + AC_SUBST(LCS_CFLAGS) + AC_SUBST(LCS_LIBS) +]) + dnl FIXME : check if these CPP flags can be dealt with otherwise dnl libdvcheck_save_CPPFLAGS="$CPPFLAGS" dnl CPPFLAGS="$CPPFLAGS $GST_CFLAGS" diff --git a/ext/Makefile.am b/ext/Makefile.am index 39e6a986..a003181d 100644 --- a/ext/Makefile.am +++ b/ext/Makefile.am @@ -120,6 +120,12 @@ else LAME_DIR= endif +if USE_LCS +LCS_DIR=lcs +else +LCS_DIR= +endif + if USE_MAD MAD_DIR=mad else @@ -210,7 +216,7 @@ SUBDIRS=$(A52DEC_DIR) $(AALIB_DIR) $(ALSA_DIR) \ $(DVDREAD_DIR) $(ESD_DIR) $(FESTIVAL_DIR) \ $(FLAC_DIR) $(GNOMEVFS_DIR) $(GSM_DIR) \ $(HERMES_DIR) $(HTTP_DIR) $(JACK_DIR) $(JPEG_DIR) \ - $(LADSPA_DIR) $(LAME_DIR) \ + $(LADSPA_DIR) $(LAME_DIR) $(LCD_DIR) \ $(MAD_DIR) $(MIKMOD_DIR) $(MJPEGTOOLS_DIR) $(MPEG2DEC_DIR) \ $(OPENQUICKTIME_DIR) $(RAW1394_DIR) $(RTP_DIR) \ $(SDL_DIR) $(SHOUT_DIR) $(SIDPLAY_DIR) \ @@ -223,7 +229,7 @@ DIST_SUBDIRS=\ dvdread esd festival \ flac gnomevfs gsm \ hermes http jack jpeg \ - ladspa lame \ + ladspa lame lcs \ mad mikmod mjpegtools mpeg2dec \ openquicktime raw1394 rtp \ sdl shout sidplay \ diff --git a/ext/jack/gstjack.c b/ext/jack/gstjack.c index 82bb4ce5..a61cdb9a 100644 --- a/ext/jack/gstjack.c +++ b/ext/jack/gstjack.c @@ -436,13 +436,15 @@ static GstPadConnectReturn gst_jack_connect (GstPad *pad, GstCaps *caps) { GstJack *this; + gint rate; this = GST_JACK (gst_pad_get_parent (pad)); g_return_val_if_fail (this != NULL, GST_PAD_CONNECT_REFUSED); g_return_val_if_fail (GST_IS_JACK (this), GST_PAD_CONNECT_REFUSED); if (GST_CAPS_IS_FIXED (caps)) { - if (this->client && gst_caps_get_int (caps, "rate") != this->client->rate) + gst_caps_get_int (caps, "rate", &rate); + if (this->client && rate != this->client->rate) return GST_PAD_CONNECT_REFUSED; return GST_PAD_CONNECT_OK; |