GNOME.org
 

gnomemm r1278 - in gstreamermm/trunk: . examples/ogg_player_gtkmm gst gst/src tests tools/m4

Author: jaalburqu
Date: Wed Jan  9 03:21:59 2008
New Revision: 1278
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1278&view=rev

Log:
2008-01-08  Josà Alburquerque  <jaalburqu svn gnome org>

	* examples/ogg_player_gtkmm/PlayerWindow.cc:
	* examples/ogg_player_gtkmm/main.cc: added necessary includes
	* gst/gstmm.h: added missing gstmm includes
	* gst/src/bin.ccg:
	* gst/src/bin.hg:
	* gst/src/bus.ccg:
	* gst/src/bus.hg:
	* gst/src/caps.ccg:
	* gst/src/caps.hg:
	* gst/src/clock.ccg:
	* gst/src/clock.hg: reduced includes in *.hg files
	* gst/src/element.ccg:
	* gst/src/element.hg: reduced includes in *.hg file; added query()
	method and fixed set_clock() to use Glib::RefPtr<Clock>
	* gst/src/enums.hg: added StateChange enum; reduced includes
	* gst/src/error.ccg:
	* gst/src/error.hg:
	* gst/src/event.ccg:
	* gst/src/iterator.hg:
	* gst/src/message.hg:
	* gst/src/pad.ccg:
	* gst/src/pad.hg:
	* gst/src/padtemplate.ccg:
	* gst/src/padtemplate.hg:
	* gst/src/pipeline.ccg:
	* gst/src/pipeline.hg:
	* gst/src/systemclock.hg:
	* gst/src/xml.ccg:
	* gst/src/xml.hg: reduced includes in *.hg files
	* tests/test-message-wrap.cc:
	* tests/test-miniobject-wrap.cc: added necessary includes
	* tools/m4/convert_gst.m4: added Query, and StateChange conversions


Modified:
   gstreamermm/trunk/ChangeLog
   gstreamermm/trunk/examples/ogg_player_gtkmm/PlayerWindow.cc
   gstreamermm/trunk/examples/ogg_player_gtkmm/main.cc
   gstreamermm/trunk/gst/gstmm.h
   gstreamermm/trunk/gst/src/bin.ccg
   gstreamermm/trunk/gst/src/bin.hg
   gstreamermm/trunk/gst/src/bus.ccg
   gstreamermm/trunk/gst/src/bus.hg
   gstreamermm/trunk/gst/src/caps.ccg
   gstreamermm/trunk/gst/src/caps.hg
   gstreamermm/trunk/gst/src/clock.ccg
   gstreamermm/trunk/gst/src/clock.hg
   gstreamermm/trunk/gst/src/element.ccg
   gstreamermm/trunk/gst/src/element.hg
   gstreamermm/trunk/gst/src/enums.hg
   gstreamermm/trunk/gst/src/error.ccg
   gstreamermm/trunk/gst/src/error.hg
   gstreamermm/trunk/gst/src/event.ccg
   gstreamermm/trunk/gst/src/iterator.hg
   gstreamermm/trunk/gst/src/message.hg
   gstreamermm/trunk/gst/src/pad.ccg
   gstreamermm/trunk/gst/src/pad.hg
   gstreamermm/trunk/gst/src/padtemplate.ccg
   gstreamermm/trunk/gst/src/padtemplate.hg
   gstreamermm/trunk/gst/src/pipeline.ccg
   gstreamermm/trunk/gst/src/pipeline.hg
   gstreamermm/trunk/gst/src/systemclock.hg
   gstreamermm/trunk/gst/src/xml.ccg
   gstreamermm/trunk/gst/src/xml.hg
   gstreamermm/trunk/tests/test-message-wrap.cc
   gstreamermm/trunk/tests/test-miniobject-wrap.cc
   gstreamermm/trunk/tools/m4/convert_gst.m4

