gnomemm r1374 - in gstreamermm/trunk: . gstreamer/src tools/m4

[jaalburqu svn gnome org]

Author: jaalburqu
Date: Thu Feb 28 23:30:11 2008
New Revision: 1374
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1374&view=rev

Log:
2008-02-28  Josà Alburquerque  <jaalburqu svn gnome org>

	* gstreamer/src/registry.hg: Added signals "feature-added" and
	"plugin-added"
	* gstreamer/src/urihandler.hg: Added signal "new-uri"
	* gstreamer/src/gst_signals.defs: Repaired Registry and URIHandler signal defenitions
	* tools/m4/convert_gst.m4: Added conversions for Registry and
	URIHandler signals

Modified:
   gstreamermm/trunk/ChangeLog
   gstreamermm/trunk/gstreamer/src/gst_signals.defs
   gstreamermm/trunk/gstreamer/src/registry.hg
   gstreamermm/trunk/gstreamer/src/urihandler.hg
   gstreamermm/trunk/tools/m4/convert_gst.m4

Modified: gstreamermm/trunk/gstreamer/src/gst_signals.defs
==============================================================================
--- gstreamermm/trunk/gstreamer/src/gst_signals.defs	(original)
+++ gstreamermm/trunk/gstreamer/src/gst_signals.defs	Thu Feb 28 23:30:11 2008
@@ -482,7 +482,7 @@
   (return-type "void")
   (when "last")
   (parameters
-    '("gpointer" "p0")
+    '("GstPlugin*" "p0")
   )
 )
 
@@ -491,7 +491,7 @@
   (return-type "void")
   (when "last")
   (parameters
-    '("gpointer" "p0")
+    '("GstPluginFeature*" "p0")
   )
 )
 
@@ -589,9 +589,9 @@
   (of-object "GstURIHandler")
   (return-type "void")
   (when "last")
-;;  (parameters
-;;    '("const gchar*" "p0")
-;;  )
+  (parameters
+    '("const-gchar*" "p0")
+  )
 )
 
 ;; From GstXML

Modified: gstreamermm/trunk/gstreamer/src/registry.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/registry.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/registry.hg	Thu Feb 28 23:30:11 2008
@@ -176,6 +176,9 @@
   _WRAP_METHOD(void add_feature(const Glib::RefPtr<PluginFeature>& feature), gst_registry_add_feature)
   _WRAP_METHOD(static bool check_feature_version(const Glib::ustring& feature_name, guint min_major, guint min_minor, guint min_micro), gst_default_registry_check_feature_version)
 
+  _WRAP_SIGNAL(void feature_added(const Glib::RefPtr<PluginFeature>& feature), "feature-added")
+  _WRAP_SIGNAL(void plugin_added(const Glib::RefPtr<Plugin>& plugin), "plugin-added")
+
   _IGNORE(gst_registry_feature_filter,
           gst_registry_plugin_filter,
           gst_registry_xml_read_cache,

Modified: gstreamermm/trunk/gstreamer/src/urihandler.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/urihandler.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/urihandler.hg	Thu Feb 28 23:30:11 2008
@@ -58,10 +58,10 @@
   _WRAP_METHOD(Glib::StringArrayHandle get_protocols(), gst_uri_handler_get_protocols)
   _WRAP_METHOD(Glib::ustring get_uri(), gst_uri_handler_get_uri)
   _WRAP_METHOD(bool set_uri(const Glib::ustring& uri), gst_uri_handler_set_uri)
-  _WRAP_METHOD(void new_uri(const Glib::ustring& uri), gst_uri_handler_new_uri)
 
-  //TODO: Fix signal definition in def file before enabling on_new_uri() signal
-  //TODO: _WRAP_SIGNAL(void on_new_uri(const Glib::ustring& uri), "new-uri")
+  _WRAP_SIGNAL(void new_uri(const Glib::ustring& uri), "new-uri")
+
+  _IGNORE(gst_uri_handler_new_uri)
 };
 
 } // namespace Gst

Modified: gstreamermm/trunk/tools/m4/convert_gst.m4
==============================================================================
--- gstreamermm/trunk/tools/m4/convert_gst.m4	(original)
+++ gstreamermm/trunk/tools/m4/convert_gst.m4	Thu Feb 28 23:30:11 2008
@@ -78,12 +78,12 @@
 #Plugin
 _CONVERSION(`const Glib::RefPtr<Plugin>&',`GstPlugin*',`Glib::unwrap($3)')
 _CONVERSION(`GstPlugin*',`Glib::RefPtr<Plugin>',`Glib::wrap($3)')
-_CONVERSION(`Glib::ListHandle< Glib::RefPtr<Plugin> >',`GList*',`($3).data()')
+_CONVERSION(`GstPlugin*',`const Glib::RefPtr<Plugin>&',`Glib::wrap($3)')
 
 #PluginFeature
 _CONVERSION(`GstPluginFeature*',`Glib::RefPtr<PluginFeature>',`Glib::wrap($3)')
 _CONVERSION(`const Glib::RefPtr<PluginFeature>&',`GstPluginFeature*',`Glib::unwrap($3)')
-_CONVERSION(`Glib::ListHandle< Glib::RefPtr<PluginFeature> >',`GList*',`($3).data()')
+_CONVERSION(`GstPluginFeature*',`const Glib::RefPtr<PluginFeature>&',`Glib::wrap($3)')
 
 #Query
 _CONVERSION(`const Glib::RefPtr<Query>&',`GstQuery*', `Glib::unwrap($3)')
@@ -122,11 +122,14 @@
 _CONVERSION(`Glib::StaticRecMutex&',`GStaticRecMutex*',`($3).gobj()')
 
 #List Conversions
+_CONVERSION(`Glib::ListHandle< Glib::RefPtr<Plugin> >',`GList*',`($3).data()')
+_CONVERSION(`Glib::ListHandle< Glib::RefPtr<PluginFeature> >',`GList*',`($3).data()')
 _CONVERSION(`gchar**',`Glib::StringArrayHandle',`Glib::StringArrayHandle($3)')
 
 #String Conversions
 _CONVERSION(`const std::string&',`const guchar*',`(const guchar*) ($3.c_str())')
 _CONVERSION(`gchar*',`const Glib::ustring&',__GCHARP_TO_USTRING)
+_CONVERSION(`const gchar*',`const Glib::ustring&',__GCHARP_TO_USTRING)
 
 #Other Conversions
 _CONVERSION(`const xmlNodePtr&',`xmlNodePtr',`$3')