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

[jaalburqu svn gnome org]

Author: jaalburqu
Date: Mon Apr 28 04:02:22 2008
New Revision: 1480
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1480&view=rev

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

	* gstreamer/src/error.hg: Added intro line to class docs of GError
	classes
	* gstreamer/src/event.hg: Corrected typo

	* gstreamer/src/pad.hg:
	* gstreamer/src/query.hg: 
	* gstreamer/src/element.hg: Used ArrayHandle<> for methods that return
	an array of QueryType (ie QueryType*)

	* gstreamer/src/gst_vfuncs.defs: Corrected return type of GstElement
	vfunc from `GstQueryType*' to `const GstQueryType*'

	* tools/m4/convert_gst.m4: Added GstQueryType array (to/from
	Glib::ArrayHandle<>) conversions

Modified:
   gstreamermm/trunk/ChangeLog
   gstreamermm/trunk/gstreamer/src/element.hg
   gstreamermm/trunk/gstreamer/src/error.hg
   gstreamermm/trunk/gstreamer/src/event.hg
   gstreamermm/trunk/gstreamer/src/gst_vfuncs.defs
   gstreamermm/trunk/gstreamer/src/pad.hg
   gstreamermm/trunk/gstreamer/src/query.hg
   gstreamermm/trunk/tools/m4/convert_gst.m4