Modified: gstreamermm/trunk/examples/ogg_player_gtkmm/PlayerWindow.cc
==============================================================================
--- gstreamermm/trunk/examples/ogg_player_gtkmm/PlayerWindow.cc	(original)
+++ gstreamermm/trunk/examples/ogg_player_gtkmm/PlayerWindow.cc	Wed Jan  9 03:21:59 2008
@@ -19,8 +19,10 @@
 
 #include <gtkmm/stock.h>
 #include <gtkmm/filechooserdialog.h>
+#include <gstmm/bus.h>
 #include <gstmm/clock.h>
 #include <gstmm/event.h>
+#include <gstmm/message.h>
 #include <iostream>
 #include <sstream>
 #include <iomanip>

Modified: gstreamermm/trunk/examples/ogg_player_gtkmm/main.cc
==============================================================================
--- gstreamermm/trunk/examples/ogg_player_gtkmm/main.cc	(original)
+++ gstreamermm/trunk/examples/ogg_player_gtkmm/main.cc	Wed Jan  9 03:21:59 2008
@@ -20,6 +20,7 @@
 #include <gtkmm/main.h>
 #include <gstmm/init.h>
 #include <gstmm/element.h>
+#include <gstmm/pad.h>
 #include <gstmm/pipeline.h>
 #include <iostream>
 #include "PlayerWindow.h"

Modified: gstreamermm/trunk/gst/gstmm.h
==============================================================================
--- gstreamermm/trunk/gst/gstmm.h	(original)
+++ gstreamermm/trunk/gst/gstmm.h	Wed Jan  9 03:21:59 2008
@@ -1,18 +1,25 @@
 #ifndef _GSTMM_H_
 #define _GSTMM_H_
 
+#include <gstmm/bin.h>
+#include <gstmm/bus.h>
+#include <gstmm/caps.h>
 #include <gstmm/clock.h>
 #include <gstmm/element.h>
+#include <gstmm/enums.h>
 #include <gstmm/error.h>
 #include <gstmm/event.h>
 #include <gstmm/format.h>
 #include <gstmm/iterator.h>
+#include <gstmm/message.h>
 #include <gstmm/object.h>
 #include <gstmm/pad.h>
+#include <gstmm/padtemplate.h>
 #include <gstmm/pipeline.h>
 #include <gstmm/query.h>
 #include <gstmm/structure.h>
 #include <gstmm/systemclock.h>
+#include <gstmm/xml.h>
 
 #include <gstmm/init.h>
 #include <gstmm/version.h>

Modified: gstreamermm/trunk/gst/src/bin.ccg
==============================================================================
--- gstreamermm/trunk/gst/src/bin.ccg	(original)
+++ gstreamermm/trunk/gst/src/bin.ccg	Wed Jan  9 03:21:59 2008
@@ -1,3 +1,6 @@
+#include <gstmm/pad.h>
+#include <gst/gstbin.h>
+#include <gst/gstutils.h>
 #include <stdexcept>
 
 namespace Gst

Modified: gstreamermm/trunk/gst/src/bin.hg
==============================================================================
--- gstreamermm/trunk/gst/src/bin.hg	(original)
+++ gstreamermm/trunk/gst/src/bin.hg	Wed Jan  9 03:21:59 2008
@@ -1,5 +1,4 @@
 #include <gstmm/element.h>
-#include <gstmm/pad.h>
 #include <gstmm/enums.h>
 _DEFS(gstmm,gst)
 _PINCLUDE(glibmm/private/object_p.h)
