diff options
| -rw-r--r-- | ChangeLog | 20 | ||||
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | docs/libs/Makefile.am | 6 | ||||
| -rw-r--r-- | docs/plugins/Makefile.am | 6 | ||||
| -rw-r--r-- | gst-libs/gst/audio/audio.h | 2 | ||||
| -rw-r--r-- | gst/audiotestsrc/gstaudiotestsrc.c | 8 |
6 files changed, 42 insertions, 8 deletions
@@ -1,3 +1,16 @@ +2007-02-12 Stefan Kost <ensonic@users.sf.net> + + * configure.ac: + * docs/libs/Makefile.am: + * docs/plugins/Makefile.am: + Add crossreferences to glib/gobject/gstream docs. + + * gst-libs/gst/audio/audio.h: + Source formatting. + + * gst/audiotestsrc/gstaudiotestsrc.c: (plugin_init): + Add own debug category. + 2007-02-12 Tim-Philipp Müller <tim at centricular dot net> Patch by: René Stadler <mail at renestadler de> @@ -2647,6 +2660,13 @@ 2006-09-17 Stefan Kost <ensonic@users.sf.net> + reviewed by: <delete if not using a buddy> + + * gst-libs/gst/audio/audio.h: + * gst/audiotestsrc/gstaudiotestsrc.c: (plugin_init): + +2006-09-17 Stefan Kost <ensonic@users.sf.net> + * gst/audioconvert/gstaudioconvert.c: (set_structure_widths), (gst_audio_convert_transform_caps): Get structure-name just once. diff --git a/configure.ac b/configure.ac index b941b2ab..d3807a0a 100644 --- a/configure.ac +++ b/configure.ac @@ -237,7 +237,7 @@ AC_C99_FUNC_LRINTF dnl Check for a way to display the function name in debug output GST_CHECK_FUNCTION -dnl *** checks for dependancy libraries *** +dnl *** checks for dependency libraries *** dnl GLib is required GST_GLIB_CHECK([2.6]) @@ -262,6 +262,12 @@ dnl check for "check", unit testing library/header AM_PATH_CHECK(0.9.2, HAVE_CHECK=yes, HAVE_CHECK=no) AM_CONDITIONAL(HAVE_CHECK, test "x$HAVE_CHECK" = "xyes") +dnl Check for documentation xrefs +GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`" +GST_PREFIX="`$PKG_CONFIG --variable=prefix gstreamer-$GST_MAJORMINOR`" +AC_SUBST(GLIB_PREFIX) +AC_SUBST(GST_PREFIX) + dnl GTK is optional and used in examples HAVE_GTK=NO PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= 2.2.0, HAVE_GTK_22=yes, HAVE_GTK_22=no) diff --git a/docs/libs/Makefile.am b/docs/libs/Makefile.am index 48513f97..8ec96d32 100644 --- a/docs/libs/Makefile.am +++ b/docs/libs/Makefile.am @@ -54,8 +54,10 @@ SCAN_OPTIONS= MKDB_OPTIONS=--sgml-mode --ignore-files=trio # Extra options to supply to gtkdoc-fixref. -# FIXME get the location of the installed gstreamer docs -#FIXXREF_OPTIONS=--extra-dir=../gst/html +FIXXREF_OPTIONS=--extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/gobject \ + --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/glib \ + --extra-dir=$(GST_PREFIX)/share/gtk-doc/html/gstreamer-@GST_MAJORMINOR@ \ + --extra-dir=$(GST_PREFIX)/share/gtk-doc/html/gstreamer-libs-@GST_MAJORMINOR@ # Used for dependencies. HFILE_GLOB=$(DOC_SOURCE_DIR)/*/*.h diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am index 73cf7d62..bcea5aa0 100644 --- a/docs/plugins/Makefile.am +++ b/docs/plugins/Makefile.am @@ -48,8 +48,10 @@ SCAN_OPTIONS= MKDB_OPTIONS=--sgml-mode # Extra options to supply to gtkdoc-fixref. -# FIXME get the location of the installed gstreamer docs -#FIXXREF_OPTIONS=--extra-dir=../gst/html +FIXXREF_OPTIONS=--extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/gobject \ + --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/glib \ + --extra-dir=$(GST_PREFIX)/share/gtk-doc/html/gstreamer-@GST_MAJORMINOR@ \ + --extra-dir=$(GST_PREFIX)/share/gtk-doc/html/gstreamer-libs-@GST_MAJORMINOR@ # Used for dependencies. HFILE_GLOB=$(DOC_SOURCE_DIR)/*/*/*.h diff --git a/gst-libs/gst/audio/audio.h b/gst-libs/gst/audio/audio.h index d7201047..f2bb7702 100644 --- a/gst-libs/gst/audio/audio.h +++ b/gst-libs/gst/audio/audio.h @@ -54,7 +54,7 @@ G_BEGIN_DECLS ((GstClockTime) (((gdouble) frames / rate) * GST_SECOND)) #define GST_CLOCK_TIME_TO_FRAMES(clocktime, rate) \ - ((gint64) ((gst_guint64_to_gdouble(clocktime) / GST_SECOND) * rate)) + ((gint64) ((gst_guint64_to_gdouble (clocktime) / GST_SECOND) * rate)) #define GST_AUDIO_DEF_RATE 44100 diff --git a/gst/audiotestsrc/gstaudiotestsrc.c b/gst/audiotestsrc/gstaudiotestsrc.c index fd2bcec7..4768bd34 100644 --- a/gst/audiotestsrc/gstaudiotestsrc.c +++ b/gst/audiotestsrc/gstaudiotestsrc.c @@ -1,8 +1,6 @@ /* GStreamer * Copyright (C) 2005 Stefan Kost <ensonic@users.sf.net> * - * gstaudiotestsrc.c: - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public * License as published by the Free Software Foundation; either @@ -64,6 +62,9 @@ #define M_PI_M2 ( M_PI + M_PI ) +GST_DEBUG_CATEGORY_STATIC (audio_test_src_debug); +#define GST_CAT_DEFAULT audio_test_src_debug + static const GstElementDetails gst_audio_test_src_details = GST_ELEMENT_DETAILS ("Audio test source", "Source/Audio", @@ -771,6 +772,9 @@ plugin_init (GstPlugin * plugin) /* initialize gst controller library */ gst_controller_init (NULL, NULL); + GST_DEBUG_CATEGORY_INIT (audio_test_src_debug, "audiotestsrc", 0, + "Audio Test Source"); + return gst_element_register (plugin, "audiotestsrc", GST_RANK_NONE, GST_TYPE_AUDIO_TEST_SRC); } |