gnomemm r1427 - in gstreamermm/trunk: . docs/reference gstreamer/src
- From: jaalburqu svn gnome org
- To: svn-commits-list gnome org
- Subject: gnomemm r1427 - in gstreamermm/trunk: . docs/reference gstreamer/src
- Date: Thu, 27 Mar 2008 21:05:33 +0000 (GMT)
Author: jaalburqu
Date: Thu Mar 27 21:05:32 2008
New Revision: 1427
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1427&view=rev
Log:
2008-03-27 Josà Alburquerque <jaalburqu svn gnome org>
Dispersed enums from:
* gstreamer/src/enums.hg:
* gstreamer/src/enums.ccg:
to:
* gstreamer/src/bin.hg:
* gstreamer/src/buffer.ccg:
* gstreamer/src/buffer.hg:
* gstreamer/src/bus.ccg:
* gstreamer/src/bus.hg:
* gstreamer/src/clock.ccg:
* gstreamer/src/clock.hg:
* gstreamer/src/element.ccg:
* gstreamer/src/element.hg:
* gstreamer/src/event.ccg:
* gstreamer/src/event.hg:
* gstreamer/src/format.ccg:
* gstreamer/src/format.hg:
* gstreamer/src/index.ccg:
* gstreamer/src/index.hg:
* gstreamer/src/iterator.ccg:
* gstreamer/src/iterator.hg:
* gstreamer/src/message.ccg:
* gstreamer/src/message.hg:
* gstreamer/src/pad.ccg:
* gstreamer/src/pad.hg:
* gstreamer/src/padtemplate.ccg:
* gstreamer/src/padtemplate.hg:
* gstreamer/src/parse.ccg:
* gstreamer/src/parse.hg:
* gstreamer/src/plugin.ccg:
* gstreamer/src/plugin.hg:
* gstreamer/src/pluginfeature.ccg:
* gstreamer/src/pluginfeature.hg:
* gstreamer/src/query.ccg:
* gstreamer/src/query.hg:
* gstreamer/src/taglist.ccg:
* gstreamer/src/taglist.hg:
* gstreamer/src/task.ccg:
* gstreamer/src/task.hg:
* gstreamer/src/urihandler.ccg:
* gstreamer/src/urihandler.hg:
* gstreamer/src/xml.hg:
* gstreamer/src/gst_enums.defs: Handwrote BusFlags, ElementFlags and
PadFlags to wrap corresp. enums
* docs/reference/Doxyfile.in: Modified to display one enum value per
line in docs
* docs/reference/Makefile.am: Modified docs build to depend on
Doxyfile which reponds better to changes to Doxyfile.in file
Modified:
gstreamermm/trunk/ChangeLog
gstreamermm/trunk/docs/reference/Doxyfile.in
gstreamermm/trunk/docs/reference/Makefile.am
gstreamermm/trunk/gstreamer/src/bin.hg
gstreamermm/trunk/gstreamer/src/buffer.ccg
gstreamermm/trunk/gstreamer/src/buffer.hg
gstreamermm/trunk/gstreamer/src/bus.ccg
gstreamermm/trunk/gstreamer/src/bus.hg
gstreamermm/trunk/gstreamer/src/clock.ccg
gstreamermm/trunk/gstreamer/src/clock.hg
gstreamermm/trunk/gstreamer/src/element.ccg
gstreamermm/trunk/gstreamer/src/element.hg
gstreamermm/trunk/gstreamer/src/enums.ccg
gstreamermm/trunk/gstreamer/src/enums.hg
gstreamermm/trunk/gstreamer/src/event.ccg
gstreamermm/trunk/gstreamer/src/event.hg
gstreamermm/trunk/gstreamer/src/format.ccg
gstreamermm/trunk/gstreamer/src/format.hg
gstreamermm/trunk/gstreamer/src/gst_enums.defs
gstreamermm/trunk/gstreamer/src/index.ccg
gstreamermm/trunk/gstreamer/src/index.hg
gstreamermm/trunk/gstreamer/src/iterator.ccg
gstreamermm/trunk/gstreamer/src/iterator.hg
gstreamermm/trunk/gstreamer/src/message.ccg
gstreamermm/trunk/gstreamer/src/message.hg
gstreamermm/trunk/gstreamer/src/pad.ccg
gstreamermm/trunk/gstreamer/src/pad.hg
gstreamermm/trunk/gstreamer/src/padtemplate.ccg
gstreamermm/trunk/gstreamer/src/padtemplate.hg
gstreamermm/trunk/gstreamer/src/parse.ccg
gstreamermm/trunk/gstreamer/src/parse.hg
gstreamermm/trunk/gstreamer/src/plugin.ccg
gstreamermm/trunk/gstreamer/src/plugin.hg
gstreamermm/trunk/gstreamer/src/pluginfeature.ccg
gstreamermm/trunk/gstreamer/src/pluginfeature.hg
gstreamermm/trunk/gstreamer/src/query.ccg
gstreamermm/trunk/gstreamer/src/query.hg
gstreamermm/trunk/gstreamer/src/taglist.ccg
gstreamermm/trunk/gstreamer/src/taglist.hg
gstreamermm/trunk/gstreamer/src/task.ccg
gstreamermm/trunk/gstreamer/src/task.hg
gstreamermm/trunk/gstreamer/src/urihandler.ccg
gstreamermm/trunk/gstreamer/src/urihandler.hg
gstreamermm/trunk/gstreamer/src/xml.hg
Modified: gstreamermm/trunk/docs/reference/Doxyfile.in
==============================================================================
--- gstreamermm/trunk/docs/reference/Doxyfile.in (original)
+++ gstreamermm/trunk/docs/reference/Doxyfile.in Thu Mar 27 21:05:32 2008
@@ -721,7 +721,7 @@
# This tag can be used to set the number of enum values (range [1..20])
# that doxygen will group on one line in the generated HTML documentation.
-ENUM_VALUES_PER_LINE = 4
+ENUM_VALUES_PER_LINE = 1
# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be
# generated containing a tree-like index structure (just like the one that
Modified: gstreamermm/trunk/docs/reference/Makefile.am
==============================================================================
--- gstreamermm/trunk/docs/reference/Makefile.am (original)
+++ gstreamermm/trunk/docs/reference/Makefile.am Thu Mar 27 21:05:32 2008
@@ -1,7 +1,6 @@
doxygenprog= DOXYGEN@
doxygen_configfile=Doxyfile
-doxygen_configfile_source = $(srcdir)/Doxyfile.in
beautify_docs = @GMMPROC_DIR@/beautify_docs.pl
docdir = $(datadir)/doc/gstreamermm-0.10/docs
@@ -11,7 +10,7 @@
HTML_INDEX=html/index.html
-$(HTML_INDEX): $(doxygen_configfile_source) $(beautify_docs_source) $(top_srcdir)/gstreamer/gstreamermm/*.h $(top_srcdir)/gstreamerbase/gstreamerbasemm/*.h
+$(HTML_INDEX): $(doxygen_configfile) $(beautify_docs_source) $(top_srcdir)/gstreamer/gstreamermm/*.h $(top_srcdir)/gstreamerbase/gstreamerbasemm/*.h
rm -rf html
$(doxygenprog) $(doxygen_configfile)
$(PERL_PATH) $(beautify_docs) html && touch $@
Modified: gstreamermm/trunk/gstreamer/src/bin.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/bin.hg (original)
+++ gstreamermm/trunk/gstreamer/src/bin.hg Thu Mar 27 21:05:32 2008
@@ -20,8 +20,8 @@
*/
#include <gstreamermm/element.h>
-#include <gstreamermm/enums.h>
#include <gstreamermm/childproxy.h>
+#include <gstreamermm/pad.h>
_DEFS(gstreamermm,gst)
_PINCLUDE(glibmm/private/object_p.h)
Modified: gstreamermm/trunk/gstreamer/src/buffer.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/buffer.ccg (original)
+++ gstreamermm/trunk/gstreamer/src/buffer.ccg Thu Mar 27 21:05:32 2008
@@ -20,8 +20,8 @@
*/
#include <stdexcept>
-#include <gst/gstbuffer.h>
#include <gst/gstutils.h>
+#include <gst/gstenumtypes.h>
namespace Gst
{
Modified: gstreamermm/trunk/gstreamer/src/buffer.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/buffer.hg (original)
+++ gstreamermm/trunk/gstreamer/src/buffer.hg Thu Mar 27 21:05:32 2008
@@ -19,11 +19,10 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#include <gst/gstbuffer.h>
#include <gstreamermm/miniobject.h>
#include <gstreamermm/wrap.h>
-#include <gstreamermm/enums.h>
#include <gstreamermm/caps.h>
-#include <gstreamermm/clock.h>
_PINCLUDE(gstreamermm/private/miniobject_p.h)
_DEFS(gstreamermm,gst)
@@ -31,6 +30,9 @@
namespace Gst
{
+_WRAP_ENUM(BufferFlag, GstBufferFlag)
+_WRAP_ENUM(BufferCopyFlags, GstBufferCopyFlags)
+
/** Buffer â Data-passing buffer type, supporting sub-buffers.
* Buffers are the basic unit of data transfer in GStreamer. The Buffer type
* provides all the state necessary to define a region of memory as part of a
Modified: gstreamermm/trunk/gstreamer/src/bus.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/bus.ccg (original)
+++ gstreamermm/trunk/gstreamer/src/bus.ccg Thu Mar 27 21:05:32 2008
@@ -19,8 +19,7 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <gst/gstbus.h>
-#include <gstreamermm/message.h>
+#include <gst/gstenumtypes.h>
static gboolean Bus_Watch_gstreamermm_callback(GstBus* bus, GstMessage* message, void* data)
{
Modified: gstreamermm/trunk/gstreamer/src/bus.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/bus.hg (original)
+++ gstreamermm/trunk/gstreamer/src/bus.hg Thu Mar 27 21:05:32 2008
@@ -19,9 +19,10 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#include <gst/gstbus.h>
#include <gstreamermm/object.h>
#include <gstreamermm/clock.h>
-#include <gstreamermm/enums.h>
+#include <gstreamermm/message.h>
_DEFS(gstreamermm,gst)
_PINCLUDE(glibmm/private/object_p.h)
@@ -32,6 +33,9 @@
class Message;
+_WRAP_ENUM(BusFlags, GstBusFlags)
+_WRAP_ENUM(BusSyncReply, GstBusSyncReply)
+
//TODO: Correct C API reference in class docs below:
/** Bus â Asynchronous message bus subsystem.
Modified: gstreamermm/trunk/gstreamer/src/clock.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/clock.ccg (original)
+++ gstreamermm/trunk/gstreamer/src/clock.ccg Thu Mar 27 21:05:32 2008
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <gst/gstclock.h>
+#include <gst/gstenumtypes.h>
static gboolean ClockID_Clock_gstreamermm_callback(GstClock* clock, GstClockTime time, GstClockID id, void* data)
{
Modified: gstreamermm/trunk/gstreamer/src/clock.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/clock.hg (original)
+++ gstreamermm/trunk/gstreamer/src/clock.hg Thu Mar 27 21:05:32 2008
@@ -19,8 +19,8 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#include <gst/gstclock.h>
#include <gstreamermm/object.h>
-#include <gstreamermm/enums.h>
_DEFS(gstreamermm,gst)
_PINCLUDE(glibmm/private/object_p.h)
@@ -31,6 +31,14 @@
class Clock;
+typedef GstClockTime ClockTime;
+typedef GstClockTimeDiff ClockTimeDiff;
+const ClockTime CLOCK_TIME_NONE = GST_CLOCK_TIME_NONE;
+
+_WRAP_ENUM(ClockEntryType, GstClockEntryType)
+_WRAP_ENUM(ClockReturn, GstClockReturn)
+_WRAP_ENUM(ClockFlags, GstClockFlags)
+
/** A datatype to hold the handle to an outstanding sync or async clock
* callback.
*/
Modified: gstreamermm/trunk/gstreamer/src/element.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/element.ccg (original)
+++ gstreamermm/trunk/gstreamer/src/element.ccg Thu Mar 27 21:05:32 2008
@@ -20,7 +20,7 @@
*/
#include <stdexcept>
-#include <gst/gstelement.h>
+#include <gst/gstenumtypes.h>
#include <gst/gstinterface.h>
#include <gst/gstutils.h>
#include <gstreamermm/bus.h>
@@ -28,7 +28,6 @@
#include <gstreamermm/elementfactory.h>
#include <gstreamermm/event.h>
#include <gstreamermm/index.h>
-#include <gstreamermm/message.h>
#include <gstreamermm/pad.h>
#include <gstreamermm/padtemplate.h>
#include <gstreamermm/query.h>
@@ -42,6 +41,16 @@
delete (Gst::Element*) data;
}
+Glib::ustring get_name(State s)
+{
+ return gst_element_state_get_name(GstState(s));
+}
+
+Glib::ustring get_name(StateChangeReturn s)
+{
+ return gst_element_state_change_return_get_name(GstStateChangeReturn(s));
+}
+
Glib::RefPtr<Element>
Element::link(const Glib::RefPtr<Element>& other_element)
{
Modified: gstreamermm/trunk/gstreamer/src/element.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/element.hg (original)
+++ gstreamermm/trunk/gstreamer/src/element.hg Thu Mar 27 21:05:32 2008
@@ -19,9 +19,13 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#include <gst/gstelement.h>
#include <gstreamermm/object.h>
#include <gstreamermm/clock.h>
#include <gstreamermm/enums.h>
+#include <gstreamermm/event.h>
+#include <gstreamermm/message.h>
+#include <gstreamermm/query.h>
_DEFS(gstreamermm,gst)
_PINCLUDE(gstreamermm/private/object_p.h)
@@ -41,6 +45,23 @@
class PadTemplate;
class Query;
+_WRAP_ENUM(ElementFlags, GstElementFlags)
+
+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)
+
+Glib::ustring get_name(State s);
+Glib::ustring get_name(StateChangeReturn s);
+
/** Element â Abstract base class for all pipeline elements.
* Element is the abstract base class needed to construct an element that can
* be used in a GStreamer pipeline. Please refer to the plugin writers guide
Modified: gstreamermm/trunk/gstreamer/src/enums.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/enums.ccg (original)
+++ gstreamermm/trunk/gstreamer/src/enums.ccg Thu Mar 27 21:05:32 2008
@@ -20,58 +20,3 @@
*/
#include <gst/gst.h>
-
-namespace Gst
-{
-
-Glib::ustring get_name(EventType t)
-{
- return gst_event_type_get_name(GstEventType(t));
-}
-
-Glib::ustring get_name(Format f)
-{
- return gst_format_get_name(GstFormat(f));
-}
-
-Glib::ustring get_name(MessageType t)
-{
- return gst_message_type_get_name(GstMessageType(t));
-}
-
-Glib::ustring get_name(QueryType t)
-{
- return gst_query_type_get_name(GstQueryType(t));
-}
-
-Glib::ustring get_name(State s)
-{
- return gst_element_state_get_name(GstState(s));
-}
-
-Glib::ustring get_name(StateChangeReturn s)
-{
- return gst_element_state_change_return_get_name(GstStateChangeReturn(s));
-}
-
-Glib::QueryQuark get_quark(EventType t)
-{
- return Glib::QueryQuark(gst_event_type_to_quark(GstEventType(t)));
-}
-
-Glib::QueryQuark get_quark(Format f)
-{
- return Glib::QueryQuark(gst_format_to_quark(GstFormat(f)));
-}
-
-Glib::QueryQuark get_quark(MessageType t)
-{
- return Glib::QueryQuark(gst_message_type_to_quark(GstMessageType(t)));
-}
-
-Glib::QueryQuark get_quark(QueryType t)
-{
- return Glib::QueryQuark(gst_query_type_to_quark(GstQueryType(t)));
-}
-
-} //namespace Gst
Modified: gstreamermm/trunk/gstreamer/src/enums.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/enums.hg (original)
+++ gstreamermm/trunk/gstreamer/src/enums.hg Thu Mar 27 21:05:32 2008
@@ -19,107 +19,15 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <gst/gstclock.h>
-#include <gst/gstevent.h>
+#include <gst/gstminiobject.h>
#include <gst/gstelement.h>
-#include <gst/gsturi.h>
_DEFS(gstreamermm,gst)
namespace Gst
{
-typedef GstClockTime ClockTime;
-typedef GstClockTimeDiff ClockTimeDiff;
-const ClockTime CLOCK_TIME_NONE = GST_CLOCK_TIME_NONE;
-
-_WRAP_ENUM(AssocFlags, GstAssocFlags)
-_WRAP_ENUM(BufferCopyFlags, GstBufferCopyFlags)
-_WRAP_ENUM(BufferFlag, GstBufferFlag)
-_WRAP_ENUM(BusSyncReply, GstBusSyncReply)
-_WRAP_ENUM(ClockEntryType, GstClockEntryType)
-_WRAP_ENUM(ClockFlags, GstClockFlags)
-_WRAP_ENUM(ClockReturn, GstClockReturn)
-
-enum EventType
-{
- EVENT_UNKNOWN = GST_EVENT_UNKNOWN,
- /* bidirectional events */
- EVENT_FLUSH_START = GST_EVENT_FLUSH_START,
- EVENT_FLUSH_STOP = GST_EVENT_FLUSH_STOP,
- /* downstream serialized events */
- EVENT_EOS = GST_EVENT_EOS,
- EVENT_NEWSEGMENT = GST_EVENT_NEWSEGMENT,
- EVENT_TAG = GST_EVENT_TAG,
- EVENT_BUFFERSIZE = GST_EVENT_BUFFERSIZE,
- /* upstream events */
- EVENT_QOS = GST_EVENT_QOS,
- EVENT_SEEK = GST_EVENT_SEEK,
- EVENT_NAVIGATION = GST_EVENT_NAVIGATION,
- EVENT_LATENCY = GST_EVENT_LATENCY,
-
- /* custom events start here */
- EVENT_CUSTOM_UPSTREAM = GST_EVENT_CUSTOM_UPSTREAM,
- EVENT_CUSTOM_DOWNSTREAM = GST_EVENT_CUSTOM_DOWNSTREAM,
- EVENT_CUSTOM_DOWNSTREAM_OOB = GST_EVENT_CUSTOM_DOWNSTREAM_OOB,
- EVENT_CUSTOM_BOTH = GST_EVENT_CUSTOM_BOTH,
- EVENT_CUSTOM_BOTH_OOB = GST_EVENT_CUSTOM_BOTH_OOB
-};
-
-_WRAP_ENUM(FlowReturn, GstFlowReturn)
-_WRAP_ENUM(Format, GstFormat)
-_WRAP_ENUM(IndexCertainty, GstIndexCertainty)
-_WRAP_ENUM(IndexEntryType, GstIndexEntryType)
-_WRAP_ENUM(IndexFlags, GstIndexFlags)
-_WRAP_ENUM(IndexLookupMethod, GstIndexLookupMethod)
-_WRAP_ENUM(IndexResolverMethod, GstIndexResolverMethod)
-_WRAP_ENUM(IteratorItem, GstIteratorItem)
-_WRAP_ENUM(IteratorResult, GstIteratorResult)
-_WRAP_ENUM(MessageType, GstMessageType)
_WRAP_ENUM(MiniObjectFlags, GstMiniObjectFlags)
-_WRAP_ENUM(PadDirection, GstPadDirection)
-_WRAP_ENUM(PadLinkReturn, GstPadLinkReturn)
-_WRAP_ENUM(PadPresence, GstPadPresence)
-_WRAP_ENUM(ParseError, GstParseError)
-_WRAP_ENUM(PluginError, GstPluginError)
-_WRAP_ENUM(QueryType, GstQueryType)
-_WRAP_ENUM(Rank, GstRank)
-_WRAP_ENUM(SeekFlags, GstSeekFlags)
-_WRAP_ENUM(SeekType, GstSeekType)
_WRAP_ENUM(State, GstState)
-_WRAP_ENUM(TaskState, GstTaskState)
-
-enum URIType
-{
- URI_UNKNOWN = GST_URI_UNKNOWN,
- URI_SINK = GST_URI_SINK,
- URI_SRC = GST_URI_SRC
-};
-
-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)
-
-Glib::ustring get_name(EventType t);
-Glib::ustring get_name(Format f);
-Glib::ustring get_name(MessageType t);
-Glib::ustring get_name(QueryType t);
-Glib::ustring get_name(State s);
-Glib::ustring get_name(StateChangeReturn s);
-
-Glib::QueryQuark get_quark(EventType t);
-Glib::QueryQuark get_quark(Format f);
-Glib::QueryQuark get_quark(MessageType t);
-Glib::QueryQuark get_quark(QueryType t);
} //namespace Gst
Modified: gstreamermm/trunk/gstreamer/src/event.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/event.ccg (original)
+++ gstreamermm/trunk/gstreamer/src/event.ccg Thu Mar 27 21:05:32 2008
@@ -19,11 +19,21 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <gst/gstevent.h>
+#include <gst/gstenumtypes.h>
namespace Gst
{
+Glib::ustring get_name(EventType t)
+{
+ return gst_event_type_get_name(GstEventType(t));
+}
+
+Glib::QueryQuark get_quark(EventType t)
+{
+ return Glib::QueryQuark(gst_event_type_to_quark(GstEventType(t)));
+}
+
const Structure* Event::get_structure()
{
static bool got_structure = false;
Modified: gstreamermm/trunk/gstreamer/src/event.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/event.hg (original)
+++ gstreamermm/trunk/gstreamer/src/event.hg Thu Mar 27 21:05:32 2008
@@ -19,9 +19,11 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#include <gst/gstevent.h>
#include <gstreamermm/miniobject.h>
#include <gstreamermm/structure.h>
#include <gstreamermm/wrap.h>
+#include <gstreamermm/format.h>
_DEFS(gstreamermm,gst)
_PINCLUDE(gstreamermm/private/miniobject_p.h)
@@ -29,6 +31,38 @@
namespace Gst
{
+enum EventType
+{
+ EVENT_UNKNOWN = GST_EVENT_UNKNOWN,
+ /* bidirectional events */
+ EVENT_FLUSH_START = GST_EVENT_FLUSH_START,
+ EVENT_FLUSH_STOP = GST_EVENT_FLUSH_STOP,
+ /* downstream serialized events */
+ EVENT_EOS = GST_EVENT_EOS,
+ EVENT_NEWSEGMENT = GST_EVENT_NEWSEGMENT,
+ EVENT_TAG = GST_EVENT_TAG,
+ EVENT_BUFFERSIZE = GST_EVENT_BUFFERSIZE,
+ /* upstream events */
+ EVENT_QOS = GST_EVENT_QOS,
+ EVENT_SEEK = GST_EVENT_SEEK,
+ EVENT_NAVIGATION = GST_EVENT_NAVIGATION,
+ EVENT_LATENCY = GST_EVENT_LATENCY,
+
+ /* custom events start here */
+ EVENT_CUSTOM_UPSTREAM = GST_EVENT_CUSTOM_UPSTREAM,
+ EVENT_CUSTOM_DOWNSTREAM = GST_EVENT_CUSTOM_DOWNSTREAM,
+ EVENT_CUSTOM_DOWNSTREAM_OOB = GST_EVENT_CUSTOM_DOWNSTREAM_OOB,
+ EVENT_CUSTOM_BOTH = GST_EVENT_CUSTOM_BOTH,
+ EVENT_CUSTOM_BOTH_OOB = GST_EVENT_CUSTOM_BOTH_OOB
+};
+
+_WRAP_ENUM(SeekType, GstSeekType)
+_WRAP_ENUM(SeekFlags, GstSeekFlags)
+_WRAP_ENUM(EventTypeFlags, GstEventTypeFlags)
+
+Glib::ustring get_name(EventType t);
+Glib::QueryQuark get_quark(EventType t);
+
class Event : public MiniObject
{
protected:
Modified: gstreamermm/trunk/gstreamer/src/format.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/format.ccg (original)
+++ gstreamermm/trunk/gstreamer/src/format.ccg Thu Mar 27 21:05:32 2008
@@ -19,11 +19,21 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <gst/gstformat.h>
+#include <gst/gstenumtypes.h>
namespace Gst
{
+Glib::ustring get_name(Format f)
+{
+ return gst_format_get_name(GstFormat(f));
+}
+
+Glib::QueryQuark get_quark(Format f)
+{
+ return Glib::QueryQuark(gst_format_to_quark(GstFormat(f)));
+}
+
Format register_format(const Glib::ustring& nick, const Glib::ustring& description)
{
return Format(gst_format_register(nick.c_str(), description.c_str()));
Modified: gstreamermm/trunk/gstreamer/src/format.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/format.hg (original)
+++ gstreamermm/trunk/gstreamer/src/format.hg Thu Mar 27 21:05:32 2008
@@ -19,28 +19,34 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <gstreamermm/enums.h>
+#include <gst/gstformat.h>
_DEFS(gstreamermm,gst)
namespace Gst
{
- struct FormatDefinition
- {
- Format value;
- Glib::ustring nick;
- Glib::ustring description;
- Glib::QueryQuark quark;
- };
-
- //Note that GstFormat is an enum. That's why these are not member functions of a class.
- Format register_format(const Glib::ustring& nick, const Glib::ustring&description);
- Format get_format(const Glib::ustring& nick);
+_WRAP_ENUM(Format, GstFormat)
- //TODO: first arg is an array of Formats
- //TODO: bool formats_contain_format(const Format& formats, Format format);
+struct FormatDefinition
+{
+ Format value;
+ Glib::ustring nick;
+ Glib::ustring description;
+ Glib::QueryQuark quark;
+};
+
+Glib::ustring get_name(Format f);
+Glib::QueryQuark get_quark(Format f);
+
+//Note that GstFormat is an enum. That's why these are not member functions of a class.
+
+Format register_format(const Glib::ustring& nick, const Glib::ustring&description);
+Format get_format(const Glib::ustring& nick);
+
+//TODO: first arg is an array of Formats
+//TODO: bool formats_contain_format(const Format& formats, Format format);
- bool get_details(Format format, FormatDefinition& def);
+bool get_details(Format format, FormatDefinition& def);
} //namespace Gst
Modified: gstreamermm/trunk/gstreamer/src/gst_enums.defs
==============================================================================
--- gstreamermm/trunk/gstreamer/src/gst_enums.defs (original)
+++ gstreamermm/trunk/gstreamer/src/gst_enums.defs Thu Mar 27 21:05:32 2008
@@ -2,9 +2,12 @@
;; every time you regenerate this file.
;; Here is the list of the defenitions:
;; BufferFlag
+;; BusFlags
+;; ClockFlags
+;; ElementFlags
;; IndexFlags
;; MessageType
-;; ClockFlags
+;; PadFlags
;; From /opt/usr-jhbuild/include/gstreamer-0.10/gst/gstbin.h
@@ -47,6 +50,8 @@
(in-module "Gst")
(c-name "GstBusFlags")
(values
+ '("flushing" "GST_BUS_FLUSHING" "GST_OBJECT_FLAG_LAST << 0")
+ '("last" "GST_BUS_FLAG_LAST" "GST_OBJECT_FLAG_LAST << 1")
)
)
@@ -158,6 +163,10 @@
(in-module "Gst")
(c-name "GstElementFlags")
(values
+ '("locked-state" "GST_ELEMENT_LOCKED_STATE" "GST_OBJECT_FLAG_LAST << 0")
+ '("is-sink" "GST_ELEMENT_IS_SINK" "GST_OBJECT_FLAG_LAST << 1")
+ '("unparenting" "GST_ELEMENT_UNPARENTING" "GST_OBJECT_FLAG_LAST << 2")
+ '("flag-set" "GST_ELEMENT_FLAG_LAST" "GST_OBJECT_FLAG_LAST << 16")
)
)
@@ -531,6 +540,12 @@
(in-module "Gst")
(c-name "GstPadFlags")
(values
+ '("blocked" "GST_PAD_BLOCKED" "GST_OBJECT_FLAG_LAST << 0")
+ '("flushing" "GST_PAD_FLUSHING" "GST_OBJECT_FLAG_LAST << 1")
+ '("in-getcaps" "GST_PAD_IN_GETCAPS" "GST_OBJECT_FLAG_LAST << 2")
+ '("in_setcaps" "GST_PAD_IN_SETCAPS" "GST_OBJECT_FLAG_LAST << 3")
+ '("blocking" "GST_PAD_BLOCKING" "GST_OBJECT_FLAG_LAST << 4")
+ '("last" "GST_PAD_FLAG_LAST" "GST_OBJECT_FLAG_LAST << 8")
)
)
Modified: gstreamermm/trunk/gstreamer/src/index.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/index.ccg (original)
+++ gstreamermm/trunk/gstreamer/src/index.ccg Thu Mar 27 21:05:32 2008
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <gst/gstindex.h>
+#include <gst/gstenumtypes.h>
namespace Gst
{
Modified: gstreamermm/trunk/gstreamer/src/index.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/index.hg (original)
+++ gstreamermm/trunk/gstreamer/src/index.hg Thu Mar 27 21:05:32 2008
@@ -19,8 +19,9 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#include <gst/gstindex.h>
#include <gstreamermm/object.h>
-#include <gstreamermm/enums.h>
+#include <gstreamermm/format.h>
_DEFS(gstreamermm,gst)
_PINCLUDE(glibmm/private/object_p.h)
@@ -29,6 +30,13 @@
namespace Gst
{
+_WRAP_ENUM(IndexCertainty, GstIndexCertainty)
+_WRAP_ENUM(IndexEntryType, GstIndexEntryType)
+_WRAP_ENUM(IndexLookupMethod, GstIndexLookupMethod)
+_WRAP_ENUM(AssocFlags, GstAssocFlags)
+_WRAP_ENUM(IndexResolverMethod, GstIndexResolverMethod)
+_WRAP_ENUM(IndexFlags, GstIndexFlags)
+
/** The basic element of an index.
*/
class IndexEntry
Modified: gstreamermm/trunk/gstreamer/src/iterator.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/iterator.ccg (original)
+++ gstreamermm/trunk/gstreamer/src/iterator.ccg Thu Mar 27 21:05:32 2008
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <gst/gstiterator.h>
+#include <gst/gstenumtypes.h>
namespace Gst
{
Modified: gstreamermm/trunk/gstreamer/src/iterator.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/iterator.hg (original)
+++ gstreamermm/trunk/gstreamer/src/iterator.hg Thu Mar 27 21:05:32 2008
@@ -26,6 +26,9 @@
namespace Gst
{
+_WRAP_ENUM(IteratorItem, GstIteratorItem)
+_WRAP_ENUM(IteratorResult, GstIteratorResult)
+
class Iterator
{
public:
Modified: gstreamermm/trunk/gstreamer/src/message.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/message.ccg (original)
+++ gstreamermm/trunk/gstreamer/src/message.ccg Thu Mar 27 21:05:32 2008
@@ -19,9 +19,21 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#include <gst/gstenumtypes.h>
+
namespace Gst
{
+Glib::ustring get_name(MessageType t)
+{
+ return gst_message_type_get_name(GstMessageType(t));
+}
+
+Glib::QueryQuark get_quark(MessageType t)
+{
+ return Glib::QueryQuark(gst_message_type_to_quark(GstMessageType(t)));
+}
+
const Structure*
Message::get_structure()
{
Modified: gstreamermm/trunk/gstreamer/src/message.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/message.hg (original)
+++ gstreamermm/trunk/gstreamer/src/message.hg Thu Mar 27 21:05:32 2008
@@ -19,9 +19,12 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#include <gst/gstmessage.h>
#include <gstreamermm/miniobject.h>
#include <gstreamermm/structure.h>
#include <gstreamermm/wrap.h>
+#include <gstreamermm/format.h>
+#include <gstreamermm/enums.h>
_DEFS(gstreamermm,gst)
_PINCLUDE(gstreamermm/private/miniobject_p.h)
@@ -29,6 +32,11 @@
namespace Gst
{
+_WRAP_ENUM(MessageType, GstMessageType)
+
+Glib::ustring get_name(MessageType t);
+Glib::QueryQuark get_quark(MessageType t);
+
class Message : public Gst::MiniObject
{
protected:
Modified: gstreamermm/trunk/gstreamer/src/pad.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/pad.ccg (original)
+++ gstreamermm/trunk/gstreamer/src/pad.ccg Thu Mar 27 21:05:32 2008
@@ -19,13 +19,13 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#include <gst/gstutils.h>
+#include <gst/gstenumtypes.h>
#include <gstreamermm/buffer.h>
#include <gstreamermm/caps.h>
#include <gstreamermm/element.h>
#include <gstreamermm/event.h>
#include <gstreamermm/query.h>
-#include <gst/gstpad.h>
-#include <gst/gstutils.h>
namespace Gst
{
Modified: gstreamermm/trunk/gstreamer/src/pad.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/pad.hg (original)
+++ gstreamermm/trunk/gstreamer/src/pad.hg Thu Mar 27 21:05:32 2008
@@ -19,9 +19,11 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#include <gst/gstpad.h>
#include <gstreamermm/object.h>
#include <gstreamermm/miniobject.h>
-#include <gstreamermm/enums.h>
+#include <gstreamermm/format.h>
+#include <gstreamermm/query.h>
_DEFS(gstreamermm,gst)
_PINCLUDE(glibmm/private/object_p.h)
@@ -37,6 +39,12 @@
class PadTemplate;
class Query;
+_WRAP_ENUM(PadDirection, GstPadDirection)
+_WRAP_ENUM(PadFlags, GstPadFlags)
+_WRAP_ENUM(PadLinkReturn, GstPadLinkReturn)
+_WRAP_ENUM(FlowReturn, GstFlowReturn)
+_WRAP_ENUM(ActivateMode, GstActivateMode)
+
class Pad : public Object
{
_CLASS_GOBJECT(Pad, GstPad, GST_PAD, Object, GstObject)
Modified: gstreamermm/trunk/gstreamer/src/padtemplate.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/padtemplate.ccg (original)
+++ gstreamermm/trunk/gstreamer/src/padtemplate.ccg Thu Mar 27 21:05:32 2008
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <gst/gstpadtemplate.h>
+#include <gst/gstenumtypes.h>
#include <gstreamermm/caps.h>
#include <gstreamermm/pad.h>
Modified: gstreamermm/trunk/gstreamer/src/padtemplate.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/padtemplate.hg (original)
+++ gstreamermm/trunk/gstreamer/src/padtemplate.hg Thu Mar 27 21:05:32 2008
@@ -19,8 +19,10 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#include <gst/gstpad.h>
+#include <gst/gstpadtemplate.h>
#include <gstreamermm/object.h>
-#include <gstreamermm/enums.h>
+#include <gstreamermm/pad.h>
_DEFS(gstreamermm,gst)
_PINCLUDE(glibmm/private/object_p.h)
@@ -29,6 +31,8 @@
namespace Gst
{
+_WRAP_ENUM(PadPresence, GstPadPresence)
+
class Caps;
class Pad;
Modified: gstreamermm/trunk/gstreamer/src/parse.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/parse.ccg (original)
+++ gstreamermm/trunk/gstreamer/src/parse.ccg Thu Mar 27 21:05:32 2008
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <gst/gstparse.h>
+#include <gst/gstenumtypes.h>
#include <gst/gstutils.h>
#include <gstreamermm/element.h>
Modified: gstreamermm/trunk/gstreamer/src/parse.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/parse.hg (original)
+++ gstreamermm/trunk/gstreamer/src/parse.hg Thu Mar 27 21:05:32 2008
@@ -19,6 +19,8 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#include <gst/gstparse.h>
+
_DEFS(gstreamermm,gst)
namespace Gst
@@ -26,6 +28,8 @@
class Element;
+_WRAP_ENUM(ParseError, GstParseError)
+
/** Parse â Get a pipeline from a text pipeline description.
* The methods in this class allow to create a pipeline based on the syntax
* used in the gst-launch utillity.
Modified: gstreamermm/trunk/gstreamer/src/plugin.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/plugin.ccg (original)
+++ gstreamermm/trunk/gstreamer/src/plugin.ccg Thu Mar 27 21:05:32 2008
@@ -19,4 +19,4 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <gst/gstplugin.h>
+#include <gst/gstenumtypes.h>
Modified: gstreamermm/trunk/gstreamer/src/plugin.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/plugin.hg (original)
+++ gstreamermm/trunk/gstreamer/src/plugin.hg Thu Mar 27 21:05:32 2008
@@ -19,6 +19,7 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#include <gst/gstplugin.h>
#include <gstreamermm/object.h>
_DEFS(gstreamermm,gst)
@@ -27,6 +28,8 @@
namespace Gst
{
+_WRAP_ENUM(PluginError, GstPluginError)
+
//TODO: Edit references below to use gstreamermm classes/methods
/** Plugin â Container for features loaded from a shared object module.
Modified: gstreamermm/trunk/gstreamer/src/pluginfeature.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/pluginfeature.ccg (original)
+++ gstreamermm/trunk/gstreamer/src/pluginfeature.ccg Thu Mar 27 21:05:32 2008
@@ -19,4 +19,4 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <gst/gstpluginfeature.h>
+#include <gst/gstenumtypes.h>
Modified: gstreamermm/trunk/gstreamer/src/pluginfeature.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/pluginfeature.hg (original)
+++ gstreamermm/trunk/gstreamer/src/pluginfeature.hg Thu Mar 27 21:05:32 2008
@@ -19,6 +19,7 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#include <gst/gstpluginfeature.h>
#include <gstreamermm/object.h>
_DEFS(gstreamermm,gst)
@@ -27,6 +28,8 @@
namespace Gst
{
+_WRAP_ENUM(Rank, GstRank)
+
/** This is a base class for anything that can be added to a Plugin.
*
*/
Modified: gstreamermm/trunk/gstreamer/src/query.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/query.ccg (original)
+++ gstreamermm/trunk/gstreamer/src/query.ccg Thu Mar 27 21:05:32 2008
@@ -19,11 +19,21 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <gst/gstquery.h>
+#include <gst/gstenumtypes.h>
namespace Gst
{
+Glib::ustring get_name(QueryType t)
+{
+ return gst_query_type_get_name(GstQueryType(t));
+}
+
+Glib::QueryQuark get_quark(QueryType t)
+{
+ return Glib::QueryQuark(gst_query_type_to_quark(GstQueryType(t)));
+}
+
const Structure* Query::get_structure()
{
static bool got_structure = false;
Modified: gstreamermm/trunk/gstreamer/src/query.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/query.hg (original)
+++ gstreamermm/trunk/gstreamer/src/query.hg Thu Mar 27 21:05:32 2008
@@ -19,9 +19,11 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#include <gst/gstquery.h>
#include <gstreamermm/miniobject.h>
#include <gstreamermm/structure.h>
#include <gstreamermm/wrap.h>
+#include <gstreamermm/format.h>
_DEFS(gstreamermm,gst)
_PINCLUDE(gstreamermm/private/miniobject_p.h)
@@ -29,6 +31,11 @@
namespace Gst
{
+_WRAP_ENUM(QueryType, GstQueryType)
+
+Glib::ustring get_name(QueryType t);
+Glib::QueryQuark get_quark(QueryType t);
+
struct QueryTypeDefinition
{
QueryType value;
Modified: gstreamermm/trunk/gstreamer/src/taglist.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/taglist.ccg (original)
+++ gstreamermm/trunk/gstreamer/src/taglist.ccg Thu Mar 27 21:05:32 2008
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <gst/gsttaglist.h>
+#include <gst/gstenumtypes.h>
/*
static gboolean
Modified: gstreamermm/trunk/gstreamer/src/taglist.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/taglist.hg (original)
+++ gstreamermm/trunk/gstreamer/src/taglist.hg Thu Mar 27 21:05:32 2008
@@ -19,11 +19,16 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#include <gst/gsttaglist.h>
+
_DEFS(gstreamermm,gst)
namespace Gst
{
+_WRAP_ENUM(TagMergeMode, GstTagMergeMode)
+_WRAP_ENUM(TagFlag, GstTagFlag)
+
class TagList
{
_CLASS_BOXEDTYPE(TagList, GstTagList, gst_tag_list_new, gst_tag_list_copy, gst_tag_list_free)
Modified: gstreamermm/trunk/gstreamer/src/task.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/task.ccg (original)
+++ gstreamermm/trunk/gstreamer/src/task.ccg Thu Mar 27 21:05:32 2008
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <gst/gsttask.h>
+#include <gst/gstenumtypes.h>
static void Task_Task_gstreamermm_callback(void* data)
{
Modified: gstreamermm/trunk/gstreamer/src/task.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/task.hg (original)
+++ gstreamermm/trunk/gstreamer/src/task.hg Thu Mar 27 21:05:32 2008
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <gstreamermm/enums.h>
+#include <gst/gsttask.h>
#include <gstreamermm/object.h>
_DEFS(gstreamermm,gst)
@@ -28,6 +28,8 @@
namespace Gst
{
+_WRAP_ENUM(TaskState, GstTaskState)
+
/** Task â Abstraction of GStreamer streaming threads.
* Task is used by Element and Pad to provide the data passing threads in a
* Pipeline.
Modified: gstreamermm/trunk/gstreamer/src/urihandler.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/urihandler.ccg (original)
+++ gstreamermm/trunk/gstreamer/src/urihandler.ccg Thu Mar 27 21:05:32 2008
@@ -19,4 +19,5 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <gstreamermm/element.h>
+#include <gst/gstenumtypes.h>
+#include <gstreamermm/element.h>
\ No newline at end of file
Modified: gstreamermm/trunk/gstreamer/src/urihandler.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/urihandler.hg (original)
+++ gstreamermm/trunk/gstreamer/src/urihandler.hg Thu Mar 27 21:05:32 2008
@@ -19,6 +19,7 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#include <gst/gsturi.h>
#include <glibmm/interface.h>
#include <gstreamermm/enums.h>
@@ -27,6 +28,13 @@
namespace Gst
{
+enum URIType
+{
+ URI_UNKNOWN = GST_URI_UNKNOWN,
+ URI_SINK = GST_URI_SINK,
+ URI_SRC = GST_URI_SRC
+};
+
class Element;
/** UriHandler â Interface to ease URI handling in plugins.
Modified: gstreamermm/trunk/gstreamer/src/xml.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/xml.hg (original)
+++ gstreamermm/trunk/gstreamer/src/xml.hg Thu Mar 27 21:05:32 2008
@@ -19,8 +19,8 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#include <gst/gstxml.h>
#include <gstreamermm/object.h>
-#include <gstreamermm/enums.h>
_DEFS(gstreamermm,gst)
_PINCLUDE(glibmm/private/object_p.h)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
