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

[jaalburqu svn gnome org]

Author: jaalburqu
Date: Tue Apr  8 22:30:15 2008
New Revision: 1447
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1447&view=rev

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

	* gstreamer/src/bin.ccg:
	* gstreamer/src/bin.hg:
	* gstreamer/src/buffer.ccg:
	* gstreamer/src/buffer.hg:
	* gstreamer/src/bus.ccg:
	* gstreamer/src/bus.hg:
	* gstreamer/src/clock.ccg:
	* gstreamer/src/clock.hg:
	* gstreamer/src/element.ccg:
	* gstreamer/src/element.hg:
	* gstreamer/src/elementfactory.ccg:
	* gstreamer/src/elementfactory.hg:
	* gstreamer/src/event.ccg:
	* gstreamer/src/event.hg:
	* gstreamer/src/index.ccg:
	* gstreamer/src/index.hg:
	* gstreamer/src/indexfactory.ccg:
	* gstreamer/src/indexfactory.hg:
	* gstreamer/src/message.ccg:
	* gstreamer/src/message.hg:
	* gstreamer/src/pad.ccg:
	* gstreamer/src/pad.hg:
	* gstreamer/src/padtemplate.ccg:
	* gstreamer/src/padtemplate.hg:
	* gstreamer/src/pipeline.ccg:
	* gstreamer/src/plugin.ccg:
	* gstreamer/src/plugin.hg:
	* gstreamer/src/pluginfeature.ccg:
	* gstreamer/src/pluginfeature.hg:
	* gstreamer/src/query.ccg:
	* gstreamer/src/query.hg:
	* gstreamer/src/registry.ccg:
	* gstreamer/src/registry.hg:
	* gstreamer/src/systemclock.ccg:
	* gstreamer/src/systemclock.hg:
	* gstreamer/src/task.ccg:
	* gstreamer/src/task.hg:
	* gstreamer/src/xml.ccg:
	* gstreamer/src/xml.hg: Moved some _PINCLUDES from *.hg files to *.ccg
	files

	* gstreamer/gstreamermm.h:
	* gstreamer/src/Makefile_list_of_hg.am_fragment:
	* gstreamer/src/ghostpad.ccg:
	* gstreamer/src/ghostpad.hg: Added GhostPad

Added:
   gstreamermm/trunk/gstreamer/src/ghostpad.ccg
   gstreamermm/trunk/gstreamer/src/ghostpad.hg
Modified:
   gstreamermm/trunk/gstreamer/gstreamermm.h
   gstreamermm/trunk/gstreamer/src/Makefile_list_of_hg.am_fragment
   gstreamermm/trunk/gstreamer/src/bin.ccg
   gstreamermm/trunk/gstreamer/src/bin.hg
   gstreamermm/trunk/gstreamer/src/buffer.ccg
   gstreamermm/trunk/gstreamer/src/buffer.hg
   gstreamermm/trunk/gstreamer/src/bus.ccg
   gstreamermm/trunk/gstreamer/src/bus.hg
   gstreamermm/trunk/gstreamer/src/clock.ccg
   gstreamermm/trunk/gstreamer/src/clock.hg
   gstreamermm/trunk/gstreamer/src/element.ccg
   gstreamermm/trunk/gstreamer/src/element.hg
   gstreamermm/trunk/gstreamer/src/elementfactory.ccg
   gstreamermm/trunk/gstreamer/src/elementfactory.hg
   gstreamermm/trunk/gstreamer/src/event.ccg
   gstreamermm/trunk/gstreamer/src/event.hg
   gstreamermm/trunk/gstreamer/src/index.ccg
   gstreamermm/trunk/gstreamer/src/index.hg
   gstreamermm/trunk/gstreamer/src/indexfactory.ccg
   gstreamermm/trunk/gstreamer/src/indexfactory.hg
   gstreamermm/trunk/gstreamer/src/message.ccg
   gstreamermm/trunk/gstreamer/src/message.hg
   gstreamermm/trunk/gstreamer/src/pad.ccg
   gstreamermm/trunk/gstreamer/src/pad.hg
   gstreamermm/trunk/gstreamer/src/padtemplate.ccg
   gstreamermm/trunk/gstreamer/src/padtemplate.hg
   gstreamermm/trunk/gstreamer/src/pipeline.ccg
   gstreamermm/trunk/gstreamer/src/plugin.ccg
   gstreamermm/trunk/gstreamer/src/plugin.hg
   gstreamermm/trunk/gstreamer/src/pluginfeature.ccg
   gstreamermm/trunk/gstreamer/src/pluginfeature.hg
   gstreamermm/trunk/gstreamer/src/query.ccg
   gstreamermm/trunk/gstreamer/src/query.hg
   gstreamermm/trunk/gstreamer/src/registry.ccg
   gstreamermm/trunk/gstreamer/src/registry.hg
   gstreamermm/trunk/gstreamer/src/systemclock.ccg
   gstreamermm/trunk/gstreamer/src/systemclock.hg
   gstreamermm/trunk/gstreamer/src/task.ccg
   gstreamermm/trunk/gstreamer/src/task.hg
   gstreamermm/trunk/gstreamer/src/xml.ccg
   gstreamermm/trunk/gstreamer/src/xml.hg

