Revert accidental checkin and start over

Original commit message from CVS:
Revert accidental checkin and start over

diff --git a/ChangeLog b/ChangeLog
index 4b86bda9827896ca9ad9531b821ffcf56d3d9e97..e461920d3ec161de4fdb471d4fe76762a1289341 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,16 +1,3 @@
-2004-01-26  David Schleef  <ds@schleef.org>
-
-       reviewed by: <delete if not using a buddy>
-
-       * docs/gst/tmpl/gstelement.sgml:
-       * docs/gst/tmpl/gstplugin.sgml:
-       * docs/gst/tmpl/gstreamer-unused.sgml:
-       * docs/gst/tmpl/gstxml.sgml:
-       * gst/gstelement.h:
-       * gst/gstpad.c: (gst_pad_try_set_caps):
-       * gst/gstqueue.c: (gst_queue_chain):
-       * testsuite/caps/Makefile.am:
-
 2004-01-26  Ronald Bultje  <rbultje@ronald.bitfreak.net>
 
        * docs/pwg/advanced_types.xml:

diff --git a/docs/gst/tmpl/gstelement.sgml b/docs/gst/tmpl/gstelement.sgml
index 01e0130f8b0ab63bfb6695fa5f933da384d7fcf0..10bef0cf5a31f97bf2f9a845e458f9e28110b43e 100644 (file)
--- a/docs/gst/tmpl/gstelement.sgml
+++ b/docs/gst/tmpl/gstelement.sgml
@@ -389,7 +389,6 @@ Sets the name of the element, getting rid of the old name if there was one.
 @code: 
 @message: 
 @debug: 
-@...: 
 <!-- # Unused Parameters # -->
 @element: 
 @error: 
@@ -988,12 +987,6 @@ Is triggered whenever an error occured.
 @gstelement: the object which received the signal.
 @arg1: the error message
 @arg2: 
-<<<<<<< gstelement.sgml
-@:
-=======
-@:
-@:
->>>>>>> 1.59
 @:
 @:
 @: 

diff --git a/docs/gst/tmpl/gstplugin.sgml b/docs/gst/tmpl/gstplugin.sgml
index e265e785b00cb7a580a9aebfea0e1b831da60356..c418c8a990122866b284d014a1ca53308f577349 100644 (file)
--- a/docs/gst/tmpl/gstplugin.sgml
+++ b/docs/gst/tmpl/gstplugin.sgml
@@ -101,6 +101,15 @@ loaded will use this variable to initialize the plugin.
 @origin: 
 @_gst_reserved: 
 
+<!-- ##### FUNCTION gst_plugin_set_name ##### -->
+<para>
+
+</para>
+
+@plugin: 
+@name: 
+
+
 <!-- ##### FUNCTION gst_plugin_get_name ##### -->
 <para>
 
@@ -110,6 +119,15 @@ loaded will use this variable to initialize the plugin.
 @Returns: 
 
 
+<!-- ##### FUNCTION gst_plugin_get_longname ##### -->
+<para>
+
+</para>
+
+@plugin: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gst_plugin_get_filename ##### -->
 <para>
 

diff --git a/docs/gst/tmpl/gstreamer-unused.sgml b/docs/gst/tmpl/gstreamer-unused.sgml
index cc6fc05def3bb9eace0824287f0804a0add44078..a987da6a61cfc0cede1eff8df72153b85d481631 100644 (file)
--- a/docs/gst/tmpl/gstreamer-unused.sgml
+++ b/docs/gst/tmpl/gstreamer-unused.sgml
@@ -9634,14 +9634,6 @@ Destroys the pipeline.
 
 @Returns: 
 
-<!-- ##### FUNCTION gst_plugin_get_longname ##### -->
-<para>
-
-</para>
-
-@plugin: 
-@Returns: 
-
 <!-- ##### FUNCTION gst_plugin_get_type_list ##### -->
 <para>
 
@@ -9733,14 +9725,6 @@ Destroys the pipeline.
 @plugin: 
 @longname: 
 
-<!-- ##### FUNCTION gst_plugin_set_name ##### -->
-<para>
-
-</para>
-
-@plugin: 
-@name: 
-
 <!-- ##### FUNCTION gst_plugin_unload_all ##### -->
 <para>
 

