[gstreamermm] Examples, tests: remove unnecessary glibmm includes

[Marcin Kolny <mkolny src gnome org>]

commit f97850925c3c68061aece8124c55e28e05655c9c
Author: Marcin Kolny <marcin kolny gmail com>
Date:   Mon Sep 26 20:45:58 2016 +0200

    Examples, tests: remove unnecessary glibmm includes

 examples/all_media_player/main.cc                 |    2 +-
 examples/audio_video_muxer/main.cc                |    2 +-
 examples/basics/bus.cc                            |    2 +-
 examples/basics/dynamic_pads.cc                   |    2 +-
 examples/basics/init_gstreamermm.cc               |    2 +-
 examples/dynamic_changing_element/main.cc         |    2 +-
 examples/dynamic_changing_source/main.cc          |    2 +-
 examples/hello_world/main.cc                      |    3 ++-
 examples/ogg_player/main.cc                       |    2 +-
 examples/ogg_rewriter/main.cc                     |    2 +-
 examples/opengl_filter/main.cc                    |    2 +-
 examples/optiongroup/main.cc                      |    7 +------
 examples/typefind/main.cc                         |    2 +-
 tests/regression/pluginbin.h                      |    1 -
 tests/regression/test-regression-bininpipeline.cc |    2 +-
 tests/regression/test-regression-binplugin.cc     |    2 +-
 tests/regression/test-regression-rewritefile.cc   |    2 +-
 tests/regression/test-regression-seekonstartup.cc |    2 +-
 tests/regression/test-regression-videoduration.cc |    2 +-
 tests/regression/utils.cc                         |    2 +-
 tests/test-init.cc                                |    1 -
 21 files changed, 20 insertions(+), 26 deletions(-)
---
diff --git a/examples/all_media_player/main.cc b/examples/all_media_player/main.cc
index 6f0b95d..1d324ea 100644
--- a/examples/all_media_player/main.cc
+++ b/examples/all_media_player/main.cc
@@ -7,7 +7,7 @@
 
 #include <gstreamermm.h>
 #include <iostream>
-#include <glibmm.h>
+#include <glibmm/main.h>
 
 using namespace Gst;
 using Glib::RefPtr;
diff --git a/examples/audio_video_muxer/main.cc b/examples/audio_video_muxer/main.cc
index 4c6e912..82f4eb1 100644
--- a/examples/audio_video_muxer/main.cc
+++ b/examples/audio_video_muxer/main.cc
@@ -7,7 +7,7 @@
 
 #include <gstreamermm.h>
 #include <iostream>
-#include <glibmm.h>
+#include <glibmm/main.h>
 
 using namespace Gst;
 using Glib::RefPtr;
diff --git a/examples/basics/bus.cc b/examples/basics/bus.cc
index 9b46b9c..e6f1e73 100644
--- a/examples/basics/bus.cc
+++ b/examples/basics/bus.cc
@@ -2,7 +2,7 @@
  * This example presents basic usage of the Gst::Bus class.
  */
 #include <gstreamermm.h>
-#include <glibmm.h>
+#include <glibmm/main.h>
 
 #include <iostream>
 
diff --git a/examples/basics/dynamic_pads.cc b/examples/basics/dynamic_pads.cc
index 9631876..4ea67ad 100644
--- a/examples/basics/dynamic_pads.cc
+++ b/examples/basics/dynamic_pads.cc
@@ -2,7 +2,7 @@
  * This example presents basic usage of dynamics Gst::Pad objects.
  */
 #include <gstreamermm.h>
-#include <glibmm.h>
+#include <glibmm/main.h>
 
 #include <iostream>
 
diff --git a/examples/basics/init_gstreamermm.cc b/examples/basics/init_gstreamermm.cc
index da54d0a..361c906 100644
--- a/examples/basics/init_gstreamermm.cc
+++ b/examples/basics/init_gstreamermm.cc
@@ -4,7 +4,7 @@
  * with your application's option group.
  */
 #include <gstreamermm.h>
-#include <glibmm.h>
+#include <glibmm/optioncontext.h>
 
 #include <iostream>
 
