GNOME.org
 

[gstreamermm] Fix the build with the latest GStreamer sources and glibmm.

commit 168ee898f59cc5e81f47f64ffe39e4cdcc32104f
Author: Josà Alburquerque <jaalburqu svn gnome org>
Date:   Mon Jan 30 23:49:04 2012 -0500

    Fix the build with the latest GStreamer sources and glibmm.
    
    	* examples/hello_world/main.cc:
    	* examples/media_player_gtkmm/player_window.cc:
    	* examples/media_player_gtkmm/player_window.h:
    	* examples/ogg_player/main.cc:
    	* examples/ogg_player_gtkmm/player_window.cc:
    	* examples/optiongroup/main.cc:
    	* examples/typefind/main.cc: Add needed includes to the example
    	sources so that they build with the latest glibmm.
    
    	* gstreamer/gstreamermm/wrap.cc:
    	* gstreamer/src/bus.hg:
    	* gstreamer/src/cddabasesrc.hg:
    	* gstreamer/src/element.hg:
    	* gstreamer/src/elementfactory.hg:
    	* gstreamer/src/format.hg:
    	* gstreamer/src/index.hg:
    	* gstreamer/src/mixer.hg:
    	* gstreamer/src/object.hg:
    	* gstreamer/src/pad.hg:
    	* gstreamer/src/plugin.hg:
    	* gstreamer/src/preset.hg:
    	* gstreamer/src/propertyprobe.hg:
    	* gstreamer/src/query.hg:
    	* gstreamer/src/ringbuffer.hg:
    	* gstreamer/src/structure.hg:
    	* gstreamer/src/task.hg:
    	* gstreamer/src/typefind.hg:
    	* gstreamer/src/typefindfactory.hg:
    	* gstreamer/src/urihandler.hg: Add needed includes to the sources so
    	that they also build with the latest glibmm.
    
    	* tools/m4/plugingen_gstreamermm.m4: Add a _TRANSLATION from
    	GstFraction to Gst::Fraction so that the plugin generation process
    	works with the latest GStreamer sources.

 ChangeLog                                    |   39 ++++++++++++++++++++++++++
 NEWS                                         |    1 +
 examples/hello_world/main.cc                 |    3 +-
 examples/media_player_gtkmm/player_window.cc |    5 ++-
 examples/media_player_gtkmm/player_window.h  |    5 +--
 examples/ogg_player/main.cc                  |    1 +
 examples/ogg_player_gtkmm/player_window.cc   |    2 +
 examples/optiongroup/main.cc                 |    1 +
 examples/typefind/main.cc                    |    1 +
 gstreamer/gstreamermm/wrap.cc                |    7 +---
 gstreamer/src/bus.hg                         |    1 +
 gstreamer/src/cddabasesrc.hg                 |    1 +
 gstreamer/src/element.hg                     |    1 +
 gstreamer/src/elementfactory.hg              |    1 +
 gstreamer/src/format.hg                      |    1 +
 gstreamer/src/index.hg                       |    1 +
 gstreamer/src/mixer.hg                       |    1 +
 gstreamer/src/object.hg                      |    1 +
 gstreamer/src/pad.hg                         |    1 +
 gstreamer/src/plugin.hg                      |    1 +
 gstreamer/src/preset.hg                      |    1 +
 gstreamer/src/propertyprobe.hg               |    1 +
 gstreamer/src/query.hg                       |    1 +
 gstreamer/src/ringbuffer.hg                  |    1 +
 gstreamer/src/structure.hg                   |    1 +
 gstreamer/src/task.hg                        |    1 +
 gstreamer/src/typefind.hg                    |    1 +
 gstreamer/src/typefindfactory.hg             |    1 +
 gstreamer/src/urihandler.hg                  |    1 +
 tools/m4/plugingen_gstreamermm.m4            |    1 +
 30 files changed, 75 insertions(+), 10 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 95906c6..a76bb5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,42 @@