diff --git a/docs/gst/tmpl/gstxml.sgml b/docs/gst/tmpl/gstxml.sgml
index 08450b21b9fcdd370fac1bdfcee0a65f4dd01147..32d00bc1f945057c688910e1ad118544fb47a328 100644 (file)
--- a/docs/gst/tmpl/gstxml.sgml
+++ b/docs/gst/tmpl/gstxml.sgml
@@ -110,10 +110,6 @@ All GstElements can be serialized to an XML presentation and subsequently loaded
 
 </para>
 
-@: 
-@: 
-@:
-
 @gstxml: the object which received the signal.
 @arg1: 
 @arg2: 
@@ -123,7 +119,7 @@ All GstElements can be serialized to an XML presentation and subsequently loaded
 
 </para>
 
-@gstxml: the object which received the signal.
-@arg1: 
-@arg2: 
+@: 
+@: 
+@: 
 

diff --git a/gst/gstelement.h b/gst/gstelement.h
index b640ef3ea6d4d3659e70989ded4c26f599a9b188..13eb2f4798257656e80d2a9d66dc8750969eeb3a 100644 (file)
--- a/gst/gstelement.h
+++ b/gst/gstelement.h
@@ -139,14 +139,12 @@ typedef enum {
 #define GST_ELEMENT_CLOCK(obj)                 (((GstElement*)(obj))->clock)
 #define GST_ELEMENT_PADS(obj)                  ((obj)->pads)
 
-#define gst_element_error(el, domain, code, message, debug, ...) \
-G_STMT_START { \
+#define gst_element_error(el, domain, code, message, debug) G_STMT_START { \
   gst_element_error_full (GST_ELEMENT(el), \
   GST_ ## domain ## _ERROR, GST_ ## domain ## _ERROR_ ## code, \
   _gst_element_error_printf message, \
   _gst_element_error_printf debug, \
-  __FILE__, GST_FUNCTION, __LINE__); \
-} G_STMT_END
+  __FILE__, GST_FUNCTION, __LINE__); } G_STMT_END
 
 typedef struct _GstElementFactory GstElementFactory;
 typedef struct _GstElementFactoryClass GstElementFactoryClass;

diff --git a/gst/gstpad.c b/gst/gstpad.c
index db6d0d7e47a7f945b28aabf13e3a15cfbe7e530f..6d1a346964379f7c2dd93e5970e2319d5696e794 100644 (file)
--- a/gst/gstpad.c
+++ b/gst/gstpad.c
@@ -1322,28 +1322,21 @@ gst_pad_try_set_caps (GstPad *pad, const GstCaps *caps)
   g_return_val_if_fail (GST_IS_REAL_PAD (pad), GST_PAD_LINK_REFUSED);
   g_return_val_if_fail (!GST_FLAG_IS_SET (pad, GST_PAD_NEGOTIATING),
       GST_PAD_LINK_REFUSED);
-
-  /* setting non-fixed caps on a pad is not allowed */
-  if (!gst_caps_is_fixed (caps)) {
-    GST_CAT_INFO (GST_CAT_CAPS, 
-              "trying to set unfixed caps on pad %s:%s, not allowed",
-             GST_DEBUG_PAD_NAME (pad));
-    g_warning ("trying to set non fixed caps on pad %s:%s, not allowed",
-               GST_DEBUG_PAD_NAME (pad));
-
-    gst_caps_debug (caps, "unfixed caps");
-    return GST_PAD_LINK_REFUSED;
-  }
-
+  
   /* we allow setting caps on non-linked pads.  It's ignored */
   if (!GST_PAD_PEER (pad)) {
     return GST_PAD_LINK_OK;
   }
 
   /* if the desired caps are already there, it's trivially ok */
