mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 12:11:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

alphabetization fixen a jack caps fix

Browse source 
Original commit message from CVS:
* alphabetization fixen
* a jack caps fix
This commit is contained in:
Andy Wingo 2002-03-30 21:07:51 +00:00
parent 00925c0c47
commit 2432f70624
3 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
configure.ac
View file

@ -432,14 +432,6 @@ GST_CHECK_FEATURE(HTTP, [http plugins], gsthttpsrc, [
AC_SUBST(GST_HTTPSRC_GET_TYPE) 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 *** 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, [
@ -464,6 +456,14 @@ GST_CHECK_LIBHEADER(LAME, mp3lame, lame_init, -lm, lame/lame.h, HAVE_LAME="yes"
]) ])
AC_SUBST(LAME_LIBS) 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 FIXME : check if these CPP flags can be dealt with otherwise
dnl libdvcheck_save_CPPFLAGS="$CPPFLAGS" dnl libdvcheck_save_CPPFLAGS="$CPPFLAGS"
dnl CPPFLAGS="$CPPFLAGS $GST_CFLAGS" dnl CPPFLAGS="$CPPFLAGS $GST_CFLAGS"

10
ext/Makefile.am
View file

@ -120,6 +120,12 @@ else
LAME_DIR= LAME_DIR=
endif endif
if USE_LCS
LCS_DIR=lcs
else
LCS_DIR=
endif
if USE_MAD if USE_MAD
MAD_DIR=mad MAD_DIR=mad
else else
@ -210,7 +216,7 @@ SUBDIRS=$(A52DEC_DIR) $(AALIB_DIR) $(ALSA_DIR) \
$(DVDREAD_DIR) $(ESD_DIR) $(FESTIVAL_DIR) \ $(DVDREAD_DIR) $(ESD_DIR) $(FESTIVAL_DIR) \
$(FLAC_DIR) $(GNOMEVFS_DIR) $(GSM_DIR) \ $(FLAC_DIR) $(GNOMEVFS_DIR) $(GSM_DIR) \
$(HERMES_DIR) $(HTTP_DIR) $(JACK_DIR) $(JPEG_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) \ $(MAD_DIR) $(MIKMOD_DIR) $(MJPEGTOOLS_DIR) $(MPEG2DEC_DIR) \
$(OPENQUICKTIME_DIR) $(RAW1394_DIR) $(RTP_DIR) \ $(OPENQUICKTIME_DIR) $(RAW1394_DIR) $(RTP_DIR) \
$(SDL_DIR) $(SHOUT_DIR) $(SIDPLAY_DIR) \ $(SDL_DIR) $(SHOUT_DIR) $(SIDPLAY_DIR) \
@ -223,7 +229,7 @@ DIST_SUBDIRS=\
dvdread esd festival \ dvdread esd festival \
flac gnomevfs gsm \ flac gnomevfs gsm \
hermes http jack jpeg \ hermes http jack jpeg \
ladspa lame \ ladspa lame lcs \
mad mikmod mjpegtools mpeg2dec \ mad mikmod mjpegtools mpeg2dec \
openquicktime raw1394 rtp \ openquicktime raw1394 rtp \
sdl shout sidplay \ sdl shout sidplay \

4
ext/jack/gstjack.c
View file

@ -436,13 +436,15 @@ static GstPadConnectReturn
gst_jack_connect (GstPad *pad, GstCaps *caps) gst_jack_connect (GstPad *pad, GstCaps *caps)
{ {
GstJack *this; GstJack *this;
gint rate;
this = GST_JACK (gst_pad_get_parent (pad)); this = GST_JACK (gst_pad_get_parent (pad));
g_return_val_if_fail (this != NULL, GST_PAD_CONNECT_REFUSED); g_return_val_if_fail (this != NULL, GST_PAD_CONNECT_REFUSED);
g_return_val_if_fail (GST_IS_JACK (this), GST_PAD_CONNECT_REFUSED); g_return_val_if_fail (GST_IS_JACK (this), GST_PAD_CONNECT_REFUSED);
if (GST_CAPS_IS_FIXED (caps)) { 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_REFUSED;
return GST_PAD_CONNECT_OK; return GST_PAD_CONNECT_OK;