GNOME.org
 

[gstreamermm] Wrapped GstObject's deep_notify signal.

commit ddd5c71e12e169b1f42ed8f90d8d8a0e553c8210
Author: José Alburquerque <jaalburqu svn gnome org>
Date:   Tue May 5 17:50:58 2009 -0400

    Wrapped GstObject's deep_notify signal.
---
 ChangeLog                            |   12 +++
 gstreamer/src/gst_signals.defs       |   96 +++++++++++++++++++++++++-
 gstreamer/src/gst_signals.defs.patch |   15 +++-
 gstreamer/src/mixer.hg               |    2 +
 gstreamer/src/object.hg              |    7 ++-
 tools/m4/convert_gst.m4              |  129 +++++++++++++++++-----------------
 6 files changed, 192 insertions(+), 69 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5206803..f8f24c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2009-05-05  José Alburquerque  <jaalburqu svn gnome org>
 
+	* gstreamer/src/object.hg: Wrapped deep_notify signal.
+	* gstreamer/src/gst_signals.defs.patch: Modified so that when patch is
+	applied to signal defs file, GstObject's deep notify signal has
+	correct parameter (the GParamSpec one in particular).
+	* gstreamer/src/gst_signals.defs: Regenerated.
+
+	* gstreamer/src/mixer.hg: Added TODO.
+	* tools/m4/convert_gst.m4: Removed un-needed () around $3 occurrences
+	in conversions.
+
+2009-05-05  José Alburquerque  <jaalburqu svn gnome org>
+
 	* gstreamer/gstreamermm.h:
 	* gstreamer/src/Makefile_list_of_hg.am_fragment:
 	* gstreamer/src/ringbuffer.ccg:
diff --git a/gstreamer/src/gst_signals.defs b/gstreamer/src/gst_signals.defs
index d48ed55..2d02fcb 100644
--- a/gstreamer/src/gst_signals.defs
+++ b/gstreamer/src/gst_signals.defs
@@ -315,7 +315,7 @@
   (when "first")
   (parameters
     '("GstObject*" "p0")
-    '("GParam" "p1")
+    '("GParamSpec*" "p1")
   )
 )
 
@@ -2378,6 +2378,15 @@
   (construct-only #f)
 )
 
