[gstreamermm] Plugins: enabled elements plugins from gst-plugins-base package: - multisocketsink - input-s

[Marcin Kolny <mkolny src gnome org>]

commit d37ca5a0bcc33441de68069cec8fed7fda18ec7c
Author: Marcin Kolny <marcin kolny gmail com>
Date:   Thu Aug 28 22:08:41 2014 +0200

    Plugins: enabled elements plugins from gst-plugins-base package:
        - multisocketsink
        - input-selector
        - output-selector.
    There is still one disabled element: audioresample.
    
         * .gitignore: added multisocketsink generated files to ignored
          list. The rest of added plugins were already there.
        * configure.ac: added plugins to .hg|.ccg generation list
        * gstreamer/src/filelist.am: added .hg files of added plugins to
          a further generator list
        * gstreamer/src/gst_enums.defs: applied a patch described below
        * gstreamer/src/gst_enums.defs.patch:  added define of missing
          enums from multisocketsink element, which cannot be
          autogenerated
        * tools/m4/convert_gst.m4: added conversion rule from Gio::Socket
          refptr to GSocket*
        * tools/m4/plugingen_gstreamermm.m4: added translation entry of
          GSocket* and GObject*

 .gitignore                         |    4 ++++
 configure.ac                       |    8 +++++---
 gstreamer/src/filelist.am          |    3 +++
 gstreamer/src/gst_enums.defs       |   27 +++++++++++++++++++++++++++
 gstreamer/src/gst_enums.defs.patch |   35 +++++++++++++++++++++++++++++++++++
 tools/m4/convert_gst.m4            |    3 +++
 tools/m4/plugingen_gstreamermm.m4  |    2 ++
 7 files changed, 79 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index af632bf..42f5dd9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -274,6 +274,8 @@ gstreamer/gstreamermm/multifdsink.cc
 gstreamer/gstreamermm/multifdsink.h
 gstreamer/gstreamermm/multiqueue.cc
 gstreamer/gstreamermm/multiqueue.h
+gstreamer/gstreamermm/multisocketsink.cc
+gstreamer/gstreamermm/multisocketsink.h
 gstreamer/gstreamermm/oggdemux.cc
 gstreamer/gstreamermm/oggdemux.h
 gstreamer/gstreamermm/oggmux.cc
@@ -408,6 +410,8 @@ gstreamer/src/multifdsink.ccg
 gstreamer/src/multifdsink.hg
 gstreamer/src/multiqueue.ccg
 gstreamer/src/multiqueue.hg
+gstreamer/src/multisocketsink.ccg
+gstreamer/src/multisocketsink.hg
 gstreamer/src/oggdemux.ccg
 gstreamer/src/oggdemux.hg
 gstreamer/src/outputselector.ccg
diff --git a/configure.ac b/configure.ac
index 90c5594..41dabc4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -93,8 +93,8 @@ MM_ARG_WITH_TAGFILE_DOC([pangomm-1.4.tag], [pangomm-1.4])
 # gstreamer/src/fileslist.am.  (That must be the same as "CppClassName" - all
 # in lowercase with a .hg extension).
 
