Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Yeongjin Jeong
gst-plugins-bad
Commits
2432f706
Commit
2432f706
authored
Mar 30, 2002
by
Andy Wingo Wingo
Browse files
alphabetization fixen a jack caps fix
Original commit message from CVS: * alphabetization fixen * a jack caps fix
parent
00925c0c
Changes
3
Hide whitespace changes
Inline
Side-by-side
configure.ac
View file @
2432f706
...
...
@@ -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"
...
...
ext/Makefile.am
View file @
2432f706
...
...
@@ -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
\
...
...
ext/jack/gstjack.c
View file @
2432f706
...
...
@@ -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
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment