[gstreamermm] extra_defs_gen: fix warnings



commit ed1f41d9789f2f30986cfdc15fb48010d4da428b
Author: Marcin Kolny <marcin kolny gmail com>
Date:   Thu Aug 27 20:18:56 2015 +0000

    extra_defs_gen: fix warnings
    
        * tools/extra_defs_gen/generate_plugin_gmmproc_file.cc: disable
          deprecations warnings when compare returned GType with
          G_TYPE_VALUE_ARRAY (it's deprecated type, but might exists somewhere
          in gstreamer's plugins). Moreover, add G_TYPE_ARRAY comparision.
        * tools/extra_defs_gen/generate_plugin_module_defs_gst.cc: remove
          unused function parameter.

 .../extra_defs_gen/generate_plugin_gmmproc_file.cc |    5 ++++-
 .../generate_plugin_module_defs_gst.cc             |    4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/tools/extra_defs_gen/generate_plugin_gmmproc_file.cc 
b/tools/extra_defs_gen/generate_plugin_gmmproc_file.cc
index 4b220ff..f65a573 100644
--- a/tools/extra_defs_gen/generate_plugin_gmmproc_file.cc
+++ b/tools/extra_defs_gen/generate_plugin_gmmproc_file.cc
@@ -380,10 +380,13 @@ static std::string get_signal_wrap_statements(std::string& includeMacroCalls,
         // wrapper.
         if(g_type_is_a(returnGType, G_TYPE_BOXED))
         {
+          G_GNUC_BEGIN_IGNORE_DEPRECATIONS // temporary disable deprecations because of G_TYPE_VALUE_ARRAY
           // Unwrapping conversion:
-          std::string access_operator = (returnGType != G_TYPE_VALUE_ARRAY &&
+          std::string access_operator = (returnGType != G_TYPE_ARRAY &&
+                                         returnGType != G_TYPE_VALUE_ARRAY &&
                                          returnGType != GST_TYPE_TAG_LIST &&
                                          returnGType != GST_TYPE_STRUCTURE) ? "->" : ".";
+          G_GNUC_END_IGNORE_DEPRECATIONS
           // For GValueArray and TagList, RefPtr is not generated, and we need to use '.' operator.
           convertMacros += "#m4 _CONVERSION(_LQ()" + returnCTypeTranslation +
             "_RQ(), ``" + returnCType + "'', ``($3)" + access_operator + "gobj_copy()'')\n";
diff --git a/tools/extra_defs_gen/generate_plugin_module_defs_gst.cc 
b/tools/extra_defs_gen/generate_plugin_module_defs_gst.cc
index 1ae8b39..b52e59f 100644
--- a/tools/extra_defs_gen/generate_plugin_module_defs_gst.cc
+++ b/tools/extra_defs_gen/generate_plugin_module_defs_gst.cc
@@ -12,7 +12,7 @@
 #include <iostream>
 
 static std::string
-get_element_factory_defs(GstElementFactory *factory, GTypeIsAPointerFunc is_a_pointer_func)
+get_element_factory_defs(GstElementFactory *factory)
 {
   GType type = 0;
   std::string result;
@@ -56,7 +56,7 @@ int main (int argc, char** argv)
     GstPluginFeature *feature = reinterpret_cast<GstPluginFeature*>(l->data);
 
     if (GST_IS_ELEMENT_FACTORY (feature)) {
-      std::cout << get_element_factory_defs (GST_ELEMENT_FACTORY_CAST (feature), gtype_is_a_pointer) << 
std::endl;
+      std::cout << get_element_factory_defs (GST_ELEMENT_FACTORY_CAST (feature)) << std::endl;
     }
     l = l->next;
   }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]