-#TODO (Add below? Plug-in is missing in 1.1.1): gdpdepay|gdpdepay|GDPDepay \
-#TODO (Add below? Plug-in is missing in 1.1.1): gdppay|gdppay|GDPPay \
+
+# todo audioresample|audioresample|AudioResample
 
 AC_SUBST([GSTREAMERMM_PLUGIN_DEFS], ["\
 adder|adder|Adder \
@@ -104,7 +104,6 @@ appsink|appsink|AppSink \
 appsrc|appsrc|AppSrc \
 audioconvert|audioconvert|AudioConvert \
 audiorate|audiorate|AudioRate \
-audioresample|audioresample|AudioResample \
 audiotestsrc|audiotestsrc|AudioTestSrc \
 capsfilter|capsfilter|CapsFilter \
 cdparanoiasrc|cdparanoiasrc|CdParanoiaSrc \
@@ -122,10 +121,13 @@ giosrc|giosrc|GioSrc \
 giostreamsink|giostreamsink|GioStreamSink \
 giostreamsrc|giostreamsrc|GioStreamSrc \
 identity|identity|Identity \
+inputselector|input-selector|InputSelector \
 multifdsink|multifdsink|MultiFdSink \
 multiqueue|multiqueue|MultiQueue \
+multisocketsink|multisocketsink|MultiSocketSink \
 oggdemux|oggdemux|OggDemux \
 oggmux|oggmux|OggMux \
+outputselector|output-selector|OutputSelector \
 playbin|playbin|PlayBin \
 queue|queue|Queue \
 queue2|queue2|Queue2 \
diff --git a/gstreamer/src/filelist.am b/gstreamer/src/filelist.am
index f948e34..549a0e7 100644
--- a/gstreamer/src/filelist.am
+++ b/gstreamer/src/filelist.am
@@ -49,9 +49,12 @@ plugins_hg =                    \
         giostreamsink.hg        \
         giostreamsrc.hg         \
         identity.hg             \
+        inputselector.hg        \      
         multiqueue.hg           \
+        multisocketsink.hg      \
         oggdemux.hg             \
         oggmux.hg               \
+        outputselector.hg       \
         playbin.hg              \
         queue.hg                \
         queue2.hg               \
diff --git a/gstreamer/src/gst_enums.defs b/gstreamer/src/gst_enums.defs
index 80bea1b..c3ca785 100644
--- a/gstreamer/src/gst_enums.defs
+++ b/gstreamer/src/gst_enums.defs
@@ -5689,3 +5689,30 @@
     '("full" "GST_PARANOIA_MODE_FULL" "0xff")
   )
 )
+
+;; Handwritten for MultiSocketSink plugin (values taken from output of
+;; `gst-inspect multisocketsink' -- "sync-method" property information)
+(define-enum-extended MultiHandleSinkSyncMethod
+  (in-module "Gst")
+  (c-name "GstMultiHandleSinkSyncMethod")
+  (values
+    '("latest" "GST_SYNC_METHOD_LATEST" "0")
+    '("next-keyframe" "GST_SYNC_METHOD_NEXT_KEYFRAME" "1")
+    '("latest-keyframe" "GST_SYNC_METHOD_LATEST_KEYFRAME" "2")
+    '("burst" "GST_SYNC_METHOD_BURST" "3")
+    '("burst-keyframe" "GST_SYNC_METHOD_BURST_KEYFRAME" "4")
+    '("burst-with-keyframe" "GST_SYNC_METHOD_BURST_WITH_KEYFRAME" "5")
+  )
+)
+
+;; Handwritten for OutputSelector plugin (values taken from output of
+;; `gst-inspect output-selector' -- "pad-negotiation-mode" property information)
+(define-enum-extended OutputSelectorPadNegotiationMode
+  (in-module "Gst")
+  (c-name "GstOutputSelectorPadNegotiationMode")
+  (values
+    '("none" "GST_OUTPUT_SELECTOR_PAD_NEGOTIATION_MODE_NONE" "0")
+    '("all" "GST_OUTPUT_SELECTOR_PAD_NEGOTIATION_MODE_ALL" "1")
+    '("active" "GST_OUTPUT_SELECTOR_PAD_NEGOTIATION_MODE_ACTIVE" "2")
+  )
+)
diff --git a/gstreamer/src/gst_enums.defs.patch b/gstreamer/src/gst_enums.defs.patch
index d06979d..c0239b2 100644
--- a/gstreamer/src/gst_enums.defs.patch
+++ b/gstreamer/src/gst_enums.defs.patch
@@ -72,6 +72,41 @@
 +    '("full" "GST_PARANOIA_MODE_FULL" "0xff")
 +  )
 +)