diff --git a/examples/dynamic_changing_element/main.cc b/examples/dynamic_changing_element/main.cc
index 6192f45..bf5ac12 100644
--- a/examples/dynamic_changing_element/main.cc
+++ b/examples/dynamic_changing_element/main.cc
@@ -8,7 +8,7 @@
  */
 
 #include <gstreamermm.h>
-#include <glibmm.h>
+#include <glibmm/main.h>
 #include <iostream>
 #include <vector>
 
diff --git a/examples/dynamic_changing_source/main.cc b/examples/dynamic_changing_source/main.cc
index 3f46d56..d7ff1e9 100644
--- a/examples/dynamic_changing_source/main.cc
+++ b/examples/dynamic_changing_source/main.cc
@@ -5,7 +5,7 @@
  *      Author: m.kolny
  */
 #include <gstreamermm.h>
-#include <glibmm.h>
+#include <glibmm/main.h>
 #include <iostream>
 
 using namespace Gst;
diff --git a/examples/hello_world/main.cc b/examples/hello_world/main.cc
index eae4b9f..ee6f371 100644
--- a/examples/hello_world/main.cc
+++ b/examples/hello_world/main.cc
@@ -17,7 +17,8 @@
  */
 
 #include <gstreamermm.h>
-#include <glibmm.h>
+#include <glibmm/main.h>
+#include <glibmm/convert.h>
 #include <iostream>
 #include <stdlib.h>
 #include <gstreamermm/playbin.h>
diff --git a/examples/ogg_player/main.cc b/examples/ogg_player/main.cc
index 44d3ba8..a3a71ca 100644
--- a/examples/ogg_player/main.cc
+++ b/examples/ogg_player/main.cc
@@ -17,7 +17,7 @@
  */
 
 #include <gstreamermm.h>
-#include <glibmm.h>
+#include <glibmm/main.h>
 #include <iostream>
 #include <iomanip>
 
diff --git a/examples/ogg_rewriter/main.cc b/examples/ogg_rewriter/main.cc
index 138031a..f1a8976 100644
--- a/examples/ogg_rewriter/main.cc
+++ b/examples/ogg_rewriter/main.cc
@@ -1,5 +1,5 @@
 #include <gstreamermm.h>
-#include <glibmm.h>
+#include <glibmm/main.h>
 #include <iostream>
 #include <stdlib.h>
 
diff --git a/examples/opengl_filter/main.cc b/examples/opengl_filter/main.cc
index 0857c07..b8db87c 100644
--- a/examples/opengl_filter/main.cc
+++ b/examples/opengl_filter/main.cc
@@ -18,7 +18,7 @@
 
 #include "sample_gl_filter.h"
 #include <gstreamermm.h>
-#include <glibmm.h>
+#include <glibmm/main.h>
 #include <iostream>
 
 Glib::RefPtr<Glib::MainLoop> mainloop;
diff --git a/examples/optiongroup/main.cc b/examples/optiongroup/main.cc
index 71b33a7..9a0eb55 100644
--- a/examples/optiongroup/main.cc
+++ b/examples/optiongroup/main.cc
@@ -17,7 +17,7 @@
  */
 
 #include <gstreamermm.h>
