GNOME.org
 

[gstreamermm] Discoverer: Wrap the methods, properties and signals.

commit fab613ca2d19f517c9f86096943b8f3acc5aa4e1
Author: Josà Alburquerque <jaalburqu svn gnome org>
Date:   Fri Jul 15 01:20:40 2011 -0400

    Discoverer: Wrap the methods, properties and signals.
    
    	* tools/extra_defs_gen/generate_defs_gst.cc: Alphabetize the
    	gst-plugins-base types and add the GST_TYPE_DISCOVERER GType to the
    	extra defs generation utility.
    	* gstreamer/src/gst_signals.defs: Regenerate with the utility to get
    	the properties and signals of GstDiscoverer.
    
    	* gstreamer/src/discoverer.{ccg,hg}: Wrap the constructor, the create
    	method, the other methods, the properties and the signals.
    	* tools/m4/convert_gst.m4: Add a GstDiscovererInfo conversion.

 ChangeLog                                 |   14 ++
 gstreamer/src/discoverer.ccg              |    6 +
 gstreamer/src/discoverer.hg               |   23 +++
 gstreamer/src/gst_signals.defs            |  214 ++++++++++++++++++-----------
 tools/extra_defs_gen/generate_defs_gst.cc |   14 +-
 tools/m4/convert_gst.m4                   |    4 +
 6 files changed, 190 insertions(+), 85 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index d81d774..736cc99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,19 @@
 2011-07-15  Josà Alburquerque  <jaalburqu svn gnome org>
 
+	Discoverer: Wrap the methods, properties and signals.
+
+	* tools/extra_defs_gen/generate_defs_gst.cc: Alphabetize the
+	gst-plugins-base types and add the GST_TYPE_DISCOVERER GType to the
+	extra defs generation utility.
+	* gstreamer/src/gst_signals.defs: Regenerate with the utility to get
+	the properties and signals of GstDiscoverer.
+
+	* gstreamer/src/discoverer.{ccg,hg}: Wrap the constructor, the create
+	method, the other methods, the properties and the signals.
+	* tools/m4/convert_gst.m4: Add a GstDiscovererInfo conversion.
+
+2011-07-15  Josà Alburquerque  <jaalburqu svn gnome org>
+
 	Add Gst::DiscovererInfo skeleton.
 
 	* gstreamer/src/discovererinfo.{ccg,hg}:
diff --git a/gstreamer/src/discoverer.ccg b/gstreamer/src/discoverer.ccg
index ecb8478..963f27e 100644
--- a/gstreamer/src/discoverer.ccg
+++ b/gstreamer/src/discoverer.ccg
@@ -18,10 +18,16 @@
  */
 
 #include <gst/pbutils/pbutils.h>
+#include <gstreamermm/discovererinfo.h>
 
 _PINCLUDE(glibmm/private/object_p.h)
 
 namespace Gst
 {
 
+Discoverer::Discoverer(ClockTime timeout)
+: _CONSTRUCT("timeout", static_cast<GstClockTime>(timeout))
+{
+}
+
 } // namespace Gst
diff --git a/gstreamer/src/discoverer.hg b/gstreamer/src/discoverer.hg
index 8d8463a..0981a2f 100644
--- a/gstreamer/src/discoverer.hg
+++ b/gstreamer/src/discoverer.hg
@@ -18,12 +18,17 @@
  */
 
 #include <glibmm/object.h>