+2012-01-16  Josà Alburquerque  <jaalburquerque gmail com>
+
+	Fix the build with the latest GStreamer sources and glibmm.
+
+	* examples/hello_world/main.cc:
+	* examples/media_player_gtkmm/player_window.cc:
+	* examples/media_player_gtkmm/player_window.h:
+	* examples/ogg_player/main.cc:
+	* examples/ogg_player_gtkmm/player_window.cc:
+	* examples/optiongroup/main.cc:
+	* examples/typefind/main.cc: Add needed includes to the example
+	sources so that they build with the latest glibmm.
+
+	* gstreamer/gstreamermm/wrap.cc:
+	* gstreamer/src/bus.hg:
+	* gstreamer/src/cddabasesrc.hg:
+	* gstreamer/src/element.hg:
+	* gstreamer/src/elementfactory.hg:
+	* gstreamer/src/format.hg:
+	* gstreamer/src/index.hg:
+	* gstreamer/src/mixer.hg:
+	* gstreamer/src/object.hg:
+	* gstreamer/src/pad.hg:
+	* gstreamer/src/plugin.hg:
+	* gstreamer/src/preset.hg:
+	* gstreamer/src/propertyprobe.hg:
+	* gstreamer/src/query.hg:
+	* gstreamer/src/ringbuffer.hg:
+	* gstreamer/src/structure.hg:
+	* gstreamer/src/task.hg:
+	* gstreamer/src/typefind.hg:
+	* gstreamer/src/typefindfactory.hg:
+	* gstreamer/src/urihandler.hg: Add needed includes to the sources so
+	that they also build with the latest glibmm.
+
+	* tools/m4/plugingen_gstreamermm.m4: Add a _TRANSLATION from
+	GstFraction to Gst::Fraction so that the plugin generation process
+	works with the latest GStreamer sources.
+
 2011-11-02  Josà Alburquerque  <jaalburqu svn gnome org>
 
 	Examples: Add a "Hello World" example.
diff --git a/NEWS b/NEWS
index 9398f8a..33287ec 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,5 @@
 0.10.10 (unstable):
+
 API:
 * Add new properties in classes.
 * AudioSink, AudioSrc, BaseSrc: Wrap the virtual functions.
diff --git a/examples/hello_world/main.cc b/examples/hello_world/main.cc
index cb006bc..af765b6 100644
--- a/examples/hello_world/main.cc
+++ b/examples/hello_world/main.cc
@@ -17,6 +17,7 @@
  */
 
 #include <gstreamermm.h>
+#include <glibmm.h>
 #include <iostream>
 #include <stdlib.h>
 
@@ -107,7 +108,7 @@ int main(int argc, char** argv)
   mainloop->run();
 
   // Clean up nicely:
-  std::cout << "Returned. Stopping playback." << std::endl;
+  std::cout << "Returned. Setting state to NULL." << std::endl;
   playbin->set_state(Gst::STATE_NULL);
 
   return EXIT_SUCCESS;
diff --git a/examples/media_player_gtkmm/player_window.cc b/examples/media_player_gtkmm/player_window.cc
index cc7fea8..088241f 100644
--- a/examples/media_player_gtkmm/player_window.cc
+++ b/examples/media_player_gtkmm/player_window.cc
@@ -28,13 +28,16 @@
 #include <gstreamermm/query.h>
 #include <gstreamermm/interface.h>
 #include <gstreamermm/xoverlay.h>
+#include <glibmm/main.h>
+#include <glibmm/miscutils.h>
+#include <glibmm/convert.h>
 #include <iostream>
 #include <sstream>
 #include <iomanip>
 #include "player_window.h"
 
 PlayerWindow::PlayerWindow(const Glib::RefPtr<Gst::PlayBin2>& playbin,
-  const Glib::RefPtr<Gst::XImageSink>& video_sink)
+  const Glib::RefPtr<Gst::Element>& video_sink)
 : m_vbox(false, 6),
   m_progress_label("000:00:00.000000000 / 000:00:00.000000000"),
   m_play_button(Gtk::Stock::MEDIA_PLAY),
diff --git a/examples/media_player_gtkmm/player_window.h b/examples/media_player_gtkmm/player_window.h
index 11fd9ca..aeaf17e 100644
--- a/examples/media_player_gtkmm/player_window.h
+++ b/examples/media_player_gtkmm/player_window.h
@@ -29,7 +29,6 @@
 #include <gstreamermm/pipeline.h>
 #include <gstreamermm/bus.h>
 #include <gstreamermm/playbin2.h>