-#include <glibmm.h>
+#include <glibmm/optioncontext.h>
 #include <iostream>
 
 Glib::OptionEntry make_entry(const Glib::ustring& long_name, const gchar& short_name, const Glib::ustring& 
description)
@@ -45,11 +45,6 @@ int main(int argc, char** argv)
   m_OptionGroup.add_entry(make_entry("silent", 's', "do not output status information"), silent);
   m_OptionGroup.add_entry_filename(make_entry("output", 'o', "save xml representation of pipeline to file 
and exit"), path);
 
-  // We must initialise the threading system before using any other GLib function.
-  // See Gstreamer's documentation for more info.
-  if(!Glib::thread_supported())
-    Glib::thread_init();
-
   m_OptionContext.set_main_group(m_OptionGroup);
 
   Glib::OptionGroup m_GstOptiongroup = Gst::get_option_group();
diff --git a/examples/typefind/main.cc b/examples/typefind/main.cc
index 73c04b7..6837022 100644
--- a/examples/typefind/main.cc
+++ b/examples/typefind/main.cc
@@ -17,7 +17,7 @@
  */
 
 #include <gstreamermm.h>
-#include <glibmm.h>
+#include <glibmm/main.h>
 #include <iostream>
 
 Glib::RefPtr<Glib::MainLoop> mainloop;
diff --git a/tests/regression/pluginbin.h b/tests/regression/pluginbin.h
index a62f6da..db3fde9 100644
--- a/tests/regression/pluginbin.h
+++ b/tests/regression/pluginbin.h
@@ -12,7 +12,6 @@
 #include <gstreamermm/private/bin_p.h>
 #include <gstreamermm/filesrc.h>
 #include <gstreamermm/filesink.h>
-#include <glibmm.h>
 #include <cstdio>
 #include <sys/stat.h>
 
diff --git a/tests/regression/test-regression-bininpipeline.cc 
b/tests/regression/test-regression-bininpipeline.cc
index 71123bf..fab7827 100644
--- a/tests/regression/test-regression-bininpipeline.cc
+++ b/tests/regression/test-regression-bininpipeline.cc
@@ -9,7 +9,7 @@
 #include <gstreamermm.h>
 #include <gstreamermm/filesrc.h>
 #include <gstreamermm/filesink.h>
-#include <glibmm.h>
+#include <glibmm/main.h>
 
 using namespace Gst;
 using Glib::RefPtr;
diff --git a/tests/regression/test-regression-binplugin.cc b/tests/regression/test-regression-binplugin.cc
index 117ef88..c579c48 100644
--- a/tests/regression/test-regression-binplugin.cc
+++ b/tests/regression/test-regression-binplugin.cc
@@ -7,7 +7,7 @@
 
 #include "mmtest.h"
 #include <gstreamermm.h>
-#include <glibmm.h>
+#include <glibmm/main.h>
 
 #include "pluginbin.h"
 
diff --git a/tests/regression/test-regression-rewritefile.cc b/tests/regression/test-regression-rewritefile.cc
index f8b551d..7d577be 100644
--- a/tests/regression/test-regression-rewritefile.cc
+++ b/tests/regression/test-regression-rewritefile.cc
@@ -7,7 +7,7 @@
 
 #include "mmtest.h"
 #include <gstreamermm.h>
-#include <glibmm.h>
+#include <glibmm/main.h>
 #include <cstdio>
 #include "utils.h"
 
diff --git a/tests/regression/test-regression-seekonstartup.cc 
b/tests/regression/test-regression-seekonstartup.cc
index 9696c05..a93b0a4 100644
--- a/tests/regression/test-regression-seekonstartup.cc
+++ b/tests/regression/test-regression-seekonstartup.cc
@@ -8,7 +8,7 @@
 #include "mmtest.h"
 #include <gstreamermm.h>
 #include <gstreamermm/fakesink.h>
-#include <glibmm.h>
+#include <glibmm/main.h>
 #include "utils.h"
 
 using namespace Gst;
diff --git a/tests/regression/test-regression-videoduration.cc 
b/tests/regression/test-regression-videoduration.cc
index e688810..0e9a254 100644
--- a/tests/regression/test-regression-videoduration.cc
+++ b/tests/regression/test-regression-videoduration.cc
@@ -8,7 +8,7 @@
 #include "mmtest.h"
 #include <gstreamermm.h>
 #include <gstreamermm/fakesink.h>
-#include <glibmm.h>
+#include <glibmm/main.h>
 #include "utils.h"
 
 using namespace Gst;
diff --git a/tests/regression/utils.cc b/tests/regression/utils.cc
index 69c4986..8a56ee1 100644
--- a/tests/regression/utils.cc
+++ b/tests/regression/utils.cc
@@ -8,7 +8,7 @@
 #include <gstreamermm.h>
 #include <gstreamermm/videotestsrc.h>
 #include <gstreamermm/filesink.h>
-#include <glibmm.h>
+#include <glibmm/main.h>
 #include "utils.h"
 
 using Glib::RefPtr;
diff --git a/tests/test-init.cc b/tests/test-init.cc
index 6d35b8b..a512b9c 100644
--- a/tests/test-init.cc
+++ b/tests/test-init.cc
@@ -7,7 +7,6 @@
 
 #include "mmtest.h"
 #include <gstreamermm.h>
-#include <glibmm.h>
 
 using namespace Gst;
 using Glib::RefPtr;