caps: _do_simplify() -> _simplify()

Rename _do_simplify() to _simplify(). The name was introduced as a replacement
method for a deprecated method but we can now rename it again.
Fix some docs.

diff --git a/docs/gst/gstreamer-sections.txt b/docs/gst/gstreamer-sections.txt
index 6bdd18e96ba33a61f4c10d0f05d0555c5f5e23a5..2e43a41e166e81e2e17acbe581f75d3d2b882d57 100644 (file)
--- a/docs/gst/gstreamer-sections.txt
+++ b/docs/gst/gstreamer-sections.txt
@@ -257,8 +257,9 @@ GST_META_FLAG_UNSET
 GstMetaInfo
 GstMetaInitFunction
 GstMetaFreeFunction
-GstMetaCopyFunction
 GstMetaTransformFunction
+gst_meta_api_type_register
+gst_meta_api_type_has_tag
 gst_meta_register
 gst_meta_get_info
 <SUBSECTION Standard>
@@ -397,7 +398,7 @@ gst_caps_intersect
 gst_caps_intersect_full
 gst_caps_union
 gst_caps_normalize
-gst_caps_do_simplify
+gst_caps_simplify
 gst_caps_replace
 gst_caps_to_string
 gst_caps_from_string
@@ -504,10 +505,6 @@ GST_CLOCK_ENTRY_STATUS
 GstClockReturn
 GstClockFlags
 GST_CLOCK_FLAGS
-GST_CLOCK_BROADCAST
-GST_CLOCK_GET_COND
-GST_CLOCK_TIMED_WAIT
-GST_CLOCK_WAIT
 gst_clock_add_observation
 gst_clock_set_master
 gst_clock_get_master

diff --git a/gst/gstcaps.c b/gst/gstcaps.c
index e14ba947d17f85ea76bad9058da813a0f1650e1f..f4964d01cd82f6be35e26b01be6d71db761c5a51 100644 (file)
--- a/gst/gstcaps.c
+++ b/gst/gstcaps.c
@@ -435,7 +435,7 @@ gst_static_caps_cleanup (GstStaticCaps * static_caps)
 static GstStructure *
 gst_caps_remove_and_get_structure (GstCaps * caps, guint idx)
 {
-  /* don't use index_fast, gst_caps_do_simplify relies on the order */
+  /* don't use index_fast, gst_caps_simplify relies on the order */
   GstStructure *s = g_ptr_array_remove_index (GST_CAPS_ARRAY (caps), idx);
 
   gst_structure_set_parent_refcount (s, NULL);
@@ -1498,7 +1498,7 @@ gst_caps_subtract (GstCaps * minuend, GstCaps * subtrahend)
   }
 
   gst_caps_unref (src);
-  dest = gst_caps_do_simplify (dest);
+  dest = gst_caps_simplify (dest);
   return dest;
 }
 
@@ -1575,7 +1575,7 @@ gst_caps_union (GstCaps * caps1, GstCaps * caps2)
   dest1 = _gst_caps_copy (caps1);
   gst_caps_append (dest1, gst_caps_ref (caps2));
 
-  dest1 = gst_caps_do_simplify (dest1);
+  dest1 = gst_caps_simplify (dest1);
   return dest1;
 }
 
@@ -1764,7 +1764,7 @@ gst_caps_switch_structures (GstCaps * caps, GstStructure * old,
 }
 
 /**
- * gst_caps_do_simplify:
+ * gst_caps_simplify:
  * @caps: (transfer full): a #GstCaps to simplify
  *
  * Modifies the given @caps inplace into a representation that represents the
@@ -1775,7 +1775,7 @@ gst_caps_switch_structures (GstCaps * caps, GstStructure * old,
  * Returns: The simplified caps.
  */
 GstCaps *
