From ae0d5d18890ec47120183145c0a04aaa9cfb6fb2 Mon Sep 17 00:00:00 2001 From: Erik Walthinsen Date: Tue, 2 Jan 2001 08:13:34 +0000 Subject: [PATCH] Massive, massive update of most source files. I went through and cleaned up all the warnings that I could, which inv... Original commit message from CVS: Massive, massive update of most source files. I went through and cleaned up all the warnings that I could, which involved fixing some of the plugins. The configure.in script was re-arranged and cleaned up so, and a check for libtool 1.3.5 was added to autogen.sh. Added checks for Gtk and GNOME. Some plugins were removed from the list of things to build for various reasons. Added GST_DEBUG_FORCE_DISABLE in gstgetbits, since that's time critical and even an if() from a DEBUG can significantly increase runtimes. --- acconfig.h | 1 + autogen.sh | 36 ++++-- configure.in | 215 ++++++++++++++++++++------------ docs/random/TODO-post-0.1.0 | 3 + examples/autoplug/Makefile.am | 4 +- gst/elements/Makefile.am | 4 +- gst/elements/gstasyncdisksrc.c | 4 +- gst/gstplugin.c | 2 +- include/registry.h | 6 +- libs/colorspace/gstcolorspace.h | 3 +- libs/colorspace/rgb2rgb.c | 6 +- libs/getbits/Makefile.am | 2 +- libs/getbits/gstgetbits.c | 2 - libs/getbits/gstgetbits.h | 2 + libs/getbits/gstgetbits_generic.c | 12 +- libs/idct/Makefile.am | 2 +- libs/riff/gstriffencode.c | 4 +- libs/riff/gstriffparse.c | 7 +- libs/videoscale/gstvideoscale.c | 8 +- plugins/elements/Makefile.am | 4 +- plugins/elements/gstasyncdisksrc.c | 4 +- tests/old/examples/autoplug/Makefile.am | 4 +- 22 files changed, 200 insertions(+), 135 deletions(-) diff --git a/acconfig.h b/acconfig.h index 157a368..ae09188 100644 --- a/acconfig.h +++ b/acconfig.h @@ -7,6 +7,7 @@ #undef HAVE_GDK_PIXBUF #undef HAVE_LIBGHTTP +#undef HAVE_GNOME #undef HAVE_LIBMMX #undef HAVE_LIBXV #undef HAVE_XAUDIO diff --git a/autogen.sh b/autogen.sh index d15a335..fdbbf3e 100755 --- a/autogen.sh +++ b/autogen.sh @@ -13,21 +13,33 @@ srcfile=gst/gstobject.h DIE=1 } +(automake --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have automake installed to compile $package." + echo "Get ftp://ftp.cygnus.com/pub/home/tromey/automake-1.2d.tar.gz" + echo "(or a newer version if it is available)" + DIE=1 +} + (libtool --version) < /dev/null > /dev/null 2>&1 || { echo echo "You must have libtool installed to compile $package." - echo "Get ftp://alpha.gnu.org/gnu/libtool-1.2.tar.gz" + echo "Get ftp://alpha.gnu.org/gnu/libtool-1.3.5.tar.gz" echo "(or a newer version if it is available)" DIE=1 } -(automake --version) < /dev/null > /dev/null 2>&1 || { +libtool_version=`libtool --version | sed 's/^.* \([0-9\.]*\) .*$/\1/'` +libtool_major=`echo $libtool_version | cut -d. -f1` +libtool_minor=`echo $libtool_version | cut -d. -f2` +libtool_micro=`echo $libtool_version | cut -d. -f3` +if [ $libtool_major -lt 1 -o $libtool_minor -lt 3 -o $libtool_micro -lt 5 ];then echo - echo "You must have automake installed to compile $package." - echo "Get ftp://ftp.cygnus.com/pub/home/tromey/automake-1.2d.tar.gz" + echo "You must have libtool 1.3.5 or greater to compile $packate." + echo "Get ftp://alpha.gnu.org/gnu/libtool-1.3.5.tar.gz" echo "(or a newer version if it is available)" DIE=1 -} +fi if test "$DIE" -eq 1; then exit 1 @@ -53,13 +65,13 @@ if [ "x$1" = "x--autogen-recurse" ];then exit # the rest will happen later fi -for dir in `find * -name autogen.sh -print | grep -v '^autogen.sh$' | \ - sed 's/autogen.sh$//'`;do - echo "Recursively running autogen.sh in $dir" - pushd $dir > /dev/null - ./autogen.sh --autogen-recurse "$@" - popd > /dev/null -done +#for dir in `find * -name autogen.sh -print | grep -v '^autogen.sh$' | \ +# sed 's/autogen.sh$//'`;do +# echo "Recursively running autogen.sh in $dir" +# pushd $dir > /dev/null +# ./autogen.sh --autogen-recurse "$@" +# popd > /dev/null +#done ./configure --enable-maintainer-mode --enable-plugin-srcdir --enable-debug-verbose "$@" diff --git a/configure.in b/configure.in index 6639ae6..1e82dc9 100644 --- a/configure.in +++ b/configure.in @@ -40,10 +40,43 @@ AM_DISABLE_STATIC AC_LIBTOOL_DLOPEN AM_PROG_LIBTOOL + dnl ############################## dnl # Do automated configuration # dnl ############################## +dnl Check for tools: +dnl ================ + +dnl Check for nasm +AC_PATH_PROG(NASM_PATH, nasm, no) +AC_SUBST(NASM_PATH) +if test x$NASM_PATH = xno; then + AC_MSG_WARN(Couldn't find nasm) + HAVE_NASM="no" +else + AC_DEFINE(HAVE_NASM) + HAVE_NASM="yes" +fi + +dnl check for gtkdoc +AC_CHECK_PROG(HAVE_GTK_DOC, gtkdoc-mkdb, true, false) +AC_CHECK_PROG(HAVE_GTK_DOC, gtkdoc-scanobj, :, false) +AC_CHECK_PROG(HAVE_GTK_DOC, gtkdoc-scan, :, false) +AC_CHECK_PROG(HAVE_GTK_DOC, gtkdoc-mktmpl, :, false) +AC_CHECK_PROG(HAVE_GTK_DOC, gtkdoc-mkdb, :, false) +AC_CHECK_PROG(HAVE_GTK_DOC, gtkdoc-mkhtml, :, false) +AC_CHECK_PROG(HAVE_GTK_DOC, gtkdoc-fixxref, :, false) + +dnl check for docbook tools +AC_CHECK_PROG(HAVE_DB2HTML, db2html, true, false) +AC_CHECK_PROG(HAVE_DB2PS, db2ps, true, false) +AC_CHECK_PROG(HAVE_PS2PDF, ps2pdf, true, false) + +dnl check for image conversion tool +AC_CHECK_PROG(HAVE_FIG2DEV, fig2dev, true, false) + + dnl Set up conditionals for (target) architecture: dnl ============================================== @@ -58,30 +91,47 @@ esac dnl Determine endianness AC_C_BIGENDIAN -dnl Check for tools: -dnl ================ +dnl Check for MMX-capable compiler +AC_MSG_CHECKING(for MMX-capable compiler) +AC_TRY_RUN([ +#include "include/mmx.h" + +main() +{ movq_r2r(mm0, mm1); return 0; } +], +[ +HAVE_LIBMMX="yes" +AC_MSG_RESULT(yes) +], +HAVE_LIBMMX="no" +AC_MSG_RESULT(no) +, +HAVE_LIBMMX="no" +AC_MSG_RESULT(no) +) + -dnl Check for nasm -AC_PATH_PROG(NASM_PATH, nasm, no) -AC_SUBST(NASM_PATH) -if test x$NASM_PATH = xno; then - AC_MSG_WARN(Couldn't find nasm) - HAVE_NASM="no" -else - AC_DEFINE(HAVE_NASM) - HAVE_NASM="yes" -fi dnl Check for essential libraries first: dnl ==================================== + dnl Check for glib AM_PATH_GLIB(1.2.0,, AC_MSG_ERROR(Cannot find glib: Is glib-config in path?), glib gmodule gthread) dnl Put the glib flags into $LIBS and $CFLAGS since we always use them LIBS="$LIBS $GLIB_LIBS" -CFLAGS="$FLAGS $GLIB_CFLAGS" +CFLAGS="$CFLAGS $GLIB_CFLAGS" + + +dnl Check for gtk +AM_PATH_GTK(1.2.0,, + AC_MSG_ERROR(Cannot find gtk: Is gtk-config in path?)) +dnl Put the gtk flags into $LIBS and $CFLAGS since we always use them +LIBS="$LIBS $GTK_LIBS" +CFLAGS="$CFLAGS $GTK_CFLAGS" + dnl Check for libxml AC_PATH_PROG(XML_CONFIG, xml-config, no) @@ -92,11 +142,14 @@ XML_LIBS=`xml-config --libs` XML_CFLAGS=`xml-config --cflags` AC_SUBST(XML_LIBS) AC_SUBST(XML_CFLAGS) +LIBS="$LIBS $XML_LIBS" +CFLAGS="$CFLAGS $XML_CFLAGS" dnl Next, check for the optional libraries: dnl ======================================= + dnl Check for libgdk-pixbuf AC_PATH_PROG(GDK_PIXBUF_CONFIG, gdk-pixbuf-config, no) if test x$GDK_PIXBUF_CONFIG = xno; then @@ -113,24 +166,35 @@ AC_SUBST(GDK_PIXBUF_LIBS) AC_SUBST(GDK_PIXBUF_CFLAGS) -dnl Check for gtk -AM_PATH_GTK(1.2.0) - dnl Check for libghttp dnl FIXME: need to check for header AC_CHECK_LIB(ghttp, ghttp_request_new, [GHTTP_LIBS="-lghttp" - GST_HTTPSRC_GET_TYPE="gst_httpsrc_get_type" HAVE_LIBGHTTP=yes ], [AC_MSG_WARN(Cannot find libghttp: can't build gsthttpsrc) GHTTP_LIBS= - GST_HTTPSRC_GET_TYPE= HAVE_LIBGHTTP=no ], $LIBS) AC_SUBST(GHTTP_LIBS) -AC_SUBST(GST_HTTPSRC_GET_TYPE) + + +dnl Check for libgnome +AC_PATH_PROG(GNOME_CONFIG, gnome-config, no) +if test x$GNOME_CONFIG = xno; then + AC_MSG_WARN(Couldn't find gnome-config: can't build editor or gstplay) + GNOME_LIBS= + GNOME_CFLAGS= + HAVE_GNOME=no +else + GNOME_LIBS=`gnome-config --libs gnome gnomeui` + GNOME_CFLAGS=`gnome-config --cflags gnome gnomeui` + HAVE_GNOME=yes +fi +AC_SUBST(GNOME_LIBS) +AC_SUBST(GNOME_CFLAGS) + dnl Check for libglade HAVE_LIBGLADE_GNOME="no" @@ -148,6 +212,7 @@ else CFLAGS=${libglade_save_CFLAGS} fi + dnl Check for atomic.h dnl Note: use AC_CHECK_HEADER not AC_CHECK_HEADERS, because the latter dnl defines the wrong default symbol as well (HAVE_ASM_ATOMIC_H) @@ -170,24 +235,6 @@ main() { atomic_t t; atomic_set(&t,0); return 0;} ]) fi -dnl Check for MMX capable compiler -AC_MSG_CHECKING(Checking MMX compilation) -AC_TRY_RUN([ -#include "include/mmx.h" - -main() -{ movq_r2r(mm0, mm1); return 0; } -], -[ -HAVE_LIBMMX="yes" -AC_MSG_RESULT(yes) -], -HAVE_LIBMMX="no" -AC_MSG_RESULT(no) -, -HAVE_LIBMMX="no" -AC_MSG_RESULT(no) -) dnl Check for X11 extensions AC_PATH_XTRA @@ -199,6 +246,8 @@ AC_SUBST(X_PRE_LIBS) AC_SUBST(X_EXTRA_LIBS) AC_SUBST(X_LIBS) + +dnl Check for the Xv library xvsave_LIBS=${LIBS} AC_CHECK_LIB(Xv, XvQueryExtension, HAVE_LIBXV=yes @@ -206,46 +255,23 @@ AC_DEFINE(HAVE_LIBXV), HAVE_LIBXV=no, $X_LIBS $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS) LIBS=${xvsave_LIBS} + dnl Check for xaudio AC_CHECK_HEADER(xaudio/decoder.h,[ AC_DEFINE(HAVE_XAUDIO) HAVE_XAUDIO="yes", [] ]) -dnl Set location of plugin directory -if test "x${prefix}" = "xNONE"; then - PLUGINS_DIR=${ac_default_prefix}/lib/gst -else - PLUGINS_DIR=${prefix}/lib/gst -fi -AC_DEFINE_UNQUOTED(PLUGINS_DIR,"$PLUGINS_DIR") -AC_SUBST(PLUGINS_DIR) - -dnl Set location of uninstalled plugin directory -PLUGINS_SRCDIR=`pwd`/$srcdir -AC_DEFINE_UNQUOTED(PLUGINS_SRCDIR,"$PLUGINS_SRCDIR") -AC_SUBST(PLUGINS_SRCDIR) -dnl check if css-auth.c exists (FIXME) -AC_MSG_CHECKING(DVD CSS code) -if test -f plugins/dvdsrc/css-auth.c -then - AC_MSG_RESULT(yes) - HAVE_CSSAUTH="yes" - AC_DEFINE(HAVE_CSSAUTH) -else - AC_MSG_RESULT(no) - HAVE_CSSAUTH="no" -fi - -dnl check for libvorbis +dnl Check for libvorbis AC_MSG_CHECKING(Vorbis library) AC_CHECK_LIB(vorbis, ogg_sync_init, HAVE_VORBIS=yes AC_DEFINE(HAVE_VORBIS), HAVE_VORBIS=no, ) -dnl check for cdparanoia + +dnl Check for cdparanoia AC_MSG_CHECKING(CDparanoia library) HAVE_CDPARANOIA=yes AC_CHECK_LIB(cdda_paranoia, paranoia_init, : , HAVE_CDPARANOIA=no, ) @@ -253,27 +279,25 @@ AC_CHECK_HEADER(cdda_paranoia.h, :, HAVE_CDPARANOIA=no) AC_CHECK_LIB(cdda_interface, cdda_open, : , HAVE_CDPARANOIA=no, ) AC_CHECK_HEADER(cdda_interface.h, :, HAVE_CDPARANOIA=no) -dnl check for liblame + +dnl Check for liblame AC_MSG_CHECKING(LAME library) AC_CHECK_LIB(mp3lame, lame_init, HAVE_LIBLAME=yes, HAVE_LIBLAME=no, ) AC_CHECK_HEADER(lame.h, :, HAVE_LIBLAME=no) -dnl check for gtkdoc -AC_CHECK_PROG(HAVE_GTK_DOC, gtkdoc-mkdb, true, false) -AC_CHECK_PROG(HAVE_GTK_DOC, gtkdoc-scanobj, :, false) -AC_CHECK_PROG(HAVE_GTK_DOC, gtkdoc-scan, :, false) -AC_CHECK_PROG(HAVE_GTK_DOC, gtkdoc-mktmpl, :, false) -AC_CHECK_PROG(HAVE_GTK_DOC, gtkdoc-mkdb, :, false) -AC_CHECK_PROG(HAVE_GTK_DOC, gtkdoc-mkhtml, :, false) -AC_CHECK_PROG(HAVE_GTK_DOC, gtkdoc-fixxref, :, false) -dnl check for docbook tools -AC_CHECK_PROG(HAVE_DB2HTML, db2html, true, false) -AC_CHECK_PROG(HAVE_DB2PS, db2ps, true, false) -AC_CHECK_PROG(HAVE_PS2PDF, ps2pdf, true, false) +dnl check if css-auth.c exists (FIXME) +AC_MSG_CHECKING(DVD CSS code) +if test -f plugins/dvdsrc/css-auth.c +then + AC_MSG_RESULT(yes) + HAVE_CSSAUTH="yes" + AC_DEFINE(HAVE_CSSAUTH) +else + AC_MSG_RESULT(no) + HAVE_CSSAUTH="no" +fi -dnl check for image conversion tool -AC_CHECK_PROG(HAVE_FIG2DEV, fig2dev, true, false) dnl ###################################################################### @@ -447,6 +471,32 @@ AM_CONDITIONAL(HAVE_FIG2DEV, $HAVE_FIG2DEV) AM_CONDITIONAL(HAVE_CDPARANOIA, test "x$HAVE_CDPARANOIA" = "xyes") AM_CONDITIONAL(HAVE_LIBLAME, test "x$HAVE_LIBLAME" = "xyes") + + +dnl ############################ +dnl # Set up some more defines # +dnl ############################ + +dnl Set location of plugin directory +if test "x${prefix}" = "xNONE"; then + PLUGINS_DIR=${ac_default_prefix}/lib/gst +else + PLUGINS_DIR=${prefix}/lib/gst +fi +AC_DEFINE_UNQUOTED(PLUGINS_DIR,"$PLUGINS_DIR") +AC_SUBST(PLUGINS_DIR) + +dnl Set location of uninstalled plugin directory +PLUGINS_SRCDIR=`pwd`/$srcdir +AC_DEFINE_UNQUOTED(PLUGINS_SRCDIR,"$PLUGINS_SRCDIR") +AC_SUBST(PLUGINS_SRCDIR) + + + + +dnl ############################## +dnl # Set up the defaults cflags # +dnl ############################## dnl CC="kgcc" CFLAGS="$CFLAGS -O6 -Wall" @@ -456,12 +506,13 @@ AC_SUBST(CFLAGS) AC_SUBST(CPPFLAGS) AC_SUBST(LDFLAGS) + dnl ############################# dnl # Configure the subpackages # dnl ############################# -AC_CONFIG_SUBDIRS(gist) -AC_CONFIG_SUBDIRS(plugins/mp3decode/xing/libxing) +dnl AC_CONFIG_SUBDIRS(gist) +dnl AC_CONFIG_SUBDIRS(plugins/mp3decode/xing/libxing) dnl ######################### @@ -533,7 +584,6 @@ plugins/videoscale/Makefile plugins/audioscale/Makefile plugins/dvdsrc/Makefile plugins/vcdsrc/Makefile -plugins/cobin/Makefile plugins/rtjpeg/Makefile plugins/vorbis/Makefile plugins/capture/Makefile @@ -557,6 +607,7 @@ examples/queue2/Makefile examples/queue3/Makefile examples/queue4/Makefile examples/thread/Makefile +examples/launch/Makefile examples/xml/Makefile editor/Makefile editor/pixmaps/Makefile diff --git a/docs/random/TODO-post-0.1.0 b/docs/random/TODO-post-0.1.0 index afc256c..db6e463 100644 --- a/docs/random/TODO-post-0.1.0 +++ b/docs/random/TODO-post-0.1.0 @@ -9,3 +9,6 @@ - make autoplugging algorithms pluggable - make scheduling algorithms pluggable + +- add help functions to traverse the hierarchy + - gst_bin_traverse_with_func(GstBin *bin, funcptr) diff --git a/examples/autoplug/Makefile.am b/examples/autoplug/Makefile.am index 4b661a3..4bd0f83 100644 --- a/examples/autoplug/Makefile.am +++ b/examples/autoplug/Makefile.am @@ -1,4 +1,4 @@ bin_PROGRAMS = autoplug -LDADD = $(GLIB_LIBS) $(GTK_LIBS) $(top_builddir)/gst/libgst.la -INCLUDES = $(GLIB_CFLAGS) $(GTK_CFLAGS) -I$(top_srcdir) +LDADD = $(GNOME_LIBS) $(top_builddir)/gst/libgst.la +INCLUDES = $(GNOME_CFLAGS) diff --git a/gst/elements/Makefile.am b/gst/elements/Makefile.am index 420b551..c9baa5a 100644 --- a/gst/elements/Makefile.am +++ b/gst/elements/Makefile.am @@ -17,14 +17,14 @@ libgstelements_la_SOURCES = \ gstdisksrc.c \ gstasyncdisksrc.c \ gstfdsrc.c \ - $(GSTHTTPSRC) \ gstaudiosink.c \ gstaudiosrc.c \ gstfdsink.c \ gstpipefilter.c \ gstqueue.c \ gsttypefind.c \ - gstsinesrc.c + gstsinesrc.c \ + $(GSTHTTPSRC) noinst_HEADERS = \ gstfakesrc.h \ diff --git a/gst/elements/gstasyncdisksrc.c b/gst/elements/gstasyncdisksrc.c index aa47e48..b24a2ec 100644 --- a/gst/elements/gstasyncdisksrc.c +++ b/gst/elements/gstasyncdisksrc.c @@ -244,7 +244,7 @@ gst_asyncdisksrc_get (GstPad *pad) } else GST_BUFFER_SIZE (buf) = src->bytes_per_read; - GST_DEBUG (0,"map %p, offset %d, size %ld\n", src->map, src->curoffset, GST_BUFFER_SIZE (buf)); + GST_DEBUG (0,"map %p, offset %ld, size %d\n", src->map, src->curoffset, GST_BUFFER_SIZE (buf)); //gst_util_dump_mem (GST_BUFFER_DATA (buf), GST_BUFFER_SIZE (buf)); @@ -303,7 +303,7 @@ gst_asyncdisksrc_get_region (GstPad *pad, gulong offset, gulong size) } else GST_BUFFER_SIZE (buf) = size; - GST_DEBUG (0,"map %p, offset %d, size %ld\n", src->map, offset, GST_BUFFER_SIZE (buf)); + GST_DEBUG (0,"map %p, offset %ld, size %d\n", src->map, offset, GST_BUFFER_SIZE (buf)); /* we're done, return the buffer off now */ return buf; diff --git a/gst/gstplugin.c b/gst/gstplugin.c index 06b058d..03c8448 100644 --- a/gst/gstplugin.c +++ b/gst/gstplugin.c @@ -140,7 +140,7 @@ gst_plugin_load_all(void) path = _gst_plugin_paths; while (path != NULL) { - GST_DEBUG (GST_CAT_PLUGIN_LOADING,"loading plugins from %s\n",path->data); + GST_DEBUG (GST_CAT_PLUGIN_LOADING,"loading plugins from %s\n",(gchar *)path->data); gst_plugin_load_recurse(path->data,NULL); path = g_list_next(path); } diff --git a/include/registry.h b/include/registry.h index 94f45fc..44026e9 100644 --- a/include/registry.h +++ b/include/registry.h @@ -15,11 +15,11 @@ extern "C" { long RegOpenKeyExA(long key, const char* subkey, long reserved, long access, int* newkey); long RegCloseKey(long key); long RegQueryValueExA(long key, const char* value, int* reserved, int* type, int* data, int* count); -long RegCreateKeyExA(long key, const char* name, long reserved, - void* classs, long options, long security, +long RegCreateKeyExA(long key, const char* name, long reserved, + void* classs, long options, long security, void* sec_attr, int* newkey, int* status) ; long RegSetValueExA(long key, const char* name, long v1, long v2, void* data, long size); #ifdef __cplusplus }; #endif -#endif \ No newline at end of file +#endif diff --git a/libs/colorspace/gstcolorspace.h b/libs/colorspace/gstcolorspace.h index b8b89a9..e5210df 100644 --- a/libs/colorspace/gstcolorspace.h +++ b/libs/colorspace/gstcolorspace.h @@ -22,8 +22,7 @@ #define __GST_COLORSPACE_H__ #include -#include -#include +#include #include "yuv2rgb.h" diff --git a/libs/colorspace/rgb2rgb.c b/libs/colorspace/rgb2rgb.c index 2b853de..43f06ce 100644 --- a/libs/colorspace/rgb2rgb.c +++ b/libs/colorspace/rgb2rgb.c @@ -17,10 +17,10 @@ * Boston, MA 02111-1307, USA. */ -//#define DEBUG_ENABLED +#include -#include -#include +//#define DEBUG_ENABLED +#include "gstcolorspace.h" static void gst_colorspace_rgb_to_rgb_identity(GstColorSpaceConverter *space, unsigned char *src, unsigned char *dest); static void gst_colorspace_rgb24_to_bgr24(GstColorSpaceConverter *space, unsigned char *src, unsigned char *dest); diff --git a/libs/getbits/Makefile.am b/libs/getbits/Makefile.am index ad833e5..eaf6d67 100644 --- a/libs/getbits/Makefile.am +++ b/libs/getbits/Makefile.am @@ -16,7 +16,7 @@ libgstgetbitsinclude_HEADERS = gstgetbits.h noinst_HEADERS = gstgetbits.h gstgetbits_inl.h -bin_PROGRAMS = gbtest +check_PROGRAMS = gbtest gbtest_SOURCES = gbtest.c gbtest_LDADD = libgstgetbits.la $(top_srcdir)/gst/libgst.la diff --git a/libs/getbits/gstgetbits.c b/libs/getbits/gstgetbits.c index e36c7bb..1a06687 100644 --- a/libs/getbits/gstgetbits.c +++ b/libs/getbits/gstgetbits.c @@ -1,5 +1,3 @@ -#include - #include "gstgetbits.h" /* Defined in gstgetbits_i386.s */ diff --git a/libs/getbits/gstgetbits.h b/libs/getbits/gstgetbits.h index 96400ad..7e56796 100644 --- a/libs/getbits/gstgetbits.h +++ b/libs/getbits/gstgetbits.h @@ -3,6 +3,8 @@ #include +// getbits is critical, we need to forcibly disable DEBUG +#define GST_DEBUG_FORCE_DISABLE #include /* disabled for now */ diff --git a/libs/getbits/gstgetbits_generic.c b/libs/getbits/gstgetbits_generic.c index cfd7a5f..4e39ad9 100644 --- a/libs/getbits/gstgetbits_generic.c +++ b/libs/getbits/gstgetbits_generic.c @@ -1,5 +1,3 @@ -#include - #include "gstgetbits.h" unsigned long _gst_getbits_int_cb(gst_getbits_t *gb, unsigned long bits); @@ -52,7 +50,7 @@ unsigned long _gst_get1bit_int(gst_getbits_t *gb, unsigned long bits) { gb->ptr += (gb->bits>>3); gb->bits &= 0x7; - GST_DEBUG (0,"getbits%d, %08x\n", bits, rval); + GST_DEBUG (0,"getbits%ld, %08x\n", bits, rval); return rval>>7; } @@ -70,7 +68,7 @@ unsigned long _gst_getbits_int(gst_getbits_t *gb, unsigned long bits) { gb->ptr += (gb->bits>>3); gb->bits &= 0x7; - GST_DEBUG (0,"getbits%d, %08x\n", bits, rval); + GST_DEBUG (0,"getbits%ld, %08lx\n", bits, rval); return rval; } @@ -86,7 +84,7 @@ unsigned long _gst_getbits_fast_int(gst_getbits_t *gb, unsigned long bits) { gb->ptr += (gb->bits>>3); gb->bits &= 0x7; - GST_DEBUG (0,"getbits%d, %08x\n", bits, rval); + GST_DEBUG (0,"getbits%ld, %08lx\n", bits, rval); return rval; } @@ -99,7 +97,7 @@ unsigned long _gst_showbits_int(gst_getbits_t *gb, unsigned long bits) { rval <<= gb->bits; rval >>= (32-bits); - GST_DEBUG (0,"showbits%d, %08x\n", bits, rval); + GST_DEBUG (0,"showbits%ld, %08lx\n", bits, rval); return rval; } @@ -107,7 +105,7 @@ void _gst_flushbits_int(gst_getbits_t *gb, unsigned long bits) { gb->bits += bits; gb->ptr += (gb->bits>>3); gb->bits &= 0x7; - GST_DEBUG (0,"flushbits%d\n", bits); + GST_DEBUG (0,"flushbits%ld\n", bits); } void _gst_getbits_back_int(gst_getbits_t *gb, unsigned long bits) { diff --git a/libs/idct/Makefile.am b/libs/idct/Makefile.am index f3fabc7..afcc080 100644 --- a/libs/idct/Makefile.am +++ b/libs/idct/Makefile.am @@ -19,7 +19,7 @@ libgstidct_la_SOURCES = \ libgstidctincludedir = $(includedir)/gst/libs/gstidct libgstidctinclude_HEADERS = gstidct.h -bin_PROGRAMS = ieeetest +check_PROGRAMS = ieeetest ieeetest_SOURCES = ieeetest.c ieeetest_LDADD = libgstidct.la $(GLIB_LIBS) $(GTK_LIBS) $(top_srcdir)/gst/libgst.la diff --git a/libs/riff/gstriffencode.c b/libs/riff/gstriffencode.c index d80a667..425e85d 100644 --- a/libs/riff/gstriffencode.c +++ b/libs/riff/gstriffencode.c @@ -17,10 +17,10 @@ * Boston, MA 02111-1307, USA. */ +#include //#define DEBUG_ENABLED -#include -#include +#include "gstriff.h" #define GST_RIFF_ENCODER_BUF_SIZE 1024 diff --git a/libs/riff/gstriffparse.c b/libs/riff/gstriffparse.c index 3f70e32..50a2642 100644 --- a/libs/riff/gstriffparse.c +++ b/libs/riff/gstriffparse.c @@ -17,8 +17,9 @@ * Boston, MA 02111-1307, USA. */ +#include + //#define DEBUG_ENABLED -#include #include GstRiff* @@ -124,7 +125,7 @@ gst_riff_parser_next_buffer (GstRiff *riff, GstBuffer *buf, gulong off) if (riff->nextlikely & 0x01) riff->nextlikely++; - GST_DEBUG (0,"gst_riff_parser: next 0x%08x last 0x%08lx offset %08x\n",riff->nextlikely, last, off); + GST_DEBUG (0,"gst_riff_parser: next 0x%08x last 0x%08lx offset %08lx\n",riff->nextlikely, last, off); /* loop while the next likely chunk header is in this buffer */ while ((riff->nextlikely+12) <= last) { gulong *words = (gulong *)((guchar *)GST_BUFFER_DATA(buf) + riff->nextlikely - off ); @@ -198,7 +199,7 @@ gst_riff_parser_next_buffer (GstRiff *riff, GstBuffer *buf, gulong off) } if ((riff->nextlikely+12) > last && !riff->incomplete_chunk) { guint left = last - riff->nextlikely; - GST_DEBUG (0,"gst_riff_parser: not enough data next 0x%08x last 0x%08lx %08x %08x\n",riff->nextlikely, + GST_DEBUG (0,"gst_riff_parser: not enough data next 0x%08x last 0x%08lx %08x %08lx\n",riff->nextlikely, last, left, off); riff->dataleft = g_malloc(left); diff --git a/libs/videoscale/gstvideoscale.c b/libs/videoscale/gstvideoscale.c index beaa281..8ec43fa 100644 --- a/libs/videoscale/gstvideoscale.c +++ b/libs/videoscale/gstvideoscale.c @@ -18,11 +18,11 @@ */ //#define DEBUG_ENABLED +#include #include -#include - -#include +#include "gstvideoscale.h" +//FIXME #include static void gst_videoscale_scale_yuv(GstVideoScale *scale, unsigned char *src, unsigned char *dest); @@ -281,7 +281,7 @@ static void generate_rowbytes(unsigned char *copy_row, int src_w, int dst_w, int pos += inc; } *eip++ = RETURN; - GST_DEBUG (0,"scaler start/end %p %p %p\n", copy_row, eip, eip-copy_row); + GST_DEBUG (0,"scaler start/end %p %p %p\n", copy_row, eip, (void*)(eip-copy_row)); } diff --git a/plugins/elements/Makefile.am b/plugins/elements/Makefile.am index 420b551..c9baa5a 100644 --- a/plugins/elements/Makefile.am +++ b/plugins/elements/Makefile.am @@ -17,14 +17,14 @@ libgstelements_la_SOURCES = \ gstdisksrc.c \ gstasyncdisksrc.c \ gstfdsrc.c \ - $(GSTHTTPSRC) \ gstaudiosink.c \ gstaudiosrc.c \ gstfdsink.c \ gstpipefilter.c \ gstqueue.c \ gsttypefind.c \ - gstsinesrc.c + gstsinesrc.c \ + $(GSTHTTPSRC) noinst_HEADERS = \ gstfakesrc.h \ diff --git a/plugins/elements/gstasyncdisksrc.c b/plugins/elements/gstasyncdisksrc.c index aa47e48..b24a2ec 100644 --- a/plugins/elements/gstasyncdisksrc.c +++ b/plugins/elements/gstasyncdisksrc.c @@ -244,7 +244,7 @@ gst_asyncdisksrc_get (GstPad *pad) } else GST_BUFFER_SIZE (buf) = src->bytes_per_read; - GST_DEBUG (0,"map %p, offset %d, size %ld\n", src->map, src->curoffset, GST_BUFFER_SIZE (buf)); + GST_DEBUG (0,"map %p, offset %ld, size %d\n", src->map, src->curoffset, GST_BUFFER_SIZE (buf)); //gst_util_dump_mem (GST_BUFFER_DATA (buf), GST_BUFFER_SIZE (buf)); @@ -303,7 +303,7 @@ gst_asyncdisksrc_get_region (GstPad *pad, gulong offset, gulong size) } else GST_BUFFER_SIZE (buf) = size; - GST_DEBUG (0,"map %p, offset %d, size %ld\n", src->map, offset, GST_BUFFER_SIZE (buf)); + GST_DEBUG (0,"map %p, offset %ld, size %d\n", src->map, offset, GST_BUFFER_SIZE (buf)); /* we're done, return the buffer off now */ return buf; diff --git a/tests/old/examples/autoplug/Makefile.am b/tests/old/examples/autoplug/Makefile.am index 4b661a3..4bd0f83 100644 --- a/tests/old/examples/autoplug/Makefile.am +++ b/tests/old/examples/autoplug/Makefile.am @@ -1,4 +1,4 @@ bin_PROGRAMS = autoplug -LDADD = $(GLIB_LIBS) $(GTK_LIBS) $(top_builddir)/gst/libgst.la -INCLUDES = $(GLIB_CFLAGS) $(GTK_CFLAGS) -I$(top_srcdir) +LDADD = $(GNOME_LIBS) $(top_builddir)/gst/libgst.la +INCLUDES = $(GNOME_CFLAGS) -- 2.7.4