gnomemm r1492 - in gstreamermm/trunk: . gstreamer/src

[murrayc svn gnome org]

Author: murrayc
Date: Wed May  7 16:33:02 2008
New Revision: 1492
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1492&view=rev

Log:
2008-05-07  Murray Cumming  <murrayc murrayc com>

* gstreamer/src/pad.ccg: add_data_probe(), add_buffer_probe(), 
add_event_probe(): Comment out the use of the new *_full() functions, 
choosing to use the existing functions, with the leak, so gstreamermm 
builds with gstreamer tarballs. We can bring this code back later.
* gstreamer/src/Makefile_list_of_hg.am_fragment: Likewise, remove 
segment.hg from the build, until bug #518932 is in a tarball.

Modified:
   gstreamermm/trunk/ChangeLog
   gstreamermm/trunk/gstreamer/src/Makefile_list_of_hg.am_fragment
   gstreamermm/trunk/gstreamer/src/interface.hg
   gstreamermm/trunk/gstreamer/src/pad.ccg

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	Wed May  7 16:33:02 2008
@@ -8,10 +8,12 @@
 	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 segment.hg \
+	plugin.hg pluginfeature.hg query.hg registry.hg \
 	structure.hg systemclock.hg tagsetter.hg task.hg urihandler.hg \
 	value.hg xml.hg
 
+#TODO: Add segment.hg when the fix from  bug #518932 is in a tarball (mid-June 2008). 
+
 files_general_deprecated_hg =
 
 include $(top_srcdir)/build_shared/Makefile_build_gensrc.am_fragment

Modified: gstreamermm/trunk/gstreamer/src/interface.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/interface.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/interface.hg	Wed May  7 16:33:02 2008
@@ -27,10 +27,10 @@
 namespace Gst
 {
 
-/** Gst::Interface â Core interface implemented by Gst::Element instances that
- * allows runtime querying of interface availabillity.
- * Provides interface functionality on per instance basis and not per class
- * basis, which is the case for gobject.
+/** Core interface implemented by Element instances that
+ * allows runtime querying of interface availability.
+ * This provides interface functionality on a per-instance basis and not a per-class
+ * basis, which is the case for GObject.
  */
 class Interface : public Glib::Interface
 {

Modified: gstreamermm/trunk/gstreamer/src/pad.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/pad.ccg	(original)
+++ gstreamermm/trunk/gstreamer/src/pad.ccg	Wed May  7 16:33:02 2008
@@ -177,21 +177,27 @@
 {
   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);
+  //TODO: Use this, when the new API from bug #526814 is in a tarball (mid-June 2008, probably):
+  //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);
 }
 
 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);
+  //TODO: Use this, when the new API from bug #526814 is in a tarball (mid-June 2008, probably):
+  //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);
 }
 
 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);
+  //TODO: Use this, when the new API from bug #526814 is in a tarball (mid-June 2008, probably):
+  //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);
 }
 
 } //namespace Gst