Modified: gstreamermm/trunk/gstreamer/gstreamermm.h
==============================================================================
--- gstreamermm/trunk/gstreamer/gstreamermm.h	(original)
+++ gstreamermm/trunk/gstreamer/gstreamermm.h	Tue Apr  8 22:30:15 2008
@@ -14,6 +14,7 @@
 #include <gstreamermm/event.h>
 #include <gstreamermm/filter.h>
 #include <gstreamermm/format.h>
+#include <gstreamermm/ghostpad.h>
 #include <gstreamermm/index.h>
 #include <gstreamermm/indexfactory.h>
 #include <gstreamermm/interface.h>

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	Tue Apr  8 22:30:15 2008
@@ -6,10 +6,10 @@
 files_win32_hg =
 files_general_hg = bin.hg buffer.hg bus.hg caps.hg childproxy.hg clock.hg \
 	element.hg elementfactory.hg enums.hg error.hg event.hg filter.hg \
-	format.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 structure.hg systemclock.hg \
-	tagsetter.hg task.hg urihandler.hg value.hg xml.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 structure.hg \
+	systemclock.hg tagsetter.hg task.hg urihandler.hg value.hg xml.hg
 
 files_general_deprecated_hg =
 

Modified: gstreamermm/trunk/gstreamer/src/bin.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/bin.ccg	(original)
+++ gstreamermm/trunk/gstreamer/src/bin.ccg	Tue Apr  8 22:30:15 2008
@@ -24,6 +24,9 @@
 #include <gst/gstutils.h>
 #include <gstreamermm/pad.h>
 
+_PINCLUDE(glibmm/private/object_p.h)
+_PINCLUDE(gstreamermm/private/element_p.h)
+
 namespace Gst
 {
 

Modified: gstreamermm/trunk/gstreamer/src/bin.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/bin.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/bin.hg	Tue Apr  8 22:30:15 2008
@@ -24,8 +24,6 @@
 #include <gstreamermm/pad.h>
 
 _DEFS(gstreamermm,gst)
-_PINCLUDE(glibmm/private/object_p.h)
-_PINCLUDE(gstreamermm/private/element_p.h)
 
 namespace Gst
 {

Modified: gstreamermm/trunk/gstreamer/src/buffer.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/buffer.ccg	(original)
+++ gstreamermm/trunk/gstreamer/src/buffer.ccg	Tue Apr  8 22:30:15 2008
@@ -23,6 +23,8 @@
 #include <gst/gstutils.h>
 #include <gst/gstenumtypes.h>
 
+_PINCLUDE(gstreamermm/private/miniobject_p.h)
+
 namespace Gst
 {
 

Modified: gstreamermm/trunk/gstreamer/src/buffer.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/buffer.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/buffer.hg	Tue Apr  8 22:30:15 2008
@@ -24,7 +24,6 @@
 #include <gstreamermm/wrap.h>
 #include <gstreamermm/caps.h>
 
-_PINCLUDE(gstreamermm/private/miniobject_p.h)
 _DEFS(gstreamermm,gst)
 
 namespace Gst

Modified: gstreamermm/trunk/gstreamer/src/bus.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/bus.ccg	(original)
+++ gstreamermm/trunk/gstreamer/src/bus.ccg	Tue Apr  8 22:30:15 2008
@@ -20,6 +20,8 @@
  */
 
 #include <gst/gstenumtypes.h>
+_PINCLUDE(glibmm/private/object_p.h)
+_PINCLUDE(gstreamermm/private/object_p.h)
 
 static gboolean Bus_Message_gstreamermm_callback(GstBus* bus, GstMessage* message, void* data)
 {

Modified: gstreamermm/trunk/gstreamer/src/bus.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/bus.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/bus.hg	Tue Apr  8 22:30:15 2008
@@ -25,8 +25,6 @@
 #include <gstreamermm/message.h>
 
 _DEFS(gstreamermm,gst)
-_PINCLUDE(glibmm/private/object_p.h)
-_PINCLUDE(gstreamermm/private/object_p.h)
 
 namespace Gst
 {
@@ -66,10 +64,10 @@
  * asynchronous callbacks.
  *
  * It is also possible to get messages from the bus without any thread
- * marshalling with the gst_bus_set_sync_handler() method. This makes it
- * possible to react to a message in the same thread that posted the message on
- * the bus. This should only be used if the application is able to deal with
- * messages from different threads.
+ * marshalling with the set_sync_handler() method. This makes it possible to
+ * react to a message in the same thread that posted the message on the bus.
+ * This should only be used if the application is able to deal with messages
+ * from different threads.
  *
  * Every Pipeline has one bus.
  *
@@ -142,6 +140,11 @@
    */
   void set_sync_handler(const SlotMessageSync& slot);
 
+  _IGNORE(gst_bus_set_sync_handler,
+         gst_bus_sync_handler,
+         gst_bus_sync_signal_handler,
+         gst_bus_async_signal_func)
+
   _WRAP_METHOD(void disable_sync_message_emission(), gst_bus_disable_sync_message_emission)
   _WRAP_METHOD(void enable_sync_message_emission(), gst_bus_enable_sync_message_emission)
   _WRAP_METHOD(void add_signal_watch(int priority = Glib::PRIORITY_DEFAULT), gst_bus_add_signal_watch_full)

Modified: gstreamermm/trunk/gstreamer/src/clock.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/clock.ccg	(original)
+++ gstreamermm/trunk/gstreamer/src/clock.ccg	Tue Apr  8 22:30:15 2008
@@ -20,6 +20,8 @@
  */
 
 #include <gst/gstenumtypes.h>
+_PINCLUDE(glibmm/private/object_p.h)
+_PINCLUDE(gstreamermm/private/object_p.h)
 
 static gboolean ClockID_Clock_gstreamermm_callback(GstClock* clock, GstClockTime time, GstClockID id, void* data)
 {

Modified: gstreamermm/trunk/gstreamer/src/clock.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/clock.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/clock.hg	Tue Apr  8 22:30:15 2008
@@ -23,8 +23,6 @@
 #include <gstreamermm/object.h>
 
 _DEFS(gstreamermm,gst)
-_PINCLUDE(glibmm/private/object_p.h)
-_PINCLUDE(gstreamermm/private/object_p.h)
 
 namespace Gst
 {

Modified: gstreamermm/trunk/gstreamer/src/element.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/element.ccg	(original)
+++ gstreamermm/trunk/gstreamer/src/element.ccg	Tue Apr  8 22:30:15 2008
@@ -32,6 +32,8 @@
 #include <gstreamermm/padtemplate.h>
 #include <gstreamermm/query.h>
 
+_PINCLUDE(gstreamermm/private/object_p.h)
+
 namespace Gst
 {
 

Modified: gstreamermm/trunk/gstreamer/src/element.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/element.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/element.hg	Tue Apr  8 22:30:15 2008
@@ -28,7 +28,6 @@
 #include <gstreamermm/query.h>
 
 _DEFS(gstreamermm,gst)
-_PINCLUDE(gstreamermm/private/object_p.h)
 
 namespace Gst
 {

Modified: gstreamermm/trunk/gstreamer/src/elementfactory.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/elementfactory.ccg	(original)
+++ gstreamermm/trunk/gstreamer/src/elementfactory.ccg	Tue Apr  8 22:30:15 2008
@@ -24,3 +24,5 @@
 #include <gstreamermm/element.h>
 #include <gstreamermm/padtemplate.h>
 #include <gstreamermm/plugin.h>
+
+_PINCLUDE(gstreamermm/private/pluginfeature_p.h)

Modified: gstreamermm/trunk/gstreamer/src/elementfactory.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/elementfactory.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/elementfactory.hg	Tue Apr  8 22:30:15 2008
@@ -23,7 +23,6 @@
 #include <gstreamermm/pluginfeature.h>
 
 _DEFS(gstreamermm,gst)
-_PINCLUDE(gstreamermm/private/pluginfeature_p.h)
 
 namespace Gst
 {

Modified: gstreamermm/trunk/gstreamer/src/event.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/event.ccg	(original)
+++ gstreamermm/trunk/gstreamer/src/event.ccg	Tue Apr  8 22:30:15 2008
@@ -20,6 +20,7 @@
  */
 
 #include <gst/gstenumtypes.h>
+_PINCLUDE(gstreamermm/private/miniobject_p.h)
 
 namespace Gst
 {

Modified: gstreamermm/trunk/gstreamer/src/event.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/event.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/event.hg	Tue Apr  8 22:30:15 2008
@@ -26,7 +26,6 @@
 #include <gstreamermm/format.h>
 
 _DEFS(gstreamermm,gst)
-_PINCLUDE(gstreamermm/private/miniobject_p.h)
 
 namespace Gst
 {

Added: gstreamermm/trunk/gstreamer/src/ghostpad.ccg
==============================================================================
--- (empty file)
+++ gstreamermm/trunk/gstreamer/src/ghostpad.ccg	Tue Apr  8 22:30:15 2008
@@ -0,0 +1,25 @@
+// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+
+/* gstreamermm - a C++ wrapper for gstreamer
+ *
+ * Copyright 2008 The gstreamermm Development Team
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <gst/gstghostpad.h>
+#include <gstreamermm/padtemplate.h>
+
+_PINCLUDE(gstreamermm/private/pad_p.h)

Added: gstreamermm/trunk/gstreamer/src/ghostpad.hg
==============================================================================
--- (empty file)
+++ gstreamermm/trunk/gstreamer/src/ghostpad.hg	Tue Apr  8 22:30:15 2008
@@ -0,0 +1,106 @@
+// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+
+/* gstreamermm - a C++ wrapper for gstreamer
+ *
+ * Copyright 2008 The gstreamermm Development Team
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <gstreamermm/pad.h>
+
+_DEFS(gstreamermm,gst)
+
+namespace Gst
+{
+
+/** GhostPad â Pseudo link pads.
+ * GhostPads are useful when organizing pipelines with Bin like elements. The
+ * idea here is to create hierarchical element graphs. The bin element contains
+ * a sub-graph. Now one would like to treat the bin-element like other
+ * Elements. This is where GhostPads come into play. A GhostPad acts as a proxy
+ * for another pad. Thus the bin can have sink and source ghost-pads that are
+ * associated with sink and source pads of the child elements.
+ *
+ * If the target pad is known at creation time, create() with a Pad argument is
+ * the method to use to get a ghost-pad. Otherwise one can use create() with a
+ * PadDirection argument to create the ghost-pad and use set_target() to
+ * establish the association later on.
+ *
+ * Note that GhostPads add overhead to the data processing of a pipeline.
+ *
+ * Last reviewed on 2005-11-18 (0.9.5)
+ */
+class GhostPad : public Pad
+{
+  _CLASS_GOBJECT(GhostPad, GstGhostPad, GST_GHOST_PAD, Pad, GstPad)
+
+protected:
+  _WRAP_CTOR(GhostPad(const Glib::ustring& name, const Glib::RefPtr<Pad>& target), gst_ghost_pad_new)
+  _WRAP_CTOR(GhostPad(const Glib::ustring& name, PadDirection dir), gst_ghost_pad_new_no_target)
+  _WRAP_CTOR(GhostPad(const Glib::ustring& name, const Glib::RefPtr<Pad>& target, const Glib::RefPtr<PadTemplate>& templ), gst_ghost_pad_new_from_template)
+  _WRAP_CTOR(GhostPad(const Glib::ustring& name, const Glib::RefPtr<PadTemplate>& templ), gst_ghost_pad_new_no_target_from_template)
+
+public:
+  /** Create a new ghostpad with target as the target. The direction will be
+   * taken from the target pad. target must be unlinked.
+   *
+   * Will ref the target.
+   *
+   * @param name the name of the new pad.
+   * @param target the pad to ghost.
+   * @returns a new GhostPad, or NULL in case of an error.
+   */
+  _WRAP_CREATE(const Glib::ustring& name, const Glib::RefPtr<Pad>& target)
+
+  /** Create a new ghostpad without a target with the given direction. A target
+   * can be set on the ghostpad later with the set_target() function.
+   *
+   * The created ghostpad will not have a padtemplate.
+   *
+   * @param name the name of the new pad.
+   * @param dir the direction of the ghostpad
+   * @return a new GhostPad, or NULL in case of an error. 
+   */
+  _WRAP_CREATE(const Glib::ustring& name, PadDirection dir)
+
+  /** Create a new ghostpad with target as the target. The direction will be
+   * taken from the target pad. The template used on the ghostpad will be
+   * template.
+   *
+   * Will ref the target.
+   *
+   * @param name the name of the new pad.
+   * @param target the pad to ghost.
+   * @param templ the PadTemplate to use on the ghostpad.
+   * @return Returns a new GhostPad, or NULL in case of an error.
+   */
+  _WRAP_CREATE(const Glib::ustring& name, const Glib::RefPtr<Pad>& target, const Glib::RefPtr<PadTemplate>& templ)
+
+  /** Create a new ghostpad based on templ, without setting a target. The
+   * direction will be taken from the templ.
+   *
+   * @param name the name of the new pad.
+   * @param templ the PadTemplate to create the ghostpad from.
+   * @return a new GhostPad, or NULL in case of an error.
+   */
+  _WRAP_CREATE(const Glib::ustring& name, const Glib::RefPtr<PadTemplate>& templ)
+
+  _WRAP_METHOD(bool set_target(const Glib::RefPtr<Pad>& new_target), gst_ghost_pad_set_target)
+  _WRAP_METHOD(Glib::RefPtr<Pad> get_target(), gst_ghost_pad_get_target)
+};
+
+} // namespace Gst
+

Modified: gstreamermm/trunk/gstreamer/src/index.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/index.ccg	(original)
+++ gstreamermm/trunk/gstreamer/src/index.ccg	Tue Apr  8 22:30:15 2008
@@ -20,6 +20,7 @@
  */
 
 #include <gst/gstenumtypes.h>
+_PINCLUDE(gstreamermm/private/object_p.h)
 
 namespace Gst
 {

Modified: gstreamermm/trunk/gstreamer/src/index.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/index.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/index.hg	Tue Apr  8 22:30:15 2008
@@ -24,8 +24,6 @@
 #include <gstreamermm/format.h>
 
 _DEFS(gstreamermm,gst)
-_PINCLUDE(glibmm/private/object_p.h)
-_PINCLUDE(gstreamermm/private/object_p.h)
 
 namespace Gst
 {

Modified: gstreamermm/trunk/gstreamer/src/indexfactory.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/indexfactory.ccg	(original)
+++ gstreamermm/trunk/gstreamer/src/indexfactory.ccg	Tue Apr  8 22:30:15 2008
@@ -20,6 +20,7 @@
  */
 
 #include <gstreamermm/index.h>
+_PINCLUDE(gstreamermm/private/pluginfeature_p.h)
 
 namespace Gst
 {

Modified: gstreamermm/trunk/gstreamer/src/indexfactory.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/indexfactory.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/indexfactory.hg	Tue Apr  8 22:30:15 2008
@@ -23,7 +23,6 @@
 #include <gstreamermm/pluginfeature.h>
 
 _DEFS(gstreamermm,gst)
-_PINCLUDE(gstreamermm/private/pluginfeature_p.h)
 
 namespace Gst
 {

Modified: gstreamermm/trunk/gstreamer/src/message.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/message.ccg	(original)
+++ gstreamermm/trunk/gstreamer/src/message.ccg	Tue Apr  8 22:30:15 2008
@@ -20,6 +20,7 @@
  */
 
 #include <gst/gstenumtypes.h>
+_PINCLUDE(gstreamermm/private/miniobject_p.h)
 
 namespace Gst
 {

Modified: gstreamermm/trunk/gstreamer/src/message.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/message.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/message.hg	Tue Apr  8 22:30:15 2008
@@ -27,7 +27,6 @@
 #include <gstreamermm/enums.h>
 
 _DEFS(gstreamermm,gst)
-_PINCLUDE(gstreamermm/private/miniobject_p.h)
 
 namespace Gst
 {

Modified: gstreamermm/trunk/gstreamer/src/pad.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/pad.ccg	(original)
+++ gstreamermm/trunk/gstreamer/src/pad.ccg	Tue Apr  8 22:30:15 2008
@@ -27,6 +27,9 @@
 #include <gstreamermm/event.h>
 #include <gstreamermm/padtemplate.h>
 
+_PINCLUDE(glibmm/private/object_p.h)
+_PINCLUDE(gstreamermm/private/object_p.h)
+
 static void Pad_Block_gstreamermm_callback(GstPad* pad, gboolean blocked, void* data)
 {
   Gst::Pad::SlotBlock * the_slot = static_cast<Gst::Pad::SlotBlock*>(data);

Modified: gstreamermm/trunk/gstreamer/src/pad.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/pad.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/pad.hg	Tue Apr  8 22:30:15 2008
@@ -26,8 +26,6 @@
 #include <gstreamermm/query.h>
 
 _DEFS(gstreamermm,gst)
-_PINCLUDE(glibmm/private/object_p.h)
-_PINCLUDE(gstreamermm/private/object_p.h)
 
 namespace Gst
 {
@@ -159,6 +157,10 @@
    */
   gulong add_event_probe(const SlotData& slot);
 
+  _IGNORE(gst_pad_add_data_probe,
+          gst_pad_add_event_probe,
+          gst_pad_add_buffer_probe)
+
   _WRAP_METHOD(void remove_data_probe(guint handler_id), gst_pad_remove_data_probe)
   _WRAP_METHOD(void remove_buffer_probe(guint handler_id), gst_pad_remove_buffer_probe)
   _WRAP_METHOD(void remove_event_probe(guint handler_id), gst_pad_remove_event_probe)

Modified: gstreamermm/trunk/gstreamer/src/padtemplate.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/padtemplate.ccg	(original)
+++ gstreamermm/trunk/gstreamer/src/padtemplate.ccg	Tue Apr  8 22:30:15 2008
@@ -23,6 +23,9 @@
 #include <gstreamermm/caps.h>
 #include <gstreamermm/pad.h>
 
+_PINCLUDE(glibmm/private/object_p.h)
+_PINCLUDE(gstreamermm/private/object_p.h)
+
 namespace Gst
 {
 

Modified: gstreamermm/trunk/gstreamer/src/padtemplate.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/padtemplate.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/padtemplate.hg	Tue Apr  8 22:30:15 2008
@@ -25,8 +25,6 @@
 #include <gstreamermm/pad.h>
 
 _DEFS(gstreamermm,gst)
-_PINCLUDE(glibmm/private/object_p.h)
-_PINCLUDE(gstreamermm/private/object_p.h)
 
 namespace Gst
 {

Modified: gstreamermm/trunk/gstreamer/src/pipeline.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/pipeline.ccg	(original)
+++ gstreamermm/trunk/gstreamer/src/pipeline.ccg	Tue Apr  8 22:30:15 2008
@@ -21,3 +21,6 @@
 
 #include <gst/gstpipeline.h>
 #include <gstreamermm/bus.h>
+
+_PINCLUDE(glibmm/private/object_p.h)
+_PINCLUDE(gstreamermm/private/bin_p.h)

Modified: gstreamermm/trunk/gstreamer/src/plugin.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/plugin.ccg	(original)
+++ gstreamermm/trunk/gstreamer/src/plugin.ccg	Tue Apr  8 22:30:15 2008
@@ -20,3 +20,4 @@
  */
 
 #include <gst/gstenumtypes.h>
+_PINCLUDE(gstreamermm/private/object_p.h)

Modified: gstreamermm/trunk/gstreamer/src/plugin.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/plugin.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/plugin.hg	Tue Apr  8 22:30:15 2008
@@ -23,7 +23,6 @@
 #include <gstreamermm/object.h>
 
 _DEFS(gstreamermm,gst)
-_PINCLUDE(gstreamermm/private/object_p.h)
 
 namespace Gst
 {

Modified: gstreamermm/trunk/gstreamer/src/pluginfeature.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/pluginfeature.ccg	(original)
+++ gstreamermm/trunk/gstreamer/src/pluginfeature.ccg	Tue Apr  8 22:30:15 2008
@@ -20,3 +20,4 @@
  */
 
 #include <gst/gstenumtypes.h>
+_PINCLUDE(gstreamermm/private/object_p.h)

Modified: gstreamermm/trunk/gstreamer/src/pluginfeature.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/pluginfeature.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/pluginfeature.hg	Tue Apr  8 22:30:15 2008
@@ -23,7 +23,6 @@
 #include <gstreamermm/object.h>
 
 _DEFS(gstreamermm,gst)
-_PINCLUDE(gstreamermm/private/object_p.h)
 
 namespace Gst
 {

Modified: gstreamermm/trunk/gstreamer/src/query.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/query.ccg	(original)
+++ gstreamermm/trunk/gstreamer/src/query.ccg	Tue Apr  8 22:30:15 2008
@@ -20,6 +20,7 @@
  */
 
 #include <gst/gstenumtypes.h>
+_PINCLUDE(gstreamermm/private/miniobject_p.h)
 
 namespace Gst
 {

Modified: gstreamermm/trunk/gstreamer/src/query.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/query.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/query.hg	Tue Apr  8 22:30:15 2008
@@ -26,7 +26,6 @@
 #include <gstreamermm/format.h>
 
 _DEFS(gstreamermm,gst)
-_PINCLUDE(gstreamermm/private/miniobject_p.h)
 
 namespace Gst
 {

Modified: gstreamermm/trunk/gstreamer/src/registry.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/registry.ccg	(original)
+++ gstreamermm/trunk/gstreamer/src/registry.ccg	Tue Apr  8 22:30:15 2008
@@ -22,6 +22,7 @@
 #include <gst/gstregistry.h>
 #include <gstreamermm/pluginfeature.h>
 #include <gstreamermm/plugin.h>
+_PINCLUDE(gstreamermm/private/object_p.h)
 
 static gboolean Registry_Plugin_Filter_gstreamermm_callback(GstPlugin* plugin, void* data)
 {

Modified: gstreamermm/trunk/gstreamer/src/registry.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/registry.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/registry.hg	Tue Apr  8 22:30:15 2008
@@ -25,7 +25,6 @@
 #include <gstreamermm/pluginfeature.h>
 
 _DEFS(gstreamermm,gst)
-_PINCLUDE(gstreamermm/private/object_p.h)
 
 namespace Gst
 {

Modified: gstreamermm/trunk/gstreamer/src/systemclock.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/systemclock.ccg	(original)
+++ gstreamermm/trunk/gstreamer/src/systemclock.ccg	Tue Apr  8 22:30:15 2008
@@ -20,6 +20,7 @@
  */
 
 #include <gst/gstsystemclock.h>
+_PINCLUDE(gstreamermm/private/clock_p.h)
 
 namespace Gst
 {

Modified: gstreamermm/trunk/gstreamer/src/systemclock.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/systemclock.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/systemclock.hg	Tue Apr  8 22:30:15 2008
@@ -22,7 +22,6 @@
 #include <gstreamermm/clock.h>
 
 _DEFS(gstreamermm,gst)
-_PINCLUDE(gstreamermm/private/clock_p.h)
 
 namespace Gst
 {

Modified: gstreamermm/trunk/gstreamer/src/task.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/task.ccg	(original)
+++ gstreamermm/trunk/gstreamer/src/task.ccg	Tue Apr  8 22:30:15 2008
@@ -20,6 +20,7 @@
  */
 
 #include <gst/gstenumtypes.h>
+_PINCLUDE(gstreamermm/private/object_p.h)
 
 static void Task_Task_gstreamermm_callback(void* data)
 {

Modified: gstreamermm/trunk/gstreamer/src/task.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/task.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/task.hg	Tue Apr  8 22:30:15 2008
@@ -23,7 +23,6 @@
 #include <gstreamermm/object.h>
 
 _DEFS(gstreamermm,gst)
-_PINCLUDE(gstreamermm/private/object_p.h)
 
 namespace Gst
 {

Modified: gstreamermm/trunk/gstreamer/src/xml.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/xml.ccg	(original)
+++ gstreamermm/trunk/gstreamer/src/xml.ccg	Tue Apr  8 22:30:15 2008
@@ -26,6 +26,9 @@
 #include <gst/gstxml.h>
 #include <gstreamermm/element.h>
 
+_PINCLUDE(glibmm/private/object_p.h)
+_PINCLUDE(gstreamermm/private/object_p.h)
+
 namespace Gst
 {
 

Modified: gstreamermm/trunk/gstreamer/src/xml.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/xml.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/xml.hg	Tue Apr  8 22:30:15 2008
@@ -23,8 +23,6 @@
 #include <gstreamermm/object.h>
 
 _DEFS(gstreamermm,gst)
-_PINCLUDE(glibmm/private/object_p.h)
-_PINCLUDE(gstreamermm/private/object_p.h)
 
 namespace Gst
 {