[gstreamermm] nclude the plug-in header files for the user.
- From: José Alburquerque <jaalburqu src gnome org>
- To: svn-commits-list gnome org
- Subject: [gstreamermm] nclude the plug-in header files for the user.
- Date: Fri, 15 May 2009 18:48:32 -0400 (EDT)
commit 8b7b8ce912de776fb1d39f6ad44be8ae03cb0138
Author: José Alburquerque <jaalburqu svn gnome org>
Date: Fri May 15 18:46:24 2009 -0400
nclude the plug-in header files for the user.
---
ChangeLog | 17 ++
examples/media_player_gtkmm/main.cc | 4 +-
examples/ogg_player_gtkmm/main.cc | 9 +-
gstreamer/gstreamermm.h | 62 +++++++
gstreamer/src/gst_enums.defs | 170 +++++++++++++++++++-
gstreamer/src/gst_enums.defs.patch | 47 ++++--
gstreamer/src/gst_signals.defs | 96 +++++++-----
.../extra_defs_gen/generate_plugin_gmmproc_file.cc | 13 +-
8 files changed, 344 insertions(+), 74 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 778b43b..b796a13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2009-05-15 José Alburquerque <jaalburqu svn gnome org>
+
+ * examples/media_player_gtkmm/main.cc:
+ * examples/ogg_player_gtkmm/main.cc:
+ * gstreamer/gstreamermm.h: Include the plug-in header files for the
+ user (if there are too many includes, the paradigm can be changed to
+ individual includes again).
+
+ * tools/extra_defs_gen/generate_plugin_gmmproc_file.cc: Fix the
+ plug-in docs so that an #include is not required and the dangers of
+ using a non-existing plug-in are understood.
+
+ * gstreamer/src/gst_signals.defs: Regenerated to remove warnings from
+ build.
+ * gstreamer/src/gst_enums.defs:
+ * gstreamer/src/gst_enums.defs.patch: Regenerated and fixed the patch.
+
2009-05-14 José Alburquerque <jaalburqu svn gnome org>
* configure.ac: Remove the need to check if a plug-in exists because
diff --git a/examples/media_player_gtkmm/main.cc b/examples/media_player_gtkmm/main.cc
index 7be36b5..30fdb76 100644
--- a/examples/media_player_gtkmm/main.cc
+++ b/examples/media_player_gtkmm/main.cc
@@ -19,11 +19,13 @@
#include <gtkmm/main.h>
#include <gstreamermm/init.h>
#include <gstreamermm/element.h>
-#include <gstreamermm/elementfactory.h>
#include <gstreamermm/pad.h>
#include <gstreamermm/pipeline.h>
+
+// Plug-ins:
#include <gstreamermm/playbin2.h>
#include <gstreamermm/ximagesink.h>
+
#include <iostream>
#include "player_window.h"
diff --git a/examples/ogg_player_gtkmm/main.cc b/examples/ogg_player_gtkmm/main.cc
index b8b0caf..93a1a7f 100644
--- a/examples/ogg_player_gtkmm/main.cc
+++ b/examples/ogg_player_gtkmm/main.cc
@@ -23,17 +23,17 @@
#include <gstreamermm/pipeline.h>
// Plug-ins
+#include <gstreamermm/alsasink.h>
+#include <gstreamermm/audioconvert.h>
#include <gstreamermm/filesrc.h>
#include <gstreamermm/oggdemux.h>
#include <gstreamermm/vorbisdec.h>
-#include <gstreamermm/audioconvert.h>
-#include <gstreamermm/alsasink.h>
#include <iostream>
#include "player_window.h"
Glib::RefPtr<Gst::Pipeline> pipeline;
-Glib::RefPtr<Gst::Element> decoder;
+Glib::RefPtr<Gst::VorbisDec> decoder;
void on_parser_pad_added(const Glib::RefPtr<Gst::Pad>& newPad)
{
@@ -68,7 +68,8 @@ main (int argc, char *argv[])
return -1;
}
- // Parses the ogg streams into elementary streams (note that an ogg file may contain a video stream too)
+ // Parses the ogg streams into elementary streams (note that an ogg file may
+ // contain a video stream too)
Glib::RefPtr<Gst::OggDemux> parser = Gst::OggDemux::create();
if(!parser)
{
diff --git a/gstreamer/gstreamermm.h b/gstreamer/gstreamermm.h
index bc64863..fa6f8fc 100644
--- a/gstreamer/gstreamermm.h
+++ b/gstreamer/gstreamermm.h
@@ -74,4 +74,66 @@
#include <gstreamermm/videoorientation.h>
#include <gstreamermm/xoverlay.h>
+// Plug-in core includes
+#include <gstreamermm/capsfilter.h>
+#include <gstreamermm/fakesrc.h>
+#include <gstreamermm/fakesink.h>
+#include <gstreamermm/fdsink.h>
+#include <gstreamermm/fdsrc.h>
+#include <gstreamermm/filesrc.h>
+#include <gstreamermm/filesink.h>
+#include <gstreamermm/identity.h>
+#include <gstreamermm/multiqueue.h>
+#include <gstreamermm/queue.h>
+#include <gstreamermm/tee.h>
+#include <gstreamermm/typefindelement.h>
+
+// Plug-in base includes
+#include <gstreamermm/adder.h>
+#include <gstreamermm/alsamixer.h>
+#include <gstreamermm/alsasink.h>
+#include <gstreamermm/alsasrc.h>
+#include <gstreamermm/audioconvert.h>
+#include <gstreamermm/audioresample.h>
+#include <gstreamermm/audiotestsrc.h>
+#include <gstreamermm/cdparanoiasrc.h>
+#include <gstreamermm/clockoverlay.h>
+#include <gstreamermm/decodebin.h>
+//TODO: #include <gstreamermm/decodebin2.h>
+#include <gstreamermm/ffmpegcolorspace.h>
+#include <gstreamermm/gdpdepay.h>
+#include <gstreamermm/gdppay.h>
+#include <gstreamermm/giosink.h>
+#include <gstreamermm/giosrc.h>
+#include <gstreamermm/giostreamsink.h>
+#include <gstreamermm/giostreamsrc.h>
+//TODO (Add plug-in first): #include <gstreamermm/gnomevfssink.h>
+//TODO (Add plug-in first): #include <gstreamermm/gnomevfssrc.h>
+//TODO (Add plug-in first): #include <gstreamermm/multifdsink.h>
+#include <gstreamermm/oggdemux.h>
+#include <gstreamermm/oggmux.h>
+//TODO (Add plug-in first): #include <gstreamermm/playbin.h>
+#include <gstreamermm/playbin2.h>
+#include <gstreamermm/tcpclientsrc.h>
+#include <gstreamermm/tcpclientsink.h>
+#include <gstreamermm/tcpserversrc.h>
+//TODO (Add plug-in first): #include <gstreamermm/tcpserversink.h>
+#include <gstreamermm/textoverlay.h>
+#include <gstreamermm/textrender.h>
+#include <gstreamermm/theoradec.h>
+#include <gstreamermm/theoraenc.h>
+//TODO (Add plug-in first): #include <gstreamermm/theoraparse.h>
+#include <gstreamermm/timeoverlay.h>
+//TODO (Add plug-in first): #include <gstreamermm/uridecodebin.h>
+#include <gstreamermm/videorate.h>
+#include <gstreamermm/videoscale.h>
+#include <gstreamermm/videotestsrc.h>
+#include <gstreamermm/volume.h>
+#include <gstreamermm/vorbisdec.h>
+#include <gstreamermm/vorbisenc.h>
+#include <gstreamermm/vorbisparse.h>
+#include <gstreamermm/vorbistag.h>
+#include <gstreamermm/ximagesink.h>
+#include <gstreamermm/xvimagesink.h>
+
#endif // _GSTREAMERMM_H
diff --git a/gstreamer/src/gst_enums.defs b/gstreamer/src/gst_enums.defs
index 0192fab..afaa8f0 100644
--- a/gstreamer/src/gst_enums.defs
+++ b/gstreamer/src/gst_enums.defs
@@ -377,7 +377,9 @@
'("info" "GST_LEVEL_INFO" "3")
'("debug" "GST_LEVEL_DEBUG" "4")
'("log" "GST_LEVEL_LOG" "5")
- '("count" "GST_LEVEL_COUNT" "6")
+ '("fixme" "GST_LEVEL_FIXME" "6")
+ '("memdump" "GST_LEVEL_MEMDUMP" "9")
+ '("count" "GST_LEVEL_COUNT" "10")
)
)
@@ -472,6 +474,20 @@
)
)
+(define-enum-extended StreamStatusType
+ (in-module "Gst")
+ (c-name "GstStreamStatusType")
+ (values
+ '("create" "GST_STREAM_STATUS_TYPE_CREATE" "0")
+ '("enter" "GST_STREAM_STATUS_TYPE_ENTER" "1")
+ '("leave" "GST_STREAM_STATUS_TYPE_LEAVE" "2")
+ '("destroy" "GST_STREAM_STATUS_TYPE_DESTROY" "3")
+ '("start" "GST_STREAM_STATUS_TYPE_START" "8")
+ '("pause" "GST_STREAM_STATUS_TYPE_PAUSE" "9")
+ '("stop" "GST_STREAM_STATUS_TYPE_STOP" "10")
+ )
+)
+
;; From /usr/src/jhbuild-sources/gstreamer/gst/gstminiobject.h
(define-flags-extended MiniObjectFlags
@@ -718,7 +734,8 @@
'("stop-type" "GST_QUARK_STOP_TYPE" "49")
'("latency" "GST_QUARK_LATENCY" "50")
'("uri" "GST_QUARK_URI" "51")
- '("max" "GST_QUARK_MAX" "52")
+ '("object" "GST_QUARK_OBJECT" "52")
+ '("max" "GST_QUARK_MAX" "53")
)
)
@@ -844,6 +861,18 @@
)
)
+;; From /usr/src/jhbuild-sources/gstreamer/gst/gstutils.h
+
+(define-enum-extended SearchMode
+ (in-module "Gst")
+ (c-name "GstSearchMode")
+ (values
+ '("exact" "GST_SEARCH_MODE_EXACT" "0")
+ '("before" "GST_SEARCH_MODE_BEFORE" "1")
+ '("after" "GST_SEARCH_MODE_AFTER" "2")
+ )
+)
+
;; From /usr/src/jhbuild-sources/gstreamer/libs/gst/base/gstbasesrc.h
(define-enum-extended BaseSrcFlags
@@ -1236,6 +1265,65 @@
)
)
+;; From /usr/src/jhbuild-sources/gst-plugins-base/gst-libs/gst/interfaces/navigation.h
+
+(define-enum-extended NavigationCommand
+ (in-module "Gst")
+ (c-name "GstNavigationCommand")
+ (values
+ '("invalid" "GST_NAVIGATION_COMMAND_INVALID" "0")
+ '("menu1" "GST_NAVIGATION_COMMAND_MENU1" "1")
+ '("menu2" "GST_NAVIGATION_COMMAND_MENU2" "2")
+ '("menu3" "GST_NAVIGATION_COMMAND_MENU3" "3")
+ '("menu4" "GST_NAVIGATION_COMMAND_MENU4" "4")
+ '("menu5" "GST_NAVIGATION_COMMAND_MENU5" "5")
+ '("menu6" "GST_NAVIGATION_COMMAND_MENU6" "6")
+ '("menu7" "GST_NAVIGATION_COMMAND_MENU7" "7")
+ '("left" "GST_NAVIGATION_COMMAND_LEFT" "20")
+ '("right" "GST_NAVIGATION_COMMAND_RIGHT" "21")
+ '("up" "GST_NAVIGATION_COMMAND_UP" "22")
+ '("down" "GST_NAVIGATION_COMMAND_DOWN" "23")
+ '("activate" "GST_NAVIGATION_COMMAND_ACTIVATE" "24")
+ '("prev-angle" "GST_NAVIGATION_COMMAND_PREV_ANGLE" "30")
+ '("next-angle" "GST_NAVIGATION_COMMAND_NEXT_ANGLE" "31")
+ )
+)
+
+(define-enum-extended NavigationQueryType
+ (in-module "Gst")
+ (c-name "GstNavigationQueryType")
+ (values
+ '("invalid" "GST_NAVIGATION_QUERY_INVALID" "0")
+ '("commands" "GST_NAVIGATION_QUERY_COMMANDS" "1")
+ '("angles" "GST_NAVIGATION_QUERY_ANGLES" "2")
+ )
+)
+
+(define-enum-extended NavigationMessageType
+ (in-module "Gst")
+ (c-name "GstNavigationMessageType")
+ (values
+ '("invalid" "GST_NAVIGATION_MESSAGE_INVALID" "0")
+ '("mouse-over" "GST_NAVIGATION_MESSAGE_MOUSE_OVER" "1")
+ '("commands-changed" "GST_NAVIGATION_MESSAGE_COMMANDS_CHANGED" "2")
+ '("angles-changed" "GST_NAVIGATION_MESSAGE_ANGLES_CHANGED" "3")
+ )
+)
+
+(define-enum-extended NavigationEventType
+ (in-module "Gst")
+ (c-name "GstNavigationEventType")
+ (values
+ '("invalid" "GST_NAVIGATION_EVENT_INVALID" "0")
+ '("key-press" "GST_NAVIGATION_EVENT_KEY_PRESS" "1")
+ '("key-release" "GST_NAVIGATION_EVENT_KEY_RELEASE" "2")
+ '("mouse-button-press" "GST_NAVIGATION_EVENT_MOUSE_BUTTON_PRESS" "3")
+ '("mouse-button-release" "GST_NAVIGATION_EVENT_MOUSE_BUTTON_RELEASE" "4")
+ '("mouse-move" "GST_NAVIGATION_EVENT_MOUSE_MOVE" "5")
+ '("command" "GST_NAVIGATION_EVENT_COMMAND" "6")
+ )
+)
+
;; From /usr/src/jhbuild-sources/gst-plugins-base/gst-libs/gst/interfaces/tunerchannel.h
(define-flags-extended TunerChannelFlags
@@ -1273,6 +1361,21 @@
'("sdes" "GST_RTCP_TYPE_SDES" "202")
'("bye" "GST_RTCP_TYPE_BYE" "203")
'("app" "GST_RTCP_TYPE_APP" "204")
+ '("rtpfb" "GST_RTCP_TYPE_RTPFB" "205")
+ '("psfb" "GST_RTCP_TYPE_PSFB" "206")
+ )
+)
+
+(define-enum-extended RTCPFBType
+ (in-module "Gst")
+ (c-name "GstRTCPFBType")
+ (values
+ '("fb-type-invalid" "GST_RTCP_FB_TYPE_INVALID" "0")
+ '("rtpfb-type-nack" "GST_RTCP_RTPFB_TYPE_NACK" "1")
+ '("psfb-type-pli" "GST_RTCP_PSFB_TYPE_PLI" "1")
+ '("psfb-type-sli" "GST_RTCP_PSFB_TYPE_SLI" "2")
+ '("psfb-type-rpsi" "GST_RTCP_PSFB_TYPE_RPSI" "3")
+ '("psfb-type-afb" "GST_RTCP_PSFB_TYPE_AFB" "15")
)
)
@@ -1349,7 +1452,9 @@
'("enet" "GST_RTSP_ENET" "-12")
'("enotip" "GST_RTSP_ENOTIP" "-13")
'("etimeout" "GST_RTSP_ETIMEOUT" "-14")
- '("elast" "GST_RTSP_ELAST" "-15")
+ '("etget" "GST_RTSP_ETGET" "-15")
+ '("etpost" "GST_RTSP_ETPOST" "-16")
+ '("elast" "GST_RTSP_ELAST" "-17")
)
)
@@ -1481,6 +1586,27 @@
'("language" "GST_RTSP_HDR_LANGUAGE" "51")
'("player-start-time" "GST_RTSP_HDR_PLAYER_START_TIME" "52")
'("location" "GST_RTSP_HDR_LOCATION" "53")
+ '("etag" "GST_RTSP_HDR_ETAG" "54")
+ '("if-match" "GST_RTSP_HDR_IF_MATCH" "55")
+ '("accept-charset" "GST_RTSP_HDR_ACCEPT_CHARSET" "56")
+ '("supported" "GST_RTSP_HDR_SUPPORTED" "57")
+ '("vary" "GST_RTSP_HDR_VARY" "58")
+ '("x-accelerate-streaming" "GST_RTSP_HDR_X_ACCELERATE_STREAMING" "59")
+ '("x-accept-authent" "GST_RTSP_HDR_X_ACCEPT_AUTHENT" "60")
+ '("x-accept-proxy-authent" "GST_RTSP_HDR_X_ACCEPT_PROXY_AUTHENT" "61")
+ '("x-broadcast-id" "GST_RTSP_HDR_X_BROADCAST_ID" "62")
+ '("x-burst-streaming" "GST_RTSP_HDR_X_BURST_STREAMING" "63")
+ '("x-notice" "GST_RTSP_HDR_X_NOTICE" "64")
+ '("x-player-lag-time" "GST_RTSP_HDR_X_PLAYER_LAG_TIME" "65")
+ '("x-playlist" "GST_RTSP_HDR_X_PLAYLIST" "66")
+ '("x-playlist-change-notice" "GST_RTSP_HDR_X_PLAYLIST_CHANGE_NOTICE" "67")
+ '("x-playlist-gen-id" "GST_RTSP_HDR_X_PLAYLIST_GEN_ID" "68")
+ '("x-playlist-seek-id" "GST_RTSP_HDR_X_PLAYLIST_SEEK_ID" "69")
+ '("x-proxy-client-agent" "GST_RTSP_HDR_X_PROXY_CLIENT_AGENT" "70")
+ '("x-proxy-client-verb" "GST_RTSP_HDR_X_PROXY_CLIENT_VERB" "71")
+ '("x-receding-playlistchange" "GST_RTSP_HDR_X_RECEDING_PLAYLISTCHANGE" "72")
+ '("x-rtp-info" "GST_RTSP_HDR_X_RTP_INFO" "73")
+ '("x-startupprofile" "GST_RTSP_HDR_X_STARTUPPROFILE" "74")
)
)
@@ -1603,6 +1729,7 @@
'("udp" "GST_RTSP_LOWER_TRANS_UDP" "1 << 0")
'("udp-mcast" "GST_RTSP_LOWER_TRANS_UDP_MCAST" "1 << 1")
'("tcp" "GST_RTSP_LOWER_TRANS_TCP" "1 << 2")
+ '("http" "GST_RTSP_LOWER_TRANS_HTTP" "1 << 4")
)
)
@@ -1702,6 +1829,7 @@
'("bgr" "GST_VIDEO_FORMAT_BGR" "15")
'("y41b" "GST_VIDEO_FORMAT_Y41B" "16")
'("y42b" "GST_VIDEO_FORMAT_Y42B" "17")
+ '("yvyu" "GST_VIDEO_FORMAT_YVYU" "18")
)
)
@@ -1847,7 +1975,9 @@
'("video" "GST_PLAY_SINK_TYPE_VIDEO" "2")
'("video-raw" "GST_PLAY_SINK_TYPE_VIDEO_RAW" "3")
'("text" "GST_PLAY_SINK_TYPE_TEXT" "4")
- '("last" "GST_PLAY_SINK_TYPE_LAST" "5")
+ '("subpic" "GST_PLAY_SINK_TYPE_SUBPIC" "5")
+ '("last" "GST_PLAY_SINK_TYPE_LAST" "6")
+ '("flushing" "GST_PLAY_SINK_TYPE_FLUSHING" "7")
)
)
@@ -2111,6 +2241,38 @@
)
)
+;; From /usr/src/jhbuild-sources/gst-plugins-base/ext/pango/gsttextrender.h
+
+(define-enum-extended TextRenderVAlign
+ (in-module "Gst")
+ (c-name "GstTextRenderVAlign")
+ (values
+ '("baseline" "GST_TEXT_RENDER_VALIGN_BASELINE" "0")
+ '("bottom" "GST_TEXT_RENDER_VALIGN_BOTTOM" "1")
+ '("top" "GST_TEXT_RENDER_VALIGN_TOP" "2")
+ )
+)
+
+(define-enum-extended TextRenderHAlign
+ (in-module "Gst")
+ (c-name "GstTextRenderHAlign")
+ (values
+ '("left" "GST_TEXT_RENDER_HALIGN_LEFT" "0")
+ '("center" "GST_TEXT_RENDER_HALIGN_CENTER" "1")
+ '("right" "GST_TEXT_RENDER_HALIGN_RIGHT" "2")
+ )
+)
+
+(define-enum-extended TextRenderLineAlign
+ (in-module "Gst")
+ (c-name "GstTextRenderLineAlign")
+ (values
+ '("left" "GST_TEXT_RENDER_LINE_ALIGN_LEFT" "0")
+ '("center" "GST_TEXT_RENDER_LINE_ALIGN_CENTER" "1")
+ '("right" "GST_TEXT_RENDER_LINE_ALIGN_RIGHT" "2")
+ )
+)
+
;; From /usr/src/jhbuild-sources/gst-plugins-base/ext/theora/gsttheoraenc.h
(define-enum-extended TheoraEncBorderMode
diff --git a/gstreamer/src/gst_enums.defs.patch b/gstreamer/src/gst_enums.defs.patch
index a6c59dc..2e8fd35 100644
--- a/gstreamer/src/gst_enums.defs.patch
+++ b/gstreamer/src/gst_enums.defs.patch
@@ -1,5 +1,5 @@
---- gst_enums.defs 2009-02-24 19:19:52.000000000 -0500
-+++ gst_enums.defs.new 2009-02-24 19:18:20.000000000 -0500
+--- gst_enums.defs 2009-05-15 17:56:23.000000000 -0400
++++ gst_enums.defs.new 2009-05-15 17:55:31.000000000 -0400
@@ -1,3 +1,5 @@
+;; Apply gst_enums.defs.patch after regenerating.
+
@@ -123,7 +123,7 @@
)
)
-@@ -459,7 +459,7 @@
+@@ -461,7 +461,7 @@
'("async-start" "GST_MESSAGE_ASYNC_START" "1 << 20")
'("async-done" "GST_MESSAGE_ASYNC_DONE" "1 << 21")
'("request-state" "GST_MESSAGE_REQUEST_STATE" "1 << 22")
@@ -132,7 +132,7 @@
)
)
-@@ -552,6 +552,12 @@
+@@ -568,6 +568,12 @@
(in-module "Gst")
(c-name "GstPadFlags")
(values
@@ -145,7 +145,7 @@
)
)
-@@ -571,6 +577,8 @@
+@@ -587,6 +593,8 @@
(in-module "Gst")
(c-name "GstPadTemplateFlags")
(values
@@ -154,7 +154,7 @@
)
)
-@@ -912,13 +920,13 @@
+@@ -941,13 +949,13 @@
(in-module "Gst")
(c-name "GstFakeSinkStateError")
(values
@@ -175,7 +175,7 @@
)
)
-@@ -928,14 +936,14 @@
+@@ -957,14 +965,14 @@
(in-module "Gst")
(c-name "GstFakeSrcOutputType")
(values
@@ -198,7 +198,7 @@
)
)
-@@ -943,8 +951,8 @@
+@@ -972,8 +980,8 @@
(in-module "Gst")
(c-name "GstFakeSrcDataType")
(values
@@ -209,7 +209,7 @@
)
)
-@@ -952,9 +960,9 @@
+@@ -981,9 +989,9 @@
(in-module "Gst")
(c-name "GstFakeSrcSizeType")
(values
@@ -222,7 +222,7 @@
)
)
-@@ -962,11 +970,11 @@
+@@ -991,11 +999,11 @@
(in-module "Gst")
(c-name "GstFakeSrcFillType")
(values
@@ -239,7 +239,7 @@
)
)
-@@ -981,6 +989,26 @@
+@@ -1010,6 +1018,26 @@
)
)
@@ -266,7 +266,7 @@
;; From /usr/src/jhbuild-sources/gst-plugins-base/gst-libs/gst/audio/gstbaseaudiosink.h
(define-enum-extended BaseAudioSinkSlaveMethod
-@@ -1695,10 +1723,10 @@
+@@ -1823,10 +1851,10 @@
(in-module "Gst")
(c-name "GstAudioConvertDithering")
(values
@@ -281,7 +281,7 @@
)
)
-@@ -1706,11 +1734,11 @@
+@@ -1834,11 +1862,11 @@
(in-module "Gst")
(c-name "GstAudioConvertNoiseShaping")
(values
@@ -298,7 +298,7 @@
)
)
-@@ -1757,6 +1785,17 @@
+@@ -1885,6 +1913,17 @@
'("event" "GST_GDP_DEPAY_STATE_EVENT" "4")
)
)
@@ -316,7 +316,7 @@
;; From /usr/src/jhbuild-sources/gst-plugins-base/gst/playback/gstfactorylists.h
-@@ -2029,17 +2068,6 @@
+@@ -2159,17 +2198,6 @@
)
)
@@ -334,7 +334,7 @@
;; From /usr/src/jhbuild-sources/gst-plugins-base/ext/pango/gsttextoverlay.h
(define-enum-extended TextOverlayVAlign
-@@ -2067,9 +2095,9 @@
+@@ -2197,9 +2225,9 @@
(c-name "GstTextOverlayWrapMode")
(values
'("none" "GST_TEXT_OVERLAY_WRAP_MODE_NONE" "-1")
@@ -347,7 +347,7 @@
)
)
-@@ -2077,21 +2105,35 @@
+@@ -2207,9 +2235,9 @@
(in-module "Gst")
(c-name "GstTextOverlayLineAlign")
(values
@@ -360,6 +360,19 @@
)
)
+@@ -2239,21 +2267,35 @@
+ (in-module "Gst")
+ (c-name "GstTextRenderLineAlign")
+ (values
+- '("left" "GST_TEXT_RENDER_LINE_ALIGN_LEFT" "#error")
+- '("center" "GST_TEXT_RENDER_LINE_ALIGN_CENTER" "#error")
+- '("right" "GST_TEXT_RENDER_LINE_ALIGN_RIGHT" "#error")
++ '("left" "GST_TEXT_RENDER_LINE_ALIGN_LEFT" "0")
++ '("center" "GST_TEXT_RENDER_LINE_ALIGN_CENTER" "1")
++ '("right" "GST_TEXT_RENDER_LINE_ALIGN_RIGHT" "2")
+ )
+ )
+
;; From /usr/src/jhbuild-sources/gst-plugins-base/ext/theora/gsttheoraenc.h
-(define-enum-extended
diff --git a/gstreamer/src/gst_signals.defs b/gstreamer/src/gst_signals.defs
index 2d02fcb..ed61886 100644
--- a/gstreamer/src/gst_signals.defs
+++ b/gstreamer/src/gst_signals.defs
@@ -3417,46 +3417,6 @@
;; From GstMixer
-(define-signal record-toggled
- (of-object "GstMixer")
- (return-type "void")
- (when "last")
- (parameters
- '("GstMixerTrack*" "p0")
- '("gboolean" "p1")
- )
-)
-
-(define-signal mute-toggled
- (of-object "GstMixer")
- (return-type "void")
- (when "last")
- (parameters
- '("GstMixerTrack*" "p0")
- '("gboolean" "p1")
- )
-)
-
-(define-signal volume-changed
- (of-object "GstMixer")
- (return-type "void")
- (when "last")
- (parameters
- '("GstMixerTrack*" "p0")
- '("gpointer" "p1")
- )
-)
-
-(define-signal option-changed
- (of-object "GstMixer")
- (return-type "void")
- (when "last")
- (parameters
- '("GstMixerOptions*" "p0")
- '("const-gchar*" "p1")
- )
-)
-
;; From GstMixerTrack
(define-property label
@@ -5451,7 +5411,7 @@
(when "last")
(parameters
'("gint" "p0")
- '("gboolean" "p1")
+ '("GstSyncMethod" "p1")
'("GstTCPUnitType" "p2")
'("guint64" "p3")
'("GstTCPUnitType" "p4")
@@ -6317,6 +6277,15 @@
(construct-only #f)
)
+(define-property subpic-sink
+ (of-object "GstPlayBin2")
+ (prop-type "GParamObject")
+ (docs "the subpicture output element to use (NULL = default dvdspu)")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
(define-property volume
(of-object "GstPlayBin2")
(prop-type "GParamDouble")
@@ -7103,6 +7072,51 @@
(construct-only #f)
)
+(define-property halignment
+ (of-object "GstTextRender")
+ (prop-type "GParamEnum")
+ (docs "Horizontal alignment of the text")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property valignment
+ (of-object "GstTextRender")
+ (prop-type "GParamEnum")
+ (docs "Vertical alignment of the text")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property line-alignment
+ (of-object "GstTextRender")
+ (prop-type "GParamEnum")
+ (docs "Alignment of text lines relative to each other.")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property xpad
+ (of-object "GstTextRender")
+ (prop-type "GParamInt")
+ (docs "Horizontal paddding when using left/right alignment")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property ypad
+ (of-object "GstTextRender")
+ (prop-type "GParamInt")
+ (docs "Vertical padding when using top/bottom alignment")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
(define-property font-desc
(of-object "GstTextRender")
(prop-type "GParamString")
diff --git a/tools/extra_defs_gen/generate_plugin_gmmproc_file.cc b/tools/extra_defs_gen/generate_plugin_gmmproc_file.cc
index 41a4166..b2a53b4 100644
--- a/tools/extra_defs_gen/generate_plugin_gmmproc_file.cc
+++ b/tools/extra_defs_gen/generate_plugin_gmmproc_file.cc
@@ -508,13 +508,12 @@ void generate_hg_file(const Glib::ustring& includeMacroCalls,
std::cout << enumWrapStatements << std::endl;
std::cout << "/** " << nmspace << "::" << cppTypeName << " - " << pluginName << " plugin." << std::endl;
- std::cout << " * Please include <" << target << "/" <<
- cppTypeName.lowercase() << ".h> to use. Please note that, though\n"
- " * using the underlying GObject is fine, using its C <B>type</B> is not\n"
- " * guaranteed to be API stable across releases because it is not "
- "guaranteed to\n * always remain the same. Also, not all plug-ins are "
- "available on all systems\n * and the ones that aren't available are not "
- "included in the build." << std::endl;
+ std::cout << " * Please note that, though using the underlying GObject is "
+ "fine, using its C\n * <B>type</B> is not guaranteed to be API stable "
+ "across releases because it is\n * not guaranteed to always remain the "
+ "same. Also, not all plug-ins are\n * available on all systems so care "
+ "must be taken that they exist before they\n * are used, otherwise there "
+ "will be errors and possibly a crash." << std::endl;
std::cout << " *" << std::endl;
std::cout << " * @ingroup " << nmspace << "Plugins" << std::endl;
std::cout << " */" << std::endl;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