@@ -9,16 +8,16 @@
 namespace Gst
 {
 
+class Pad;
+
 class Bin : public Element 
 {
   _CLASS_GOBJECT(Bin, GstBin, GST_BIN, Element, GstElement)
 
 protected:
-
   _CTOR_DEFAULT
 
 public:
-
   //TODO: Why doesn't this use _WRAP_CREATE()?
   static Glib::RefPtr<Bin> create(const Glib::ustring& name);
 

Modified: gstreamermm/trunk/gst/src/bus.ccg
==============================================================================
--- gstreamermm/trunk/gst/src/bus.ccg	(original)
+++ gstreamermm/trunk/gst/src/bus.ccg	Wed Jan  9 03:21:59 2008
@@ -1,3 +1,5 @@
+#include <gstmm/message.h>
+#include <gst/gstbus.h>
 
 static gboolean SignalProxy_Watch_gstmm_callback(GstBus* bus, GstMessage* message, void* data)
 {

Modified: gstreamermm/trunk/gst/src/bus.hg
==============================================================================
--- gstreamermm/trunk/gst/src/bus.hg	(original)
+++ gstreamermm/trunk/gst/src/bus.hg	Wed Jan  9 03:21:59 2008
@@ -1,5 +1,4 @@
 #include <gstmm/object.h>
-#include <gstmm/message.h>
 #include <gstmm/clock.h>
 #include <gstmm/enums.h>
 _DEFS(gstmm,gst)
@@ -8,6 +7,7 @@
 
 namespace Gst
 {
+
 class Message;
 
 class Bus : public Object
@@ -18,7 +18,6 @@
   _CTOR_DEFAULT()
 
 public:
-
   static Glib::RefPtr<Bus> create();
   _WRAP_METHOD(bool post(const Glib::RefPtr<Message>& message), gst_bus_post)
   _WRAP_METHOD(bool have_pending() const, gst_bus_have_pending)

Modified: gstreamermm/trunk/gst/src/caps.ccg
==============================================================================
--- gstreamermm/trunk/gst/src/caps.ccg	(original)
+++ gstreamermm/trunk/gst/src/caps.ccg	Wed Jan  9 03:21:59 2008
@@ -1,3 +1,4 @@
+#include <gstmm/structure.h>
 #include <gst/gstcaps.h>
 
 namespace Gst

Modified: gstreamermm/trunk/gst/src/caps.hg
==============================================================================
--- gstreamermm/trunk/gst/src/caps.hg	(original)
+++ gstreamermm/trunk/gst/src/caps.hg	Wed Jan  9 03:21:59 2008
@@ -1,11 +1,11 @@
-#include <gstmm/structure.h>
-#include <gstmm/enums.h>
 #include <gst/gstcaps.h>
 _DEFS(gstmm,gst)
 
 namespace Gst
 {
 
+struct Structure;
+
 class Caps 
 {
   _CLASS_OPAQUE_REFCOUNTED(Caps, GstCaps, NONE, gst_caps_ref, gst_caps_unref)
@@ -57,7 +57,6 @@
   _IGNORE(gst_caps_copy, gst_caps_make_writable)
 
 protected: 
-
   GstCaps * cobj_;
 };
 

Modified: gstreamermm/trunk/gst/src/clock.ccg
==============================================================================
--- gstreamermm/trunk/gst/src/clock.ccg	(original)
+++ gstreamermm/trunk/gst/src/clock.ccg	Wed Jan  9 03:21:59 2008
@@ -1,4 +1,3 @@
-#include <gstmm/bus.h>
 #include <gst/gstclock.h>
 
 namespace Gst

Modified: gstreamermm/trunk/gst/src/clock.hg
==============================================================================
--- gstreamermm/trunk/gst/src/clock.hg	(original)
+++ gstreamermm/trunk/gst/src/clock.hg	Wed Jan  9 03:21:59 2008
@@ -1,6 +1,5 @@
 #include <gstmm/object.h>
 #include <gstmm/enums.h>
-#include <gst/gstclock.h>
 _DEFS(gstmm,gst)
 _PINCLUDE(glibmm/private/object_p.h)
 _PINCLUDE(gstmm/private/object_p.h)
@@ -10,10 +9,8 @@
 
 class ClockID
 {
-
   _CLASS_OPAQUE_REFCOUNTED(ClockID, GstClockID, NONE, gst_clock_id_ref, gst_clock_id_unref)
   _IGNORE(gst_clock_id_ref, gst_clock_id_unref)
-
 };
 
 typedef GstClockTime ClockTime;
@@ -32,17 +29,14 @@
 
 class Clock : public Object
 {
-
   _CLASS_GOBJECT(Clock, GstClock, GST_CLOCK, Object, GstObject)
 
 protected:
-
   //TODO: What C function does this correspond to?
   //TODO: Add a create()?
   _CTOR_DEFAULT()
 
 public:
-
   _WRAP_METHOD(bool add_observation(ClockTime slave_time, ClockTime master_time, gdouble* result), gst_clock_add_observation)
   _WRAP_METHOD(bool set_master(const Clock& master_clock), gst_clock_set_master)
   _WRAP_METHOD(Glib::RefPtr<Clock> get_master(), gst_clock_get_master)
@@ -54,7 +48,6 @@
   _WRAP_METHOD(ClockTime get_internal_time() const, gst_clock_get_internal_time)
   _WRAP_METHOD(ClockTime adjust_unlocked(ClockTime internal_time), gst_clock_adjust_unlocked)
   _WRAP_METHOD(ClockTime unadjust_unlocked(ClockTime external_time), gst_clock_unadjust_unlocked)
-
 };
 
 } //namespace Gst

Modified: gstreamermm/trunk/gst/src/element.ccg
==============================================================================
--- gstreamermm/trunk/gst/src/element.ccg	(original)
+++ gstreamermm/trunk/gst/src/element.ccg	Wed Jan  9 03:21:59 2008
@@ -1,5 +1,13 @@
-#include <stdexcept>
+#include <gstmm/bus.h>
+#include <gstmm/caps.h>
 #include <gstmm/event.h>
+#include <gstmm/message.h>
+#include <gstmm/pad.h>
+#include <gstmm/padtemplate.h>
+#include <gstmm/query.h>
+#include <gst/gstelement.h>
+#include <gst/gstutils.h>
+#include <stdexcept>
 
 namespace Gst
 {

Modified: gstreamermm/trunk/gst/src/element.hg
==============================================================================
--- gstreamermm/trunk/gst/src/element.hg	(original)
+++ gstreamermm/trunk/gst/src/element.hg	Wed Jan  9 03:21:59 2008
@@ -1,24 +1,21 @@
 #include <gstmm/object.h>
-#include <gstmm/pad.h>
-#include <gstmm/padtemplate.h>
-#include <gstmm/caps.h>
 #include <gstmm/clock.h>
-#include <gstmm/bus.h>
 #include <gstmm/enums.h>
-#include <gstmm/message.h>
 _DEFS(gstmm,gst)
 _PINCLUDE(glibmm/private/object_p.h)
 _PINCLUDE(gstmm/private/object_p.h)
 
-
 namespace Gst
 {
 
 class Bus;
+class Caps;
+class Clock;
 class Event;
 class Message;
 class Pad;
 class PadTemplate;
+class Query;
 
 class Element : public Object 
 {
@@ -29,7 +26,6 @@
   _CTOR_DEFAULT
 
 public:
-
   static Glib::RefPtr<Element> create(const Glib::ustring& factoryname, const Glib::ustring& name);
   Glib::RefPtr<Element> link(const Glib::RefPtr<Element>& other_element);
   _WRAP_METHOD(bool add_pad(const Glib::RefPtr<Pad>& pad), gst_element_add_pad)
@@ -64,7 +60,7 @@
 
   _WRAP_METHOD(bool is_indexable() const, gst_element_is_indexable)
   _WRAP_METHOD(bool requires_clock() const, gst_element_requires_clock)
-  _WRAP_METHOD(bool set_clock(const Clock& clock), gst_element_set_clock)
+  _WRAP_METHOD(bool set_clock(const Glib::RefPtr<Clock>& clock), gst_element_set_clock)
   _WRAP_METHOD(Glib::RefPtr<Clock> get_clock(), gst_element_get_clock)
   _WRAP_METHOD(Glib::RefPtr<const Clock> get_clock() const, gst_element_get_clock, constversion)
   _WRAP_METHOD(bool provides_clock() const, gst_element_provides_clock)
@@ -78,10 +74,11 @@
   _WRAP_METHOD(StateChangeReturn continue_state(StateChangeReturn prestate_value), gst_element_continue_state)
   _WRAP_METHOD(void lost_state(), gst_element_lost_state)
   _WRAP_METHOD(bool sync_state_with_parent(), gst_element_sync_state_with_parent)
-  _WRAP_METHOD(StateChangeReturn change_state(GstStateChange transition), gst_element_change_state)
+  _WRAP_METHOD(StateChangeReturn change_state(StateChange transition), gst_element_change_state)
 
   _WRAP_METHOD(bool post_message(const Glib::RefPtr<Message>& message), gst_element_post_message)
 
+  _WRAP_METHOD(bool query(const Glib::RefPtr<Query>& query), gst_element_query)
   _WRAP_METHOD(bool query_convert(Format src_format, gint64 src_value, Format& dst_format, gint64& dst_value) const, gst_element_query_convert)
   _WRAP_METHOD(bool query_position(Format& format, gint64& position) const, gst_element_query_position)
   _WRAP_METHOD(bool query_duration(Format& format, gint64& duration) const, gst_element_query_duration)

Modified: gstreamermm/trunk/gst/src/enums.hg
==============================================================================
--- gstreamermm/trunk/gst/src/enums.hg	(original)
+++ gstreamermm/trunk/gst/src/enums.hg	Wed Jan  9 03:21:59 2008
@@ -1,4 +1,5 @@
 #include <gst/gstevent.h>
+#include <gst/gstelement.h>
 _DEFS(gstmm,gst)
 
 namespace Gst
@@ -175,6 +176,17 @@
 
 _WRAP_ENUM(SeekType, GstSeekType)
 _WRAP_ENUM(State, GstState)
+
+enum StateChange
+{
+  STATE_CHANGE_NULL_TO_READY = GST_STATE_CHANGE_NULL_TO_READY,
+  STATE_CHANGE_READY_TO_PAUSED = GST_STATE_CHANGE_READY_TO_PAUSED,
+  STATE_CHANGE_PAUSED_TO_PLAYING = GST_STATE_CHANGE_PAUSED_TO_PLAYING,
+  STATE_CHANGE_PLAYING_TO_PAUSED = GST_STATE_CHANGE_PLAYING_TO_PAUSED,
+  STATE_CHANGE_PAUSED_TO_READY = GST_STATE_CHANGE_PAUSED_TO_READY,
+  STATE_CHANGE_READY_TO_NULL = GST_STATE_CHANGE_READY_TO_NULL 
+};
+
 _WRAP_ENUM(StateChangeReturn, GstStateChangeReturn)
 _WRAP_ENUM(TagMergeMode, GstTagMergeMode)
 _WRAP_ENUM(TagFlag, GstTagFlag)

Modified: gstreamermm/trunk/gst/src/error.ccg
==============================================================================
--- gstreamermm/trunk/gst/src/error.ccg	(original)
+++ gstreamermm/trunk/gst/src/error.ccg	Wed Jan  9 03:21:59 2008
@@ -1,3 +1,5 @@
+#include <gst/gsterror.h>
+
 namespace Gst
 {
 }

Modified: gstreamermm/trunk/gst/src/error.hg
==============================================================================
--- gstreamermm/trunk/gst/src/error.hg	(original)
+++ gstreamermm/trunk/gst/src/error.hg	Wed Jan  9 03:21:59 2008
@@ -1,8 +1,8 @@
-#include <gst/gsterror.h> //TODO: Remove this include?
 _DEFS(gstmm,gst)
 
 namespace Gst
 {
+
   _WRAP_GERROR(CoreError, GstCoreError, GST_CORE_ERROR, NO_GTYPE)
   _WRAP_GERROR(LibraryError, GstLibraryError, GST_LIBRARY_ERROR, NO_GTYPE)
   _WRAP_GERROR(ResourceError, GstResourceError, GST_RESOURCE_ERROR, NO_GTYPE)

Modified: gstreamermm/trunk/gst/src/event.ccg
==============================================================================
--- gstreamermm/trunk/gst/src/event.ccg	(original)
+++ gstreamermm/trunk/gst/src/event.ccg	Wed Jan  9 03:21:59 2008
@@ -1,3 +1,4 @@
+#include <gst/gstevent.h>
 
 namespace Gst
 {

Modified: gstreamermm/trunk/gst/src/iterator.hg
==============================================================================
--- gstreamermm/trunk/gst/src/iterator.hg	(original)
+++ gstreamermm/trunk/gst/src/iterator.hg	Wed Jan  9 03:21:59 2008
@@ -1,4 +1,3 @@
-#include <gstmm/enums.h>
 #include <gst/gstiterator.h>
 _DEFS(gstmm,gst)
 

Modified: gstreamermm/trunk/gst/src/message.hg
==============================================================================
--- gstreamermm/trunk/gst/src/message.hg	(original)
+++ gstreamermm/trunk/gst/src/message.hg	Wed Jan  9 03:21:59 2008
@@ -1,7 +1,5 @@
 #include <gstmm/miniobject.h>
 #include <gstmm/structure.h>
-#include <gstmm/format.h>
-#include <gstmm/element.h>
 #include <gstmm/wrap.h>
 _PINCLUDE(gstmm/private/miniobject_p.h)
 _DEFS(gstmm,gst)

Modified: gstreamermm/trunk/gst/src/pad.ccg
==============================================================================
--- gstreamermm/trunk/gst/src/pad.ccg	(original)
+++ gstreamermm/trunk/gst/src/pad.ccg	Wed Jan  9 03:21:59 2008
@@ -1,4 +1,7 @@
+#include <gstmm/caps.h>
+#include <gstmm/element.h>
 #include <gst/gstpad.h>
+#include <gst/gstutils.h>
 
 namespace Gst
 {

Modified: gstreamermm/trunk/gst/src/pad.hg
==============================================================================
--- gstreamermm/trunk/gst/src/pad.hg	(original)
+++ gstreamermm/trunk/gst/src/pad.hg	Wed Jan  9 03:21:59 2008
@@ -1,9 +1,4 @@
-#include <string>
-#include <gst/gst.h>
 #include <gstmm/object.h>
-#include <gstmm/element.h>
-#include <gstmm/padtemplate.h>
-#include <gstmm/format.h>
 #include <gstmm/enums.h>
 _DEFS(gstmm,gst)
 _PINCLUDE(glibmm/private/object_p.h)
@@ -11,7 +6,10 @@
 
 namespace Gst
 {
+
+class Caps;
 class Element;
+class PadTemplate;
 
 class Pad : public Object 
 {
@@ -21,8 +19,6 @@
   _CTOR_DEFAULT
 
 public:
-
-
   // The C API has gst_pad_new, we just use the very common ::create() here
   static Glib::RefPtr<Pad> create(const Glib::ustring& name, PadDirection direction);
 
@@ -92,7 +88,6 @@
 
   bool set_blocked_async(bool blocked, const SlotPadBlockCallback& slot);
 
-
   //_WRAP_SIGNAL(void have_data(const Glib::RefPtr<MiniObject>& mini_obj), "have-data")
 
 #m4 _CONVERSION(`GstPad*',`const Glib::RefPtr<Pad>&',`Glib::wrap($3, true)')
@@ -103,7 +98,6 @@
   _WRAP_PROPERTY("caps", Glib::RefPtr<Caps>)
   _WRAP_PROPERTY("direction", PadDirection)
   _WRAP_PROPERTY("template", PadTemplate)
-
 };
 
 } // namespace Gst

Modified: gstreamermm/trunk/gst/src/padtemplate.ccg
==============================================================================
--- gstreamermm/trunk/gst/src/padtemplate.ccg	(original)
+++ gstreamermm/trunk/gst/src/padtemplate.ccg	Wed Jan  9 03:21:59 2008
@@ -1,4 +1,5 @@
-#include <gst/gstpad.h> //Must be included before gstpadtemplate.h
+#include <gstmm/caps.h>
+#include <gstmm/pad.h>
 #include <gst/gstpadtemplate.h>
 
 namespace Gst

Modified: gstreamermm/trunk/gst/src/padtemplate.hg
==============================================================================
--- gstreamermm/trunk/gst/src/padtemplate.hg	(original)
+++ gstreamermm/trunk/gst/src/padtemplate.hg	Wed Jan  9 03:21:59 2008
@@ -1,6 +1,4 @@
 #include <gstmm/object.h>
-#include <gstmm/caps.h>
-#include <gstmm/pad.h>
 #include <gstmm/enums.h>
 _DEFS(gstmm,gst)
 _PINCLUDE(glibmm/private/object_p.h)
@@ -9,6 +7,7 @@
 namespace Gst
 {
 
+class Caps;
 class Pad;
 
 class PadTemplate  : public Object 

Modified: gstreamermm/trunk/gst/src/pipeline.ccg
==============================================================================
--- gstreamermm/trunk/gst/src/pipeline.ccg	(original)
+++ gstreamermm/trunk/gst/src/pipeline.ccg	Wed Jan  9 03:21:59 2008
@@ -1,4 +1,5 @@
-#include <stdexcept>
+#include <gstmm/bus.h>
+#include <gst/gstpipeline.h>
 
 namespace Gst
 {

Modified: gstreamermm/trunk/gst/src/pipeline.hg
==============================================================================
--- gstreamermm/trunk/gst/src/pipeline.hg	(original)
+++ gstreamermm/trunk/gst/src/pipeline.hg	Wed Jan  9 03:21:59 2008
@@ -1,7 +1,5 @@
 #include <gstmm/bin.h>
-#include <gstmm/bus.h>
 #include <gstmm/clock.h>
-#include <gstmm/enums.h>
 _DEFS(gstmm,gst)
 _PINCLUDE(glibmm/private/object_p.h)
 _PINCLUDE(gstmm/private/bin_p.h)
@@ -9,16 +7,17 @@
 
 namespace Gst
 {
+
+class Bus;
+
 class Pipeline : public Bin 
 {
   _CLASS_GOBJECT(Pipeline, GstPipeline, GST_PIPELINE, Bin, GstBin)
 
 protected:
-
   _CTOR_DEFAULT
 
 public:
-
   static Glib::RefPtr<Pipeline> create(const Glib::ustring& name);
 
   _WRAP_METHOD(Glib::RefPtr<Bus> get_bus(), gst_pipeline_get_bus)

Modified: gstreamermm/trunk/gst/src/systemclock.hg
==============================================================================
--- gstreamermm/trunk/gst/src/systemclock.hg	(original)
+++ gstreamermm/trunk/gst/src/systemclock.hg	Wed Jan  9 03:21:59 2008
@@ -1,8 +1,5 @@
-#include <gstmm/object.h>
 #include <gstmm/clock.h>
-#include <gstmm/enums.h>
 _DEFS(gstmm,gst)
-_PINCLUDE(glibmm/private/object_p.h)
 _PINCLUDE(gstmm/private/clock_p.h)
 
 namespace Gst
@@ -12,11 +9,9 @@
   _CLASS_GOBJECT(SystemClock, GstSystemClock, GST_SYSTEM_CLOCK, Clock, GstClock)
 
 protected:
-
   _CTOR_DEFAULT
 
 public:
-
   _WRAP_METHOD(static Glib::RefPtr<Clock> obtain(), gst_system_clock_obtain)
 };
 

Modified: gstreamermm/trunk/gst/src/xml.ccg
==============================================================================
--- gstreamermm/trunk/gst/src/xml.ccg	(original)
+++ gstreamermm/trunk/gst/src/xml.ccg	Wed Jan  9 03:21:59 2008
@@ -1,7 +1,9 @@
+#include <gstmm/element.h>
+#include <gst/gstxml.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-
+#include <errno.h>
 
 namespace Gst
 {

Modified: gstreamermm/trunk/gst/src/xml.hg
==============================================================================
--- gstreamermm/trunk/gst/src/xml.hg	(original)
+++ gstreamermm/trunk/gst/src/xml.hg	Wed Jan  9 03:21:59 2008
@@ -1,5 +1,4 @@
 #include <gstmm/object.h>
-#include <gstmm/element.h>
 #include <gstmm/enums.h>
 _DEFS(gstmm,gst)
 _PINCLUDE(glibmm/private/object_p.h)
@@ -8,17 +7,16 @@
 namespace Gst
 {
 
+class Element;
+
 class XML : public Object
 {
-
   _CLASS_GOBJECT(XML, GstXML, GST_XML, Object, GstObject)
 
 protected:
-
   _CTOR_DEFAULT
 
 public:
-
   _WRAP_CREATE()
 
   _WRAP_METHOD(bool parse_doc(xmlDocPtr doc, const std::string& root), gst_xml_parse_doc)
@@ -30,7 +28,6 @@
   _IGNORE(gst_xml_parse_memory)
 
   //TODO: Is this useful? _WRAP_SIGNAL(void object_loaded(Glib::RefPtr<Object> object, xmlNode* xml_node), "object-loaded")
-
 };
 
 xmlDocPtr write_xml(const Glib::RefPtr<Element>& element);
@@ -38,4 +35,3 @@
 Glib::RefPtr<Element> make_element(const xmlNodePtr& xml_node, const Glib::RefPtr<Object>& parent);
 
 } //namespace Gst
-

Modified: gstreamermm/trunk/tests/test-message-wrap.cc
==============================================================================
--- gstreamermm/trunk/tests/test-message-wrap.cc	(original)
+++ gstreamermm/trunk/tests/test-message-wrap.cc	Wed Jan  9 03:21:59 2008
@@ -1,4 +1,6 @@
 #include <gstmm.h>
+#include <gst/gstbin.h>
+#include <gst/gsterror.h>
 #include <iostream>
 
 int main (int argc, char* argv[])

Modified: gstreamermm/trunk/tests/test-miniobject-wrap.cc
==============================================================================
--- gstreamermm/trunk/tests/test-miniobject-wrap.cc	(original)
+++ gstreamermm/trunk/tests/test-miniobject-wrap.cc	Wed Jan  9 03:21:59 2008
@@ -1,4 +1,6 @@
 #include <gstmm.h>
+#include <gst/gstbin.h>
+#include <gst/gsterror.h>
 #include <iostream>
 
 int main (int argc, char* argv[])

Modified: gstreamermm/trunk/tools/m4/convert_gst.m4
==============================================================================
--- gstreamermm/trunk/tools/m4/convert_gst.m4	(original)
+++ gstreamermm/trunk/tools/m4/convert_gst.m4	Wed Jan  9 03:21:59 2008
@@ -37,6 +37,7 @@
 _CONVERSION(`GstMessage*',`Glib::RefPtr<const Message>',`Gst::Message::wrap($3)')
 _CONVERSION(`const Glib::RefPtr<Message>&',`GstMessage*',__CONVERT_REFPTR_TO_P)
 _CONVERSION(`const Glib::RefPtr<Event>&',`GstEvent*',__CONVERT_REFPTR_TO_P)
+_CONVERSION(`const Glib::RefPtr<Query>&',`GstQuery*',__CONVERT_REFPTR_TO_P)
 _CONVERSION(`const Glib::RefPtr<Caps>&',`GstCaps*',__CONVERT_REFPTR_TO_P)
 _CONVERSION(`const Glib::RefPtr<Bus>&',`GstBus*',__CONVERT_REFPTR_TO_P)
 
@@ -53,6 +54,9 @@
 _CONVERSION(`gint64&',`gint64*',`&($3)')
 _CONVERSION(`const double&',`gdouble',`$3')
 
+_CONVERSION(`StateChange',`GstStateChange',`GstStateChange($3)')
+_CONVERSION(`GstStateChange',`StateChange',`StateChange($3)')
+
 _CONVERSION(`GstMessageType',`MessageType',`MessageType($3)')
 _CONVERSION(`MessageType',`GstMessageType',`GstMessageType($3)')
 _CONVERSION(`GstEventType',`EventType',`EventType($3)')
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]