Added check for vorbis.

Original commit message from CVS:
Added check for vorbis.
Really compile with Xv extension if the library is found.
Changed the disksrc so that is goes to the PAUSE state if eof.
This commit is contained in:
Wim Taymans 2000-09-17 14:06:18 +00:00
parent 0de050707a
commit f7bace76aa
5 changed files with 12 additions and 8 deletions

View file

@ -8,6 +8,7 @@
#undef HAVE_GDK_PIXBUF #undef HAVE_GDK_PIXBUF
#undef HAVE_LIBGHTTP #undef HAVE_LIBGHTTP
#undef HAVE_LIBMMX #undef HAVE_LIBMMX
#undef HAVE_LIBXV
#undef HAVE_XAUDIO #undef HAVE_XAUDIO
#undef HAVE_CSSAUTH #undef HAVE_CSSAUTH
#undef HAVE_VORBIS #undef HAVE_VORBIS

View file

@ -200,7 +200,10 @@ AC_SUBST(X_EXTRA_LIBS)
AC_SUBST(X_LIBS) AC_SUBST(X_LIBS)
xvsave_LIBS=${LIBS} xvsave_LIBS=${LIBS}
AC_CHECK_LIB(Xv, XvQueryExtension, HAVE_LIBXV=yes, HAVE_LIBXV=no, $X_LIBS $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS) AC_CHECK_LIB(Xv, XvQueryExtension,
HAVE_LIBXV=yes
AC_DEFINE(HAVE_LIBXV),
HAVE_LIBXV=no, $X_LIBS $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS)
LIBS=${xvsave_LIBS} LIBS=${xvsave_LIBS}
dnl Check for xaudio dnl Check for xaudio
@ -236,8 +239,10 @@ fi
dnl check for libvorbis dnl check for libvorbis
AC_MSG_CHECKING(Vorbis library) AC_MSG_CHECKING(Vorbis library)
AC_MSG_RESULT(... check not implemented !! FIXME) AC_CHECK_LIB(vorbis, ogg_sync_init,
HAVE_VORBIS="no" HAVE_VORBIS=yes
AC_DEFINE(HAVE_VORBIS),
HAVE_VORBIS=no, )
dnl check for gtkdoc dnl check for gtkdoc
AC_CHECK_PROG(HAVE_GTK_DOC, gtkdoc-mkdb, true, false) AC_CHECK_PROG(HAVE_GTK_DOC, gtkdoc-mkdb, true, false)

View file

@ -221,8 +221,7 @@ void gst_disksrc_push(GstSrc *src) {
else if (readbytes == 0) { else if (readbytes == 0) {
gst_src_signal_eos(GST_SRC(disksrc)); gst_src_signal_eos(GST_SRC(disksrc));
gst_buffer_unref(buf); gst_buffer_unref(buf);
gst_disksrc_close_file(disksrc); GST_STATE(src) = GST_STATE_PAUSED;
GST_STATE(src) = GST_STATE_NULL;
return; return;
} }

View file

@ -441,7 +441,7 @@ static int gst_bin_loopfunc_wrapper(int argc,char *argv[]) {
DEBUG("** gst_bin_loopfunc_wrapper(): element is chain-based, calling in infinite loop\n"); DEBUG("** gst_bin_loopfunc_wrapper(): element is chain-based, calling in infinite loop\n");
if (GST_IS_SRC(element)) { if (GST_IS_SRC(element)) {
//while (1) { //while (1) {
while (GST_STATE(element) != GST_STATE_NULL) { while (GST_STATE(element) == GST_STATE_PLAYING) {
DEBUG("** gst_bin_loopfunc_wrapper(): calling push function of source\n"); DEBUG("** gst_bin_loopfunc_wrapper(): calling push function of source\n");
gst_src_push(GST_SRC(element)); gst_src_push(GST_SRC(element));
} }

View file

@ -221,8 +221,7 @@ void gst_disksrc_push(GstSrc *src) {
else if (readbytes == 0) { else if (readbytes == 0) {
gst_src_signal_eos(GST_SRC(disksrc)); gst_src_signal_eos(GST_SRC(disksrc));
gst_buffer_unref(buf); gst_buffer_unref(buf);
gst_disksrc_close_file(disksrc); GST_STATE(src) = GST_STATE_PAUSED;
GST_STATE(src) = GST_STATE_NULL;
return; return;
} }