+#include <gstreamermm/clock.h>
+#include <gstreamermm/miniobject.h>
+#include <gst/pbutils/pbutils.h>
 
 _DEFS(gstreamermm,gst)
 
 namespace Gst
 {
 
+class DiscovererInfo;
+
 /** Discoverer - Utility for discovering information on URIs.
  * The Discoverer is a utility object which allows to get as much information
  * as possible from one or many URIs.
@@ -45,8 +50,26 @@ class Discoverer : public Glib::Object
   _CLASS_GOBJECT(Discoverer, GstDiscoverer, GST_DISCOVERER, Glib::Object, GObject)
 
 protected:
+  explicit Discoverer(ClockTime timeout);
 
 public:
+  _WRAP_METHOD_DOCS_ONLY(gst_discoverer_new, errthrow)
+  _WRAP_CREATE(ClockTime timeout)
+
+  _WRAP_METHOD(void start(), gst_discoverer_start)
+  _WRAP_METHOD(void stop(), gst_discoverer_stop)
+  _WRAP_METHOD(Glib::RefPtr<DiscovererInfo> discover_uri(const Glib::ustring& uri), gst_discoverer_discover_uri, errthrow)
+  _WRAP_METHOD(bool discover_uri_async(const Glib::ustring& uri), gst_discoverer_discover_uri_async)
+
+  _WRAP_PROPERTY("timeout", guint64)
+
+#m4 _CONVERSION(`GstDiscovererInfo*', `const Glib::RefPtr<DiscovererInfo>&', `Gst::wrap($3,true)')
+  //TODO: Docs?
+  //TODO: Use a Glib::Error instead of a GError?
+  _WRAP_SIGNAL(void discovered(const Glib::RefPtr<DiscovererInfo>& info, const GError* error), "discovered")
+
+  _WRAP_SIGNAL(void finished(), "finished")
+  _WRAP_SIGNAL(void starting(), "starting")
 };
 
 } //namespace Gst
diff --git a/gstreamer/src/gst_signals.defs b/gstreamer/src/gst_signals.defs
index edbc282..298013b 100644
--- a/gstreamer/src/gst_signals.defs
+++ b/gstreamer/src/gst_signals.defs
@@ -1358,6 +1358,15 @@
   (construct-only #f)
 )
 
+(define-property sync-streams
+  (of-object "GstInputSelector")
+  (prop-type "GParamBoolean")
+  (docs "Synchronize inactive streams to the running time of the active stream")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 ;; From GstMultiQueue
 
 (define-signal underrun
@@ -1453,6 +1462,15 @@
   (construct-only #f)
 )
 
+(define-property sync-by-running-time
+  (of-object "GstMultiQueue")
+  (prop-type "GParamBoolean")
+  (docs "Synchronize deactivated or not-linked streams by running time")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 ;; From GstOutputSelector
 
 (define-property active-pad
@@ -1863,6 +1881,10 @@
 
 ;; From GstAudioFilter
 
+;; From GstAudioSink
+
+;; From GstAudioSrc
+
 ;; From GstBaseAudioSink
 
 (define-property buffer-time
@@ -1975,43 +1997,6 @@
   (construct-only #f)
 )
 
-;; From GstAudioSink
-
-;; From GstAudioSrc
-
-;; From GstRingBuffer
-
-;; From GstCddaBaseSrc
-
-(define-property mode
-  (of-object "GstCddaBaseSrc")
-  (prop-type "GParamEnum")
-  (docs "Mode")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property device
-  (of-object "GstCddaBaseSrc")
-  (prop-type "GParamString")
-  (docs "CD device location")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property track
-  (of-object "GstCddaBaseSrc")
-  (prop-type "GParamUInt")
-  (docs "Track")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-;; From GstNetBuffer
-
 ;; From GstBaseRTPAudioPayload
 
 (define-property buffer-list
@@ -2135,8 +2120,76 @@
   (construct-only #f)
 )
 
+;; From GstCddaBaseSrc
+
+(define-property mode
+  (of-object "GstCddaBaseSrc")
+  (prop-type "GParamEnum")
+  (docs "Mode")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property device
+  (of-object "GstCddaBaseSrc")
+  (prop-type "GParamString")
+  (docs "CD device location")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property track
+  (of-object "GstCddaBaseSrc")
+  (prop-type "GParamUInt")
+  (docs "Track")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+;; From GstDiscoverer
+
+(define-signal finished
+  (of-object "GstDiscoverer")
+  (return-type "void")
+  (when "last")
+)
+
+(define-signal starting
+  (of-object "GstDiscoverer")
+  (return-type "void")
+  (when "last")
+)
+
+(define-signal discovered
+  (of-object "GstDiscoverer")
+  (return-type "void")
+  (when "last")
+  (parameters
+    '("GstDiscovererInfo*" "p0")
+    '("const-GError*" "p1")
+  )
+)
+
+(define-property timeout
+  (of-object "GstDiscoverer")
+  (prop-type "GParamUInt64")
+  (docs "Timeout")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+;; From GstNetBuffer
+
+;; From GstRingBuffer
+
 ;; From GstTagDemux
 
+;; From GstVideoFilter
+
 ;; From GstVideoSink
 
 (define-property show-preroll-frame
@@ -2148,8 +2201,6 @@
   (construct-only #f)
 )
 
-;; From GstVideoFilter
-
 ;; From GstColorBalance
 
 (define-signal value-changed
@@ -2175,46 +2226,6 @@
 
 ;; 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
@@ -3573,6 +3584,15 @@
   (construct-only #f)
 )
 
+(define-property max-tolerance
+  (of-object "GstOggMux")
+  (prop-type "GParamUInt64")
+  (docs "Maximum timestamp difference for maintaining perfect granules")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 ;; From GstPlayBin
 
 (define-property audio-sink
@@ -4288,6 +4308,24 @@
   (construct-only #f)
 )
 
+(define-property shadow
+  (of-object "GstTextOverlay")
+  (prop-type "GParamBoolean")
+  (docs "Whether to create a shadow of the letters under the text")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property outline-color
+  (of-object "GstTextOverlay")
+  (prop-type "GParamUInt")
+  (docs "Color to use for outline the text (big-endian ARGB).")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 ;; From GstTextRender
 
 (define-property halignment
@@ -4783,6 +4821,24 @@
   (construct-only #f)
 )
 
+(define-property drop-only
+  (of-object "GstVideoRate")
+  (prop-type "GParamBoolean")
+  (docs "Only drop frames, no duplicates are produced")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property average-period
+  (of-object "GstVideoRate")
+  (prop-type "GParamUInt64")
+  (docs "Period over which to average the framerate (in ns) (0 = disabled)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 ;; From GstVideoScale
 
 (define-property method
diff --git a/tools/extra_defs_gen/generate_defs_gst.cc b/tools/extra_defs_gen/generate_defs_gst.cc
index 915b654..75e48da 100644
--- a/tools/extra_defs_gen/generate_defs_gst.cc
+++ b/tools/extra_defs_gen/generate_defs_gst.cc
@@ -47,6 +47,7 @@
 #include <gst/audio/gstringbuffer.h>
 #include <gst/cdda/gstcddabasesrc.h>
 #include <gst/netbuffer/gstnetbuffer.h>
+#include <gst/pbutils/pbutils.h>
 #include <gst/rtp/gstbasertpaudiopayload.h>
 #include <gst/rtp/gstbasertpdepayload.h>
 #include <gst/rtp/gstbasertppayload.h>
@@ -150,19 +151,20 @@ int main (int argc, char *argv[])
   // gst-plugins-base (GStreamer base) types:
             << get_defs(GST_TYPE_AUDIO_CLOCK, gst_type_is_a_pointer)
             << get_defs(GST_TYPE_AUDIO_FILTER, gst_type_is_a_pointer)
-            << get_defs(GST_TYPE_BASE_AUDIO_SINK, gst_type_is_a_pointer)
-            << get_defs(GST_TYPE_BASE_AUDIO_SRC, gst_type_is_a_pointer)
             << get_defs(GST_TYPE_AUDIO_SINK, gst_type_is_a_pointer)
             << get_defs(GST_TYPE_AUDIO_SRC, gst_type_is_a_pointer)
-            << get_defs(GST_TYPE_RING_BUFFER, gst_type_is_a_pointer)
-            << get_defs(GST_TYPE_CDDA_BASE_SRC, gst_type_is_a_pointer)
-            << get_defs(GST_TYPE_NETBUFFER, gst_type_is_a_pointer)
+            << get_defs(GST_TYPE_BASE_AUDIO_SINK, gst_type_is_a_pointer)
+            << get_defs(GST_TYPE_BASE_AUDIO_SRC, gst_type_is_a_pointer)
             << get_defs(GST_TYPE_BASE_RTP_AUDIO_PAYLOAD, gst_type_is_a_pointer)
             << get_defs(GST_TYPE_BASE_RTP_DEPAYLOAD, gst_type_is_a_pointer)
             << get_defs(GST_TYPE_BASE_RTP_PAYLOAD, gst_type_is_a_pointer)
+            << get_defs(GST_TYPE_CDDA_BASE_SRC, gst_type_is_a_pointer)
+            << get_defs(GST_TYPE_DISCOVERER, gst_type_is_a_pointer)
+            << get_defs(GST_TYPE_NETBUFFER, gst_type_is_a_pointer)
+            << get_defs(GST_TYPE_RING_BUFFER, gst_type_is_a_pointer)
             << get_defs(GST_TYPE_TAG_DEMUX, gst_type_is_a_pointer)
-            << get_defs(GST_TYPE_VIDEO_SINK, gst_type_is_a_pointer)
             << get_defs(GST_TYPE_VIDEO_FILTER, gst_type_is_a_pointer)
+            << get_defs(GST_TYPE_VIDEO_SINK, gst_type_is_a_pointer)
 
   // gst-plugins-base (GStreamer base) interfaces:
             << get_defs(GST_TYPE_COLOR_BALANCE, gst_type_is_a_pointer)
diff --git a/tools/m4/convert_gst.m4 b/tools/m4/convert_gst.m4
index 41419b9..e1dbb9c 100644
--- a/tools/m4/convert_gst.m4
+++ b/tools/m4/convert_gst.m4
@@ -90,6 +90,10 @@ dnl ColorBalanceChannel
 _CONVERSION(`const Glib::RefPtr<ColorBalanceChannel>&',`GstColorBalanceChannel*',`Glib::unwrap($3)')
 _CONVERSION(`const Glib::RefPtr<const ColorBalanceChannel>&',`GstColorBalanceChannel*',`const_cast<GstColorBalanceChannel*>(Glib::unwrap($3))')
 
+dnl DiscovererInfo
+_CONVERSION(`GstDiscovererInfo*',`Glib::RefPtr<DiscovererInfo>',`Gst::wrap($3)')
+_CONVERSION(`const Glib::RefPtr<DiscovererInfo>&',`GstDiscovererInfo*',`Gst::unwrap($3)')
+
 dnl Element
 _CONVERSION(`Glib::RefPtr<Gst::Element>',`GstElement*', `Glib::unwrap($3)')
 _CONVERSION(`GstElement*',`Glib::RefPtr<Gst::Element>',`Glib::wrap($3)')
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]