-#include <gstreamermm/ximagesink.h>
 
 class PlayerWindow : public Gtk::Window
 {
@@ -38,7 +37,7 @@ public:
    * @param playbin The pipeline that can play media files.
    * @param video_sink The video sink to use to display stream video (if any).
    */
-  PlayerWindow(const Glib::RefPtr<Gst::PlayBin2>& playbin, const Glib::RefPtr<Gst::XImageSink>& video_sink);
+  PlayerWindow(const Glib::RefPtr<Gst::PlayBin2>& playbin, const Glib::RefPtr<Gst::Element>& video_sink);
   virtual ~PlayerWindow();
 
 protected:
@@ -74,7 +73,7 @@ protected:
   Gtk::Button m_open_button;
 
   Glib::RefPtr<Gst::PlayBin2> m_play_bin;
-  Glib::RefPtr<Gst::XImageSink> m_video_sink;
+  Glib::RefPtr<Gst::Element> m_video_sink;
   sigc::connection m_timeout_connection;
   guint m_watch_id;
   gint64 m_duration;
diff --git a/examples/ogg_player/main.cc b/examples/ogg_player/main.cc
index 31b317e..a0621aa 100644
--- a/examples/ogg_player/main.cc
+++ b/examples/ogg_player/main.cc
@@ -17,6 +17,7 @@
  */
 
 #include <gstreamermm.h>
+#include <glibmm.h>
 #include <iostream>
 #include <iomanip>
 
diff --git a/examples/ogg_player_gtkmm/player_window.cc b/examples/ogg_player_gtkmm/player_window.cc
index 9037eb9..97fb163 100644
--- a/examples/ogg_player_gtkmm/player_window.cc
+++ b/examples/ogg_player_gtkmm/player_window.cc
@@ -23,6 +23,8 @@
 #include <gstreamermm/event.h>
 #include <gstreamermm/message.h>
 #include <gstreamermm/query.h>
+#include <glibmm/main.h>
+#include <glibmm/miscutils.h>
 #include <iostream>
 #include <sstream>
 #include <iomanip>
diff --git a/examples/optiongroup/main.cc b/examples/optiongroup/main.cc
index f6cd306..71b33a7 100644
--- a/examples/optiongroup/main.cc
+++ b/examples/optiongroup/main.cc
@@ -17,6 +17,7 @@
  */
 
 #include <gstreamermm.h>
+#include <glibmm.h>
 #include <iostream>
 
 Glib::OptionEntry make_entry(const Glib::ustring& long_name, const gchar& short_name, const Glib::ustring& description)
diff --git a/examples/typefind/main.cc b/examples/typefind/main.cc
index 76c2c32..73c04b7 100644
--- a/examples/typefind/main.cc
+++ b/examples/typefind/main.cc
@@ -17,6 +17,7 @@
  */
 
 #include <gstreamermm.h>
+#include <glibmm.h>
 #include <iostream>
 
 Glib::RefPtr<Glib::MainLoop> mainloop;
diff --git a/gstreamer/gstreamermm/wrap.cc b/gstreamer/gstreamermm/wrap.cc
index 3ae2742..b7f2786 100644
--- a/gstreamer/gstreamermm/wrap.cc
+++ b/gstreamer/gstreamermm/wrap.cc
@@ -20,17 +20,14 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <glib/gtypes.h>
-#include <glib/gmacros.h>
-
-#include <vector>
 #include <gstreamermm/miniobject.h>
 #include <gstreamermm/wrap.h>
+#include <glib.h>
+#include <vector>
 
 #include <glibmmconfig.h>
 GLIBMM_USING_STD(vector)
 
-
 namespace
 {
 
diff --git a/gstreamer/src/bus.hg b/gstreamer/src/bus.hg
index 463cdd8..ce4f208 100644
--- a/gstreamer/src/bus.hg
+++ b/gstreamer/src/bus.hg
@@ -21,6 +21,7 @@
 #include <gstreamermm/object.h>
 #include <gstreamermm/clock.h>
 #include <gstreamermm/message.h>
+#include <glibmm/priorities.h>
 //#include <glibmm/main.h> //For Glib::Source
 
 _DEFS(gstreamermm,gst)
diff --git a/gstreamer/src/cddabasesrc.hg b/gstreamer/src/cddabasesrc.hg
index c929223..314f4ee 100644
--- a/gstreamer/src/cddabasesrc.hg
+++ b/gstreamer/src/cddabasesrc.hg
@@ -20,6 +20,7 @@
 #include <gst/cdda/gstcddabasesrc.h>
 #include <gstreamermm/pushsrc.h>
 #include <gstreamermm/taglist.h>
+#include <glibmm/arrayhandle.h>
 
 _DEFS(gstreamermm,gst)
 
diff --git a/gstreamer/src/element.hg b/gstreamer/src/element.hg
index 3eb620c..e393e02 100644
--- a/gstreamer/src/element.hg
+++ b/gstreamer/src/element.hg
@@ -26,6 +26,7 @@
 #include <gstreamermm/message.h>
 #include <gstreamermm/pad.h>
 #include <gstreamermm/query.h>
+#include <glibmm/arrayhandle.h>
 
 _DEFS(gstreamermm,gst)
 
diff --git a/gstreamer/src/elementfactory.hg b/gstreamer/src/elementfactory.hg
index 18c3621..b001a7f 100644
--- a/gstreamer/src/elementfactory.hg
+++ b/gstreamer/src/elementfactory.hg
@@ -20,6 +20,7 @@
 #include <gst/gstelement.h>
 #include <gstreamermm/pad.h>
 #include <gstreamermm/pluginfeature.h>
+#include <glibmm/arrayhandle.h>
 
 _DEFS(gstreamermm,gst)
 
diff --git a/gstreamer/src/format.hg b/gstreamer/src/format.hg
index cec0004..72517eb 100644
--- a/gstreamer/src/format.hg
+++ b/gstreamer/src/format.hg
@@ -18,6 +18,7 @@
  */
 
 #include <gst/gstformat.h>
+#include <glibmm/arrayhandle.h>
 
 _DEFS(gstreamermm,gst)
 
diff --git a/gstreamer/src/index.hg b/gstreamer/src/index.hg
index 856374a..c185e62 100644
--- a/gstreamer/src/index.hg
+++ b/gstreamer/src/index.hg
@@ -20,6 +20,7 @@
 #include <gst/gstindex.h>
 #include <gstreamermm/object.h>
 #include <gstreamermm/format.h>
+#include <glibmm/arrayhandle.h>
 
 _DEFS(gstreamermm,gst)
 
diff --git a/gstreamer/src/mixer.hg b/gstreamer/src/mixer.hg
index 5161b8c..c778b0e 100644
--- a/gstreamer/src/mixer.hg
+++ b/gstreamer/src/mixer.hg
@@ -21,6 +21,7 @@
 #include <gst/interfaces/mixeroptions.h>
 #include <gstreamermm/mixertrack.h>
 #include <gstreamermm/message.h>
+#include <glibmm/arrayhandle.h>
 #include <glibmm/interface.h>
 
 _DEFS(gstreamermm,gst)
diff --git a/gstreamer/src/object.hg b/gstreamer/src/object.hg
index a3295dc..af99c01 100644
--- a/gstreamer/src/object.hg
+++ b/gstreamer/src/object.hg
@@ -19,6 +19,7 @@
 
 #include <gst/gstobject.h>
 #include <glibmm/object.h>
+#include <glibmm/listhandle.h>
 #include <libxml++/nodes/node.h>
 
 _DEFS(gstreamermm,gst)
diff --git a/gstreamer/src/pad.hg b/gstreamer/src/pad.hg
index 20381dc..3665f9b 100644
--- a/gstreamer/src/pad.hg
+++ b/gstreamer/src/pad.hg
@@ -22,6 +22,7 @@
 #include <gstreamermm/miniobject.h>
 #include <gstreamermm/format.h>
 #include <gstreamermm/query.h>
+#include <glibmm/arrayhandle.h>
 
 _DEFS(gstreamermm,gst)
 
diff --git a/gstreamer/src/plugin.hg b/gstreamer/src/plugin.hg
index a555385..5b218b0 100644
--- a/gstreamer/src/plugin.hg
+++ b/gstreamer/src/plugin.hg
@@ -19,6 +19,7 @@
 
 #include <gst/gstplugin.h>
 #include <gstreamermm/object.h>
+#include <glibmm/arrayhandle.h>
 
 _DEFS(gstreamermm,gst)
 
diff --git a/gstreamer/src/preset.hg b/gstreamer/src/preset.hg
index beb81b7..a65e36e 100644
--- a/gstreamer/src/preset.hg
+++ b/gstreamer/src/preset.hg
@@ -19,6 +19,7 @@
 
 #include <gst/gstconfig.h>
 #include <gst/gstpreset.h>
+#include <glibmm/arrayhandle.h>
 #include <glibmm/interface.h>
 
 _DEFS(gstreamermm,gst)
diff --git a/gstreamer/src/propertyprobe.hg b/gstreamer/src/propertyprobe.hg
index 24b0dac..f93a4db 100644
--- a/gstreamer/src/propertyprobe.hg
+++ b/gstreamer/src/propertyprobe.hg
@@ -18,6 +18,7 @@
  */
 
 #include <gst/interfaces/propertyprobe.h>
+#include <glibmm/valuearray.h>
 #include <glibmm/interface.h>
 
 _DEFS(gstreamermm,gst)
diff --git a/gstreamer/src/query.hg b/gstreamer/src/query.hg
index 0348bbe..e9df36a 100644
--- a/gstreamer/src/query.hg
+++ b/gstreamer/src/query.hg
@@ -22,6 +22,7 @@
 #include <gstreamermm/structure.h>
 #include <gstreamermm/wrap.h>
 #include <gstreamermm/format.h>
+#include <glibmm/arrayhandle.h>
 
 _DEFS(gstreamermm,gst)
 
diff --git a/gstreamer/src/ringbuffer.hg b/gstreamer/src/ringbuffer.hg
index 577846c..ebcd437 100644
--- a/gstreamer/src/ringbuffer.hg
+++ b/gstreamer/src/ringbuffer.hg
@@ -21,6 +21,7 @@
 #include <gstreamermm/caps.h>
 #include <gstreamermm/object.h>
 #include <gstreamermm/format.h>
+#include <glibmm/arrayhandle.h>
 #include <memory>
 
 _DEFS(gstreamermm,gst)
diff --git a/gstreamer/src/structure.hg b/gstreamer/src/structure.hg
index 32e821b..9308cae 100644
--- a/gstreamer/src/structure.hg
+++ b/gstreamer/src/structure.hg
@@ -20,6 +20,7 @@
 #include <gstreamermm/clock.h>
 #include <gstreamermm/enums.h>
 #include <gstreamermm/value.h>
+#include <glibmm/date.h>
 
 _DEFS(gstreamermm,gst)
 
diff --git a/gstreamer/src/task.hg b/gstreamer/src/task.hg
index 24c7f17..b459cbc 100644
--- a/gstreamer/src/task.hg
+++ b/gstreamer/src/task.hg
@@ -19,6 +19,7 @@
 
 #include <gst/gsttask.h>
 #include <gstreamermm/object.h>
+#include <glibmm/thread.h>
 #include <memory>
 
 _DEFS(gstreamermm,gst)
diff --git a/gstreamer/src/typefind.hg b/gstreamer/src/typefind.hg
index 44e6770..d3fa1be 100644
--- a/gstreamer/src/typefind.hg
+++ b/gstreamer/src/typefind.hg
@@ -18,6 +18,7 @@
  */
 
 #include <gst/gsttypefind.h>
+#include <glibmm/arrayhandle.h>
 
 _DEFS(gstreamermm,gst)
 
diff --git a/gstreamer/src/typefindfactory.hg b/gstreamer/src/typefindfactory.hg
index 2ff25b1..02c7962 100644
--- a/gstreamer/src/typefindfactory.hg
+++ b/gstreamer/src/typefindfactory.hg
@@ -19,6 +19,7 @@
 
 #include <gst/gsttypefindfactory.h>
 #include <gstreamermm/pluginfeature.h>
+#include <glibmm/arrayhandle.h>
 
 _DEFS(gstreamermm,gst)
 
diff --git a/gstreamer/src/urihandler.hg b/gstreamer/src/urihandler.hg
index 206456f..6d1315a 100644
--- a/gstreamer/src/urihandler.hg
+++ b/gstreamer/src/urihandler.hg
@@ -20,6 +20,7 @@
 #include <gst/gsturi.h>
 #include <glibmm/interface.h>
 #include <gstreamermm/enums.h>
+#include <glibmm/arrayhandle.h>
 
 _DEFS(gstreamermm,gst)
 
diff --git a/tools/m4/plugingen_gstreamermm.m4 b/tools/m4/plugingen_gstreamermm.m4
index 2a30c29..afb171b 100644
--- a/tools/m4/plugingen_gstreamermm.m4
+++ b/tools/m4/plugingen_gstreamermm.m4
@@ -22,6 +22,7 @@ _TRANSLATION(`GstBuffer*',`Gst::Buffer',`const Glib::RefPtr<Gst::Buffer>&',`Glib
 _TRANSLATION(`GstCaps*',`Gst::Caps',`const Glib::RefPtr<Gst::Caps>&',`Glib::RefPtr<Gst::Caps>',`<gstreamermm/caps.h>')
 _TRANSLATION(`GstElement*',`Gst::Element',`const Glib::RefPtr<Gst::Element>&',`Glib::RefPtr<Gst::Element>',`<gstreamermm/element.h>')
 _TRANSLATION(`GstElementFactory*',`Gst::ElementFactory',`const Glib::RefPtr<Gst::ElementFactory>&',`Glib::RefPtr<Gst::ElementFactory>',`<gstreamermm/elementfactory.h>')
+_TRANSLATION(`GstFraction',`Gst::Fraction',`const Gst::Fraction&',`Gst::Fraction',`<gstreamermm/value.h>')
 _TRANSLATION(`GstPad*',`Gst::Pad',`const Glib::RefPtr<Gst::Pad>&',`Glib::RefPtr<Gst::Pad>',`<gstreamermm/pad.h>')
 _TRANSLATION(`GstTagList*',`Gst::TagList',`const Gst::TagList&',`Gst::TagList',`<gstreamermm/taglist.h>')
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]