diff options
| author | Andy Wingo <wingo@pobox.com> | 2002-03-30 21:07:51 +0000 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2002-03-30 21:07:51 +0000 |
| commit | 2432f706243dac1c1c6005d1ed9116c6536a7e04 (patch) | |
| tree | 261031bc342a25baf62a2ff1aecafa72b75695f5 /ext | |
| parent | 00925c0c473a194f8573837f1bf11dd591c61407 (diff) | |
| download | gst-plugins-bad-2432f706243dac1c1c6005d1ed9116c6536a7e04.tar.gz gst-plugins-bad-2432f706243dac1c1c6005d1ed9116c6536a7e04.tar.bz2 gst-plugins-bad-2432f706243dac1c1c6005d1ed9116c6536a7e04.zip | |
alphabetization fixen a jack caps fix
Original commit message from CVS:
* alphabetization fixen
* a jack caps fix
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/Makefile.am | 10 | ||||
| -rw-r--r-- | ext/jack/gstjack.c | 4 |
2 files changed, 11 insertions, 3 deletions
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; |