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

[jaalburqu svn gnome org]

Author: jaalburqu
Date: Wed Aug 20 02:04:48 2008
New Revision: 1687
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1687&view=rev

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

	* gstreamer/src/bin.ccg:
	* gstreamer/src/bin.hg: Forward declared Gst::Iterator<> in hg file.
	* gstreamer/src/element.ccg:
	* gstreamer/src/element.hg:
	* tools/m4/convert_gst.m4: Wrapped iterate*_pads() methods.

Modified:
   gstreamermm/trunk/ChangeLog
   gstreamermm/trunk/gstreamer/src/bin.ccg
   gstreamermm/trunk/gstreamer/src/bin.hg
   gstreamermm/trunk/gstreamer/src/element.ccg
   gstreamermm/trunk/gstreamer/src/element.hg
   gstreamermm/trunk/tools/m4/convert_gst.m4

Modified: gstreamermm/trunk/gstreamer/src/bin.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/bin.ccg	(original)
+++ gstreamermm/trunk/gstreamer/src/bin.ccg	Wed Aug 20 02:04:48 2008
@@ -23,6 +23,7 @@
 #include <gst/gstbin.h>
 #include <gst/gstutils.h>
 #include <gstreamermm/pad.h>
+#include <gstreamermm/iterator.h>
 
 _PINCLUDE(glibmm/private/object_p.h)
 _PINCLUDE(gstreamermm/private/element_p.h)

Modified: gstreamermm/trunk/gstreamer/src/bin.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/bin.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/bin.hg	Wed Aug 20 02:04:48 2008
@@ -22,7 +22,6 @@
 #include <gstreamermm/element.h>
 #include <gstreamermm/childproxy.h>
 #include <gstreamermm/pad.h>
-#include <gstreamermm/iterator.h>
 #include <stdexcept> //Because add() throws std::runtime_error.
 
 _DEFS(gstreamermm,gst)
@@ -32,6 +31,10 @@
 
 class Pad;
 
+//Gst::Iterator<> forward declaration.
+template <class CppType>
+class Iterator;
+
 /** Gst::Bin â Base class and element that can contain other elements.
  * Gst::Bin is an element that can contain other Gst::Element, allowing them to
  * be managed as a group. Pads from the child elements can be ghosted to the

Modified: gstreamermm/trunk/gstreamer/src/element.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/element.ccg	(original)
+++ gstreamermm/trunk/gstreamer/src/element.ccg	Wed Aug 20 02:04:48 2008
@@ -32,6 +32,7 @@
 #include <gstreamermm/padtemplate.h>
 #include <gstreamermm/query.h>
 #include <gstreamermm/taglist.h>
+#include <gstreamermm/iterator.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	Wed Aug 20 02:04:48 2008
@@ -46,6 +46,10 @@
 class Query;
 class TagList;
 
+//Gst::Iterator<> forward declaration.
+template <class CppType>
+class Iterator;
+
 _WRAP_ENUM(ElementFlags, GstElementFlags)
 
 //TODO: Fix gmmproc so that definition in gst_enums.defs does not cause errors
@@ -96,7 +100,7 @@
  * add_pad() and remove_pad().
  *
  * A pad of an element can be retrieved by name with get_pad(). An iterator of
- * all pads can be retrieved with gst_element_iterate_pads().
+ * all pads can be retrieved with iterate_pads().
  *
  * Gst::Elements can be linked through their pads. Use the link() function to
  * link elements. Use link_filtered() to link two elements constrained by a
@@ -162,7 +166,9 @@
   _WRAP_METHOD(void no_more_pads(), gst_element_no_more_pads)
   _WRAP_METHOD(void release_request_pad(const Glib::RefPtr<Pad>& pad), gst_element_release_request_pad)
   _WRAP_METHOD(bool remove_pad(const Glib::RefPtr<Pad>& pad), gst_element_remove_pad)
- 
+  _WRAP_METHOD(Iterator<Pad> iterate_pads(), gst_element_iterate_pads)
+  _WRAP_METHOD(Iterator<Pad> iterate_sink_pads(), gst_element_iterate_sink_pads)
+  _WRAP_METHOD(Iterator<Pad> iterate_src_pads(), gst_element_iterate_src_pads)
   _WRAP_METHOD(void unlink(const Glib::RefPtr<Element>& other_element), gst_element_unlink)
 
   //TODO: Make this like link()?

Modified: gstreamermm/trunk/tools/m4/convert_gst.m4
==============================================================================
--- gstreamermm/trunk/tools/m4/convert_gst.m4	(original)
+++ gstreamermm/trunk/tools/m4/convert_gst.m4	Wed Aug 20 02:04:48 2008
@@ -98,6 +98,7 @@
 #
 #Iterator
 _CONVERSION(`GstIterator*',`Iterator<Element>',`Iterator<Element>::Iterator($3)')
+_CONVERSION(`GstIterator*',`Iterator<Pad>',`Iterator<Pad>::Iterator($3)')
 
 #Message
 _CONVERSION(`GstMessage*',`Glib::RefPtr<Message>',`Gst::Message::wrap($3)')