Rename gst_caps_structure_fixate_* to gst_structure_fixate_* (#322027)

Original commit message from CVS:
* docs/gst/gstreamer-sections.txt:
* gst/gststructure.c: (gst_structure_fixate_field_nearest_int),
(gst_structure_fixate_field_nearest_double),
(gst_structure_fixate_field_boolean):
* gst/gststructure.h:
* win32/common/libgstreamer.def:
* win32/gstreamer.def:

Rename gst_caps_structure_fixate_* to gst_structure_fixate_*
(#322027)

diff --git a/ChangeLog b/ChangeLog
index 4ebd358..f2456d4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,16 @@
 2005-11-21  Jan Schmidt  <thaytan@mad.scientist.com>
+       * docs/gst/gstreamer-sections.txt:
+       * gst/gststructure.c: (gst_structure_fixate_field_nearest_int),
+       (gst_structure_fixate_field_nearest_double),
+       (gst_structure_fixate_field_boolean):
+       * gst/gststructure.h:
+       * win32/common/libgstreamer.def:
+       * win32/gstreamer.def:
+
+       Rename gst_caps_structure_fixate_* to gst_structure_fixate_*
+       (#322027)
+
+2005-11-21  Jan Schmidt  <thaytan@mad.scientist.com>
 
        * gst/elements/gstfdsrc.c: (_do_init), (gst_fdsrc_class_init),
        (gst_fdsrc_init), (gst_fdsrc_dispose), (gst_fdsrc_set_property),

diff --git a/docs/gst/gstreamer-sections.txt b/docs/gst/gstreamer-sections.txt
index 934bfa0..cfb0117 100644 (file)
--- a/docs/gst/gstreamer-sections.txt
+++ b/docs/gst/gstreamer-sections.txt
@@ -234,7 +234,6 @@ gst_caps_from_string
 gst_caps_subtract
 gst_caps_make_writable
 gst_caps_ref
-gst_caps_structure_fixate_field_boolean
 gst_caps_truncate
 gst_caps_unref
 <SUBSECTION Standard>
@@ -1699,8 +1698,9 @@ gst_structure_nth_field_name
 gst_structure_set_parent_refcount
 gst_structure_to_string
 gst_structure_from_string
-gst_caps_structure_fixate_field_nearest_int
-gst_caps_structure_fixate_field_nearest_double
+gst_structure_fixate_field_nearest_int
+gst_structure_fixate_field_nearest_double
+gst_structure_fixate_field_boolean
 <SUBSECTION Standard>
 GST_STRUCTURE
 GST_IS_STRUCTURE

diff --git a/gst/gststructure.c b/gst/gststructure.c
index f4bdc7f..ad83197 100644 (file)
--- a/gst/gststructure.c
+++ b/gst/gststructure.c
@@ -1747,7 +1747,7 @@ gst_structure_copy_conditional (const GstStructure * structure)
 /* fixate utility functions */
 
 /**
- * gst_caps_structure_fixate_field_nearest_int:
+ * gst_structure_fixate_field_nearest_int:
  * @structure: a #GstStructure
  * @field_name: a field in @structure
  * @target: the target value of the fixation
@@ -1757,9 +1757,8 @@ gst_structure_copy_conditional (const GstStructure * structure)
  *
  * Returns: TRUE if the structure could be fixated
  */
-/* FIXME: rename to gst_structure_... */
 gboolean
-gst_caps_structure_fixate_field_nearest_int (GstStructure * structure,
+gst_structure_fixate_field_nearest_int (GstStructure * structure,
     const char *field_name, int target)
 {
   const GValue *value;
@@ -1812,7 +1811,7 @@ gst_caps_structure_fixate_field_nearest_int (GstStructure * structure,
 }
 
 /**
- * gst_caps_structure_fixate_field_nearest_double:
+ * gst_structure_fixate_field_nearest_double:
  * @structure: a #GstStructure
  * @field_name: a field in @structure
  * @target: the target value of the fixation
@@ -1823,7 +1822,7 @@ gst_caps_structure_fixate_field_nearest_int (GstStructure * structure,
  * Returns: TRUE if the structure could be fixated
  */
 gboolean
-gst_caps_structure_fixate_field_nearest_double (GstStructure * structure,
+gst_structure_fixate_field_nearest_double (GstStructure * structure,
     const char *field_name, double target)
 {
   const GValue *value;
@@ -1877,7 +1876,7 @@ gst_caps_structure_fixate_field_nearest_double (GstStructure * structure,
 }
 
 /**
- * gst_caps_structure_fixate_field_boolean:
+ * gst_structure_fixate_field_boolean:
  * @structure: a #GstStructure
  * @field_name: a field in @structure
  * @target: the target value of the fixation
@@ -1887,9 +1886,8 @@ gst_caps_structure_fixate_field_nearest_double (GstStructure * structure,
  *
  * Returns: TRUE if the structure could be fixated
  */
-/* FIXME: rename to gst_structure_... */
 gboolean
-gst_caps_structure_fixate_field_boolean (GstStructure * structure,
+gst_structure_fixate_field_boolean (GstStructure * structure,
     const char *field_name, gboolean target)
 {
   const GValue *value;

diff --git a/gst/gststructure.h b/gst/gststructure.h
index 1a73e21..fbba358 100644 (file)
--- a/gst/gststructure.h
+++ b/gst/gststructure.h
@@ -178,14 +178,14 @@ gchar *                 gst_structure_to_string            (const GstStructure
 GstStructure *          gst_structure_from_string          (const gchar             *string,
                                                            gchar                  **end);
 
-gboolean                 gst_caps_structure_fixate_field_nearest_int    (GstStructure *structure,
+gboolean                 gst_structure_fixate_field_nearest_int    (GstStructure *structure,
                                                                         const char   *field_name,
                                                                         int           target);
-gboolean                 gst_caps_structure_fixate_field_nearest_double (GstStructure *structure,
+gboolean                 gst_structure_fixate_field_nearest_double (GstStructure *structure,
                                                                         const char   *field_name,
                                                                         double        target);
 
-gboolean                 gst_caps_structure_fixate_field_boolean (GstStructure *structure,
+gboolean                 gst_structure_fixate_field_boolean (GstStructure *structure,
                                                                         const char   *field_name,
                                                                         gboolean        target);
 

diff --git a/win32/common/libgstreamer.def b/win32/common/libgstreamer.def
index 87ed709..f64d1fe 100644 (file)
--- a/win32/common/libgstreamer.def
+++ b/win32/common/libgstreamer.def
@@ -34,8 +34,8 @@ EXPORTS
     gst_structure_set_name\r
     gst_structure_copy\r
     gst_structure_remove_field\r
-    gst_caps_structure_fixate_field_nearest_int\r
-    gst_caps_structure_fixate_field_nearest_double\r
+    gst_structure_fixate_field_nearest_int\r
+    gst_structure_fixate_field_nearest_double\r
     gst_caps_get_structure\r
     gst_caps_get_size\r
     gst_caps_set_simple\r

diff --git a/win32/gstreamer.def b/win32/gstreamer.def
index 17e53c0..ea90598 100644 (file)
--- a/win32/gstreamer.def
+++ b/win32/gstreamer.def
@@ -34,8 +34,8 @@ EXPORTS
     gst_structure_set_name
     gst_structure_copy
     gst_structure_remove_field
-    gst_caps_structure_fixate_field_nearest_int
-    gst_caps_structure_fixate_field_nearest_double
+    gst_structure_fixate_field_nearest_int
+    gst_structure_fixate_field_nearest_double
     gst_caps_get_structure
     gst_caps_get_size
     gst_caps_set_simple
@@ -332,4 +332,4 @@ EXPORTS
        gst_plugin_list_free
        gst_registry_get_plugin_list
        gst_plugin_load_file
-       _gst_debug_nameof_funcptr
\ No newline at end of file
+       _gst_debug_nameof_funcptr

diff --git a/win32/vs7/gstreamer.def b/win32/vs7/gstreamer.def
index 17e53c0..ea90598 100644 (file)
--- a/win32/vs7/gstreamer.def
+++ b/win32/vs7/gstreamer.def
@@ -34,8 +34,8 @@ EXPORTS
     gst_structure_set_name
     gst_structure_copy
     gst_structure_remove_field
-    gst_caps_structure_fixate_field_nearest_int
-    gst_caps_structure_fixate_field_nearest_double
+    gst_structure_fixate_field_nearest_int
+    gst_structure_fixate_field_nearest_double
     gst_caps_get_structure
     gst_caps_get_size
     gst_caps_set_simple
@@ -332,4 +332,4 @@ EXPORTS
        gst_plugin_list_free
        gst_registry_get_plugin_list
        gst_plugin_load_file
-       _gst_debug_nameof_funcptr
\ No newline at end of file
+       _gst_debug_nameof_funcptr