+
+--- a/gstreamer/src/gst_enums.defs
++++ b/gstreamer/src/gst_enums.defs
+@@ -5689,3 +5689,30 @@
+     '("full" "GST_PARANOIA_MODE_FULL" "0xff")
+   )
+ )
++
++;; Handwritten for MultiSocketSink plugin (values taken from output of
++;; `gst-inspect multisocketsink' -- "sync-method" property information)
++(define-enum-extended MultiHandleSinkSyncMethod
++  (in-module "Gst")
++  (c-name "GstMultiHandleSinkSyncMethod")
++  (values
++    '("latest" "GST_SYNC_METHOD_LATEST" "0")
++    '("next-keyframe" "GST_SYNC_METHOD_NEXT_KEYFRAME" "1")
++    '("latest-keyframe" "GST_SYNC_METHOD_LATEST_KEYFRAME" "2")
++    '("burst" "GST_SYNC_METHOD_BURST" "3")
++    '("burst-keyframe" "GST_SYNC_METHOD_BURST_KEYFRAME" "4")
++    '("burst-with-keyframe" "GST_SYNC_METHOD_BURST_WITH_KEYFRAME" "5")
++  )
++)
++
++;; Handwritten for OutputSelector plugin (values taken from output of
++;; `gst-inspect output-selector' -- "pad-negotiation-mode" property information)
++(define-enum-extended OutputSelectorPadNegotiationMode
++  (in-module "Gst")
++  (c-name "GstOutputSelectorPadNegotiationMode")
++  (values
++    '("none" "GST_OUTPUT_SELECTOR_PAD_NEGOTIATION_MODE_NONE" "0")
++    '("all" "GST_OUTPUT_SELECTOR_PAD_NEGOTIATION_MODE_ALL" "1")
++    '("active" "GST_OUTPUT_SELECTOR_PAD_NEGOTIATION_MODE_ACTIVE" "2")
++  )
++)
+
  
 -- 
 1.9.1
diff --git a/tools/m4/convert_gst.m4 b/tools/m4/convert_gst.m4
index 08c280f..2ba243b 100644
--- a/tools/m4/convert_gst.m4
+++ b/tools/m4/convert_gst.m4
@@ -131,6 +131,9 @@ _CONVERSION(`const Glib::RefPtr<Gst::Event>&',`GstEvent*', `Glib::unwrap($3)')
 _CONVERSION(`GstEvent*',`const Glib::RefPtr<Gst::Event>&', `Glib::wrap($3)')
 _CONVERSION(`GstEvent*',`Glib::RefPtr<Gst::Event>', `Glib::wrap($3)')
 
+dnl Socket
+_CONVERSION(`const Glib::RefPtr<Gio::Socket>&',`GSocket*', `Glib::unwrap($3)')
+
 dnl Index
 _CONVERSION(`GstIndex*',`Glib::RefPtr<Gst::Index>',`Glib::wrap($3)')
 _CONVERSION(`const Glib::RefPtr<Gst::Index>&',`GstIndex*',`Glib::unwrap($3)')
diff --git a/tools/m4/plugingen_gstreamermm.m4 b/tools/m4/plugingen_gstreamermm.m4
index d73fc04..2753d62 100644
--- a/tools/m4/plugingen_gstreamermm.m4
+++ b/tools/m4/plugingen_gstreamermm.m4
@@ -13,9 +13,11 @@ dnl giomm
 _TRANSLATION(`GFile*',`Gio::File',`const 
Glib::RefPtr<Gio::File>&',`Glib::RefPtr<Gio::File>',`<giomm/file.h>')
 _TRANSLATION(`GInputStream*',`Gio::InputStream',`const 
Glib::RefPtr<Gio::InputStream>&',`Glib::RefPtr<Gio::InputStream>',`<giomm/inputstream.h>')
 _TRANSLATION(`GOutputStream*',`Gio::OutputStream',`const 
Glib::RefPtr<Gio::OutputStream>&',`Glib::RefPtr<Gio::OutputStream>',`<giomm/outputstream.h>')
+_TRANSLATION(`GSocket*',`Gio::Socket',`const 
Glib::RefPtr<Gio::Socket>&',`Glib::RefPtr<Gio::Socket>',`<giomm/socket.h>')
 
 dnl glibmm
 _TRANSLATION(`GValueArray*',`Glib::ValueArray',`const 
Glib::ValueArray&',`Glib::ValueArray',`<glibmm/valuearray.h>')
+_TRANSLATION(`GObject*',`Glib::Object',`const Glib::Object&',`Glib::Object',`<glibmm/object.h>')
 
 dnl gstreamermm
 _TRANSLATION(`GstBuffer*',`Gst::Buffer',`const 
Glib::RefPtr<Gst::Buffer>&',`Glib::RefPtr<Gst::Buffer>',`<gstreamermm/buffer.h>')