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

[jaalburqu svn gnome org]

Author: jaalburqu
Date: Wed Apr 16 04:53:41 2008
New Revision: 1464
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1464&view=rev

Log:
2008-04-15  Josà Alburquerque  <jaalburqu svn gnome org>

	* gstreamer/src/index.hg: Wrapped signals and properties; Made
	IndexEtnry::assoc_map() constant (ie bool assoc_map(...) const)

	* tools/m4/convert_gst.m4: Added/Re-organized IndexEntry conversions

Modified:
   gstreamermm/trunk/ChangeLog
   gstreamermm/trunk/gstreamer/src/index.hg
   gstreamermm/trunk/tools/m4/convert_gst.m4

Modified: gstreamermm/trunk/gstreamer/src/index.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/index.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/index.hg	Wed Apr 16 04:53:41 2008
@@ -41,7 +41,7 @@
 {
   _CLASS_OPAQUE_COPYABLE(IndexEntry, GstIndexEntry, NONE, gst_index_entry_copy, gst_index_entry_free)
 public:
-  _WRAP_METHOD(bool assoc_map(Format format, gint64& value), gst_index_entry_assoc_map)
+  _WRAP_METHOD(bool assoc_map(Format format, gint64& value) const, gst_index_entry_assoc_map)
 
 };
 
@@ -104,6 +104,10 @@
   typedef sigc::slot<bool, const Glib::RefPtr<Index>&, const Glib::RefPtr<Gst::Object>&, Glib::ustring&> SlotResolver;
 
   void set_resolver(const SlotResolver& slot);
+
+  _WRAP_SIGNAL(void entry_added(const IndexEntry& entry), "entry-added")
+
+  _WRAP_PROPERTY("resolver", Gst::Index::SlotResolver)
 };
 
 }//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	Wed Apr 16 04:53:41 2008
@@ -60,10 +60,14 @@
 #Index
 _CONVERSION(`GstIndex*',`Glib::RefPtr<Index>',`Glib::wrap($3)')
 _CONVERSION(`const Glib::RefPtr<Index>&',`GstIndex*',`Glib::unwrap($3)')
-_CONVERSION(`GstIndexEntry*',`IndexEntry',`Glib::wrap($3)')
 _CONVERSION(`const IndexAssociation&',`const GstIndexAssociation*',`((GstIndexAssociation*)(&($3)))')
 _CONVERSION(`GstIndex*',`Glib::RefPtr<Index>',`Glib::wrap($3)')
 
+#IndexEntry
+_CONVERSION(`GstIndexEntry*',`IndexEntry',`Glib::wrap($3)')
+_CONVERSION(`GstIndexEntry*',`const IndexEntry&',`Glib::wrap($3)')
+_CONVERSION(`const IndexEntry&',`GstIndexEntry*',`const_cast<GstIndexEntry*>(($3).gobj())')
+
 #IndexFactory
 _CONVERSION(`GstIndexFactory*',`Glib::RefPtr<IndexFactory>',`Glib::wrap($3)')