gnomemm r1975 - in gstreamermm/trunk: . gstreamer gstreamer/src tools/extra_defs_gen tools/m4
- From: jaalburqu svn gnome org
- To: svn-commits-list gnome org
- Subject: gnomemm r1975 - in gstreamermm/trunk: . gstreamer gstreamer/src tools/extra_defs_gen tools/m4
- Date: Thu, 8 Jan 2009 03:22:45 +0000 (UTC)
Author: jaalburqu
Date: Thu Jan 8 03:22:45 2009
New Revision: 1975
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1975&view=rev
Log:
2009-01-07 Josà Alburquerque <jaalburqu svn gnome org>
* configure.ac:
* gstreamer/gstreamermm-0.10.pc.in:
* tools/extra_defs_gen/generate_defs_gst.cc:
* gstreamer/src/gst_signals.defs: Forgot to add one dependency and
type to extra defs gen. utility. Added dependency and type and
regenerated.
* gstreamer/src/Makefile_list_of_hg.am_fragment:
* gstreamer/src/navigation.ccg:
* gstreamer/src/navigation.hg: Added Gst::Navigation interface.
Wrapped its vfuncs.
* gstreamer/src/basesink.hg:
* gstreamer/src/basesrc.hg:
* gstreamer/src/basetransform.hg: Corrected vfunc m4 conversions to
take referecences.
* gstreamer/src/colorbalance.hg:
* gstreamer/src/gst_vfuncs.defs: Wrapped vfuncs.
* gstreamer/src/baseaudiosink.hg:
* gstreamer/src/cddabasesrc.hg:
* gstreamer/src/mixer.ccg:
* gstreamer/src/mixer.hg:
* gstreamer/src/mixertrack.hg:
* tools/m4/convert_gst.m4: Completed some TODO's.
Added:
gstreamermm/trunk/gstreamer/src/navigation.ccg
gstreamermm/trunk/gstreamer/src/navigation.hg
Modified:
gstreamermm/trunk/ChangeLog
gstreamermm/trunk/configure.ac
gstreamermm/trunk/gstreamer/gstreamermm-0.10.pc.in
gstreamermm/trunk/gstreamer/src/Makefile_list_of_hg.am_fragment
gstreamermm/trunk/gstreamer/src/baseaudiosink.hg
gstreamermm/trunk/gstreamer/src/basesink.hg
gstreamermm/trunk/gstreamer/src/basesrc.hg
gstreamermm/trunk/gstreamer/src/basetransform.hg
gstreamermm/trunk/gstreamer/src/cddabasesrc.hg
gstreamermm/trunk/gstreamer/src/colorbalance.hg
gstreamermm/trunk/gstreamer/src/gst_signals.defs
gstreamermm/trunk/gstreamer/src/gst_vfuncs.defs
gstreamermm/trunk/gstreamer/src/mixer.ccg
gstreamermm/trunk/gstreamer/src/mixer.hg
gstreamermm/trunk/gstreamer/src/mixertrack.hg
gstreamermm/trunk/tools/extra_defs_gen/generate_defs_gst.cc
gstreamermm/trunk/tools/m4/convert_gst.m4
Modified: gstreamermm/trunk/configure.ac
==============================================================================
--- gstreamermm/trunk/configure.ac (original)
+++ gstreamermm/trunk/configure.ac Thu Jan 8 03:22:45 2009
@@ -143,6 +143,7 @@
gstreamer-audio-0.10 >= ${gstreamermm_min_gst_version} \
gstreamer-cdda-0.10 >= ${gstreamermm_min_gst_version} \
gstreamer-interfaces-0.10 >= ${gstreamermm_min_gst_version} \
+ gstreamer-netbuffer-0.10 >= ${gstreamermm_min_gst_version} \
gstreamer-rtp-0.10 >= ${gstreamermm_min_gst_version} \
gstreamer-video-0.10 >= ${gstreamermm_min_gst_version} \
)
Modified: gstreamermm/trunk/gstreamer/gstreamermm-0.10.pc.in
==============================================================================
--- gstreamermm/trunk/gstreamer/gstreamermm-0.10.pc.in (original)
+++ gstreamermm/trunk/gstreamer/gstreamermm-0.10.pc.in Thu Jan 8 03:22:45 2009
@@ -8,8 +8,8 @@
Requires: glibmm-2.4 giomm-2.4 libxml++-2.6 gstreamer-0.10 \
gstreamer-base-0.10 gstreamer-controller-0.10 gstreamer-dataprotocol-0.10 \
gstreamer-net-0.10 gstreamer-plugins-base-0.10 gstreamer-audio-0.10 \
-gstreamer-cdda-0.10 gstreamer-interfaces-0.10 gstreamer-rtp-0.10 \
-gstreamer-video-0.10
+gstreamer-cdda-0.10 gstreamer-interfaces-0.10 gstreamer-netbuffer-0.10 \
+gstreamer-rtp-0.10 gstreamer-video-0.10
Version: @VERSION@
Libs: -L${libdir} -lgstreamermm-0.10
Cflags: -I${includedir}/gstreamermm-0.10 -I${libdir}/gstreamermm-0.10/include
Modified: gstreamermm/trunk/gstreamer/src/Makefile_list_of_hg.am_fragment
==============================================================================
--- gstreamermm/trunk/gstreamer/src/Makefile_list_of_hg.am_fragment (original)
+++ gstreamermm/trunk/gstreamer/src/Makefile_list_of_hg.am_fragment Thu Jan 8 03:22:45 2009
@@ -15,7 +15,7 @@
audiofilter.hg audiosink.hg audiosrc.hg baseaudiosink.hg \
baseaudiosrc.hg cddabasesrc.hg videosink.hg \
colorbalance.hg colorbalancechannel.hg mixer.hg mixeroptions.hg \
- mixertrack.hg xoverlay.hg
+ mixertrack.hg navigation.hg xoverlay.hg
#TODO: Add ghostpad.hg when bug #539108 is fixed (and patch in bug is applied)
Modified: gstreamermm/trunk/gstreamer/src/baseaudiosink.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/baseaudiosink.hg (original)
+++ gstreamermm/trunk/gstreamer/src/baseaudiosink.hg Thu Jan 8 03:22:45 2009
@@ -26,9 +26,7 @@
namespace Gst
{
-//TODO: Enum is not registered nor does it have a *_get_type() functions. See
-//bug #564200.
-//_WRAP_ENUM(BaseAudioSinkSlaveMethod, GstBaseAudioSinkSlaveMethod)
+_WRAP_ENUM(BaseAudioSinkSlaveMethod, GstBaseAudioSinkSlaveMethod)
/** Gst::BaseAudioSink â Base class for audio sinks.
* This is the base class for audio sinks. Subclasses need to implement the
@@ -53,9 +51,8 @@
_WRAP_METHOD(void set_provide_clock(bool provide), gst_base_audio_sink_set_provide_clock)
_WRAP_METHOD(bool get_provide_clock(), gst_base_audio_sink_get_provide_clock)
- //TODO: Following methods depend on enum above (see bug #564200)
- //_WRAP_METHOD(void set_slave_method(GstBaseAudioSinkSlaveMethod method), gst_base_audio_sink_set_slave_method)
- //WRAP_METHOD(BaseAudioSinkSlaveMethod get_slave_method(),gst_base_audio_sink_get_slave_method)
+ _WRAP_METHOD(void set_slave_method(Gst::BaseAudioSinkSlaveMethod method), gst_base_audio_sink_set_slave_method)
+ _WRAP_METHOD(Gst::BaseAudioSinkSlaveMethod get_slave_method(), gst_base_audio_sink_get_slave_method)
//TODO: Wrap vfuncs.
};
Modified: gstreamermm/trunk/gstreamer/src/basesink.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/basesink.hg (original)
+++ gstreamermm/trunk/gstreamer/src/basesink.hg Thu Jan 8 03:22:45 2009
@@ -152,13 +152,8 @@
_WRAP_METHOD(bool is_async_enabled(), gst_base_sink_is_async_enabled)
_WRAP_METHOD(void set_ts_offset(ClockTimeDiff offset), gst_base_sink_set_ts_offset)
_WRAP_METHOD(ClockTimeDiff get_ts_offset(), gst_base_sink_get_ts_offset)
-
- //TODO: Doesn't compile with GStreamer 0.10.20:
- //_WRAP_METHOD(void set_render_delay(ClockTime delay), gst_base_sink_set_render_delay)
-
- //TODO: Doesn't compile with GStreamer 0.10.20:
- //_WRAP_METHOD(ClockTime get_render_delay(), gst_base_sink_get_render_delay)
-
+ _WRAP_METHOD(void set_render_delay(ClockTime delay), gst_base_sink_set_render_delay)
+ _WRAP_METHOD(ClockTime get_render_delay(), gst_base_sink_get_render_delay)
_WRAP_METHOD(Glib::RefPtr<Gst::Buffer> get_last_buffer(), gst_base_sink_get_last_buffer)
/** Gets the sink Gst::Pad object of the element.
@@ -186,7 +181,7 @@
*/
_WRAP_VFUNC(Glib::RefPtr<Gst::Caps> get_caps(), "get_caps")
-#m4 _CONVERSION(`GstCaps*', `const Glib::RefPtr<Gst::Caps>&', `Glib::wrap($3)')
+#m4 _CONVERSION(`GstCaps*', `const Glib::RefPtr<Gst::Caps>&', `Glib::wrap($3, true)')
///** Notify subclass of changed caps.
//*/
//_WRAP_VFUNC(bool set_caps(const Glib::RefPtr<Gst::Caps>& caps), "set_caps")
@@ -194,7 +189,7 @@
//TODO: #m4 _CONVERSION(`Glib::RefPtr<Gst::Buffer>&', `GstBuffer**', `*($3)')
//_WRAP_VFUNC(FlowReturn buffer_alloc(guint64 offset, guint size, Glib::RefPtr<Gst::Buffer>& buffer), "buffer_alloc")
-#m4 _CONVERSION(`GstBuffer*', `const Glib::RefPtr<Gst::Buffer>&', `Gst::wrap($3)')
+#m4 _CONVERSION(`GstBuffer*', `const Glib::RefPtr<Gst::Buffer>&', `Gst::wrap($3, true)')
#m4 _CONVERSION(`GstClockTime*', `ClockTime&', `*($3)')
/** Called to get the start and end times for synchronising the passed buffer
* to the clock.
Modified: gstreamermm/trunk/gstreamer/src/basesrc.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/basesrc.hg (original)
+++ gstreamermm/trunk/gstreamer/src/basesrc.hg Thu Jan 8 03:22:45 2009
@@ -176,7 +176,7 @@
*/
_WRAP_VFUNC(Glib::RefPtr<Gst::Caps> get_caps(), "get_caps")
-#m4 _CONVERSION(`GstCaps*', `const Glib::RefPtr<Gst::Caps>&', `Glib::wrap($3)')
+#m4 _CONVERSION(`GstCaps*', `const Glib::RefPtr<Gst::Caps>&', `Glib::wrap($3, true)')
///** Notify subclass of changed output caps.
//*/
//_WRAP_VFUNC(bool set_caps(const Glib::RefPtr<Gst::Caps>& caps), "set_caps")
@@ -198,7 +198,7 @@
//*/
//_WRAP_VFUNC(bool stop(), "stop")
-#m4 _CONVERSION(`GstBuffer*', `const Glib::RefPtr<Gst::Buffer>&', `Gst::wrap($3)')
+#m4 _CONVERSION(`GstBuffer*', `const Glib::RefPtr<Gst::Buffer>&', `Gst::wrap($3, true)')
#m4 _CONVERSION(`GstClockTime*', `ClockTime&', `*($3)')
/** Given a buffer, return the start and stop time when it should be pushed
* out. The base class will sync on the clock using these times.
@@ -228,7 +228,7 @@
//_WRAP_VFUNC(FlowReturn create(guint64 offset, guint size, Glib::RefPtr<Gst::Buffer>& buffer), "create")
#m4 _CONVERSION(`Segment', `GstSegment*', `($3).gobj()')
-#m4 _CONVERSION(`GstSegment*', `Segment', `Glib::wrap($3)')
+#m4 _CONVERSION(`GstSegment*', `Segment', `Glib::wrap($3, true)')
///** Perform seeking on the resource to the indicated segment.
//*/
//_WRAP_VFUNC(bool do_seek(Segment segment), "do_seek")
Modified: gstreamermm/trunk/gstreamer/src/basetransform.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/basetransform.hg (original)
+++ gstreamermm/trunk/gstreamer/src/basetransform.hg Thu Jan 8 03:22:45 2009
@@ -180,7 +180,7 @@
//to return true which would then work.
#m4 _CONVERSION(`Glib::RefPtr<Gst::Caps>', `GstCaps*', `($3)->gobj()')
-#m4 _CONVERSION(`GstCaps*', `const Glib::RefPtr<Gst::Caps>&', `Glib::wrap($3)')
+#m4 _CONVERSION(`GstCaps*', `const Glib::RefPtr<Gst::Caps>&', `Glib::wrap($3, true)')
/** Optional. Given the pad in this direction and the given caps, what caps
* are allowed on the other pad in this element ?
*/
@@ -222,7 +222,7 @@
//*/
//_WRAP_VFUNC(bool event(const Glib::RefPtr<Gst::Event>& event), "event")
-#m4 _CONVERSION(`GstBuffer*', `const Glib::RefPtr<Gst::Buffer>&', `Gst::wrap($3)')
+#m4 _CONVERSION(`GstBuffer*', `const Glib::RefPtr<Gst::Buffer>&', `Gst::wrap($3, true)')
/** Required if the element does not operate in-place. Transforms one
* incoming buffer to one outgoing buffer. The function is allowed to change
* size/timestamp/duration of the outgoing buffer.
@@ -238,7 +238,7 @@
//be wrapped?
//TODO: #m4 _CONVERSION(`Glib::RefPtr<Gst::Buffer>&', `GstBuffer**', `&(($3)->gobj())')
-//#m4 _CONVERSION(`GstBuffer**', `Glib::RefPtr<Gst::Buffer>&', `Gst::wrap(*($3))')
+//#m4 _CONVERSION(`GstBuffer**', `Glib::RefPtr<Gst::Buffer>&', `Gst::wrap(*($3, true))')
//_WRAP_VFUNC(FlowReturn prepare_output_buffer(const Glib::RefPtr<Gst::Buffer>& input, int size, const Glib::RefPtr<Gst::Caps>& caps, Glib::RefPtr<Gst::Buffer>&), "prepare_output_buffer")
///** Optional. Event handler on the source pad.
Modified: gstreamermm/trunk/gstreamer/src/cddabasesrc.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/cddabasesrc.hg (original)
+++ gstreamermm/trunk/gstreamer/src/cddabasesrc.hg Thu Jan 8 03:22:45 2009
@@ -27,8 +27,7 @@
namespace Gst
{
-//TODO: Include when bug #566837 is resolved:
-//_WRAP_ENUM(CddaBaseSrcMode,GstCddaBaseSrcMode)
+_WRAP_ENUM(CddaBaseSrcMode,GstCddaBaseSrcMode)
/** Gst::CddaBaseSrc â Base class for CD digital audio (CDDA) sources.
* Provides a base class for CDDA sources, which handles things like seeking,
@@ -71,10 +70,7 @@
//TODO: _WRAP_METHOD(bool add_track(...), gst_cdda_base_src_add_track)
_WRAP_PROPERTY("device", Glib::ustring)
-
- //TODO: Include when bug #566837 is resolved:
- //_WRAP_PROPERTY("mode", CddaBaseSrcMode)
-
+ _WRAP_PROPERTY("mode", CddaBaseSrcMode)
_WRAP_PROPERTY("track", guint)
//TODO: Wrap vfuncs.
Modified: gstreamermm/trunk/gstreamer/src/colorbalance.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/colorbalance.hg (original)
+++ gstreamermm/trunk/gstreamer/src/colorbalance.hg Thu Jan 8 03:22:45 2009
@@ -27,8 +27,7 @@
namespace Gst
{
-//TODO: Include when bug #566822 is resolved.
-//_WRAP_ENUM(ColorBalanceType, GstColorBalanceType)
+_WRAP_ENUM(ColorBalanceType, GstColorBalanceType)
class ColorBalanceChannel;
@@ -51,6 +50,20 @@
/** Fired when the value of the indicated channel has changed.
*/
_WRAP_SIGNAL(void value_changed(const Glib::RefPtr<ColorBalanceChannel>& channel, int value), "value-changed")
+
+#m4 _CONVERSION(`Glib::ListHandle< Glib::RefPtr<ColorBalanceChannel> >', `const GList*', `($3).data()')
+ //TODO: Include when bug #530416 is resolved.
+ ///** Lists the channels of the Gst::ColorBalance.
+ //*/
+ //_WRAP_VFUNC(Glib::ListHandle< Glib::RefPtr<ColorBalanceChannel> > list_channels(), "list_channels")
+
+ /** Sets the value of a Gst::ColorBalanceChannel of the Gst::ColorBalance.
+ */
+ _WRAP_VFUNC(void set_value(const Glib::RefPtr<ColorBalanceChannel>& channel, int value), "set_value")
+
+ /** Gets the value of a Gst::ColorBalanceChannel of the Gst::ColorBalance.
+ */
+ _WRAP_VFUNC(int get_value(const Glib::RefPtr<ColorBalanceChannel>& channel), "get_value")
};
} // namespace Gst
Modified: gstreamermm/trunk/gstreamer/src/gst_signals.defs
==============================================================================
--- gstreamermm/trunk/gstreamer/src/gst_signals.defs (original)
+++ gstreamermm/trunk/gstreamer/src/gst_signals.defs Thu Jan 8 03:22:45 2009
@@ -3027,6 +3027,8 @@
(construct-only #f)
)
+;; From GstNetBuffer
+
;; From GstBaseRTPAudioPayload
(define-property name
@@ -4234,6 +4236,24 @@
(construct-only #f)
)
+(define-property can-activate-push
+ (of-object "GstAudioTestSrc")
+ (prop-type "GParamBoolean")
+ (docs "Can activate in push mode")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property can-activate-pull
+ (of-object "GstAudioTestSrc")
+ (prop-type "GParamBoolean")
+ (docs "Can activate in pull mode")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
;; From GstCdParanoiaSrc
(define-signal transport-error
Modified: gstreamermm/trunk/gstreamer/src/gst_vfuncs.defs
==============================================================================
--- gstreamermm/trunk/gstreamer/src/gst_vfuncs.defs (original)
+++ gstreamermm/trunk/gstreamer/src/gst_vfuncs.defs Thu Jan 8 03:22:45 2009
@@ -518,3 +518,37 @@
'("GstEvent*" "event")
)
)
+
+; GstColorBalance
+
+(define-vfunc list_channels
+ (of-object "GstColorBalance")
+ (return-type "const-GList*")
+)
+
+(define-vfunc set_value
+ (of-object "GstColorBalance")
+ (return-type "void")
+ (parameters
+ '("GstColorBalanceChannel*" "balance")
+ '("gint" "value")
+ )
+)
+
+(define-vfunc get_value
+ (of-object "GstColorBalance")
+ (return-type "gint")
+ (parameters
+ '("GstColorBalanceChannel*" "balance")
+ )
+)
+
+; GstColorBalance
+
+(define-vfunc send_event
+ (of-object "GstNavigation")
+ (return-type "void")
+ (parameters
+ '("GstStructure*" "structure")
+ )
+)
Modified: gstreamermm/trunk/gstreamer/src/mixer.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/mixer.ccg (original)
+++ gstreamermm/trunk/gstreamer/src/mixer.ccg Thu Jan 8 03:22:45 2009
@@ -19,6 +19,7 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+ #include <gst/interfaces/mixer.h>
#include <gstreamermm/mixeroptions.h>
#include <gstreamermm/mixertrack.h>
@@ -36,4 +37,4 @@
Glib::OWNERSHIP_DEEP);
}
- }
+} // namespace Gst
Modified: gstreamermm/trunk/gstreamer/src/mixer.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/mixer.hg (original)
+++ gstreamermm/trunk/gstreamer/src/mixer.hg Thu Jan 8 03:22:45 2009
@@ -19,7 +19,6 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <gst/interfaces/mixer.h>
#include <glibmm/interface.h>
_DEFS(gstreamermm,gst)
@@ -27,10 +26,9 @@
namespace Gst
{
-//TODO: Include enums when bug #566824 is resolved:
-//_WRAP_ENUM(MixerType, GstMixerType)
-//_WRAP_ENUM(MixerFlags, GstMixerFlags)
-//_WRAP_ENUM(MixerMessageType, GstMixerMessageType)
+_WRAP_ENUM(MixerType, GstMixerType)
+_WRAP_ENUM(MixerFlags, GstMixerFlags)
+_WRAP_ENUM(MixerMessageType, GstMixerMessageType)
class MixerOptions;
class MixerTrack;
@@ -68,9 +66,7 @@
_WRAP_METHOD(void options_list_changed(const Glib::RefPtr<Gst::MixerOptions>& opts), gst_mixer_options_list_changed)
_WRAP_METHOD(Glib::ustring get_option(const Glib::RefPtr<Gst::MixerOptions>& opts), gst_mixer_get_option)
_WRAP_METHOD(void mixer_changed(), gst_mixer_mixer_changed)
-
- //TODO: Include enums when bug #566824 is resolved:
- //_WRAP_METHOD(Gst::MixerFlags get_mixer_flags(), gst_mixer_get_mixer_flags)
+ _WRAP_METHOD(Gst::MixerFlags get_mixer_flags(), gst_mixer_get_mixer_flags)
/* TODO:
_WRAP_METHOD(satic Gst::MixerMessageType message_get_type(GstMessage *message), gst_mixer_message_get_type)
@@ -80,7 +76,6 @@
_WRAP_METHOD(static void message_parse_volume_changed(GstMessage *message, GstMixerTrack **track, gint **volumes, gint *num_channels), gst_mixer_message_parse_volume_changed)
_WRAP_METHOD(static void message_parse_options_list_changed(GstMessage *message, GstMixerOptions **options), gst_mixer_message_parse_options_list_changed)
*/
-
};
} // namespace Gst
Modified: gstreamermm/trunk/gstreamer/src/mixertrack.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/mixertrack.hg (original)
+++ gstreamermm/trunk/gstreamer/src/mixertrack.hg Thu Jan 8 03:22:45 2009
@@ -26,8 +26,7 @@
namespace Gst
{
-//TODO: Include when bug #566824 is resolved.
-//_WRAP_ENUM(MixerTrackFlags, GstMixerTrackFlags)
+_WRAP_ENUM(MixerTrackFlags, GstMixerTrackFlags)
/** Gst::MixerTrack â A track in an element that implement the Gst::Mixer
* interface.
Added: gstreamermm/trunk/gstreamer/src/navigation.ccg
==============================================================================
--- (empty file)
+++ gstreamermm/trunk/gstreamer/src/navigation.ccg Thu Jan 8 03:22:45 2009
@@ -0,0 +1,22 @@
+// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+
+/* gstreamermm - a C++ wrapper for gstreamer
+ *
+ * Copyright 2008 The gstreamermm Development Team
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+ #include <gstreamermm/structure.h>
Added: gstreamermm/trunk/gstreamer/src/navigation.hg
==============================================================================
--- (empty file)
+++ gstreamermm/trunk/gstreamer/src/navigation.hg Thu Jan 8 03:22:45 2009
@@ -0,0 +1,52 @@
+// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+
+/* gstreamermm - a C++ wrapper for gstreamer
+ *
+ * Copyright 2008 The gstreamermm Development Team
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <gst/interfaces/navigation.h>
+#include <glibmm/interface.h>
+
+_DEFS(gstreamermm,gst)
+
+namespace Gst
+{
+
+class Structure;
+
+/** Gst::Naviagtion â Interface for elements that provide navigation
+ * functionality.
+ * @ingroup GstInterfaces
+ */
+class Navigation : public Glib::Interface
+{
+ _CLASS_INTERFACE(Navigation, GstNavigation, GST_NAVIGATION, GstNavigationInterface)
+
+public:
+ _WRAP_METHOD(void send_event(Gst::Structure& structure), gst_navigation_send_event)
+ _WRAP_METHOD(void send_key_event(const Glib::ustring& event, const Glib::ustring& key), gst_navigation_send_key_event)
+ _WRAP_METHOD(void send_mouse_event(const Glib::ustring& event, int button, double x, double y), gst_navigation_send_mouse_event)
+
+//TODO:
+//#m4 _CONVERSION(`GstStructure*', `Gst::Structure&', `Glib::wrap(($3), true)')
+ ///** Called when an event has been sent to the Gst::Navigation.
+ //*/
+ //_WRAP_VFUNC(void send_event(Gst::Structure& structure), "send_event")
+};
+
+} // namespace Gst
Modified: gstreamermm/trunk/tools/extra_defs_gen/generate_defs_gst.cc
==============================================================================
--- gstreamermm/trunk/tools/extra_defs_gen/generate_defs_gst.cc (original)
+++ gstreamermm/trunk/tools/extra_defs_gen/generate_defs_gst.cc Thu Jan 8 03:22:45 2009
@@ -46,6 +46,7 @@
#include <gst/audio/gstaudiosrc.h>
#include <gst/audio/gstringbuffer.h>
#include <gst/cdda/gstcddabasesrc.h>
+#include <gst/netbuffer/gstnetbuffer.h>
#include <gst/rtp/gstbasertpaudiopayload.h>
#include <gst/rtp/gstbasertpdepayload.h>
#include <gst/rtp/gstbasertppayload.h>
@@ -143,6 +144,7 @@
<< get_defs(GST_TYPE_AUDIO_SRC)
<< get_defs(GST_TYPE_RING_BUFFER)
<< get_defs(GST_TYPE_CDDA_BASE_SRC)
+ << get_defs(GST_TYPE_NETBUFFER)
<< get_defs(GST_TYPE_BASE_RTP_AUDIO_PAYLOAD)
<< get_defs(GST_TYPE_BASE_RTP_DEPAYLOAD)
<< get_defs(GST_TYPE_BASE_RTP_PAYLOAD)
Modified: gstreamermm/trunk/tools/m4/convert_gst.m4
==============================================================================
--- gstreamermm/trunk/tools/m4/convert_gst.m4 (original)
+++ gstreamermm/trunk/tools/m4/convert_gst.m4 Thu Jan 8 03:22:45 2009
@@ -1,5 +1,6 @@
#Enums
_CONV_ENUM(Gst,AssocFlags)
+_CONV_ENUM(Gst,BaseAudioSinkSlaveMethod)
_CONV_ENUM(Gst,BufferCopyFlags)
_CONV_ENUM(Gst,BufferFlag)
_CONV_ENUM(Gst,ClockEntryType)
@@ -14,6 +15,7 @@
_CONV_ENUM(Gst,IndexLookupMethod)
_CONV_ENUM(Gst,IndexResolverMethod)
_CONV_ENUM(Gst,MessageType)
+_CONV_ENUM(Gst,MixerFlags)
_CONV_ENUM(Gst,PadDirection)
_CONV_ENUM(Gst,PadLinkReturn)
_CONV_ENUM(Gst,PadPresence)
@@ -143,6 +145,7 @@
#Structure
_CONVERSION(`const GstStructure*',`const Gst::Structure',`Glib::wrap(const_cast<GstStructure*>($3), true)')
_CONVERSION(`GstStructure*',`const Gst::Structure',`Glib::wrap(const_cast<GstStructure*>($3), true)')
+_CONVERSION(`Gst::Structure&',`GstStructure*',`($3).gobj()')
#TagList
_CONVERSION(`const Gst::TagList&',`const GstTagList*',`(($3).gobj())')
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