-gst_caps_do_simplify (GstCaps * caps)
+gst_caps_simplify (GstCaps * caps)
 {
   GstStructure *simplify, *compare, *result = NULL;
   gint i, j, start;

diff --git a/gst/gstcaps.h b/gst/gstcaps.h
index 9563b3abb66b3260597926f2782cad4123fb1b7e..345cf7b4a85abb8e02c1423263fed00646415714 100644 (file)
--- a/gst/gstcaps.h
+++ b/gst/gstcaps.h
@@ -438,7 +438,7 @@ GstCaps *         gst_caps_subtract            (GstCaps *minuend,
 GstCaps *         gst_caps_union                   (GstCaps *caps1,
                                                    GstCaps *caps2) G_GNUC_WARN_UNUSED_RESULT;
 GstCaps *         gst_caps_normalize               (GstCaps *caps) G_GNUC_WARN_UNUSED_RESULT;
-GstCaps *         gst_caps_do_simplify             (GstCaps *caps) G_GNUC_WARN_UNUSED_RESULT;
+GstCaps *         gst_caps_simplify                (GstCaps *caps) G_GNUC_WARN_UNUSED_RESULT;
 
 GstCaps *         gst_caps_fixate                  (GstCaps *caps) G_GNUC_WARN_UNUSED_RESULT;
 

diff --git a/gst/gstmeta.c b/gst/gstmeta.c
index 8a0978afdf8c5107219d586fe0dca9cd65f13fb4..6f3cdcb496fd80e7997a0ae47c2b3e8844e38592 100644 (file)
--- a/gst/gstmeta.c
+++ b/gst/gstmeta.c
@@ -107,8 +107,6 @@ gst_meta_api_type_has_tag (GType api, GQuark tag)
  * @init_func: a #GstMetaInitFunction
  * @free_func: a #GstMetaFreeFunction
  * @transform_func: a #GstMetaTransformFunction
- * @tags: a NULL terminated array of strings describing what the metadata
- *        contains info about.
  *
  * Register a new #GstMeta implementation.
  *

diff --git a/gst/gstmeta.h b/gst/gstmeta.h
index c616a74833236c26a04a7cd619e58d1fbd0770ee..3a92cfe8ada83c898d534e2628f74883698f55ef 100644 (file)
--- a/gst/gstmeta.h
+++ b/gst/gstmeta.h
@@ -165,8 +165,6 @@ typedef gboolean (*GstMetaTransformFunction) (GstBuffer *transbuf,
  * @init_func: function for initializing the metadata
  * @free_func: function for freeing the metadata
  * @transform_func: function for transforming the metadata
- * @tags: 0 terminated array of GQuarks describing what the metadata
- *        contains info about
  *
  * The #GstMetaInfo provides information about a specific metadata
  * structure.

diff --git a/gst/gstquery.c b/gst/gstquery.c
index 52c111854461359b6bf8fd3c436d3ead2119af39..291046b8a48caa108e5ac2a8740925bf9b3abd73 100644 (file)
--- a/gst/gstquery.c
+++ b/gst/gstquery.c
@@ -873,7 +873,8 @@ gst_query_get_structure (GstQuery * query)
  * gst_query_writable_structure:
  * @query: a #GstQuery
  *
- * Get the structure of a query.
+ * Get the structure of a query. This method should be called with a writable
+ * @query so that the returned structure is guranteed to be writable.
  *
  * Returns: (transfer none): the #GstStructure of the query. The structure is
  *     still owned by the query and will therefore be freed when the query

diff --git a/gst/gstregistrychunks.c b/gst/gstregistrychunks.c
index b377b945612dfe8f6c8c290a371ab965222b1395..0c58dabfead512c98e6c65a2e00c765564ef6054 100644 (file)
--- a/gst/gstregistrychunks.c
+++ b/gst/gstregistrychunks.c
@@ -324,7 +324,7 @@ gst_registry_chunks_save_feature (GList ** list, GstPluginFeature * feature)
       GstCaps *fcaps = gst_caps_ref (factory->caps);
       /* we simplify the caps before saving. This is a lot faster
        * when loading them later on */
-      fcaps = gst_caps_do_simplify (fcaps);
+      fcaps = gst_caps_simplify (fcaps);
       str = gst_caps_to_string (fcaps);
       gst_caps_unref (fcaps);
 

diff --git a/plugins/elements/gstcapsfilter.c b/plugins/elements/gstcapsfilter.c
index 685e04dbcdeac862bf88b3ebb54e9d7303f9cf32..ec753617e50d1446350be7e66c3cb7955cf54e4a 100644 (file)
--- a/plugins/elements/gstcapsfilter.c
+++ b/plugins/elements/gstcapsfilter.c
@@ -298,7 +298,7 @@ gst_capsfilter_prepare_buf (GstBaseTransform * trans, GstBuffer * input,
       g_return_val_if_fail (out_caps != NULL, GST_FLOW_ERROR);
     }
 
-    out_caps = gst_caps_do_simplify (out_caps);
+    out_caps = gst_caps_simplify (out_caps);
 
     if (gst_caps_is_fixed (out_caps) && !gst_caps_is_empty (out_caps)) {
       GST_DEBUG_OBJECT (trans, "Have fixed output caps %"

diff --git a/tests/check/gst/gstcaps.c b/tests/check/gst/gstcaps.c
index 281ddf29edb579b668f92eaf29442a2f18021d20..1e3255563d0ef621d40e7ab0ac417c668bac4cfa 100644 (file)
--- a/tests/check/gst/gstcaps.c
+++ b/tests/check/gst/gstcaps.c
@@ -196,8 +196,8 @@ GST_START_TEST (test_simplify)
   fail_unless (caps != NULL,
       "gst_caps_from_string (non_simple_caps_string) failed");
 
-  caps = gst_caps_do_simplify (caps);
-  fail_unless (caps != NULL, "gst_caps_do_simplify() should have worked");
+  caps = gst_caps_simplify (caps);
+  fail_unless (caps != NULL, "gst_caps_simplify() should have worked");
 
   /* check simplified caps, should be:
    *

diff --git a/win32/common/libgstreamer.def b/win32/common/libgstreamer.def
index 40a096803fccf489872a3e3492e2c8501ec0d0c1..0844ce164e1eff053e002e41fd258c884e36e185 100644 (file)
--- a/win32/common/libgstreamer.def
+++ b/win32/common/libgstreamer.def
@@ -170,7 +170,6 @@ EXPORTS
        gst_caps_append_structure
        gst_caps_can_intersect
        gst_caps_copy_nth
-       gst_caps_do_simplify
        gst_caps_fixate
        gst_caps_flags_get_type
        gst_caps_from_string
@@ -202,6 +201,7 @@ EXPORTS
        gst_caps_set_simple
        gst_caps_set_simple_valist
        gst_caps_set_value
+       gst_caps_simplify
        gst_caps_steal_structure
        gst_caps_subtract
        gst_caps_to_string