gnomemm r1341 - in gstreamermm/trunk: . gstreamer/src tools/extra_defs_gen tools/m4
- From: jaalburqu svn gnome org
- To: svn-commits-list gnome org
- Subject: gnomemm r1341 - in gstreamermm/trunk: . gstreamer/src tools/extra_defs_gen tools/m4
- Date: Mon, 11 Feb 2008 00:38:59 +0000 (GMT)
Author: jaalburqu
Date: Mon Feb 11 00:38:59 2008
New Revision: 1341
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1341&view=rev
Log:
2008-02-10 Josà Alburquerque <jaalburqu svn gnome org>
* gstreamer/src/bus.hg: Moved SlotWatch typdef to top of Bus class
definition; Used Glib::PRIORITY_DEFAULT instead of G_PRIORITY_DEFAULT
* gstreamer/src/childproxy.hg: Repaired wraps of static method
child_added() and child_removed() and signals "child-added" and
"child-removed"
* gstreamer/src/gst_signals.defs: Regenerated with generate_extra_defs
tool to include missing signals and properties
* tools/extra_defs_gen/generate_defs_gst.cc: Added all types so that
signal and property generation includes all methods possible
* tools/m4/convert_gst.m4: Included def from GstObject* to const
Glib::RefPtr<>&
Modified:
gstreamermm/trunk/ChangeLog
gstreamermm/trunk/gstreamer/src/bus.hg
gstreamermm/trunk/gstreamer/src/childproxy.hg
gstreamermm/trunk/gstreamer/src/gst_signals.defs
gstreamermm/trunk/tools/extra_defs_gen/generate_defs_gst.cc
gstreamermm/trunk/tools/m4/convert_gst.m4
Modified: gstreamermm/trunk/gstreamer/src/bus.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/bus.hg (original)
+++ gstreamermm/trunk/gstreamer/src/bus.hg Mon Feb 11 00:38:59 2008
@@ -39,6 +39,12 @@
_CTOR_DEFAULT()
public:
+ /** For example,
+ * bool on_bus_watch(const Glib::RefPtr<Bus>& bus, const
+ * Glib::RefPtr<Message>& message);
+ */
+ typedef sigc::slot< bool, const Glib::RefPtr<Bus>&, const Glib::RefPtr<Message>& > SlotWatch;
+
static Glib::RefPtr<Bus> create();
_WRAP_METHOD(bool post(const Glib::RefPtr<Message>& message), gst_bus_post)
_WRAP_METHOD(bool have_pending() const, gst_bus_have_pending)
@@ -51,18 +57,14 @@
_WRAP_METHOD(void set_flushing(bool flushing = true), gst_bus_set_flushing)
- /** For example,
- * bool on_bus_watch(const Glib::RefPtr<Bus>& bus, const Glib::RefPtr<Message>& message);
- */
- typedef sigc::slot<bool, const Glib::RefPtr<Bus>&, const Glib::RefPtr<Message>& > SlotWatch;
- guint add_watch(const SlotWatch& slot, int priority = G_PRIORITY_DEFAULT);
+ guint add_watch(const SlotWatch& slot, int priority = Glib::PRIORITY_DEFAULT);
bool remove_watch(guint watch_id);
_IGNORE(gst_bus_add_watch, gst_bus_add_watch_full)
_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 = G_PRIORITY_DEFAULT), gst_bus_add_signal_watch_full)
+ _WRAP_METHOD(void add_signal_watch(int priority = Glib::PRIORITY_DEFAULT), gst_bus_add_signal_watch_full)
_WRAP_METHOD(void remove_signal_watch(), gst_bus_remove_signal_watch)
_IGNORE(gst_bus_add_signal_watch)
Modified: gstreamermm/trunk/gstreamer/src/childproxy.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/childproxy.hg (original)
+++ gstreamermm/trunk/gstreamer/src/childproxy.hg Mon Feb 11 00:38:59 2008
@@ -58,11 +58,11 @@
_WRAP_METHOD(static void get_valist(const Glib::RefPtr<Gst::Object>& object, const Glib::ustring& first_prop_name, const va_list& var_args), gst_child_proxy_get_valist)
_WRAP_METHOD(static void set_property(const Glib::RefPtr<Gst::Object>& object, const Glib::ustring& name, const Glib::ValueBase& value), gst_child_proxy_set_property)
_WRAP_METHOD(static void set_valist(const Glib::RefPtr<Gst::Object>& object, const Glib::ustring& first_prop_name, const va_list& var_args), gst_child_proxy_set_valist)
- _WRAP_METHOD(static void child_added(const Glib::RefPtr<Gst::Object>& object, const Glib::RefPtr<Gst::Object>& child), gst_child_proxy_added)
- _WRAP_METHOD(static void child_removed(const Glib::RefPtr<Gst::Object>& object, const Glib::RefPtr<Gst::Object>& child), gst_child_proxy_removed)
+ _WRAP_METHOD(static void child_added(const Glib::RefPtr<Gst::Object>& object, const Glib::RefPtr<Gst::Object>& child), gst_child_proxy_child_added)
+ _WRAP_METHOD(static void child_removed(const Glib::RefPtr<Gst::Object>& object, const Glib::RefPtr<Gst::Object>& child), gst_child_proxy_child_removed)
- _WRAP_SIGNAL(void child_added(const Glib::RefPtr<Gst::Object>& object), "child_added")
- _WRAP_SIGNAL(void child_removed(const Glib::RefPtr<Gst::Object>& object), "child_removed")
+ _WRAP_SIGNAL(void child_added(const Glib::RefPtr<Gst::Object>& object), "child-added")
+ _WRAP_SIGNAL(void child_removed(const Glib::RefPtr<Gst::Object>& object), "child-removed")
_IGNORE(gst_child_proxy_get, gst_child_proxy_set)
};
Modified: gstreamermm/trunk/gstreamer/src/gst_signals.defs
==============================================================================
--- gstreamermm/trunk/gstreamer/src/gst_signals.defs (original)
+++ gstreamermm/trunk/gstreamer/src/gst_signals.defs Mon Feb 11 00:38:59 2008
@@ -65,6 +65,30 @@
(construct-only #f)
)
+;; From GstBuffer
+
+;; From GstCaps
+
+;; From GstChildProxy
+
+(define-signal child-added
+ (of-object "GstChildProxy")
+ (return-type "void")
+ (when "first")
+ (parameters
+ '("GstObject*" "p0")
+ )
+)
+
+(define-signal child-removed
+ (of-object "GstChildProxy")
+ (return-type "void")
+ (when "first")
+ (parameters
+ '("GstObject*" "p0")
+ )
+)
+
;; From GstClock
(define-property name
@@ -147,6 +171,107 @@
(construct-only #f)
)
+;; From GstElementFactory
+
+(define-property name
+ (of-object "GstElementFactory")
+ (prop-type "GParamString")
+ (docs "The name of the object")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+;; From GstEvent
+
+;; From GstFormat
+
+;; From GstGError
+
+;; From GstGhostPad
+
+(define-property name
+ (of-object "GstGhostPad")
+ (prop-type "GParamString")
+ (docs "The name of the object")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property caps
+ (of-object "GstGhostPad")
+ (prop-type "GParamBoxed")
+ (docs "The capabilities of the pad")
+ (readable #t)
+ (writable #f)
+ (construct-only #f)
+)
+
+(define-property direction
+ (of-object "GstGhostPad")
+ (prop-type "GParamEnum")
+ (docs "The direction of the pad")
+ (readable #t)
+ (writable #t)
+ (construct-only #t)
+)
+
+(define-property template
+ (of-object "GstGhostPad")
+ (prop-type "GParamObject")
+ (docs "The GstPadTemplate of this pad")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+;; From GstImplementsInterface
+
+;; From GstIndex
+
+(define-signal entry-added
+ (of-object "GstIndex")
+ (return-type "void")
+ (when "last")
+ (parameters
+ '("GstIndexEntry*" "p0")
+ )
+)
+
+(define-property name
+ (of-object "GstIndex")
+ (prop-type "GParamString")
+ (docs "The name of the object")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property resolver
+ (of-object "GstIndex")
+ (prop-type "GParamEnum")
+ (docs "Select a predefined object to string mapper")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+;; From GstIndexFactory
+
+(define-property name
+ (of-object "GstIndexFactory")
+ (prop-type "GParamString")
+ (docs "The name of the object")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+;; From GstMessage
+
+;; From GstMiniObject
+
;; From GstObject
(define-signal parent-set
@@ -324,6 +449,63 @@
(construct-only #f)
)
+;; From GstPlugin
+
+(define-property name
+ (of-object "GstPlugin")
+ (prop-type "GParamString")
+ (docs "The name of the object")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+;; From GstPluginFeature
+
+(define-property name
+ (of-object "GstPluginFeature")
+ (prop-type "GParamString")
+ (docs "The name of the object")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+;; From GstQuery
+
+;; From GstRegistry
+
+(define-signal plugin-added
+ (of-object "GstRegistry")
+ (return-type "void")
+ (when "last")
+ (parameters
+ '("gpointer" "p0")
+ )
+)
+
+(define-signal feature-added
+ (of-object "GstRegistry")
+ (return-type "void")
+ (when "last")
+ (parameters
+ '("gpointer" "p0")
+ )
+)
+
+(define-property name
+ (of-object "GstRegistry")
+ (prop-type "GParamString")
+ (docs "The name of the object")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+;; From GstSegment
+
+;; From GstStructure
+
;; From GstSystemClock
(define-property name
@@ -371,6 +553,36 @@
(construct-only #f)
)
+;; From GstTagList
+
+;; From GstTagSetter
+
+;; From GstTask
+
+(define-property name
+ (of-object "GstTask")
+ (prop-type "GParamString")
+ (docs "The name of the object")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+;; From GstTypeFind
+
+;; From GstTypeFindFactory
+
+(define-property name
+ (of-object "GstTypeFindFactory")
+ (prop-type "GParamString")
+ (docs "The name of the object")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+;; From GstURIHandler
+
;; From GstXML
(define-signal object-loaded
Modified: gstreamermm/trunk/tools/extra_defs_gen/generate_defs_gst.cc
==============================================================================
--- gstreamermm/trunk/tools/extra_defs_gen/generate_defs_gst.cc (original)
+++ gstreamermm/trunk/tools/extra_defs_gen/generate_defs_gst.cc Mon Feb 11 00:38:59 2008
@@ -27,13 +27,38 @@
gst_init (&argc, &argv);
std::cout << get_defs(GST_TYPE_BUS)
<< get_defs(GST_TYPE_BIN)
+ << get_defs(GST_TYPE_BUFFER)
+ << get_defs(GST_TYPE_CAPS)
+ << get_defs(GST_TYPE_CHILD_PROXY)
<< get_defs(GST_TYPE_CLOCK)
<< get_defs(GST_TYPE_ELEMENT)
+ << get_defs(GST_TYPE_ELEMENT_FACTORY)
+ << get_defs(GST_TYPE_EVENT)
+ << get_defs(GST_TYPE_FORMAT)
+ << get_defs(GST_TYPE_G_ERROR)
+ << get_defs(GST_TYPE_GHOST_PAD)
+ << get_defs(GST_TYPE_IMPLEMENTS_INTERFACE)
+ << get_defs(GST_TYPE_INDEX)
+ << get_defs(GST_TYPE_INDEX_FACTORY)
+ << get_defs(GST_TYPE_MESSAGE)
+ << get_defs(GST_TYPE_MINI_OBJECT)
<< get_defs(GST_TYPE_OBJECT)
<< get_defs(GST_TYPE_PAD)
<< get_defs(GST_TYPE_PAD_TEMPLATE)
<< get_defs(GST_TYPE_PIPELINE)
+ << get_defs(GST_TYPE_PLUGIN)
+ << get_defs(GST_TYPE_PLUGIN_FEATURE)
+ << get_defs(GST_TYPE_QUERY)
+ << get_defs(GST_TYPE_REGISTRY)
+ << get_defs(GST_TYPE_SEGMENT)
+ << get_defs(GST_TYPE_STRUCTURE)
<< get_defs(GST_TYPE_SYSTEM_CLOCK)
+ << get_defs(GST_TYPE_TAG_LIST)
+ << get_defs(GST_TYPE_TAG_SETTER)
+ << get_defs(GST_TYPE_TASK)
+ << get_defs(GST_TYPE_TYPE_FIND)
+ << get_defs(GST_TYPE_TYPE_FIND_FACTORY)
+ << get_defs(GST_TYPE_URI_HANDLER)
<< get_defs(GST_TYPE_XML);
return 0;
}
Modified: gstreamermm/trunk/tools/m4/convert_gst.m4
==============================================================================
--- gstreamermm/trunk/tools/m4/convert_gst.m4 (original)
+++ gstreamermm/trunk/tools/m4/convert_gst.m4 Mon Feb 11 00:38:59 2008
@@ -11,6 +11,7 @@
_CONVERSION(`GstObject*',`Glib::RefPtr<Gst::Object>',`Glib::wrap($3)')
_CONVERSION(`GstObject*',`Glib::RefPtr<const Gst::Object>',`Glib::wrap($3)')
_CONVERSION(`const Glib::RefPtr<Gst::Object>&',`GstObject*',`Glib::unwrap($3)')
+_CONVERSION(`GstObject*',`const Glib::RefPtr<Gst::Object>&',`Glib::wrap($3)')
#_CONVERSION(`Glib::RefPtr<Object>&',`GstObject*', `Glib::unwrap($3)')
_CONVERSION(`State&',`GstState*',`((GstState*) (&($3)))')
@@ -57,6 +58,8 @@
_CONVERSION(`const va_list&',`va_list',`const_cast<va_list&>($3)')
_CONVERSION(`GstBus*',`Glib::RefPtr<Bus>',`Glib::wrap($3)')
+_CONVERSION(`TypeNameData&',`GstTypeNameData*',`(GstTypeName*)(&$3)')
+
_CONVERSION(`Format&',`GstFormat*',`(($2) &($3))')
_CONVERSION(`const gint64&',`gint64',`$3')
_CONVERSION(`gint64&',`gint64*',`&($3)')
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