+(define-property alloc-pad
+  (of-object "GstTee")
+  (prop-type "GParamObject")
+  (docs "The pad used for gst_pad_alloc_buffer")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 ;; From GstTypeFindElement
 
 (define-signal have-type
@@ -3408,6 +3417,46 @@
 
 ;; From GstMixer
 
+(define-signal record-toggled
+  (of-object "GstMixer")
+  (return-type "void")
+  (when "last")
+  (parameters
+    '("GstMixerTrack*" "p0")
+    '("gboolean" "p1")
+  )
+)
+
+(define-signal mute-toggled
+  (of-object "GstMixer")
+  (return-type "void")
+  (when "last")
+  (parameters
+    '("GstMixerTrack*" "p0")
+    '("gboolean" "p1")
+  )
+)
+
+(define-signal volume-changed
+  (of-object "GstMixer")
+  (return-type "void")
+  (when "last")
+  (parameters
+    '("GstMixerTrack*" "p0")
+    '("gpointer" "p1")
+  )
+)
+
+(define-signal option-changed
+  (of-object "GstMixer")
+  (return-type "void")
+  (when "last")
+  (parameters
+    '("GstMixerOptions*" "p0")
+    '("const-gchar*" "p1")
+  )
+)
+
 ;; From GstMixerTrack
 
 (define-property label
@@ -5732,6 +5781,24 @@
   (construct-only #f)
 )
 
+(define-property handle-read
+  (of-object "GstMultiFdSink")
+  (prop-type "GParamBoolean")
+  (docs "Handle client reads and discard the data")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property resend-streamheader
+  (of-object "GstMultiFdSink")
+  (prop-type "GParamBoolean")
+  (docs "Resend the streamheader if it changes in the caps")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 ;; From GstOggDemux
 
 (define-property name
@@ -6241,6 +6308,15 @@
   (construct-only #f)
 )
 
+(define-property text-sink
+  (of-object "GstPlayBin2")
+  (prop-type "GParamObject")
+  (docs "the text output element to use (NULL = default textoverlay)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 (define-property volume
   (of-object "GstPlayBin2")
   (prop-type "GParamDouble")
@@ -6834,6 +6910,24 @@
   (construct-only #f)
 )
 
+(define-property handle-read
+  (of-object "GstTCPServerSink")
+  (prop-type "GParamBoolean")
+  (docs "Handle client reads and discard the data")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property resend-streamheader
+  (of-object "GstTCPServerSink")
+  (prop-type "GParamBoolean")
+  (docs "Resend the streamheader if it changes in the caps")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 (define-property host
   (of-object "GstTCPServerSink")
   (prop-type "GParamString")
diff --git a/gstreamer/src/gst_signals.defs.patch b/gstreamer/src/gst_signals.defs.patch
index a80f805..dff61b2 100644
--- a/gstreamer/src/gst_signals.defs.patch
+++ b/gstreamer/src/gst_signals.defs.patch
@@ -1,5 +1,5 @@
---- gst_signals.defs	2009-03-23 16:36:31.000000000 -0400
-+++ gst_signals.defs.new	2009-03-23 16:40:30.000000000 -0400
+--- gst_signals.defs	2009-05-05 17:05:00.000000000 -0400
++++ gst_signals.defs.new	2009-05-05 17:06:01.000000000 -0400
 @@ -1,3 +1,5 @@
 +;; Apply gst_signals.defs.patch after regenerating.
 +
@@ -51,6 +51,15 @@
    )
  )
  
+@@ -313,7 +315,7 @@
+   (when "first")
+   (parameters
+     '("GstObject*" "p0")
+-    '("GParam" "p1")
++    '("GParamSpec*" "p1")
+   )
+ )
+ 
 @@ -357,7 +359,7 @@
    (return-type "gboolean")
    (when "last")
@@ -123,7 +132,7 @@
    )
  )
  
-@@ -6043,7 +6045,7 @@
+@@ -6110,7 +6112,7 @@
  
  (define-signal convert-frame
    (of-object "GstPlayBin2")
diff --git a/gstreamer/src/mixer.hg b/gstreamer/src/mixer.hg
index 9726f22..490b7bd 100644
--- a/gstreamer/src/mixer.hg
+++ b/gstreamer/src/mixer.hg
@@ -81,6 +81,8 @@ public:
   _WRAP_METHOD(static void message_parse_options_list_changed(GstMessage *message, GstMixerOptions **options), gst_mixer_message_parse_options_list_changed)
   */
 
+  //TODO: Wrap signals if necessary.
+
 #ifdef GLIBMM_VFUNCS_ENABLED
   virtual Glib::ArrayHandle<int> get_volume_vfunc(const Glib::RefPtr<const Gst::MixerTrack>& track) const;
   virtual Glib::ListHandle< Glib::RefPtr<Gst::MixerTrack> > list_tracks_vfunc() const;
diff --git a/gstreamer/src/object.hg b/gstreamer/src/object.hg
index 9477186..161ee0f 100644
--- a/gstreamer/src/object.hg
+++ b/gstreamer/src/object.hg
@@ -98,7 +98,12 @@ public:
   _WRAP_METHOD(void restore(xmlpp::Node* self), gst_object_restore_thyself)
   _WRAP_METHOD(Glib::ustring get_path_string(), gst_object_get_path_string)
 
-  //TODO: Is this useful? (Note that the .def needs to be fixed by hand): _WRAP_SIGNAL(void deep_notify(Glib::RefPtr<Object> prop_object, GParamSpec* prop), "deep-notify")
+#m4 _CONVERSION(`GstObject*', `const Glib::RefPtr<Object>&', `Glib::wrap($3, true)')
+  /** The deep notify signal is used to be notified of property changes. It is
+   * typically attached to the toplevel bin to receive notifications from all
+   * the elements contained in that bin.
+   */
+  _WRAP_SIGNAL(void deep_notify(const Glib::RefPtr<Object>& prop_object, GParamSpec* prop), "deep-notify")
 
   /** Trigered whenever a new object is saved to XML. You can connect to this
    * signal to insert custom XML tags into the core XML.
diff --git a/tools/m4/convert_gst.m4 b/tools/m4/convert_gst.m4
index d53c212..28f35d7 100644
--- a/tools/m4/convert_gst.m4
+++ b/tools/m4/convert_gst.m4
@@ -35,51 +35,52 @@ _CONV_ENUM(Gst,URIType)
 #Gst::Object
 _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*',`($3)->gobj()')
-_CONVERSION(`Glib::RefPtr<Gst::Object>',`GstObject*',`($3)->gobj()')
-_CONVERSION(`const Glib::RefPtr<const Gst::Object>&',`GstObject*',`const_cast<GstObject*>(($3)->gobj())')
+_CONVERSION(`const Glib::RefPtr<Gst::Object>&',`GstObject*',`$3->gobj()')
+_CONVERSION(`Glib::RefPtr<Gst::Object>',`GstObject*',`$3->gobj()')
+_CONVERSION(`const Glib::RefPtr<const Gst::Object>&',`GstObject*',`const_cast<GstObject*>($3->gobj())')
+_CONVERSION(`const Glib::RefPtr<Object>&', `GstObject*', `$3->gobj()')
 
 #Buffer
 _CONVERSION(`GstBuffer*',`Glib::RefPtr<Gst::Buffer>',`Gst::wrap($3)')
-_CONVERSION(`const Glib::RefPtr<Gst::Buffer>&',`GstBuffer*', `($3)->gobj()')
-_CONVERSION(`const Glib::RefPtr<const Gst::Buffer>&',`GstBuffer*', `const_cast<GstBuffer*>(($3)->gobj())')
-_CONVERSION(`const Glib::RefPtr<Gst::Buffer>&',`const GstBuffer*', `($3)->gobj()')
-_CONVERSION(`Glib::RefPtr<Gst::Buffer>',`GstBuffer*', `($3)->gobj()')
+_CONVERSION(`const Glib::RefPtr<Gst::Buffer>&',`GstBuffer*', `$3->gobj()')
+_CONVERSION(`const Glib::RefPtr<const Gst::Buffer>&',`GstBuffer*', `const_cast<GstBuffer*>($3->gobj())')
+_CONVERSION(`const Glib::RefPtr<Gst::Buffer>&',`const GstBuffer*', `$3->gobj()')
+_CONVERSION(`Glib::RefPtr<Gst::Buffer>',`GstBuffer*', `$3->gobj()')
 
 #Bus
-_CONVERSION(`const Glib::RefPtr<Gst::Bus>&',`GstBus*', `($3)->gobj()')
+_CONVERSION(`const Glib::RefPtr<Gst::Bus>&',`GstBus*', `$3->gobj()')
 _CONVERSION(`GstBus*',`Glib::RefPtr<Gst::Bus>',`Glib::wrap($3)')
 
 #Caps
 _CONVERSION(`GstCaps*',`Glib::RefPtr<Gst::Caps>',`Glib::wrap($3)')
-_CONVERSION(`Glib::RefPtr<Gst::Caps>',`GstCaps*',`($3)->gobj()')
-_CONVERSION(`const Glib::RefPtr<Gst::Caps>&',`GstCaps*', `($3)->gobj()')
-_CONVERSION(`const Glib::RefPtr<const Gst::Caps>&',`GstCaps*', `const_cast<$2>(($3)->gobj())')
-_CONVERSION(`const Glib::RefPtr<Gst::Caps>&',`const GstCaps*', `($3)->gobj()')
-_CONVERSION(`const Glib::RefPtr<const Gst::Caps>&',`const GstCaps*', `($3)->gobj()')
+_CONVERSION(`Glib::RefPtr<Gst::Caps>',`GstCaps*',`$3->gobj()')
+_CONVERSION(`const Glib::RefPtr<Gst::Caps>&',`GstCaps*', `$3->gobj()')
+_CONVERSION(`const Glib::RefPtr<const Gst::Caps>&',`GstCaps*', `const_cast<$2>($3->gobj())')
+_CONVERSION(`const Glib::RefPtr<Gst::Caps>&',`const GstCaps*', `$3->gobj()')
+_CONVERSION(`const Glib::RefPtr<const Gst::Caps>&',`const GstCaps*', `$3->gobj()')
 
 #Clock
 _CONVERSION(`GstClock*',`Glib::RefPtr<Gst::Clock>',`Glib::wrap($3)')
 _CONVERSION(`GstClock*',`Glib::RefPtr<const Gst::Clock>',`Glib::wrap($3)')
-_CONVERSION(`const Glib::RefPtr<Gst::Clock>&',`GstClock*', `($3)->gobj()')
-_CONVERSION(`const Clock&',`GstClock*',`((GstClock*)(&($3)))')
-_CONVERSION(`Glib::RefPtr<Gst::Clock>',`GstClock*', `($3)->gobj()')
+_CONVERSION(`const Glib::RefPtr<Gst::Clock>&',`GstClock*', `$3->gobj()')
+_CONVERSION(`const Clock&',`GstClock*',`((GstClock*)(&$3))')
+_CONVERSION(`Glib::RefPtr<Gst::Clock>',`GstClock*', `$3->gobj()')
 
 #ClockID
 _CONVERSION(`GstClockID',`Glib::RefPtr<Gst::ClockID>',`Glib::wrap((GstClockEntry*)($3))')
-_CONVERSION(`const Glib::RefPtr<Gst::ClockID>&',`GstClockEntry*',`($3)->gobj()')
+_CONVERSION(`const Glib::RefPtr<Gst::ClockID>&',`GstClockEntry*',`$3->gobj()')
 
 #ColorBalanceChannel
-_CONVERSION(`const Glib::RefPtr<ColorBalanceChannel>&',`GstColorBalanceChannel*',`($3)->gobj()')
-_CONVERSION(`const Glib::RefPtr<const ColorBalanceChannel>&',`GstColorBalanceChannel*',`const_cast<GstColorBalanceChannel*>(($3)->gobj())')
+_CONVERSION(`const Glib::RefPtr<ColorBalanceChannel>&',`GstColorBalanceChannel*',`$3->gobj()')
+_CONVERSION(`const Glib::RefPtr<const ColorBalanceChannel>&',`GstColorBalanceChannel*',`const_cast<GstColorBalanceChannel*>($3->gobj())')
 
 #Element
-_CONVERSION(`Glib::RefPtr<Gst::Element>',`GstElement*', `($3)->gobj()')
+_CONVERSION(`Glib::RefPtr<Gst::Element>',`GstElement*', `$3->gobj()')
 _CONVERSION(`GstElement*',`Glib::RefPtr<Gst::Element>',`Glib::wrap($3)')
 _CONVERSION(`GstElement*',`Glib::RefPtr<const Gst::Element>',`Glib::wrap($3)')
-_CONVERSION(`const Glib::RefPtr<Gst::Element>&',`GstElement*', `($3)->gobj()')
-_CONVERSION(`const Glib::RefPtr<const Gst::Element>&',`GstElement*', `const_cast<GstElement*>(($3)->gobj())')
-_CONVERSION(`State&',`GstState*',`((GstState*)(&($3)))')
+_CONVERSION(`const Glib::RefPtr<Gst::Element>&',`GstElement*', `$3->gobj()')
+_CONVERSION(`const Glib::RefPtr<const Gst::Element>&',`GstElement*', `const_cast<GstElement*>($3->gobj())')
+_CONVERSION(`State&',`GstState*',`(GstState*)(&$3)')
 
 #ElementFactory
 _CONVERSION(`GstElementFactory*',`Glib::RefPtr<Gst::ElementFactory>',`Glib::wrap($3)')
@@ -90,8 +91,8 @@ _CONVERSION(`const Glib::RefPtr<Gst::Event>&',`GstEvent*', `Gst::unwrap($3)')
 
 #Index
 _CONVERSION(`GstIndex*',`Glib::RefPtr<Gst::Index>',`Glib::wrap($3)')
-_CONVERSION(`const Glib::RefPtr<Gst::Index>&',`GstIndex*',`($3)->gobj()')
-_CONVERSION(`Glib::RefPtr<Gst::Index>',`GstIndex*',`($3)->gobj()')
+_CONVERSION(`const Glib::RefPtr<Gst::Index>&',`GstIndex*',`$3->gobj()')
+_CONVERSION(`Glib::RefPtr<Gst::Index>',`GstIndex*',`$3->gobj()')
 
 #IndexFactory
 _CONVERSION(`GstIndexFactory*',`Glib::RefPtr<Gst::IndexFactory>',`Glib::wrap($3)')
@@ -106,31 +107,31 @@ _CONVERSION(`GstIterator*',`Gst::IteratorBasic<const Gst::QueryTypeDefinition>',
 #Message
 _CONVERSION(`GstMessage*',`Glib::RefPtr<Gst::Message>',`Gst::Message::wrap($3)')
 _CONVERSION(`GstMessage*',`Glib::RefPtr<const Gst::Message>',`Gst::Message::wrap($3)')
-_CONVERSION(`const Glib::RefPtr<Gst::Message>&',`GstMessage*', `($3)->gobj()')
+_CONVERSION(`const Glib::RefPtr<Gst::Message>&',`GstMessage*', `$3->gobj()')
 
 #Mixer
-_CONVERSION(`const Glib::RefPtr<Gst::MixerOptions>&',`GstMixerOptions*', `($3)->gobj()')
-_CONVERSION(`const Glib::RefPtr<const Gst::MixerOptions>&',`GstMixerOptions*', `const_cast<$2>(($3)->gobj())')
-_CONVERSION(`const Glib::RefPtr<Gst::MixerTrack>&',`GstMixerTrack*', `($3)->gobj()')
+_CONVERSION(`const Glib::RefPtr<Gst::MixerOptions>&',`GstMixerOptions*', `$3->gobj()')
+_CONVERSION(`const Glib::RefPtr<const Gst::MixerOptions>&',`GstMixerOptions*', `const_cast<$2>($3->gobj())')
+_CONVERSION(`const Glib::RefPtr<Gst::MixerTrack>&',`GstMixerTrack*', `$3->gobj()')
 
 #Pad
 _CONVERSION(`GstPad*',`Glib::RefPtr<Gst::Pad>',`Glib::wrap($3)')
 _CONVERSION(`GstPad*',`Glib::RefPtr<const Gst::Pad>',`Glib::wrap($3)')
-_CONVERSION(`Glib::RefPtr<Gst::Pad>',`GstPad*', `($3)->gobj()')
-_CONVERSION(`const Glib::RefPtr<Gst::Pad>&',`GstPad*', `($3)->gobj()')
-_CONVERSION(`const Glib::RefPtr<const Gst::Pad>&',`GstPad*',`const_cast<GstPad*>(($3)->gobj())')
+_CONVERSION(`Glib::RefPtr<Gst::Pad>',`GstPad*', `$3->gobj()')
+_CONVERSION(`const Glib::RefPtr<Gst::Pad>&',`GstPad*', `$3->gobj()')
+_CONVERSION(`const Glib::RefPtr<const Gst::Pad>&',`GstPad*',`const_cast<GstPad*>($3->gobj())')
 
 #PadTemplate
 _CONVERSION(`GstPadTemplate*',`Glib::RefPtr<Gst::PadTemplate>', `Glib::wrap($3)')
-_CONVERSION(`const Glib::RefPtr<const Gst::PadTemplate>&',`GstPadTemplate*',`const_cast<GstPadTemplate*>(($3)->gobj())')
+_CONVERSION(`const Glib::RefPtr<const Gst::PadTemplate>&',`GstPadTemplate*',`const_cast<GstPadTemplate*>($3->gobj())')
 
 #Plugin
-_CONVERSION(`const Glib::RefPtr<Gst::Plugin>&',`GstPlugin*',`($3)->gobj()')
+_CONVERSION(`const Glib::RefPtr<Gst::Plugin>&',`GstPlugin*',`$3->gobj()')
 _CONVERSION(`GstPlugin*',`Glib::RefPtr<Gst::Plugin>',`Glib::wrap($3)')
 
 #PluginFeature
 _CONVERSION(`GstPluginFeature*',`Glib::RefPtr<Gst::PluginFeature>',`Glib::wrap($3)')
-_CONVERSION(`const Glib::RefPtr<Gst::PluginFeature>&',`GstPluginFeature*',`($3)->gobj()')
+_CONVERSION(`const Glib::RefPtr<Gst::PluginFeature>&',`GstPluginFeature*',`$3->gobj()')
 
 #Query
 _CONVERSION(`const Glib::RefPtr<Gst::Query>&',`GstQuery*', `Gst::unwrap($3)')
@@ -139,58 +140,58 @@ _CONVERSION(`const Glib::RefPtr<Gst::Query>&',`GstQuery*', `Gst::unwrap($3)')
 _CONVERSION(`GstRegistry*',`Glib::RefPtr<Gst::Registry>', `Glib::wrap($3)')
 
 #Structure
-_CONVERSION(`Gst::Structure&',`GstStructure*',`($3).gobj()')
+_CONVERSION(`Gst::Structure&',`GstStructure*',`$3.gobj()')
 
 #TagList
-_CONVERSION(`const Gst::TagList&',`const GstTagList*',`(($3).gobj())')
+_CONVERSION(`const Gst::TagList&',`const GstTagList*',`$3.gobj()')
 _CONVERSION(`GstTagList*',`Gst::TagList',`Glib::wrap($3, 0)')
-_CONVERSION(`Gst::TagList&',`GstTagList*',`($3).gobj()')
-_CONVERSION(`Gst::TagList',`GstTagList*',`($3).gobj()')
+_CONVERSION(`Gst::TagList&',`GstTagList*',`$3.gobj()')
+_CONVERSION(`Gst::TagList',`GstTagList*',`$3.gobj()')
 
 #TypeFind
-_CONVERSION(`Gst::TypeFind&',`GstTypeFind*',`($3).gobj()')
+_CONVERSION(`Gst::TypeFind&',`GstTypeFind*',`$3.gobj()')
 
 ############### gstreamermm Interface Conversions ######################
 
 #TunerChannel
 _CONVERSION(`GstTunerChannel*',`Glib::RefPtr<Gst::TunerChannel>', `Glib::wrap($3)')
 _CONVERSION(`GstTunerChannel*',`Glib::RefPtr<const Gst::TunerChannel>', `Glib::wrap($3)')
-_CONVERSION(`const Glib::RefPtr<Gst::TunerChannel>&',`GstTunerChannel*', `($3)->gobj()')
-_CONVERSION(`const Glib::RefPtr<const Gst::TunerChannel>&',`GstTunerChannel*', `const_cast<GstTunerChannel*>(($3)->gobj())')
-_CONVERSION(`Glib::RefPtr<Gst::TunerChannel>', `GstTunerChannel*', `($3)->gobj()')
+_CONVERSION(`const Glib::RefPtr<Gst::TunerChannel>&',`GstTunerChannel*', `$3->gobj()')
+_CONVERSION(`const Glib::RefPtr<const Gst::TunerChannel>&',`GstTunerChannel*', `const_cast<GstTunerChannel*>($3->gobj())')
+_CONVERSION(`Glib::RefPtr<Gst::TunerChannel>', `GstTunerChannel*', `$3->gobj()')
 
 #TunerNorm
 _CONVERSION(`GstTunerNorm*',`Glib::RefPtr<Gst::TunerNorm>', `Glib::wrap($3)')
 _CONVERSION(`GstTunerNorm*',`Glib::RefPtr<const Gst::TunerNorm>', `Glib::wrap($3)')
-_CONVERSION(`const Glib::RefPtr<Gst::TunerNorm>&',`GstTunerNorm*', `($3)->gobj()')
-_CONVERSION(`const Glib::RefPtr<const Gst::TunerNorm>&',`GstTunerNorm*', `const_cast<GstTunerNorm*>(($3)->gobj())')
-_CONVERSION(`Glib::RefPtr<Gst::TunerNorm>', `GstTunerNorm*', `($3)->gobj()')
+_CONVERSION(`const Glib::RefPtr<Gst::TunerNorm>&',`GstTunerNorm*', `$3->gobj()')
+_CONVERSION(`const Glib::RefPtr<const Gst::TunerNorm>&',`GstTunerNorm*', `const_cast<GstTunerNorm*>($3->gobj())')
+_CONVERSION(`Glib::RefPtr<Gst::TunerNorm>', `GstTunerNorm*', `$3->gobj()')
 
 #URIHandler
-_CONVERSION(`const Glib::RefPtr<Gst::URIHandler>&',`GstURIHandler*',`($3)->gobj()')
+_CONVERSION(`const Glib::RefPtr<Gst::URIHandler>&',`GstURIHandler*',`$3->gobj()')
 
 ###################General Conversions############################
 
 #Basic General Conversions
-_CONVERSION(`gint64&',`gint64*',`&($3)')
-_CONVERSION(`guint64&',`guint64*',`&($3)')
-_CONVERSION(`guint*',`guint&',`*($3)')
+_CONVERSION(`gint64&',`gint64*',`&$3')
+_CONVERSION(`guint64&',`guint64*',`&$3')
+_CONVERSION(`guint*',`guint&',`*$3')
 _CONVERSION(`const guint&',`guint',`$3')
-_CONVERSION(`const guint32&',`guint32',`($3)')
-_CONVERSION(`guint8*&',`guint8**',`&($3)')
+_CONVERSION(`const guint32&',`guint32',`$3')
+_CONVERSION(`guint8*&',`guint8**',`&$3')
 
 #Basic Gstreamermm Conversions
-_CONVERSION(`ClockTime&',`GstClockTime*',`(GstClockTime*)(&($3))')
+_CONVERSION(`ClockTime&',`GstClockTime*',`(GstClockTime*)(&$3)')
 _CONVERSION(`ClockTimeDiff',`GstClockTimeDiff',`GstClockTimeDiff($3)')
 _CONVERSION(`GstClockTimeDiff',`ClockTimeDiff',`ClockTimeDiff($3)')
-_CONVERSION(`ClockTimeDiff&',`GstClockTimeDiff*',`(GstClockTimeDiff*)(&($3))')
-_CONVERSION(`Format&',`GstFormat*',`(($2)&($3))')
-_CONVERSION(`GstClockTimeDiff*',`ClockTimeDiff&',`(ClockTimeDiff&)(*($3))')
+_CONVERSION(`ClockTimeDiff&',`GstClockTimeDiff*',`(GstClockTimeDiff*)(&$3)')
+_CONVERSION(`Format&',`GstFormat*',`($2)&$3')
+_CONVERSION(`GstClockTimeDiff*',`ClockTimeDiff&',`(ClockTimeDiff&)(*$3)')
 _CONVERSION(`const GstQueryType*',`const QueryType*',`(QueryType*)($3)')
 _CONVERSION(`GstState*',`State&',`*reinterpret_cast<Gst::State*>($3)')
 _CONVERSION(`GstTagFlag',`TagFlag',`(TagFlag)($3)')
-_CONVERSION(`guint64',`ClockTime',`(ClockTime ($3))')
-_CONVERSION(`const URIType',`const GstURIType',`(GstURIType($3))')
+_CONVERSION(`guint64',`ClockTime',`(ClockTime)($3)')
+_CONVERSION(`const URIType',`const GstURIType',`(GstURIType)($3)')
 
 #C++ Conversions
 _CONVERSION(`const va_list&',`va_list',`const_cast<va_list&>($3)')
@@ -198,15 +199,15 @@ _CONVERSION(`const va_list&',`va_list',`const_cast<va_list&>($3)')
 #Glibmm Conversions
 _CONVERSION(`GQuark',`Glib::QueryQuark',`Glib::QueryQuark($3)')
 _CONVERSION(`const Glib::QueryQuark&',`GQuark',`$3')
-_CONVERSION(`Glib::StaticRecMutex&',`GStaticRecMutex*',`($3).gobj()')
+_CONVERSION(`Glib::StaticRecMutex&',`GStaticRecMutex*',`$3.gobj()')
 
 #String Conversions
-_CONVERSION(`const std::string&',`const guchar*',`(($2)($3).c_str())')
+_CONVERSION(`const std::string&',`const guchar*',`($2)($3.c_str())')
 _CONVERSION(`gchar*',`const Glib::ustring&',__GCHARP_TO_USTRING)
 _CONVERSION(`const gchar*',`const Glib::ustring&',__GCHARP_TO_USTRING)
-_CONVERSION(`Glib::ustring&',`const guchar*', (($2)($3).c_str()))
+_CONVERSION(`Glib::ustring&',`const guchar*', ($2)($3.c_str()))
 
 #libxml++ Conversions
-_CONVERSION(`xmlpp::Node*',`xmlNodePtr',`($3)->cobj()')
-_CONVERSION(`xmlpp::Node*',`GstXmlNodePtr',`($3)->cobj()')
-_CONVERSION(`xmlpp::Document*',`xmlDocPtr',`($3)->cobj()')
+_CONVERSION(`xmlpp::Node*',`xmlNodePtr',`$3->cobj()')
+_CONVERSION(`xmlpp::Node*',`GstXmlNodePtr',`$3->cobj()')
+_CONVERSION(`xmlpp::Document*',`xmlDocPtr',`$3->cobj()')
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]