gnomemm r1373 - in gstreamermm/trunk: . gstreamer/src tools/m4
- From: jaalburqu svn gnome org
- To: svn-commits-list gnome org
- Subject: gnomemm r1373 - in gstreamermm/trunk: . gstreamer/src tools/m4
- Date: Thu, 28 Feb 2008 21:58:30 +0000 (GMT)
Author: jaalburqu
Date: Thu Feb 28 21:58:30 2008
New Revision: 1373
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1373&view=rev
Log:
2008-02-28 Josà Alburquerque <jaalburqu svn gnome org>
* gstreamer/src/elementfactory.hg: Renamed make() to create()
* gstreamer/src/pluginfeature.ccg:
* gstreamer/src/pluginfeature.hg: Removed type_name_filter() (It is a
reimplementation of a C filter callback) and struct TypeNameData (used
only in type_name_filter() method)
* gstreamer/src/indexfactory.hg:
* gstreamer/src/plugin.hg:
* gstreamer/src/registry.hg: Added some _IGNORE's
* tools/m4/convert_gst.m4: Removed unused TypeNameData conversion;
Finished ordering conversions
Modified:
gstreamermm/trunk/ChangeLog
gstreamermm/trunk/gstreamer/src/elementfactory.hg
gstreamermm/trunk/gstreamer/src/indexfactory.hg
gstreamermm/trunk/gstreamer/src/plugin.hg
gstreamermm/trunk/gstreamer/src/pluginfeature.ccg
gstreamermm/trunk/gstreamer/src/pluginfeature.hg
gstreamermm/trunk/gstreamer/src/registry.hg
gstreamermm/trunk/tools/m4/convert_gst.m4
Modified: gstreamermm/trunk/gstreamer/src/elementfactory.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/elementfactory.hg (original)
+++ gstreamermm/trunk/gstreamer/src/elementfactory.hg Thu Feb 28 21:58:30 2008
@@ -45,8 +45,8 @@
* ElementFactory is used to create instances of elements. A Elementfactory can
* be added to a Plugin as it is also a PluginFeature.
*
- * Use the find() and create() functions to create element instances or use
- * make() as a convenient shortcut.
+ * Use the find() and create() functions to create element instances. or use
+ * the static create() as a convenient shortcut.
*
* The following code example shows you how to create a GstFileSrc element.
*
@@ -58,7 +58,6 @@
_CLASS_GOBJECT(ElementFactory, GstElementFactory, GST_ELEMENT_FACTORY, PluginFeature, GstPluginFeature)
public:
- _WRAP_METHOD(static bool register_factory(const Glib::RefPtr<Plugin>& plugin, const Glib::ustring& name, guint rank, GType type), gst_element_register)
_WRAP_METHOD(static Glib::RefPtr<ElementFactory> find(const Glib::ustring& name), gst_element_factory_find)
_WRAP_METHOD(GType get_element_type() const, gst_element_factory_get_element_type)
_WRAP_METHOD(Glib::ustring get_long_name() const, gst_element_factory_get_longname)
@@ -67,15 +66,20 @@
_WRAP_METHOD(Glib::ustring get_author() const, gst_element_factory_get_author)
_WRAP_METHOD(guint get_num_pad_templates() const, gst_element_factory_get_num_pad_templates)
_WRAP_METHOD(int get_uri_type() const, gst_element_factory_get_uri_type)
+
+ //TODO: Is the conversion from gchar** to Glb::StringArrayHandle used here valid?
_WRAP_METHOD(Glib::StringArrayHandle get_uri_protocols() const, gst_element_factory_get_uri_protocols)
+
_WRAP_METHOD(bool has_interface(const Glib::ustring& name) const, gst_element_factory_has_interface)
_WRAP_METHOD(Glib::RefPtr<Element> create(const Glib::ustring& name), gst_element_factory_create)
- _WRAP_METHOD(static Glib::RefPtr<Element> make(const Glib::ustring& factory_name, const Glib::ustring& name), gst_element_factory_make)
+ _WRAP_METHOD(static Glib::RefPtr<Element> create(const Glib::ustring& factory_name, const Glib::ustring& name), gst_element_factory_make)
_WRAP_METHOD(bool can_sink_caps(const Glib::RefPtr<const Caps>& caps) const, gst_element_factory_can_sink_caps)
_WRAP_METHOD(bool can_src_caps(const Glib::RefPtr<const Caps>& caps) const, gst_element_factory_can_src_caps)
#m4 _CONVERSION(`const GList*', `Glib::ListHandle< Glib::RefPtr<const PadTemplate> >', `$2(const_cast<GList*>($3), Glib::OWNERSHIP_NONE)')
_WRAP_METHOD(Glib::ListHandle< Glib::RefPtr<const PadTemplate> > get_static_pad_templates(), gst_element_factory_get_static_pad_templates)
+
+ _IGNORE(gst_element_register)
};
} // namespace Gst
Modified: gstreamermm/trunk/gstreamer/src/indexfactory.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/indexfactory.hg (original)
+++ gstreamermm/trunk/gstreamer/src/indexfactory.hg Thu Feb 28 21:58:30 2008
@@ -48,6 +48,8 @@
_WRAP_METHOD(Glib::RefPtr<Index> make(), gst_index_factory_create)
_WRAP_METHOD(static Glib::RefPtr<Index> make(const Glib::ustring& factory_name), gst_index_factory_make)
+
+ _IGNORE(gst_index_factory_destroy)
};
} // namespace Gst
Modified: gstreamermm/trunk/gstreamer/src/plugin.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/plugin.hg (original)
+++ gstreamermm/trunk/gstreamer/src/plugin.hg Thu Feb 28 21:58:30 2008
@@ -81,6 +81,8 @@
_WRAP_METHOD(Glib::RefPtr<Plugin> load(), gst_plugin_load)
_WRAP_METHOD(static Glib::RefPtr<Plugin> load_by_name(const Glib::ustring& name), gst_plugin_load_by_name)
_WRAP_METHOD(static void free(Glib::ListHandle< Glib::RefPtr<Plugin> >), gst_plugin_list_free)
+
+ _IGNORE(gst_plugin_name_filter)
};
} // namespace Gst
Modified: gstreamermm/trunk/gstreamer/src/pluginfeature.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/pluginfeature.ccg (original)
+++ gstreamermm/trunk/gstreamer/src/pluginfeature.ccg Thu Feb 28 21:58:30 2008
@@ -20,16 +20,3 @@
*/
#include <gst/gstpluginfeature.h>
-
-namespace Gst
-{
-
-bool PluginFeature::type_name_filter(const TypeNameData& data) const
-{
- GstTypeNameData gst_data = { data.name.c_str(), data.type};
-
- return gst_plugin_feature_type_name_filter(const_cast<GstPluginFeature*>(gobj()), &gst_data);
-
-}
-
-} //namespace Gst
Modified: gstreamermm/trunk/gstreamer/src/pluginfeature.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/pluginfeature.hg (original)
+++ gstreamermm/trunk/gstreamer/src/pluginfeature.hg Thu Feb 28 21:58:30 2008
@@ -27,12 +27,6 @@
namespace Gst
{
-struct TypeNameData
-{
- Glib::ustring name;
- GType type;
-};
-
/** This is a base class for anything that can be added to a Plugin.
*
*/
@@ -46,8 +40,6 @@
*/
typedef sigc::slot< bool, const Glib::RefPtr<PluginFeature>& > SlotFilter;
- bool type_name_filter(const TypeNameData& data) const;
-
_WRAP_METHOD(void set_rank(guint rank), gst_plugin_feature_set_rank)
_WRAP_METHOD(void set_name(const Glib::ustring& name), gst_plugin_feature_set_name)
_WRAP_METHOD(guint get_rank() const, gst_plugin_feature_get_rank)
Modified: gstreamermm/trunk/gstreamer/src/registry.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/registry.hg (original)
+++ gstreamermm/trunk/gstreamer/src/registry.hg Thu Feb 28 21:58:30 2008
@@ -175,6 +175,13 @@
_WRAP_METHOD(void remove_feature(const Glib::RefPtr<PluginFeature>& feature), gst_registry_remove_feature)
_WRAP_METHOD(void add_feature(const Glib::RefPtr<PluginFeature>& feature), gst_registry_add_feature)
_WRAP_METHOD(static bool check_feature_version(const Glib::ustring& feature_name, guint min_major, guint min_minor, guint min_micro), gst_default_registry_check_feature_version)
+
+ _IGNORE(gst_registry_feature_filter,
+ gst_registry_plugin_filter,
+ gst_registry_xml_read_cache,
+ gst_registry_xml_write_cache,
+ gst_registry_binary_write_cache,
+ gst_registry_binary_read_cache)
};
} // 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 Feb 28 21:58:30 2008
@@ -8,6 +8,8 @@
_CONVERSION(`$1', `GST$1', ((GST$1)(__ARG3__)))
')dnl
+###############Gstreamermm Class Conversions######################
+
#Gst::Object
_CONVERSION(`GstObject*',`Glib::RefPtr<Gst::Object>',`Glib::wrap($3)')
_CONVERSION(`GstObject*',`Glib::RefPtr<const Gst::Object>',`Glib::wrap($3)')
@@ -79,7 +81,6 @@
_CONVERSION(`Glib::ListHandle< Glib::RefPtr<Plugin> >',`GList*',`($3).data()')
#PluginFeature
-_CONVERSION(`const TypeNameData&',`GstTypeNameData*',`($2)(&($3))')
_CONVERSION(`GstPluginFeature*',`Glib::RefPtr<PluginFeature>',`Glib::wrap($3)')
_CONVERSION(`const Glib::RefPtr<PluginFeature>&',`GstPluginFeature*',`Glib::unwrap($3)')
_CONVERSION(`Glib::ListHandle< Glib::RefPtr<PluginFeature> >',`GList*',`($3).data()')
@@ -97,25 +98,41 @@
#URIHandler
_CONVERSION(`const Glib::RefPtr<URIHandler>&',`GstURIHandler*',`Glib::unwrap($3)')
-#General Conversions
-_CONVERSION(`guint64',`ClockTime',`(ClockTime ($3))')
-_CONVERSION(`ClockTimeDiff',`GstClockTimeDiff',`GstClockTimeDiff ($3)')
-_CONVERSION(`const URIType',`const GstURIType',`(GstURIType($3))')
-_CONVERSION(`Format&',`GstFormat*',`(($2) &($3))')
+###################General Conversions############################
+
+#Basic General Conversions
_CONVERSION(`gint64&',`gint64*',`&($3)')
_CONVERSION(`bool&',`gboolean*',`(($2) &($3))')
_CONVERSION(`const guint&',`guint',`$3')
_CONVERSION(`const guint32&',`guint32',`$3')
-_CONVERSION(`const std::string&',`const guchar*',`(const guchar*) ($3.c_str())')
-_CONVERSION(`gchar*',`const Glib::ustring&',__GCHARP_TO_USTRING)
+
+#Basic Gstreamermm Conversions
+_CONVERSION(`guint64',`ClockTime',`(ClockTime ($3))')
+_CONVERSION(`ClockTimeDiff',`GstClockTimeDiff',`GstClockTimeDiff ($3)')
+_CONVERSION(`Format&',`GstFormat*',`(($2) &($3))')
+_CONVERSION(`const GstQueryType*',`const QueryType*',`(QueryType*)($3)')
+_CONVERSION(`const URIType',`const GstURIType',`(GstURIType($3))')
+
+#C++ Conversions
_CONVERSION(`const va_list&',`va_list',`const_cast<va_list&>($3)')
-_CONVERSION(`const xmlNodePtr&',`xmlNodePtr',`$3')
+
+#Glibmm Conversions
_CONVERSION(`GQuark',`Glib::QueryQuark',`Glib::QueryQuark($3)')
_CONVERSION(`const Glib::QueryQuark&',`GQuark',`$3')
-_CONVERSION(`const GstQueryType*',`const QueryType*',`(QueryType*)($3)')
-_CONVERSION(`gchar**',`Glib::StringArrayHandle',`Glib::StringArrayHandle($3)')
_CONVERSION(`Glib::StaticRecMutex&',`GStaticRecMutex*',`($3).gobj()')
+#List Conversions
+_CONVERSION(`gchar**',`Glib::StringArrayHandle',`Glib::StringArrayHandle($3)')
+
+#String Conversions
+_CONVERSION(`const std::string&',`const guchar*',`(const guchar*) ($3.c_str())')
+_CONVERSION(`gchar*',`const Glib::ustring&',__GCHARP_TO_USTRING)
+
+#Other Conversions
+_CONVERSION(`const xmlNodePtr&',`xmlNodePtr',`$3')
+
+#############################Enums####################################
+
_CONV_ENUM(Gst,AssocFlags)
_CONV_ENUM(Gst,BufferCopyFlags)
_CONV_ENUM(Gst,BufferFlag)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]