[gstreamermm/devel-other-plugins] gstreamermm-plugins-bad: use Gst::Bad namespace for plugins-bad module



commit 04c240a7518936c5e8316666e0aaa66018267e3f
Author: Marcin Kolny <marcin kolny flytronic pl>
Date:   Wed Jul 29 14:18:11 2015 +0200

    gstreamermm-plugins-bad: use Gst::Bad namespace for plugins-bad module
    
        * configure.ac: gstreamermm requires newest version of glibmm module,
          because of improvements in generate_wrap_init.pl script.
        * gst-plugins-bad/gstreamermm-plugins-bad/wrap_init.h: use Gst::Bad
          namespace for wrap_init function.
        * gst-plugins-bad/src/Makefile.am: use Gst::Bad namespace as a global
          namespace in plugins-bad module.
        * gst-plugins-bad/src/glbasefilter.hg:
        * gst-plugins-bad/src/glfilter.hg: remove _GMMPROC_EXTRA_NAMESPACE
          macro (it's not necessary anymore).

 configure.ac                                       |    2 +-
 .../gstreamermm-plugins-bad/wrap_init.h            |    7 +++++--
 gst-plugins-bad/src/Makefile.am                    |    2 +-
 gst-plugins-bad/src/glbasefilter.hg                |    2 --
 gst-plugins-bad/src/glfilter.hg                    |    2 --
 5 files changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 9c942af..53d7bdd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -64,7 +64,7 @@ AS_IF([test "x$enable_static" = xyes],
 # file.
 
 AC_SUBST([GSTREAMERMM_MODULES],
-         ['giomm-2.4 >= 2.36.0[]m4_foreach([gstmm_mod],
+         ['giomm-2.4 >= 2.45.41[]m4_foreach([gstmm_mod],
          [[], [-base], [-check], [-controller], [-net],
           [-allocators], [-app], [-audio], [-fft], [-pbutils],
           [-plugins-base], [-riff], [-rtp], [-rtsp], [-sdp],
diff --git a/gst-plugins-bad/gstreamermm-plugins-bad/wrap_init.h 
b/gst-plugins-bad/gstreamermm-plugins-bad/wrap_init.h
index 2561128..03dbc49 100644
--- a/gst-plugins-bad/gstreamermm-plugins-bad/wrap_init.h
+++ b/gst-plugins-bad/gstreamermm-plugins-bad/wrap_init.h
@@ -26,11 +26,14 @@
 
 #include <gstreamermmconfig.h>
 
-namespace GstBad
+namespace Gst
+{
+namespace Bad
 {
   /** Initializes the gstreamermm-plugins-bad wrapping system.
    */
   void wrap_init();
-}
+} // Bad
+} // Gst
 
 #endif //_GSTREAMERMM_WRAP_INIT_H
diff --git a/gst-plugins-bad/src/Makefile.am b/gst-plugins-bad/src/Makefile.am
index 01a5a29..637dd7e 100644
--- a/gst-plugins-bad/src/Makefile.am
+++ b/gst-plugins-bad/src/Makefile.am
@@ -15,7 +15,7 @@
 
 binding_name    = gstreamermm-plugins-bad
 # generate_wrap_init.pl should support nested namespaces
-wrap_init_flags = --namespace=Gst --parent_dir=gstreamermm-plugins-bad 
+wrap_init_flags = --namespace=Gst::Bad --parent_dir=gstreamermm-plugins-bad 
 codegen_srcdir  = $(top_srcdir)/tools
 
 
diff --git a/gst-plugins-bad/src/glbasefilter.hg b/gst-plugins-bad/src/glbasefilter.hg
index 55e1bf1..36d5f29 100644
--- a/gst-plugins-bad/src/glbasefilter.hg
+++ b/gst-plugins-bad/src/glbasefilter.hg
@@ -27,8 +27,6 @@ namespace Gst
 namespace Bad
 {
 
-_GMMPROC_EXTRA_NAMESPACE(Bad)
-
 class GLBaseFilter
 : public BaseTransform
 {
diff --git a/gst-plugins-bad/src/glfilter.hg b/gst-plugins-bad/src/glfilter.hg
index 94f70c9..800168d 100644
--- a/gst-plugins-bad/src/glfilter.hg
+++ b/gst-plugins-bad/src/glfilter.hg
@@ -29,8 +29,6 @@ namespace Gst
 namespace Bad
 {
 
-_GMMPROC_EXTRA_NAMESPACE(Bad)
-
 class GLFilter
 : public GLBaseFilter
 {


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]