-  if (GST_PAD_CAPS (pad) && gst_caps_is_equal_fixed (caps,
-        GST_PAD_CAPS (pad))) {
-    return GST_PAD_LINK_OK;
+  if (GST_PAD_CAPS (pad)) {
+    GstCaps *intersection;
+    intersection = gst_caps_intersect (caps, GST_PAD_CAPS (pad));
+    if (!gst_caps_is_empty (intersection)) {
+      gst_caps_free (intersection);
+      return GST_PAD_LINK_OK;
+    }
+    gst_caps_free (intersection);
   }
 
   g_return_val_if_fail (GST_PAD_LINK_SRC (pad), GST_PAD_LINK_REFUSED);

diff --git a/gst/gstqueue.c b/gst/gstqueue.c
index 3f81a98753c326fd66662a2f387112e1f1ee6624..d9a215537459806ba82cb9468874bb74281b673c 100644 (file)
--- a/gst/gstqueue.c
+++ b/gst/gstqueue.c
@@ -510,6 +510,7 @@ restart:
          * to make things read-only. Also keep our list uptodate. */
         queue->cur_level.bytes -= GST_BUFFER_SIZE (data);
         queue->cur_level.buffers --;
+        g_object_notify (G_OBJECT (queue), "current-level-buffers");
         if (GST_BUFFER_DURATION (data) != GST_CLOCK_TIME_NONE)
           queue->cur_level.time -= GST_BUFFER_DURATION (data);
 
@@ -605,6 +606,7 @@ restart:
   /* Note that we only add buffers (not events) to the statistics */
   if (GST_IS_BUFFER (data)) {
     queue->cur_level.buffers++;
+    g_object_notify (G_OBJECT (queue), "current-level-buffers");
     queue->cur_level.bytes += GST_BUFFER_SIZE (data);
     if (GST_BUFFER_DURATION (data) != GST_CLOCK_TIME_NONE)
       queue->cur_level.time += GST_BUFFER_DURATION (data);

diff --git a/plugins/elements/gstqueue.c b/plugins/elements/gstqueue.c
index 3f81a98753c326fd66662a2f387112e1f1ee6624..d9a215537459806ba82cb9468874bb74281b673c 100644 (file)
--- a/plugins/elements/gstqueue.c
+++ b/plugins/elements/gstqueue.c
@@ -510,6 +510,7 @@ restart:
          * to make things read-only. Also keep our list uptodate. */
         queue->cur_level.bytes -= GST_BUFFER_SIZE (data);
         queue->cur_level.buffers --;
+        g_object_notify (G_OBJECT (queue), "current-level-buffers");
         if (GST_BUFFER_DURATION (data) != GST_CLOCK_TIME_NONE)
           queue->cur_level.time -= GST_BUFFER_DURATION (data);
 
@@ -605,6 +606,7 @@ restart:
   /* Note that we only add buffers (not events) to the statistics */
   if (GST_IS_BUFFER (data)) {
     queue->cur_level.buffers++;
+    g_object_notify (G_OBJECT (queue), "current-level-buffers");
     queue->cur_level.bytes += GST_BUFFER_SIZE (data);
     if (GST_BUFFER_DURATION (data) != GST_CLOCK_TIME_NONE)
       queue->cur_level.time += GST_BUFFER_DURATION (data);

diff --git a/tests/old/testsuite/caps/Makefile.am b/tests/old/testsuite/caps/Makefile.am
index 3034b5f0667899179aecb181346a49a1d2f34466..10d217aa1abc04c2d29720e9341e639b7ae6284f 100644 (file)
--- a/tests/old/testsuite/caps/Makefile.am
+++ b/tests/old/testsuite/caps/Makefile.am
@@ -12,8 +12,7 @@ tests_pass = \
        intersect2 \
        caps \
        value_compare \
-       value_intersect \
-       it
+       value_intersect
 
 tests_fail =
 
@@ -35,7 +34,5 @@ fixed_CFLAGS = $(GST_CFLAGS) $(XML_CFLAGS)
 intersect2_LDADD = $(GST_LIBS) 
 intersect2_CFLAGS = $(GST_CFLAGS) $(XML_CFLAGS)
 
-it_LDADD = $(GST_LIBS) 
-it_CFLAGS = $(GST_CFLAGS) $(XML_CFLAGS)
 
 

diff --git a/testsuite/caps/Makefile.am b/testsuite/caps/Makefile.am
index 3034b5f0667899179aecb181346a49a1d2f34466..10d217aa1abc04c2d29720e9341e639b7ae6284f 100644 (file)
--- a/testsuite/caps/Makefile.am
+++ b/testsuite/caps/Makefile.am
@@ -12,8 +12,7 @@ tests_pass = \
        intersect2 \
        caps \
        value_compare \
-       value_intersect \
-       it
+       value_intersect
 
 tests_fail =
 
@@ -35,7 +34,5 @@ fixed_CFLAGS = $(GST_CFLAGS) $(XML_CFLAGS)
 intersect2_LDADD = $(GST_LIBS) 
 intersect2_CFLAGS = $(GST_CFLAGS) $(XML_CFLAGS)
 
-it_LDADD = $(GST_LIBS) 
-it_CFLAGS = $(GST_CFLAGS) $(XML_CFLAGS)