Modified: gstreamermm/trunk/gstreamer/src/element.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/element.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/element.hg	Mon Apr 28 04:02:22 2008
@@ -178,8 +178,7 @@
   _WRAP_METHOD(void post_message(MessageType message_type, GQuark 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)
   _WRAP_METHOD(bool post_message(const Glib::RefPtr<Message>& message), gst_element_post_message)
 
-  //TODO: Use ArrayHandle?
-  _WRAP_METHOD(const QueryType* get_query_types() const, gst_element_get_query_types)
+  _WRAP_METHOD(Glib::ArrayHandle<QueryType> get_query_types() const, gst_element_get_query_types)
 
   _WRAP_METHOD(bool query(const Glib::RefPtr<Query>& query), gst_element_query)
   _WRAP_METHOD(bool query_convert(Format src_format, gint64 src_value, Format& dst_format, gint64& dst_value) const, gst_element_query_convert)
@@ -279,7 +278,9 @@
    */
   _WRAP_VFUNC(bool send_event(const Glib::RefPtr<Event>& event), "send_event")
 
-  //TODO: _WRAP_VFUNC(const GstQueryType* get_query_types(), "get_query_types")
+  //TODO: /** get the supported GstQueryType of this element
+  //TODO: */
+  //TODO: _WRAP_VFUNC(Glib::ArrayHandle<QueryType> get_query_types(), "get_query_types")
 
   /** perform a Gst::Query on the element 
    */

Modified: gstreamermm/trunk/gstreamer/src/error.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/error.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/error.hg	Mon Apr 28 04:02:22 2008
@@ -24,7 +24,8 @@
 namespace Gst
 {
 
-/** GStreamer elements can throw non-fatal warnings and fatal errors.
+/** The GStreamer core GError type.
+ * GStreamer elements can throw non-fatal warnings and fatal errors.
  * Higher-level elements and applications can programatically filter the ones
  * they are interested in or can recover from, and have a default handler
  * handle the rest of them. Both warnings and fatal errors are treated
@@ -80,7 +81,8 @@
 
 _WRAP_GERROR(CoreError, GstCoreError, GST_CORE_ERROR, NO_GTYPE)
 
-/** GStreamer elements can throw non-fatal warnings and fatal errors.
+/** The GStreamer library GError type.
+ * GStreamer elements can throw non-fatal warnings and fatal errors.
  * Higher-level elements and applications can programatically filter the ones
  * they are interested in or can recover from, and have a default handler
  * handle the rest of them. Both warnings and fatal errors are treated
@@ -126,7 +128,8 @@
  */
 _WRAP_GERROR(LibraryError, GstLibraryError, GST_LIBRARY_ERROR, NO_GTYPE)
 
-/** GStreamer elements can throw non-fatal warnings and fatal errors.
+/** The GStreamer resource GError type.
+ * GStreamer elements can throw non-fatal warnings and fatal errors.
  * Higher-level elements and applications can programatically filter the ones
  * they are interested in or can recover from, and have a default handler
  * handle the rest of them. Both warnings and fatal errors are treated
@@ -182,7 +185,8 @@
  */
 _WRAP_GERROR(ResourceError, GstResourceError, GST_RESOURCE_ERROR, NO_GTYPE)
 
-/** GStreamer elements can throw non-fatal warnings and fatal errors.
+/** The GStreamer stream GError type.
+ * GStreamer elements can throw non-fatal warnings and fatal errors.
  * Higher-level elements and applications can programatically filter the ones
  * they are interested in or can recover from, and have a default handler
  * handle the rest of them. Both warnings and fatal errors are treated

Modified: gstreamermm/trunk/gstreamer/src/event.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/event.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/event.hg	Mon Apr 28 04:02:22 2008
@@ -361,7 +361,7 @@
   void parse(bool& update, double& rate, Format& format, gint64& start, gint64& stop, gint64& position, double& applied_rate);
 };
 
-/** A QOS Event.  See create() for more details.
+/** A QOS event.  See create() for more details.
  */
 class EventQos : public Event
 {

Modified: gstreamermm/trunk/gstreamer/src/gst_vfuncs.defs
==============================================================================
--- gstreamermm/trunk/gstreamer/src/gst_vfuncs.defs	(original)
+++ gstreamermm/trunk/gstreamer/src/gst_vfuncs.defs	Mon Apr 28 04:02:22 2008
@@ -179,7 +179,7 @@
 
 (define-vfunc get_query_types
   (of-object "GstElement")
-  (return-type "GstQueryType*")
+  (return-type "const-GstQueryType*")
 )
 
 (define-vfunc query

Modified: gstreamermm/trunk/gstreamer/src/pad.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/pad.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/pad.hg	Mon Apr 28 04:02:22 2008
@@ -240,9 +240,8 @@
    _WRAP_METHOD(bool query_peer_duration(Format& format, gint64& duration) const, gst_pad_query_peer_duration)
    _WRAP_METHOD(bool query_peer_convert(Format src_format, gint64 src_value, Format& dst_format, gint64& dst_value) const, gst_pad_query_peer_convert)
 
-  //TODO: Use ArrayHandle?
-  _WRAP_METHOD(const QueryType* get_query_types() const, gst_pad_get_query_types)
-  _WRAP_METHOD(const QueryType* get_query_types_default() const, gst_pad_get_query_types_default)
+  _WRAP_METHOD(Glib::ArrayHandle<QueryType> get_query_types() const, gst_pad_get_query_types)
+  _WRAP_METHOD(Glib::ArrayHandle<QueryType> get_query_types_default() const, gst_pad_get_query_types_default)
 
 #m4 _CONVERSION(`GList*', `Glib::ListHandle< Glib::RefPtr<Pad> >', `$2($3, Glib::OWNERSHIP_SHALLOW)')
   _WRAP_METHOD(Glib::ListHandle< Glib::RefPtr<Pad> > get_internal_links(), gst_pad_get_internal_links)

Modified: gstreamermm/trunk/gstreamer/src/query.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/query.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/query.hg	Mon Apr 28 04:02:22 2008
@@ -66,7 +66,7 @@
 
   _WRAP_METHOD(static QueryType register_query_type(const Glib::ustring& nick, const Glib::ustring& description), gst_query_type_register)
   _WRAP_METHOD(static QueryType get_query_type(const Glib::ustring& nick), gst_query_type_get_by_nick)
-  //TODO: static bool query_types_contains(const std::vector<const QueryType>& types, QueryType type)
+  _WRAP_METHOD(static bool query_types_contains(const Glib::ArrayHandle<QueryType>& types, QueryType type), gst_query_types_contains)
 
   bool get_details(QueryType type, QueryTypeDefinition& def);
 };

Modified: gstreamermm/trunk/tools/m4/convert_gst.m4
==============================================================================
--- gstreamermm/trunk/tools/m4/convert_gst.m4	(original)
+++ gstreamermm/trunk/tools/m4/convert_gst.m4	Mon Apr 28 04:02:22 2008
@@ -152,6 +152,8 @@
 _CONVERSION(`Glib::ListHandle< Glib::RefPtr<Plugin> >',`GList*',`($3).data()')
 _CONVERSION(`Glib::ListHandle< Glib::RefPtr<PluginFeature> >',`GList*',`($3).data()')
 _CONVERSION(`gchar**',`Glib::StringArrayHandle',`Glib::StringArrayHandle($3)')
+_CONVERSION(`const GstQueryType*',`Glib::ArrayHandle<QueryType>',`Glib::ArrayHandle<QueryType>((QueryType*)($3), Glib::OWNERSHIP_SHALLOW)')
+_CONVERSION(`const Glib::ArrayHandle<QueryType>&',`GstQueryType*',`(GstQueryType*)(($3).data())')
 
 #String Conversions
 _CONVERSION(`const std::string&',`const guchar*',`(const guchar*) ($3.c_str())')