summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Vander Stichele <thomas@apestaart.org>2004-06-05 12:19:27 +0000
committerThomas Vander Stichele <thomas@apestaart.org>2004-06-05 12:19:27 +0000
commit5729f3b2a3bc454c53b9a97512e5dd4c6b6635e8 (patch)
tree1701968f14c707143fae961cd6d83b805c738486
parent864b8837cf4dfd3a4c8f5106df129a74f2342093 (diff)
put back GST_CAT_DATAFLOWRELEASE-0_8_3
Original commit message from CVS: put back GST_CAT_DATAFLOW
-rw-r--r--ChangeLog8
-rw-r--r--configure.ac2
-rw-r--r--docs/gst/tmpl/gstelement.sgml23
-rw-r--r--docs/gst/tmpl/gsttypes.sgml32
-rw-r--r--gst/gstinfo.c6
5 files changed, 31 insertions, 40 deletions
diff --git a/ChangeLog b/ChangeLog
index 588437e28..ada718e2a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-06-05 Thomas Vander Stichele <thomas at apestaart dot org>
+
+ * configure.ac:
+ * docs/gst/tmpl/gstelement.sgml:
+ * docs/gst/tmpl/gsttypes.sgml:
+ * gst/gstinfo.c: (_gst_debug_init):
+ put back GST_CAT_DATAFLOW to fix API breakage
+
2004-06-04 David Schleef <ds@schleef.org>
* autogen.sh: Add a temporary 'env' to test buildbot problems.
diff --git a/configure.ac b/configure.ac
index b41fdd032..2f2b4b957 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@ dnl - library source changed -> increment REVISION
dnl - interfaces added/removed/changed -> increment CURRENT, REVISION = 0
dnl - interfaces added -> increment AGE
dnl - interfaces removed -> AGE = 0
-AS_LIBTOOL(GST, 2, 0, 1)
+AS_LIBTOOL(GST, 3, 0, 2)
AM_PROG_LIBTOOL
AC_CONFIG_SRCDIR([gst/gst.c])
diff --git a/docs/gst/tmpl/gstelement.sgml b/docs/gst/tmpl/gstelement.sgml
index ad7905f84..d6e0772f2 100644
--- a/docs/gst/tmpl/gstelement.sgml
+++ b/docs/gst/tmpl/gstelement.sgml
@@ -76,8 +76,6 @@ and gst_element_set_clock(). You can wait for the clock to reach a given
</para>
-@:
-
@gstelement: the object which received the signal.
<!-- ##### SIGNAL GstElement::error ##### -->
@@ -85,11 +83,6 @@ and gst_element_set_clock(). You can wait for the clock to reach a given
</para>
-@:
-@:
-@:
-@:
-
@gstelement: the object which received the signal.
@arg1:
@arg2:
@@ -100,10 +93,6 @@ and gst_element_set_clock(). You can wait for the clock to reach a given
</para>
-@:
-@:
-@:
-
@gstelement: the object which received the signal.
@arg1:
@arg2:
@@ -113,9 +102,6 @@ and gst_element_set_clock(). You can wait for the clock to reach a given
</para>
-@:
-@:
-
@gstelement: the object which received the signal.
@arg1:
@@ -124,8 +110,6 @@ and gst_element_set_clock(). You can wait for the clock to reach a given
</para>
-@:
-
@gstelement: the object which received the signal.
<!-- ##### SIGNAL GstElement::pad-removed ##### -->
@@ -133,9 +117,6 @@ and gst_element_set_clock(). You can wait for the clock to reach a given
</para>
-@:
-@:
-
@gstelement: the object which received the signal.
@arg1:
@@ -144,10 +125,6 @@ and gst_element_set_clock(). You can wait for the clock to reach a given
</para>
-@:
-@:
-@:
-
@gstelement: the object which received the signal.
@arg1:
@arg2:
diff --git a/docs/gst/tmpl/gsttypes.sgml b/docs/gst/tmpl/gsttypes.sgml
index dcf6af2d8..b78624314 100644
--- a/docs/gst/tmpl/gsttypes.sgml
+++ b/docs/gst/tmpl/gsttypes.sgml
@@ -127,58 +127,58 @@ template.
</para>
-@gstelement: the object which received the signal.
+@:
<!-- ##### SIGNAL GstElement::error ##### -->
<para>
</para>
-@gstelement: the object which received the signal.
-@arg1:
-@arg2:
-@arg3:
+@:
+@:
+@:
+@:
<!-- ##### SIGNAL GstElement::found-tag ##### -->
<para>
</para>
-@gstelement: the object which received the signal.
-@arg1:
-@arg2:
+@:
+@:
+@:
<!-- ##### SIGNAL GstElement::new-pad ##### -->
<para>
</para>
-@gstelement: the object which received the signal.
-@arg1:
+@:
+@:
<!-- ##### SIGNAL GstElement::no-more-pads ##### -->
<para>
</para>
-@gstelement: the object which received the signal.
+@:
<!-- ##### SIGNAL GstElement::pad-removed ##### -->
<para>
</para>
-@gstelement: the object which received the signal.
-@arg1:
+@:
+@:
<!-- ##### SIGNAL GstElement::state-change ##### -->
<para>
</para>
-@gstelement: the object which received the signal.
-@arg1:
-@arg2:
+@:
+@:
+@:
<!-- ##### STRUCT GstElementClass ##### -->
<para>
diff --git a/gst/gstinfo.c b/gst/gstinfo.c
index 57be7be26..e0fa8f888 100644
--- a/gst/gstinfo.c
+++ b/gst/gstinfo.c
@@ -134,6 +134,9 @@ GstDebugCategory *GST_CAT_PARENTAGE = NULL;
GstDebugCategory *GST_CAT_STATES = NULL;
GstDebugCategory *GST_CAT_PLANNING = NULL;
GstDebugCategory *GST_CAT_SCHEDULING = NULL;
+
+/* FIXME: remove GST_CAT_DATAFLOW in 0.9 */
+GstDebugCategory *GST_CAT_DATAFLOW = NULL;
GstDebugCategory *GST_CAT_BUFFER = NULL;
GstDebugCategory *GST_CAT_CAPS = NULL;
GstDebugCategory *GST_CAT_CLOCK = NULL;
@@ -233,6 +236,9 @@ _gst_debug_init (void)
GST_DEBUG_BOLD | GST_DEBUG_FG_MAGENTA, NULL);
GST_CAT_SCHEDULING = _gst_debug_category_new ("GST_SCHEDULING",
GST_DEBUG_BOLD | GST_DEBUG_FG_MAGENTA, NULL);
+/* FIXME: remove GST_CAT_DATAFLOW in 0.9 */
+ GST_CAT_DATAFLOW = _gst_debug_category_new ("GST_DATAFLOW",
+ GST_DEBUG_BOLD | GST_DEBUG_FG_GREEN, NULL);
GST_CAT_BUFFER = _gst_debug_category_new ("GST_BUFFER",
GST_DEBUG_BOLD | GST_DEBUG_FG_GREEN, NULL);
GST_CAT_CAPS = _gst_debug_category_new ("GST_CAPS",