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

[jaalburqu svn gnome org]

Author: jaalburqu
Date: Thu May  1 02:08:21 2008
New Revision: 1487
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1487&view=rev

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

	* gstreamer/src/Makefile_list_of_hg.am_fragment: Added segment.hg
	which means that when gstreamermm will compile with GStreamer CVS only
	until bug fix #518932 is reflected in GStreamer release

	* gstreamer/src/element.ccg:
	* gstreamer/src/element.hg: Added Element::found_tags() and
	Element::found_tags_for_pad()
	* tools/m4/convert_gst.m4: Added TagList conversion needed for two
	method wrapping above

	* gstreamer/src/pad.ccg: Used gst_pad_add_*_probe_full() methods for
	adding probes which means that gstreamermm will compile only with
	GStreamer CVS until bug fix #526814 is reflected in release

Modified:
   gstreamermm/trunk/ChangeLog
   gstreamermm/trunk/gstreamer/src/Makefile_list_of_hg.am_fragment
   gstreamermm/trunk/gstreamer/src/element.ccg
   gstreamermm/trunk/gstreamer/src/element.hg
   gstreamermm/trunk/gstreamer/src/pad.ccg
   gstreamermm/trunk/tools/m4/convert_gst.m4

Modified: gstreamermm/trunk/gstreamer/src/Makefile_list_of_hg.am_fragment
==============================================================================
--- gstreamermm/trunk/gstreamer/src/Makefile_list_of_hg.am_fragment	(original)
+++ gstreamermm/trunk/gstreamer/src/Makefile_list_of_hg.am_fragment	Thu May  1 02:08:21 2008
@@ -8,7 +8,7 @@
 	element.hg elementfactory.hg enums.hg error.hg event.hg filter.hg \
 	format.hg ghostpad.hg index.hg indexfactory.hg interface.hg \
 	iterator.hg message.hg pad.hg padtemplate.hg parse.hg pipeline.hg \
-	plugin.hg pluginfeature.hg query.hg registry.hg \
+	plugin.hg pluginfeature.hg query.hg registry.hg segment.hg \
 	structure.hg systemclock.hg tagsetter.hg task.hg urihandler.hg \
 	value.hg xml.hg
 

Modified: gstreamermm/trunk/gstreamer/src/element.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/element.ccg	(original)
+++ gstreamermm/trunk/gstreamer/src/element.ccg	Thu May  1 02:08:21 2008
@@ -31,6 +31,7 @@
 #include <gstreamermm/pad.h>
 #include <gstreamermm/padtemplate.h>
 #include <gstreamermm/query.h>
+#include <gstreamermm/taglist.h>
 
 _PINCLUDE(gstreamermm/private/object_p.h)
 

Modified: gstreamermm/trunk/gstreamer/src/element.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/element.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/element.hg	Thu May  1 02:08:21 2008
@@ -43,6 +43,7 @@
 class Pad;
 class PadTemplate;
 class Query;
+class TagList;
 
 _WRAP_ENUM(ElementFlags, GstElementFlags)
 
@@ -173,6 +174,8 @@
   _WRAP_METHOD(void lost_state(), gst_element_lost_state)
   _WRAP_METHOD(bool sync_state_with_parent(), gst_element_sync_state_with_parent)
   _WRAP_METHOD(StateChangeReturn change_state(StateChange transition), gst_element_change_state)
+  _WRAP_METHOD(void found_tags(TagList& list), gst_element_found_tags)
+  _WRAP_METHOD(void found_tags_for_pad(const Glib::RefPtr<Pad>& pad, TagList& list), gst_element_found_tags_for_pad)
 
   //TODO: Change the parameter order?
   _WRAP_METHOD(void post_message(MessageType message_type, const Glib::QueryQuark& domain, int code, const Glib::ustring& message, const Glib::ustring& debug, const Glib::ustring& filename, const Glib::ustring& function_name, int line_number), gst_element_message_full)

Modified: gstreamermm/trunk/gstreamer/src/pad.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/pad.ccg	(original)
+++ gstreamermm/trunk/gstreamer/src/pad.ccg	Thu May  1 02:08:21 2008
@@ -177,24 +177,21 @@
 {
   SlotData* slot_copy = new SlotData(slot);
 
-  // return gst_pad_add_data_probe_full(gobj(), G_CALLBACK (Pad_Data_gstreamermm_callback), slot_copy, &Pad_Data_gstreamermm_callback_disconnect);
-  return gst_pad_add_data_probe(gobj(), G_CALLBACK (Pad_Data_gstreamermm_callback), slot_copy);
+  return gst_pad_add_data_probe_full(gobj(), G_CALLBACK (Pad_Data_gstreamermm_callback), slot_copy, &Pad_Data_gstreamermm_callback_disconnect);
 }
 
 gulong Pad::add_buffer_probe(const SlotData& slot)
 {
   SlotData* slot_copy = new SlotData(slot);
 
-  // return gst_pad_add_buffer_probe_full(gobj(), G_CALLBACK (Pad_Data_gstreamermm_callback), slot_copy, &Pad_Data_gstreamermm_callback_disconnect);
-  return gst_pad_add_buffer_probe(gobj(), G_CALLBACK (Pad_Data_gstreamermm_callback), slot_copy);
+  return gst_pad_add_buffer_probe_full(gobj(), G_CALLBACK (Pad_Data_gstreamermm_callback), slot_copy, &Pad_Data_gstreamermm_callback_disconnect);
 }
 
 gulong Pad::add_event_probe(const SlotData& slot)
 {
   SlotData* slot_copy = new SlotData(slot);
 
-  // return gst_pad_add_event_probe_full(gobj(), G_CALLBACK (Pad_Data_gstreamermm_callback), slot_copy, &Pad_Data_gstreamermm_callback_disconnect);
-  return gst_pad_add_event_probe(gobj(), G_CALLBACK (Pad_Data_gstreamermm_callback), slot_copy);
+  return gst_pad_add_event_probe_full(gobj(), G_CALLBACK (Pad_Data_gstreamermm_callback), slot_copy, &Pad_Data_gstreamermm_callback_disconnect);
 }
 
 } //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 May  1 02:08:21 2008
@@ -116,6 +116,7 @@
 #TagList
 _CONVERSION(`const TagList&',`const GstTagList*',`(($3).gobj())')
 _CONVERSION(`GstTagList*',`TagList',`Glib::wrap($3)')
+_CONVERSION(`TagList&',`GstTagList*',`(($3).gobj())')
 
 #URIHandler
 _CONVERSION(`const Glib::RefPtr<URIHandler>&',`GstURIHandler*',`Glib::unwrap($3)')