diff --git a/Makefile.am b/Makefile.am index 4564aa5387..d730c1018c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -25,8 +25,11 @@ SUBDIRS = include gst libs tools \ # These are all the possible subdirs DIST_SUBDIRS = include libs gst tools tests testsuite examples docs +gstreamer-@GST_MAJORMINOR@.pc: gstreamer.pc + cp gstreamer.pc gstreamer-@GST_MAJORMINOR@.pc + pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = gstreamer.pc +pkgconfig_DATA = gstreamer-@GST_MAJORMINOR@.pc EXTRA_DIST = gstreamer.spec.in \ gstreamer.pc.in gstreamer-uninstalled.pc.in \ diff --git a/common b/common index 9d5642850b..92ff5101d5 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 9d5642850b94f5bc21d565f8c900a0606fbb518f +Subproject commit 92ff5101d55c0f853620bf13f8dd528992824137 diff --git a/configure.ac b/configure.ac index 662d72d0df..069bbaf099 100644 --- a/configure.ac +++ b/configure.ac @@ -7,7 +7,17 @@ AS_VERSION(gstreamer, GST_VERSION, 0, 4, 2, 1, GST_ERROR="-Wall", GST_ERROR="-Wa dnl AM_MAINTAINER_MODE only provides the option to configure to enable it AM_MAINTAINER_MODE AM_INIT_AUTOMAKE($PACKAGE,$VERSION) -AS_LIBTOOL(GST, 0, 0, 0, yes) + +dnl our libraries and install dirs use major.minor as a version +GST_MAJORMINOR=$GST_VERSION_MAJOR.$GST_VERSION_MINOR +AC_SUBST(GST_MAJORMINOR) + +dnl CURRENT, REVISION, AGE +dnl - library source changed -> increment REVISION +dnl - interfaces added/removed/changed -> increment CURRENT, REVISION = 0 +dnl - interfaces added -> increment AGE +dnl - interfaces removed -> AGE = 0 +AS_LIBTOOL(GST, 1, 0, 0) AC_CONFIG_SRCDIR([gst/gst.c]) AM_CONFIG_HEADER(config.h) @@ -121,7 +131,7 @@ AC_SUBST(GST_PKG_DEPS) dnl === libxml 2 === dnl Minimum required version of libxml2 -LIBXML2_REQ="2.4.0" +LIBXML2_REQ="2.4.9" AC_SUBST(LIBXML2_REQ) dnl check for libxml2 @@ -218,28 +228,13 @@ AC_HELP_STRING([--enable-profiling],[adds -pg to compiler commandline, for profi esac], [USE_PROFILING=no]) dnl Default value -dnl set up a configuration dir -GST_CONFIG_DIR=${sysconfdir}/gstreamer -AC_ARG_WITH(configdir, -AC_HELP_STRING([--with-configdir],[specify path to use for configuration files]), -[case "${withval}" in - yes) AC_MSG_ERROR(bad value ${withval} for --with-configdir) ;; - no) AC_MSG_ERROR(bad value ${withval} for --with-configdir) ;; - *) GST_CONFIG_DIR="${withval}" ;; -esac], -[:]) dnl Default value - -AS_AC_EXPAND(GST_CONFIG_DIR, $GST_CONFIG_DIR) -AC_MSG_NOTICE(Using $GST_CONFIG_DIR as configuration dir) - - dnl use a cache dir for storing element registry info. dnl default to building registry in the source tree if we are enabling plugin build dir if test "x$PLUGINS_USE_BUILDDIR" = "xyes"; then GST_CACHE_DIR=`pwd` else dnl ${localstatedir} points to PREFIX/var - GST_CACHE_DIR=${localstatedir}/cache/gstreamer + GST_CACHE_DIR=${localstatedir}/cache/gstreamer-$GST_MAJORMINOR fi AC_ARG_WITH(cachedir, AC_HELP_STRING([--with-cachedir],[specify path to use for plugin and command completion registries]), @@ -371,19 +366,15 @@ dnl ############################ dnl # Set up some more defines # dnl ############################ -dnl Set location of configuration dir. -AC_DEFINE_UNQUOTED(GST_CONFIG_DIR, "$GST_CONFIG_DIR", [Define the configuration directory]) -AC_SUBST(GST_CONFIG_DIR) - dnl Set location of registry dir. AC_DEFINE_UNQUOTED(GST_CACHE_DIR, "$GST_CACHE_DIR", [Define the registry directory]) AC_SUBST(GST_CACHE_DIR) dnl Set location of plugin directory if test "x${prefix}" = "xNONE"; then - PLUGINS_DIR=${ac_default_prefix}/lib/gst + PLUGINS_DIR=${ac_default_prefix}/lib/gstreamer-$GST_MAJORMINOR else - PLUGINS_DIR=${prefix}/lib/gst + PLUGINS_DIR=${prefix}/lib/gstreamer-$GST_MAJORMINOR fi AC_DEFINE_UNQUOTED(PLUGINS_DIR, "$PLUGINS_DIR", [Define the plugin directory]) AC_SUBST(PLUGINS_DIR) @@ -414,7 +405,7 @@ AC_SUBST(LIBGST_LIBS) AC_SUBST(LIBGST_CFLAGS) dnl Vars for everyone else -GST_INT_LIBS="\$(top_builddir)/gst/libgstreamer.la" +GST_INT_LIBS="\$(top_builddir)/gst/libgstreamer-$GST_MAJORMINOR.la" GST_INT_CFLAGS="$GST_INT_CFLAGS -I\$(top_srcdir)/libs -I\$(top_srcdir)/include" AC_SUBST(GST_CFLAGS, "$LIBGST_CFLAGS $GST_INT_CFLAGS") diff --git a/docs/devhelp/Makefile.am b/docs/devhelp/Makefile.am index 34b31b7fa5..a98b0a5ad5 100644 --- a/docs/devhelp/Makefile.am +++ b/docs/devhelp/Makefile.am @@ -2,18 +2,18 @@ EXTRA_DIST = html2xml.py all-am: devhelp -devhelp: gstreamer.devhelp gstreamer-libs.devhelp +devhelp: gstreamer-@GST_MAJORMINOR@.devhelp gstreamer-libs-@GST_MAJORMINOR@.devhelp -gstreamer.devhelp: +gstreamer-@GST_MAJORMINOR@.devhelp: cd ../gst && make $(PYTHON) ./html2xml.py ../gst/html - sed 's@base=""@base="@HTML_DIR@/gstreamer"@g' html.devhelp > gstreamer.devhelp - perl -i -p -e 's/name="html"/name="gstreamer"/' gstreamer.devhelp + sed 's@base=""@base="@HTML_DIR@/gstreamer-@GST_MAJORMINOR@"@g' html.devhelp > gstreamer-@GST_MAJORMINOR@.devhelp + perl -i -p -e 's/name="html"/name="gstreamer-@GST_MAJORMINOR@"/' gstreamer-@GST_MAJORMINOR@.devhelp rm html.devhelp -gstreamer-libs.devhelp: +gstreamer-libs-@GST_MAJORMINOR@.devhelp: cd ../libs && make $(PYTHON) ./html2xml.py ../libs/html - sed 's@base=""@base="@HTML_DIR@/gstreamer-libs"@g' html.devhelp > gstreamer-libs.devhelp - perl -i -p -e 's/name="html"/name="gstreamer-libs"/' gstreamer-libs.devhelp + sed 's@base=""@base="@HTML_DIR@/gstreamer-libs-@GST_MAJORMINOR@"@g' html.devhelp > gstreamer-libs-@GST_MAJORMINOR@.devhelp + perl -i -p -e 's/name="html"/name="gstreamer-libs-@GST_MAJORMINOR@"/' gstreamer-libs-@GST_MAJORMINOR@.devhelp rm html.devhelp diff --git a/docs/gst/Makefile.am b/docs/gst/Makefile.am index 66cab70eb5..639836972b 100644 --- a/docs/gst/Makefile.am +++ b/docs/gst/Makefile.am @@ -66,7 +66,8 @@ GTKDOC_LD=$(LIBTOOL) --mode=link $(CC) # Everything below here is generic and you shouldn't need to change it. ########################################################################### -TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE) +# added majorminor here because we want parallel installs +TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@ EXTRA_DIST = \ $(content_files) \ diff --git a/docs/gst/tmpl/cothreads.sgml b/docs/gst/tmpl/cothreads.sgml index 2bd0141f5d..d18ee31bb1 100644 --- a/docs/gst/tmpl/cothreads.sgml +++ b/docs/gst/tmpl/cothreads.sgml @@ -34,7 +34,7 @@ Get the current stack frame. @ctx: -@threadnum: +@cothreadnum: @priv: @func: @argc: @@ -42,8 +42,8 @@ Get the current stack frame. @flags: @sp: @jmp: -@top_sp: -@pc: +@stack_base: +@stack_size: @magic_number: diff --git a/docs/gst/tmpl/gst.sgml b/docs/gst/tmpl/gst.sgml index d39641c2a0..829817c29b 100644 --- a/docs/gst/tmpl/gst.sgml +++ b/docs/gst/tmpl/gst.sgml @@ -97,6 +97,7 @@ pipeline and Microsoft's DirectShow for some background. @argc: @argv: @popt_options: +@Returns: diff --git a/docs/gst/tmpl/gstaggregator.sgml b/docs/gst/tmpl/gstaggregator.sgml index 46ca5a9276..6670f70513 100644 --- a/docs/gst/tmpl/gstaggregator.sgml +++ b/docs/gst/tmpl/gstaggregator.sgml @@ -15,13 +15,27 @@ methods to request buffers from its pads. + + + + + + @AGGREGATOR_LOOP: -@AGGREGATOR_LOOP_PEEK: @AGGREGATOR_LOOP_SELECT: @AGGREGATOR_CHAIN: + + + + + +@factory: +@Returns: + + diff --git a/docs/gst/tmpl/gstcaps.sgml b/docs/gst/tmpl/gstcaps.sgml index d068a80622..d747f9a553 100644 --- a/docs/gst/tmpl/gstcaps.sgml +++ b/docs/gst/tmpl/gstcaps.sgml @@ -125,6 +125,8 @@ A convenience macro to create a new GstCaps structure. @name: the name of the caps structure @type: the mime type of the caps structure +@...: + @a...: the properties of this caps stucture. @@ -134,6 +136,8 @@ A convenience macro to create a GstCaps factory. @factoryname: the name of the factory +@...: + @a...: the caps to create with this factory, usualy specified with GST_CAPS_NEW() @@ -405,6 +409,8 @@ Set a property of a caps structure. @caps: the caps structure to modify +@...: + @name: the name of the property to change @args...: the new value of the property @@ -415,6 +421,8 @@ Get key/value pairs from the given GstCaps. @caps: the caps to get the values from +@...: + @name: the name of the first key @args...: a pointer to the variable that can hold the result followed by more key/value pairs. diff --git a/docs/gst/tmpl/gstclock.sgml b/docs/gst/tmpl/gstclock.sgml index 18d0546b55..87f20512e1 100644 --- a/docs/gst/tmpl/gstclock.sgml +++ b/docs/gst/tmpl/gstclock.sgml @@ -42,6 +42,7 @@ The function prototype of the callback. @time: The time it was triggered @id: The id that expired @user_data: user data passed in the async_wait call +@Returns: @@ -59,6 +60,7 @@ The return value of a clock operation. @GST_CLOCK_TIMEOUT: The operation timed out. @GST_CLOCK_EARLY: The operation was scheduled too late. @GST_CLOCK_ERROR: An error occured +@GST_CLOCK_UNSUPPORTED: @@ -134,6 +136,7 @@ The opaque data structure of the clock. @clock: @speed: +@Returns: @@ -183,79 +186,6 @@ The opaque data structure of the clock. @Returns: - - - - - -@clock: -@Returns: - - - - - - - -@clock: -@time: -@jitter: -@Returns: - - - - - - - -@clock: -@time: -@func: -@user_data: -@Returns: - - - - - - - -@clock: -@id: - - - - - - - -@clock: -@interval: -@func: -@user_data: -@Returns: - - - - - - - -@clock: -@id: - - - - - - - -@clock: -@id: -@jitter: -@Returns: - - @@ -265,15 +195,6 @@ The opaque data structure of the clock. @Returns: - - - - - -@clock: -@id: - - @@ -308,5 +229,11 @@ The opaque data structure of the clock. @clock: @resolution: +@Returns: + + + + + diff --git a/docs/gst/tmpl/gstelementfactory.sgml b/docs/gst/tmpl/gstelementfactory.sgml index e2e95f7974..5f52f4ba11 100644 --- a/docs/gst/tmpl/gstelementfactory.sgml +++ b/docs/gst/tmpl/gstelementfactory.sgml @@ -62,6 +62,7 @@ describes the element, mostly for the benefit of editors. @longname: @klass: +@license: @description: @version: @author: diff --git a/docs/gst/tmpl/gstevent.sgml b/docs/gst/tmpl/gstevent.sgml index 32c634afc6..ae94c3840f 100644 --- a/docs/gst/tmpl/gstevent.sgml +++ b/docs/gst/tmpl/gstevent.sgml @@ -45,6 +45,7 @@ The different major types of events. @GST_EVENT_SIZE: a size suggestion for a peer element @GST_EVENT_RATE: adjust the output rate of an element @GST_EVENT_FILLER: a dummy element that should be ignored by plugins +@GST_EVENT_TS_OFFSET: @@ -243,13 +244,13 @@ The value of the size event -The event data structure. + -@data: The parent data type. -@type: The event type. -@timestamp: The event timestamp. -@src: The object that generated the event +@data: +@type: +@timestamp: +@src: diff --git a/docs/gst/tmpl/gstextratypes.sgml b/docs/gst/tmpl/gstextratypes.sgml index 4eae4a0ee5..ddb3e57204 100644 --- a/docs/gst/tmpl/gstextratypes.sgml +++ b/docs/gst/tmpl/gstextratypes.sgml @@ -21,3 +21,11 @@ A type that can be used to indicate a filename. + + + + + +@Returns: + + diff --git a/docs/gst/tmpl/gstfakesink.sgml b/docs/gst/tmpl/gstfakesink.sgml index 361a67d1a7..6e672957c9 100644 --- a/docs/gst/tmpl/gstfakesink.sgml +++ b/docs/gst/tmpl/gstfakesink.sgml @@ -16,3 +16,12 @@ with the buffer. (fakesink) + + + + + +@factory: +@Returns: + + diff --git a/docs/gst/tmpl/gstfakesrc.sgml b/docs/gst/tmpl/gstfakesrc.sgml index dfc2d57101..afabed4d76 100644 --- a/docs/gst/tmpl/gstfakesrc.sgml +++ b/docs/gst/tmpl/gstfakesrc.sgml @@ -14,3 +14,55 @@ The GstFakeSrc generates empty buffers. (fakesrc) + + + + + +@FAKESRC_FIRST_LAST_LOOP: +@FAKESRC_LAST_FIRST_LOOP: +@FAKESRC_PING_PONG: +@FAKESRC_ORDERED_RANDOM: +@FAKESRC_RANDOM: +@FAKESRC_PATTERN_LOOP: +@FAKESRC_PING_PONG_PATTERN: +@FAKESRC_GET_ALWAYS_SUCEEDS: + + + + + + +@FAKESRC_DATA_ALLOCATE: +@FAKESRC_DATA_SUBBUFFER: +@FAKESRC_DATA_BUFFERPOOL: + + + + + + +@FAKESRC_SIZETYPE_NULL: +@FAKESRC_SIZETYPE_FIXED: +@FAKESRC_SIZETYPE_RANDOM: + + + + + + +@FAKESRC_FILLTYPE_NOTHING: +@FAKESRC_FILLTYPE_NULL: +@FAKESRC_FILLTYPE_RANDOM: +@FAKESRC_FILLTYPE_PATTERN: +@FAKESRC_FILLTYPE_PATTERN_CONT: + + + + + + +@factory: +@Returns: + + diff --git a/docs/gst/tmpl/gstfilesrc.sgml b/docs/gst/tmpl/gstfilesrc.sgml index 67715c209d..c9b5f0ae36 100644 --- a/docs/gst/tmpl/gstfilesrc.sgml +++ b/docs/gst/tmpl/gstfilesrc.sgml @@ -15,3 +15,11 @@ and subbuffers. + + + + + +@GST_FILESRC_OPEN: +@GST_FILESRC_FLAG_LAST: + diff --git a/docs/gst/tmpl/gstinfo.sgml b/docs/gst/tmpl/gstinfo.sgml index c108ccd9af..1514b22f4d 100644 --- a/docs/gst/tmpl/gstinfo.sgml +++ b/docs/gst/tmpl/gstinfo.sgml @@ -100,6 +100,8 @@ Print out any information usable at run-time by application developers. @cat: the GST_CAT_... category for the information +@...: + @format: printf-style format string @args...: printf arguments @@ -111,6 +113,8 @@ Print out information like #GST_INFO, but with an element pointer to clarify thi @cat: the GST_CAT_... category for the information @element: pointer to the #GstElement in question +@...: + @format: printf-style format string @args...: printf arguments @@ -153,6 +157,8 @@ Called at the beginning of a function, it simply prints out a DEBUG string of "e in addition to the given string. +@...: + @format: printf-style format string @args...: printf arguments @@ -163,6 +169,8 @@ Called at the end of a function, it simply prints out a DEBUG string of "leaving in addition to the given string. +@...: + @format: printf-stype format string @args...: printf arguments @@ -173,6 +181,8 @@ Print out debugging information. @cat: the GST_CAT_... the debug falls within +@...: + @format: printf-style format string @args...: printf arguments @@ -224,6 +234,8 @@ Print out usefull debugging info of an element. @cat: The category of this debugging statement. @element: The element to debug. +@...: + @format: A printf-like string. @args...: The argument for the printf-like string. @@ -234,6 +246,8 @@ Print out an error condition and abort the application. @element: the #GstElement in question +@...: + @format: printf-style format string @args...: printf arguments @@ -245,6 +259,8 @@ Print out an error condition and abort the application. @element: the #GstElement in question @object: pointer to a 'contributing' object +@...: + @format: printf-style format string @args...: printf arguments diff --git a/docs/gst/tmpl/gstobject.sgml b/docs/gst/tmpl/gstobject.sgml index 82b040fc30..1429d921b6 100644 --- a/docs/gst/tmpl/gstobject.sgml +++ b/docs/gst/tmpl/gstobject.sgml @@ -280,6 +280,15 @@ Check if the object has been destroyed. @Returns: + + + + + +@gstobject: the object which received the signal. +@arg1: +@arg2: + Is trigered whenever a new object is saved to XML. You can connect to diff --git a/docs/gst/tmpl/gstpad.sgml b/docs/gst/tmpl/gstpad.sgml index e297b8f82b..e1c382e8a4 100644 --- a/docs/gst/tmpl/gstpad.sgml +++ b/docs/gst/tmpl/gstpad.sgml @@ -922,6 +922,7 @@ Destroy the pad. @querytypefunc: @intconnfunc: @bufferpoolfunc: +@probedisp: diff --git a/docs/gst/tmpl/gstpadtemplate.sgml b/docs/gst/tmpl/gstpadtemplate.sgml index 7b0ebef8d1..ab313fa993 100644 --- a/docs/gst/tmpl/gstpadtemplate.sgml +++ b/docs/gst/tmpl/gstpadtemplate.sgml @@ -127,6 +127,8 @@ Create a new padtemplate. @padname: the nametemplate for the pads that will be created with this template @dir: the direction of the pads. @pres: the presence of the pads. +@...: + @a...: the capabilities of this padtemplate usually created with GST_CAPS_NEW() @@ -140,6 +142,8 @@ of the padtemplate. Use GST_PAD_TEMPLATE_GET() to get the unique padtemplate. @padname: the nametemplate of the pads @dir: the direction of the pads. @pres: the presence of the pads. +@...: + @a...: the capabilities of this padtemplate, usually created with GST_CAPS_NEW() diff --git a/docs/gst/tmpl/gstpipefilter.sgml b/docs/gst/tmpl/gstpipefilter.sgml index 968c3132aa..b7674d1b76 100644 --- a/docs/gst/tmpl/gstpipefilter.sgml +++ b/docs/gst/tmpl/gstpipefilter.sgml @@ -15,3 +15,11 @@ buffers from its output. + + + + + +@GST_PIPEFILTER_OPEN: +@GST_PIPEFILTER_FLAG_LAST: + diff --git a/docs/gst/tmpl/gstprops.sgml b/docs/gst/tmpl/gstprops.sgml index 160f6d1c52..747ebf4cb8 100644 --- a/docs/gst/tmpl/gstprops.sgml +++ b/docs/gst/tmpl/gstprops.sgml @@ -34,10 +34,11 @@ are usually used in conjunction with GstCaps. @GST_PROPS_INT_TYPE: @GST_PROPS_FLOAT_TYPE: @GST_PROPS_FOURCC_TYPE: -@GST_PROPS_BOOL_TYPE: +@GST_PROPS_BOOLEAN_TYPE: @GST_PROPS_STRING_TYPE: @GST_PROPS_VAR_TYPE: @GST_PROPS_LIST_TYPE: +@GST_PROPS_GLIST_TYPE: @GST_PROPS_FLOAT_RANGE_TYPE: @GST_PROPS_INT_RANGE_TYPE: @GST_PROPS_LAST_TYPE: @@ -84,6 +85,8 @@ Create a FOURCC value from a string. example: Create a list of properties. +@...: + @a...: the list of GstProps diff --git a/docs/gst/tmpl/gstqueue.sgml b/docs/gst/tmpl/gstqueue.sgml index 87d54cc408..6de503a687 100644 --- a/docs/gst/tmpl/gstqueue.sgml +++ b/docs/gst/tmpl/gstqueue.sgml @@ -25,3 +25,9 @@ The queue blocks by default. + + + + + + diff --git a/docs/gst/tmpl/gstreamer-unused.sgml b/docs/gst/tmpl/gstreamer-unused.sgml index 61fa2a4f3e..caa70aaf0e 100644 --- a/docs/gst/tmpl/gstreamer-unused.sgml +++ b/docs/gst/tmpl/gstreamer-unused.sgml @@ -38,6 +38,26 @@ Information about audio buffers. audioraw + + + + + + + + + + + + + + + + + +cothreads_compat + + @@ -58,6 +78,46 @@ audioraw GObject + + + + + + + + + + + + + + + + + +grammar.tab + + + + + + + + + + + + + + + + + + + +gst_private + + The aggregator is mainly used for testing purposes. It has several @@ -96,6 +156,26 @@ the offset. GstAsyncDiskSrc + + + + + + + + + + + + + + + + + +gstatomic + + @@ -136,6 +216,46 @@ GstAudioSink GstAudioSrc + + + + + + + + + + + + + + + + + +gstbufferpool-default + + + + + + + + + + + + + + + + + + + +GstCacheFactory + + @@ -156,6 +276,26 @@ GstAudioSrc GstColorSpace + + + + + + + + + + + + + + + + + +gstconfig + + A connection is a bas class for a generic connection between @@ -178,6 +318,26 @@ Generic connection between elements. GstConnection + + + + + + + + + + + + + + + + + +gstdata_private + + The disksink write to a file. The filename can be given as an argument. @@ -239,6 +399,26 @@ GstDiskSrc GstElementFactory + + + + + + + + + + + + + + + + + +gstenumtypes + + @@ -361,6 +541,26 @@ Read buffers from a file descriptor. (fdsrc) GstFdSrc + + + + + + + + + + + + + + + + + +GstFileSink + + FileSrc is used to read buffers from a file. It efficiently uses mmap @@ -405,6 +605,26 @@ Take data in and spit data out GstFilter + + + + + + + + + + + + + + + + + +gstformat + + @@ -465,6 +685,46 @@ Pass data without modification. (identity) GstIdentity + + + + + + + + + + + + + + + + + +gstmacros + + + + + + + + + + + + + + + + + + + +gstmarshal + + @@ -485,6 +745,26 @@ GstIdentity GstMD5Sink + + + + + + + + + + + + + + + + + +gstmemchunk + + The point of the metadata is to provide some context for each buffer. In @@ -639,6 +919,26 @@ A wrapper around every stdin/stdout capable program GstPipefilter + + + + + + + + + + + + + + + + + +gstprobe + + Simple data queue. Data is queued till max_level buffers any subsequent buffers @@ -670,6 +970,26 @@ Simple asynchronous data queue. GstQueue + + + + + + + + + + + + + + + + + +gstsearchfuncs + + Create a sine wave of a given frequency and volume. @@ -712,6 +1032,46 @@ The end point of a filter graph GstSink + + + + + + + + + + + + + + + + + +GstSpider + + + + + + + + + + + + + + + + + + + +GstSpiderIdentity + + A GstSrc is the start of a filter graph. It typically is a file or an @@ -776,6 +1136,66 @@ Detect the mime type of a media stream GstTypeFind + + + + + + + + + + + + + + + + + +gsttypes + + + + + + + + + + + + + + + + + + + +gstversion + + + + + + + + + + + + + + + + + + + +GstXMLRegistry + + @@ -817,6 +1237,26 @@ Frequencies of a spectrum analysis. spectrum + + + + + + + + + + + + + + + + + +types + + Information about video buffers. @@ -837,6 +1277,30 @@ Information about video buffers. videoraw + + + + + + + + + + + + + + + + + + + + + + + + The maximum number of cothreads we are going to support. @@ -923,6 +1387,18 @@ g_print messages. @format: @args...: + + + + + + + + + + + + @@ -953,6 +1429,24 @@ g_print messages. + + + + + + + + + + + + + + + + + + @@ -988,6 +1482,105 @@ g_print messages. @klass: + + + + + +@ref: +@count: + + + + + + +@ref: +@zero: + + + + + + +@ref: + + + + + + +@ref: + + + + + + +@ref: +@val: + + + + + + +@ref: +@res: + + + + + + +@ref: +@val: + + + + + + +@ref: + + + + + + + + + + + + +@swap: +@val: + + + + + + +@swap: +@val: +@res: + + + + + + +@swap: +@val: + + + + + + +@swap: + @@ -1016,6 +1609,26 @@ g_print messages. @klass: + + + + + +@obj: + + + + + + +@klass: + + + + + + + @@ -1023,6 +1636,13 @@ g_print messages. @obj: + + + + + +@obj: + @@ -1030,6 +1650,13 @@ g_print messages. @klass: + + + + + +@klass: + Obtains a lock on the object, making serialization possible. @@ -1088,6 +1715,78 @@ Releases a lock on the buffer. @buf: a #GstBuffer to unlock + + + + + +@entry: + + + + + + +@entry: +@i: + + + + + + +@entry: +@i: + + + + + + +@obj: + + + + + + +@klass: + + + + + + +@entry: + + + + + + +@entry: + + + + + + +@entry: + + + + + + +@entry: + + + + + + +@caps: + Lock the caps structure @@ -1109,6 +1808,55 @@ Unlock the caps structure @caps: The caps structure to unlock + + + + + +@entry: + + + + + + +@entry: + + + + + + +@entry: + + + + + + +@entry: + + + + + + +@entry: + + + + + + +@entry: + + + + + + +@clock: + @@ -1192,6 +1940,12 @@ to the current function, i.e. "('element')" @format: printf-style format string @args...: printf arguments + + + + + + @@ -1213,6 +1967,13 @@ to the current function, i.e. "('element')" @obj: + + + + + +@obj: + @@ -1220,6 +1981,27 @@ to the current function, i.e. "('element')" @klass: + + + + + +@klass: + + + + + + +@obj: + + + + + + +@klass: + Queries whether the cothread holding this element needs to be stopped. @@ -1263,6 +2045,14 @@ The properties of the info event @event: The event to query + + + + + +@functionname: +@...: + Qeury wether the seek event also needs a flush. @@ -1346,6 +2136,48 @@ subclass use this to start their flag enumeration + + + + + +@functionname: +@...: + + + + + + +@obj: + + + + + + +@obj: + + + + + + +@klass: + + + + + + +@klass: + + + + + + + >>>>>>> 1.23.2.3 @@ -1417,6 +2249,20 @@ subclass use this to start their flag enumeration @obj: + + + + + +@obj: + + + + + + +@obj: + @@ -1431,6 +2277,20 @@ subclass use this to start their flag enumeration @obj: + + + + + +@obj: + + + + + + +@obj: + @@ -1473,6 +2333,20 @@ subclass use this to start their flag enumeration @obj: + + + + + +@obj: + + + + + + +@klass: + @@ -1557,6 +2431,27 @@ subclass use this to start their flag enumeration @obj: + + + + + +@obj: + + + + + + +@obj: + + + + + + +@obj: + @@ -1613,6 +2508,27 @@ subclass use this to start their flag enumeration @obj: + + + + + +@obj: + + + + + + +@obj: + + + + + + +@obj: + @@ -1641,6 +2557,41 @@ subclass use this to start their flag enumeration @obj: + + + + + +@obj: + + + + + + +@obj: + + + + + + +@obj: + + + + + + +@obj: + + + + + + +@obj: + @@ -1756,6 +2707,13 @@ Clear a flag in the meta data. @obj: + + + + + +@obj: + @@ -1763,6 +2721,13 @@ Clear a flag in the meta data. @klass: + + + + + +@klass: + subclasses can use this value to start the enumeration of their flags @@ -1776,6 +2741,13 @@ subclasses can use this value to start the enumeration of their flags @obj: + + + + + +@obj: + @@ -1783,6 +2755,13 @@ subclasses can use this value to start the enumeration of their flags @klass: + + + + + +@klass: + Is this pad connected. @@ -1830,6 +2809,42 @@ Indicates a srcpad for the padfactory. + + + + + +@pad: + + + + + + +@pad: + + + + + + +@functionname: +@...: + + + + + + +@obj: + + + + + + +@klass: + @@ -1844,6 +2859,13 @@ Indicates a srcpad for the padfactory. @klass: + + + + + +@plugin: + @@ -1885,6 +2907,13 @@ Create a fourcc property out of an integer value. @a: the integer value + + + + + +@a: + @@ -1917,6 +2946,34 @@ Create a fourcc property out of an integer value. @klass: + + + + + +@obj: + + + + + + +@obj: + + + + + + +@klass: + + + + + + +@klass: + Get the EOS function of the real pad. @@ -1924,6 +2981,27 @@ Get the EOS function of the real pad. @pad: the real pad to query. + + + + + +@pad: + + + + + + +@pad: + + + + + + +@pad: + Get the getregion function of the real pad. @@ -1987,6 +3065,20 @@ Get the QoS function of the real pad. @pad: the real pad to query. + + + + + +@pad: + + + + + + +@pad: + Get the type of the region that is being pulled. @@ -1994,6 +3086,20 @@ Get the type of the region that is being pulled. @pad: the real pad to query. + + + + + +@obj: + + + + + + +@klass: + Fast macro to add an element to the scheduler. @@ -2240,6 +3346,12 @@ This macro unsets the given state on the element. @klass: + + + + + + >>>>>>> 1.23.2.3 @@ -2259,18 +3371,108 @@ This macro unsets the given state on the element. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2283,12 +3485,48 @@ This macro unsets the given state on the element. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2325,6 +3563,18 @@ A type that can be used to indicate a filename. + + + + + + + + + + + + @@ -2343,24 +3593,144 @@ A type that can be used to indicate a filename. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2391,6 +3761,12 @@ A type that can be used to indicate a filename. + + + + + + @@ -2838,10 +4214,17 @@ A type that can be used to indicate a filename. @AGGREGATOR_LOOP: -@AGGREGATOR_LOOP_PEEK: @AGGREGATOR_LOOP_SELECT: @AGGREGATOR_CHAIN: + + + + + +@GST_ACCOCIATION_FLAG_NONE: +@GST_ACCOCIATION_FLAG_KEY_UNIT: + @@ -2901,6 +4284,19 @@ Specify the current offset in the file. @GST_ASYNCDISKSRC_OPEN: @GST_ASYNCDISKSRC_FLAG_LAST: + + + + + + + + + + + +@lock: + @@ -2987,6 +4383,17 @@ The frequency. + + + + + +@prev: +@fac: +@templ: +@cost: +@endpoint: + @@ -3041,6 +4448,81 @@ can perform necessary cleanup. @pool: The pool that is being destroyed @user_data: user data as set on th bufferpool + + + + + +@format: +@value: + + + + + + +@GST_CACHE_UNKNOWN: +@GST_CACHE_CERTAIN: +@GST_CACHE_FUZZY: + + + + + + +@type: +@id: + + + + + + +@GST_CACHE_ENTRY_ID: +@GST_CACHE_ENTRY_ASSOCIATION: +@GST_CACHE_ENTRY_OBJECT: +@GST_CACHE_ENTRY_FORMAT: + + + + + + +@cache: +@entry: +@Returns: + + + + + + +@groupnum: +@entries: +@certainty: +@peergroup: + + + + + + +@GST_CACHE_LOOKUP_EXACT: +@GST_CACHE_LOOKUP_BEFORE: +@GST_CACHE_LOOKUP_AFTER: + + + + + + +@cache: +@writer: +@writer_id: +@writer_string: +@user_data: +@Returns: + @@ -3067,6 +4549,41 @@ can perform necessary cleanup. + + + + + + + + + + + +@GST_CLOCK_ENTRY_OK: +@GST_CLOCK_ENTRY_EARLY: +@GST_CLOCK_ENTRY_RESTART: + + + + + + +@GST_CLOCK_ENTRY_SINGLE: +@GST_CLOCK_ENTRY_PERIODIC: + + + + + + +@GST_CLOCK_FLAG_CAN_DO_SINGLE_SYNC: +@GST_CLOCK_FLAG_CAN_DO_SINGLE_ASYNC: +@GST_CLOCK_FLAG_CAN_DO_PERIODIC_SYNC: +@GST_CLOCK_FLAG_CAN_DO_PERIODIC_ASYNC: +@GST_CLOCK_FLAG_CAN_SET_RESOLUTION: +@GST_CLOCK_FLAG_CAN_SET_SPEED: + @@ -3171,6 +4688,15 @@ Get the size of the file. @GST_DISKSRC_OPEN: @GST_DISKSRC_FLAG_LAST: + + + + + +@gstelement: the object which received the signal. +@arg1: +@arg2: + @@ -3210,6 +4736,22 @@ GstElementDetails struct for the element. + + +The function to get the clock from a clock providing element + + +@element: The element to get the clock of +@Returns: The clock provided by the element + + + +The function to set the clock on a clock receiving element. + + +@element: The element to set the clock on +@clock: The clock to set on the element + @@ -3222,6 +4764,14 @@ GstElementDetails struct for the element. + + + + + +@GST_EVENT_FLAG_NONE: +@GST_RATE_FLAG_NEGATIVE: + @@ -3394,6 +4944,49 @@ Sync on the clock + + + + + +@FAKESRC_DATA_ALLOCATE: +@FAKESRC_DATA_SUBBUFFER: +@FAKESRC_DATA_BUFFERPOOL: + + + + + + +@FAKESRC_FILLTYPE_NOTHING: +@FAKESRC_FILLTYPE_NULL: +@FAKESRC_FILLTYPE_RANDOM: +@FAKESRC_FILLTYPE_PATTERN: +@FAKESRC_FILLTYPE_PATTERN_CONT: + + + + + + +@FAKESRC_FIRST_LAST_LOOP: +@FAKESRC_LAST_FIRST_LOOP: +@FAKESRC_PING_PONG: +@FAKESRC_ORDERED_RANDOM: +@FAKESRC_RANDOM: +@FAKESRC_PATTERN_LOOP: +@FAKESRC_PING_PONG_PATTERN: +@FAKESRC_GET_ALWAYS_SUCEEDS: + + + + + + +@FAKESRC_SIZETYPE_NULL: +@FAKESRC_SIZETYPE_FIXED: +@FAKESRC_SIZETYPE_RANDOM: + @@ -3442,6 +5035,14 @@ Get the current offset in the file. + + + + + +@GST_FILESINK_OPEN: +@GST_FILESINK_FLAG_LAST: + The size of the buffers to pass to the peer element. @@ -3484,6 +5085,14 @@ Indicates the mmapped area should be touched to bring it into memory. + + + + + +@GST_FILESRC_OPEN: +@GST_FILESRC_FLAG_LAST: + @@ -3496,6 +5105,28 @@ Indicates the mmapped area should be touched to bring it into memory. + + + + + +@GST_FORMAT_UNDEFINED: +@GST_FORMAT_DEFAULT: +@GST_FORMAT_BYTES: +@GST_FORMAT_TIME: +@GST_FORMAT_BUFFERS: +@GST_FORMAT_PERCENT: +@GST_FORMAT_UNITS: + + + + + + +@value: +@nick: +@description: + @@ -3601,6 +5232,27 @@ Specify the location of the file. The location must be a fully qualified URL. + + + + + +@swap: +@name: +@area_size: +@chunk_size: +@atom_size: +@cleanup: +@lock: + + + + + + +@link: +@area: + @@ -3626,15 +5278,6 @@ Flags indicating properties about the meta data. @GST_MULTIDISKSRC_OPEN: @GST_MULTIDISKSRC_FLAG_LAST: - - - - - -@gstobject: the object which received the signal. -@arg1: -@arg2: - @@ -3673,6 +5316,14 @@ The function that will be called in an EOS case. @pad: the pad that needs to be set to EOS state @Returns: TRUE if EOS was successful, FALSE otherwise + + + + + +@pad: +@Returns: + Defines an entry for a padfactory. @@ -3685,6 +5336,14 @@ The padfactory. + + + + + +@pad: +@Returns: + The function that will be called when pulling a region buffer. @@ -3764,6 +5423,20 @@ The function that will be called when a QoS message is sent. @pad: the pad that sent the QoS message @qos_message: the message + + + + + +@pad: +@Returns: + + + + + + + @@ -3775,6 +5448,14 @@ The function that will be called when a QoS message is sent. @GST_PARSE_ERROR_INTERNAL: @GST_PARSE_ERROR_CONNECT: + + + + + +@GST_PIPEFILTER_OPEN: +@GST_PIPEFILTER_FLAG_LAST: + Sets the command to be executed. @@ -3793,6 +5474,33 @@ Sets the command to be executed. + + + + + +@single_shot: +@callback: +@user_data: + + + + + + +@probe: +@data: +@user_data: +@Returns: + + + + + + +@active: +@probes: + @@ -3898,6 +5606,15 @@ the region types for #gst_pad_pullregion. @file: @tmp_file: + + + + + +@GST_RESULT_OK: +@GST_RESULT_NOK: +@GST_RESULT_NOT_IMPL: + @@ -3911,6 +5628,27 @@ the region types for #gst_pad_pullregion. @cothreaded_elements: @schedule: + + + + + +@object: +@parent: +@parent_sched: +@state: +@clock: +@current_clock: +@clock_providers: +@clock_receivers: +@schedulers: + + + + + + + @@ -3983,6 +5721,12 @@ The volume as a double 0.0 is silent, 1.0 is loudest. + + + + + + @@ -4123,6 +5867,39 @@ TRUE if the thread should be created. + + + + + +@GST_TIME_CACHE_UNKNOWN: +@GST_TIME_CACHE_CERTAIN: +@GST_TIME_CACHE_FUZZY_LOCATION: +@GST_TIME_CACHE_FUZZY_TIMESTAMP: +@GST_TIME_CACHE_FUZZY: + + + + + + +@location: +@timestamp: + + + + + + +@groupnum: +@entries: +@certainty: +@peergroup: +@mintimestamp: +@maxtimestamp: +@minlocation: +@maxlocation: + @@ -4170,6 +5947,95 @@ Query the element for the current mime type + + + + + +@registry: + + + + + + +@registry: +@Returns: + + + + + + +@registry: + + + + + + +@registry: +@dest: +@size: +@Returns: + + + + + + +@GST_XML_REGISTRY_READ: +@GST_XML_REGISTRY_WRITE: + + + + + + +@registry: +@mode: +@Returns: + + + + + + +@context: +@tag: +@text: +@text_len: +@registry: +@error: +@Returns: + + + + + + +@registry: +@format: +@Varargs: +@Returns: + + + + + + +@GST_XML_REGISTRY_NONE: +@GST_XML_REGISTRY_TOP: +@GST_XML_REGISTRY_PATHS: +@GST_XML_REGISTRY_PATH: +@GST_XML_REGISTRY_PATHS_DONE: +@GST_XML_REGISTRY_PLUGIN: +@GST_XML_REGISTRY_FEATURE: +@GST_XML_REGISTRY_PADTEMPLATE: +@GST_XML_REGISTRY_CAPS: +@GST_XML_REGISTRY_CAPSCOMP: +@GST_XML_REGISTRY_PROPERTIES: + @@ -4179,6 +6045,12 @@ Query the element for the current mime type @arg1: @arg2: + + + + + + @@ -4198,6 +6070,24 @@ Query the element for the current mime type @format: @args...: + + + + + + + + + + + + + + + + + + @@ -4260,6 +6150,13 @@ Query the element for the current mime type @overlay_info: @dga_info: + + + + + +@String: + @@ -4300,6 +6197,45 @@ must be defined to activate the tracing functionality. + + + + + + + + + + + + + + + + + +@String: + + + + + + +@Domain: +@Directory: + + + + + + + + + + + + + @@ -4331,6 +6267,120 @@ must be defined to activate the tracing functionality. @key: @data: + + + + + +@Domain: +@String: +@Type: + + + + + + +@Domain: +@String: + + + + + + +@context: + + + + + + + + + + + + +@new_cothread: +@context: +@func: +@argc: +@argv: + + + + + + +@cothread: + + + + + + + + + + + + +@context: + + + + + + +@cothread: + + + + + + +@cothread: +@context: +@func: +@argc: +@argv: + + + + + + +@to: + + + + + + +@cothread: + + + + + + +@x: + + + + + + +@stack: +@size: + + + + + + + @@ -5107,12 +7157,49 @@ must be defined to activate the tracing functionality. @val: + + + + + +@String: + + + + + + +@first: +@current: +@parent: +@current_bin_type: +@elements: +@connections: +@connections_pending: +@bins: +@bin: + + + + + + +@factory: +@Returns: + + + + + + +@Returns: + @@ -5196,6 +7283,42 @@ must be defined to activate the tracing functionality. @src: + + + + + +@fac: +@sink: +@Returns: + + + + + + +@fac: +@src: +@Returns: + + + + + + +@src: +@dest: +@Returns: + + + + + + +@src: +@sink: +@Returns: + @@ -5209,6 +7332,48 @@ must be defined to activate the tracing functionality. @srccaps: @sinkcaps: + + + + + +@factories: +@dir: +@maxtemplates: +@Returns: + + + + + + +@factories: +@Returns: + + + + + + +@factories: +@Returns: + + + + + + +@factories: +@Returns: + + + + + + +@factories: +@Returns: + @@ -5216,6 +7381,36 @@ must be defined to activate the tracing functionality. @Returns: + + + + + +@Returns: + + + + + + +@fac: +@dir: +@Returns: + + + + + + +@fac: + + + + + + +@fac: + @@ -5233,6 +7428,30 @@ must be defined to activate the tracing functionality. @parent: @Returns: + + + + + +@Returns: + + + + + + +@fac: + + + + + + +@src_caps: +@sink_caps: +@factories: +@Returns: + @@ -5256,6 +7475,19 @@ must be defined to activate the tracing functionality. @bin: + + + + + + + + + + + +@Returns: + @@ -5329,6 +7561,13 @@ must be defined to activate the tracing functionality. @buffer: + + + + + +@Returns: + @@ -5345,6 +7584,20 @@ must be defined to activate the tracing functionality. @buffer: @Returns: + + + + + +@buf: + + + + + + +@pool: + @@ -5360,6 +7613,13 @@ must be defined to activate the tracing functionality. @pool: @buffer: + + + + + +@pool: + @@ -5426,6 +7686,248 @@ must be defined to activate the tracing functionality. @buffer: @meta: + + + + + +@buf: +@data: +@size: + + + + + + +@cache: +@id: +@flags: +@format: +@value: +@Varargs: +@Returns: + + + + + + +@cache: +@id: +@format: +@Returns: + + + + + + +@cache: +@id: +@description: +@Returns: + + + + + + +@cache: +@id: +@key: +@type: +@object: +@Returns: + + + + + + +@Returns: + + + + + + +@entry: +@format: +@value: +@Returns: + + + + + + +@entry: + + + + + + +@Returns: + + + + + + +@factory: +@Returns: + + + + + + +@factory: + + + + + + +@name: +@Returns: + + + + + + +@Returns: + + + + + + +@name: +@Returns: + + + + + + +@name: +@longdesc: +@type: +@Returns: + + + + + + +@cache: +@id: +@method: +@format: +@value: +@Returns: + + + + + + +@cache: +@id: +@method: +@format: +@value: +@func: +@user_data: +@Returns: + + + + + + +@cache: +@Returns: + + + + + + +@cache: +@Returns: + + + + + + +@cache: +@writer: +@id: +@Returns: + + + + + + +@Returns: + + + + + + +@Returns: + + + + + + +@cache: +@Returns: + + + + + + +@cache: +@certainty: + + + + + + +@cache: +@filter: +@user_data: + + + + + + +@cache: +@groupnum: +@Returns: + + + + + + +@cache: +@resolver: +@user_data: + @@ -5471,6 +7973,22 @@ must be defined to activate the tracing functionality. @clock: @active: + + + + + +@clock: +@Returns: + + + + + + +@clock: +@id: + @@ -5480,6 +7998,27 @@ must be defined to activate the tracing functionality. @time: @Returns: + + + + + +@Returns: + + + + + + +@Returns: + + + + + + +@Returns: + @@ -5487,6 +8026,46 @@ must be defined to activate the tracing functionality. @Returns: + + + + + +@id: + + + + + + +@id: + + + + + + +@id: + + + + + + +@id: +@jitter: +@Returns: + + + + + + +@id: +@func: +@user_data: +@Returns: + @@ -5495,6 +8074,36 @@ must be defined to activate the tracing functionality. @name: @Returns: + + + + + +@clock: +@start_time: +@interval: +@Returns: + + + + + + +@clock: +@time: +@Returns: + + + + + + +@clock: +@interval: +@func: +@user_data: +@Returns: + @@ -5503,6 +8112,21 @@ must be defined to activate the tracing functionality. @clock: @obj: + + + + + +@clock: +@id: + + + + + + +@Returns: + @@ -5511,6 +8135,45 @@ must be defined to activate the tracing functionality. @clock: @time: + + + + + +@clock: +@id: + + + + + + +@clock: +@time: +@jitter: +@Returns: + + + + + + +@clock: +@time: +@func: +@user_data: +@Returns: + + + + + + +@clock: +@id: +@jitter: +@Returns: + @@ -5533,6 +8196,13 @@ must be defined to activate the tracing functionality. @connection: + + + + + +@Returns: + @@ -5548,6 +8218,21 @@ must be defined to activate the tracing functionality. @data: + + + + + +@Returns: + + + + + + +@data: +@Returns: + @@ -5570,6 +8255,15 @@ must be defined to activate the tracing functionality. @state: @Returns: + + + + + +@klass: +@first_name: +@Varargs: + @@ -5599,6 +8293,21 @@ must be defined to activate the tracing functionality. @Varargs: @Returns: + + + + + + + + + + + +@object: +@orig: +@error: + @@ -5648,6 +8357,13 @@ must be defined to activate the tracing functionality. @elementfactory: + + + + + +@Returns: + @@ -5656,6 +8372,15 @@ must be defined to activate the tracing functionality. @parent: @Returns: + + + + + +@factoryname: +@name: +@Returns: + @@ -5672,6 +8397,21 @@ must be defined to activate the tracing functionality. @parent: @Returns: + + + + + +@Returns: + + + + + + +@element: +@Returns: + @@ -5724,6 +8464,14 @@ must be defined to activate the tracing functionality. @first_name: @Varargs: + + + + + +@element: +@Returns: + @@ -5749,6 +8497,14 @@ must be defined to activate the tracing functionality. @Returns: + + + + + +@element: +@Returns: + @@ -5777,6 +8533,14 @@ must be defined to activate the tracing functionality. @name: @Returns: + + + + + +@element: +@Returns: + @@ -5795,6 +8559,14 @@ must be defined to activate the tracing functionality. @parent: @Returns: + + + + + +@element: +@cache: + @@ -5802,6 +8574,20 @@ must be defined to activate the tracing functionality. @element: + + + + + +@Returns: + + + + + + +@Returns: + @@ -5856,6 +8642,13 @@ must be defined to activate the tracing functionality. @esdsink: + + + + + +@Returns: + @@ -5872,6 +8665,13 @@ must be defined to activate the tracing functionality. @Varargs: @Returns: + + + + + +@Returns: + @@ -5887,6 +8687,14 @@ must be defined to activate the tracing functionality. @pad: @buf: + + + + + +@factory: +@Returns: + @@ -5902,6 +8710,14 @@ must be defined to activate the tracing functionality. @name: @Returns: + + + + + +@factory: +@Returns: + @@ -5978,6 +8794,61 @@ must be defined to activate the tracing functionality. @name: @Returns: + + + + + +@nick: +@Returns: + + + + + + +@Returns: + + + + + + +@format: +@Returns: + + + + + + +@Returns: + + + + + + +@nick: +@description: +@Returns: + + + + + + +@Returns: + + + + + + +@pad: +@parent: +@Returns: + @@ -6013,9 +8884,26 @@ must be defined to activate the tracing functionality. +@...: @format: @args...: + + + + + +@argc: +@argv: +@Returns: + + + + + + +@Returns: + @@ -6028,11 +8916,29 @@ must be defined to activate the tracing functionality. - + +@closure: +@return_value: +@n_param_values: +@param_values: +@invocation_hint: +@marshal_data: + + + + + + +@closure: +@return_value: +@n_param_values: +@param_values: +@invocation_hint: +@marshal_data: @@ -6040,11 +8946,41 @@ must be defined to activate the tracing functionality. - + +@closure: +@return_value: +@n_param_values: +@param_values: +@invocation_hint: +@marshal_data: + + + + + + +@closure: +@return_value: +@n_param_values: +@param_values: +@invocation_hint: +@marshal_data: + + + + + + +@closure: +@return_value: +@n_param_values: +@param_values: +@invocation_hint: +@marshal_data: @@ -6064,6 +9000,56 @@ must be defined to activate the tracing functionality. + + + + + +@factory: +@Returns: + + + + + + +@mem_chunk: +@Returns: + + + + + + +@mem_chunk: +@Returns: + + + + + + +@mem_chunk: + + + + + + +@mem_chunk: +@mem: + + + + + + +@name: +@atom_size: +@area_size: +@type: +@Returns: + Create new meta data. @@ -6093,6 +9079,23 @@ Create new meta data. @meta: + + + + + +@object: +@orig: +@pspec: +@excluded_props: + + + + + + +@Returns: + @@ -6115,6 +9118,28 @@ Create new meta data. @pad: @parent: + + + + + +@pad: +@probe: + + + + + + +@Returns: + + + + + + +@Returns: + Call the EOS function of the pad @@ -6141,6 +9166,13 @@ Call the EOS function of the pad @data: @Returns: + + + + + +@Returns: + @@ -6166,6 +9198,38 @@ Call the EOS function of the pad @pad: @Returns: + + + + + +@pad: +@Returns: + + + + + + +@pad: +@Returns: + + + + + + +@pad: +@Returns: + + + + + + +@pad: +@Returns: + @@ -6174,6 +9238,22 @@ Call the EOS function of the pad @pad: @Returns: + + + + + +@pad: +@Returns: + + + + + + +@pad: +@Returns: + @@ -6197,6 +9277,32 @@ Call the EOS function of the pad @pad: @qos_message: + + + + + +@pad: +@mask: +@Returns: + + + + + + +@pad: +@format: +@Returns: + + + + + + +@pad: +@Returns: + @@ -6209,6 +9315,39 @@ Call the EOS function of the pad @counter: @count: + + + + + +@Returns: + + + + + + +@probe: + + + + + + +@single_shot: +@callback: +@user_data: +@Returns: + + + + + + +@probe: +@data: +@Returns: + @@ -6231,6 +9370,13 @@ Call the EOS function of the pad @Returns: @size: + + + + + +@Returns: + @@ -6239,6 +9385,14 @@ Call the EOS function of the pad @pad: @parent: + + + + + +@pad: +@probe: + @@ -6256,6 +9410,14 @@ Call the EOS function of the pad @parent: @Returns: + + + + + +@pad: +@active: + @@ -6289,6 +9451,22 @@ Call the EOS function of the pad @pad: @eos: + + + + + +@pad: +@mask_func: + + + + + + +@pad: +@format: + @@ -6329,6 +9507,14 @@ Call the EOS function of the pad @pad: @qos: + + + + + +@pad: +@type_function: + @@ -6348,6 +9534,13 @@ Call the EOS function of the pad @caps: @Returns: + + + + + +@Returns: + @@ -6374,6 +9567,19 @@ Call the EOS function of the pad @sinkpad: @Returns: + + + + + +@Returns: + + + + + + + @@ -6419,6 +9625,13 @@ Call the EOS function of the pad @plugin: @factory: + + + + + +@Returns: + @@ -6529,6 +9742,60 @@ Call the EOS function of the pad + + + + + +@disp: +@probe: + + + + + + +@disp: + + + + + + +@disp: +@data: +@Returns: + + + + + + +@disp: + + + + + + +@Returns: + + + + + + +@disp: +@probe: + + + + + + +@disp: +@active: + @@ -6591,6 +9858,13 @@ Call the EOS function of the pad @counter: @Returns: + + + + + +@Returns: + @@ -6599,6 +9873,12 @@ Call the EOS function of the pad @pad: @buf: + + + + + + @@ -6621,6 +9901,20 @@ Call the EOS function of the pad @connection: + + + + + +@Returns: + + + + + + +@Returns: + @@ -6635,6 +9929,13 @@ Call the EOS function of the pad @Returns: + + + + + +@Returns: + @@ -6642,6 +9943,13 @@ Call the EOS function of the pad @Returns: + + + + + +@Returns: + @@ -6754,6 +10062,52 @@ Call the EOS function of the pad @Returns: + + + + + +@Returns: + + + + + + +@sched: +@stack: +@size: +@Returns: + + + + + + +@sched: +@element: + + + + + + +@Returns: + + + + + + +@Returns: + + + + + + +@Returns: + @@ -6791,6 +10145,52 @@ Call the EOS function of the pad @name: @Returns: + + + + + + + + + + + +@name: +@Returns: + + + + + + +@name: +@Returns: + + + + + + +@ident: + + + + + + +@element: +@templ: +@name: +@Returns: + + + + + + +@ident: + @@ -6829,6 +10229,20 @@ Call the EOS function of the pad @pad: @buf: + + + + + + + + + + + +@factory: +@Returns: + @@ -6852,6 +10266,12 @@ Call the EOS function of the pad @tee: @Returns: + + + + + + @@ -6873,6 +10293,90 @@ Call the EOS function of the pad @arg: + + + + + +@Returns: + + + + + + +@tc: +@location: +@timestamp: + + + + + + +@tc: +@location: +@timestamp: +@Returns: + + + + + + +@tc: +@timestamp: +@location: +@Returns: + + + + + + +@tc: +@Returns: + + + + + + +@tc: +@Returns: + + + + + + +@Returns: + + + + + + +@tc: +@Returns: + + + + + + +@tc: +@certainty: + + + + + + +@tc: +@groupnum: +@Returns: + @@ -6994,6 +10498,12 @@ Call the EOS function of the pad @parent: @Returns: + + + + + + @@ -7061,6 +10571,15 @@ Call the EOS function of the pad @root: @Returns: + + + + + +@name: +@location: +@Returns: + @@ -7089,3 +10608,25 @@ Call the EOS function of the pad + + + + + + + + + + + +@buffers: +@bytes: +@events: + + + + + + +@String: + diff --git a/docs/gst/tmpl/gstscheduler.sgml b/docs/gst/tmpl/gstscheduler.sgml index 0d74f5437a..4b1bc9db61 100644 --- a/docs/gst/tmpl/gstscheduler.sgml +++ b/docs/gst/tmpl/gstscheduler.sgml @@ -64,17 +64,6 @@ Destroy the scheduler @sched: - - - - - -@sched: -@stack: -@size: -@Returns: - - diff --git a/docs/gst/tmpl/gststatistics.sgml b/docs/gst/tmpl/gststatistics.sgml index 100aed6afd..9566e3c5f7 100644 --- a/docs/gst/tmpl/gststatistics.sgml +++ b/docs/gst/tmpl/gststatistics.sgml @@ -15,3 +15,12 @@ the data stream, such as buffers/bytes/events etc. + + + + + +@buffers: +@bytes: +@events: + diff --git a/docs/gst/tmpl/gsttimecache.sgml b/docs/gst/tmpl/gsttimecache.sgml index 4854dcc10a..60ad156ba7 100644 --- a/docs/gst/tmpl/gsttimecache.sgml +++ b/docs/gst/tmpl/gsttimecache.sgml @@ -15,122 +15,3 @@ used for efficient seeking. - - - - - -@location: -@timestamp: - - - - - - -@groupnum: -@entries: -@certainty: -@peergroup: -@mintimestamp: -@maxtimestamp: -@minlocation: -@maxlocation: - - - - - - -@GST_TIME_CACHE_UNKNOWN: -@GST_TIME_CACHE_CERTAIN: -@GST_TIME_CACHE_FUZZY_LOCATION: -@GST_TIME_CACHE_FUZZY_TIMESTAMP: -@GST_TIME_CACHE_FUZZY: - - - - - - -@Returns: - - - - - - - -@tc: -@Returns: - - - - - - - -@tc: -@Returns: - - - - - - - -@tc: -@groupnum: -@Returns: - - - - - - - -@tc: -@certainty: - - - - - - - -@tc: -@Returns: - - - - - - - -@tc: -@location: -@timestamp: - - - - - - - -@tc: -@location: -@timestamp: -@Returns: - - - - - - - -@tc: -@timestamp: -@location: -@Returns: - - diff --git a/docs/gst/tmpl/gsttypefind.sgml b/docs/gst/tmpl/gsttypefind.sgml index 4fb5972710..ad3f5ae74f 100644 --- a/docs/gst/tmpl/gsttypefind.sgml +++ b/docs/gst/tmpl/gsttypefind.sgml @@ -15,3 +15,9 @@ the detected mime type of the stream. It is used in autoplugging. + + + + + + diff --git a/docs/libs/Makefile.am b/docs/libs/Makefile.am index 6a75dbdc8b..da6ee0b024 100644 --- a/docs/libs/Makefile.am +++ b/docs/libs/Makefile.am @@ -12,7 +12,8 @@ DOC_SOURCE_DIR=$(top_srcdir)/libs EXTRA_DIST = $(DOC_MODULE)-docs.sgml $(DOC_MODULE)-sections.txt HTML_DIR=@HTML_DIR@ -TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE) +# add major minor here for parallel installs +TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@ if HAVE_GTK_DOC html: html/book1.html diff --git a/gst/Makefile.am b/gst/Makefile.am index c13eb20b18..a0feeb1f17 100644 --- a/gst/Makefile.am +++ b/gst/Makefile.am @@ -1,4 +1,4 @@ -lib_LTLIBRARIES = libgstreamer.la +lib_LTLIBRARIES = libgstreamer-@GST_MAJORMINOR@.la noinst_LTLIBRARIES = libcothreads.la if HAVE_CPU_I386 @@ -41,13 +41,12 @@ else GST_TRACE_SRC = gsttrace.c endif -EXTRA_libgstreamer_la_SOURCES = gstcpuid_i386.s gstmarshal.list gstxml.c gsttypefind.c gstparse.c gstautoplug.c gsttrace.c +EXTRA_libgstreamer_@GST_MAJORMINOR@_la_SOURCES = gstcpuid_i386.s gstmarshal.list gstxml.c gsttypefind.c gstparse.c gstautoplug.c gsttrace.c SUBDIRS = parse registries . $(GST_AUTOPLUG_DIRS) elements schedulers types caches DIST_SUBDIRS = autoplug elements parse registries schedulers types caches -libcothreads_la_SOURCES = cothreads.c -libgstreamer_la_SOURCES = \ +libgstreamer_@GST_MAJORMINOR@_la_SOURCES = \ gst.c \ gstmarshal.c \ gstenumtypes.c \ @@ -91,7 +90,17 @@ libgstreamer_la_SOURCES = \ BUILT_SOURCES = gstmarshal.h gstmarshal.c gstenumtypes.h gstenumtypes.c -libgstreamerincludedir = $(includedir)/gstreamer-@VERSION@/gst +libgstreamer_@GST_MAJORMINOR@_la_CFLAGS = -D_GNU_SOURCE \ + $(LIBGST_CFLAGS) \ + -DG_LOG_DOMAIN=g_log_domain_gstreamer \ + -DGST_CONFIG_DIR=\""$(GST_CONFIG_DIR)"\" \ + -DGST_CACHE_DIR=\""$(GST_CACHE_DIR)"\" +libgstreamer_@GST_MAJORMINOR@_la_LIBADD = $(LIBGST_LIBS) parse/libgstparse.la registries/libgstxmlregistry.la +libgstreamer_@GST_MAJORMINOR@_la_LDFLAGS = @GST_LT_LDFLAGS@ -version-info @GST_LIBVERSION@ + + + +libgstreamer_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst gst_headers = \ gst.h \ @@ -139,7 +148,7 @@ built_headers = \ gstmarshal.h \ gstenumtypes.h -libgstreamerinclude_HEADERS = $(gst_headers) $(built_headers) +libgstreamer_@GST_MAJORMINOR@include_HEADERS = $(gst_headers) $(built_headers) noinst_HEADERS = \ gst_private.h \ @@ -147,6 +156,10 @@ noinst_HEADERS = \ gstarch.h \ cothreads.h +# the compiler shoots cothreads.c in the head at -O6 +libcothreads_la_SOURCES = cothreads.c +libcothreads_la_CFLAGS = $(libgstreamer_@GST_MAJORMINOR@_la_CFLAGS) + gstmarshal.h: gstmarshal.list glib-genmarshal --header --prefix=gst_marshal $^ > gstmarshal.h.tmp @@ -184,16 +197,4 @@ dist-hook: distclean-local: rm -f $(top_builddir)/gst/gstmarshal.c $(top_builddir)/gst/gstmarshal.h -libgstreamer_la_CFLAGS = -D_GNU_SOURCE \ - $(LIBGST_CFLAGS) \ - -DG_LOG_DOMAIN=g_log_domain_gstreamer \ - -DGST_CONFIG_DIR=\""$(GST_CONFIG_DIR)"\" \ - -DGST_CACHE_DIR=\""$(GST_CACHE_DIR)"\" - -# the compiler shoots cothreads.c in the head at -O6 -libcothreads_la_CFLAGS = $(libgstreamer_la_CFLAGS) -O2 - -libgstreamer_la_LIBADD = $(LIBGST_LIBS) parse/libgstparse.la registries/libgstxmlregistry.la -libgstreamer_la_LDFLAGS = @GST_LT_LDFLAGS@ -version-info @GST_LIBVERSION@ - EXTRA_DIST = ROADMAP diff --git a/gst/autoplug/Makefile.am b/gst/autoplug/Makefile.am index 73380e0fac..3f17a4f4be 100644 --- a/gst/autoplug/Makefile.am +++ b/gst/autoplug/Makefile.am @@ -1,4 +1,4 @@ -plugindir = $(libdir)/gst +plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = \ libgststaticautoplug.la \ diff --git a/gst/caches/Makefile.am b/gst/caches/Makefile.am index 4688c97802..d5aaf6d82a 100644 --- a/gst/caches/Makefile.am +++ b/gst/caches/Makefile.am @@ -1,4 +1,4 @@ -plugindir = $(libdir)/gst +plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstcaches.la diff --git a/gst/elements/Makefile.am b/gst/elements/Makefile.am index 35007cb507..bfb42a2ffc 100644 --- a/gst/elements/Makefile.am +++ b/gst/elements/Makefile.am @@ -1,8 +1,8 @@ -plugindir = $(libdir)/gst +plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstelements.la -libgstelements_la_DEPENDENCIES = ../libgstreamer.la +libgstelements_la_DEPENDENCIES = ../libgstreamer-@GST_MAJORMINOR@.la libgstelements_la_SOURCES = \ gstelements.c \ gstfakesrc.c \ diff --git a/gst/gstinfo.h b/gst/gstinfo.h index 5d5df6e471..c3a24c7a20 100644 --- a/gst/gstinfo.h +++ b/gst/gstinfo.h @@ -455,9 +455,7 @@ extern GstErrorHandler _gst_error_handler; extern GHashTable *__gst_function_pointers; -#if GST_DEBUG_ENABLED -#define GST_DEBUG_FUNCPTR(ptr) _gst_debug_register_funcptr((void *)(ptr), #ptr) -#define GST_DEBUG_FUNCPTR_NAME(ptr) _gst_debug_nameof_funcptr((void *)ptr) +#ifdef GST_DEBUG_ENABLED static inline void * _gst_debug_register_funcptr (void *ptr, gchar *ptrname) { @@ -466,8 +464,10 @@ _gst_debug_register_funcptr (void *ptr, gchar *ptrname) g_hash_table_insert(__gst_function_pointers,ptr,ptrname); return ptr; } +#define GST_DEBUG_FUNCPTR(ptr) _gst_debug_register_funcptr((void *)(ptr), #ptr) +#define GST_DEBUG_FUNCPTR_NAME(ptr) _gst_debug_nameof_funcptr((void *)ptr) -gchar *_gst_debug_nameof_funcptr (void *ptr); +gchar * _gst_debug_nameof_funcptr (void *ptr); #else #define GST_DEBUG_FUNCPTR(ptr) (ptr) #define GST_DEBUG_FUNCPTR_NAME(ptr) "" @@ -475,6 +475,4 @@ gchar *_gst_debug_nameof_funcptr (void *ptr); void gst_debug_print_stack_trace (void); - - #endif /* __GSTINFO_H__ */ diff --git a/gst/schedulers/Makefile.am b/gst/schedulers/Makefile.am index 984c99db20..bc12181402 100644 --- a/gst/schedulers/Makefile.am +++ b/gst/schedulers/Makefile.am @@ -1,4 +1,4 @@ -plugindir = $(libdir)/gst +plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = \ libgstbasicomegascheduler.la \ diff --git a/gst/types/Makefile.am b/gst/types/Makefile.am index 95b69162a5..5f26e166cc 100644 --- a/gst/types/Makefile.am +++ b/gst/types/Makefile.am @@ -1,4 +1,4 @@ -plugindir = $(libdir)/gst +plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgsttypes.la diff --git a/gstreamer.pc.in b/gstreamer.pc.in index 2d21149f0a..a48d0cb309 100644 --- a/gstreamer.pc.in +++ b/gstreamer.pc.in @@ -1,12 +1,13 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ -includedir=@includedir@/gstreamer-@VERSION@ +includedir=@includedir@/gstreamer-@GST_MAJORMINOR@ toolsdir=${exec_prefix}/bin +gstcontrol_libs=-lgstcontrol-@GST_MAJORMINOR@ Name: GStreamer Description: Streaming-media framework Requires: @GST_PKG_DEPS@@LIBXML_PKG@ Version: @VERSION@ -Libs: -L${libdir} -lgstreamer +Libs: -L${libdir} -lgstreamer-@GST_MAJORMINOR@ Cflags: -I${includedir} @GST_PKG_CFLAGS@ diff --git a/gstreamer.spec.in b/gstreamer.spec.in index 48ecc56e0b..039f9e0efa 100644 --- a/gstreamer.spec.in +++ b/gstreamer.spec.in @@ -10,12 +10,14 @@ Vendor: GStreamer Backpackers Team Source: http://gstreamer.net/releases/%{version}/src/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-root +%define majorminor @GST_MAJORMINOR@ %define _glib2 @GLIB2_REQ@ %define _libxml2 @LIBXML2_REQ@ Requires: glib2 >= %_glib2 Requires: libxml2 >= %_libxml2 Requires: popt > 1.6 +Requires: %{name}-tools >= %{version} BuildRequires: glib2-devel >= %_glib2 BuildRequires: libxml2-devel >= %_libxml2 BuildRequires: bison @@ -59,6 +61,22 @@ plugins. This package contains the libraries and includes files necessary to develop applications and plugins for GStreamer. +%package tools +Summary: tools for GStreamer streaming media framework. +Group: Libraries/Multimedia + +%description tools +GStreamer is a streaming-media framework, based on graphs of filters which +operate on media data. Applications using this library can do anything +from real-time sound processing to playing videos, and just about anything +else media-related. Its plugin-based architecture means that new data +types or processing capabilities can be added simply by installing new +plugins. + +This package contains the basic command-line tools used for GStreamer, like +gst-register and gst-launch. It is split off to allow parallel-installability +in the future. + %prep %setup @@ -82,7 +100,7 @@ FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \ --mandir=%{_mandir} \ --infodir=%{_infodir} \ --enable-debug \ - --with-configdir=/etc/gstreamer \ + --with-cachedir=%{_localstatedir}/cache/gstreamer \ --disable-tests --disable-examples \ --enable-docs-build --with-html-dir=$RPM_BUILD_ROOT%{_datadir}/gtk-doc/html @@ -102,8 +120,8 @@ cp $RPM_BUILD_DIR/%{name}-%{version}/docs/devhelp/*.devhelp $RPM_BUILD_ROOT/usr/ %makeinstall # Clean out files that should not be part of the rpm. # This is the recommended way of dealing with it for RH8 -rm -f $RPM_BUILD_ROOT%{_libdir}/gst/*.la -rm -f $RPM_BUILD_ROOT%{_libdir}/gst/*.a +rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}-%{majorminor}/*.la +rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}-%{majorminor}/*.a rm -f $RPM_BUILD_ROOT%{_libdir}/*.a rm -f $RPM_BUILD_ROOT%{_libdir}/*.la @@ -126,6 +144,27 @@ ln -sf %{_datadir}/gtk-doc/html/gstreamer-libs %{_datadir}/devhelp/books %files %defattr(-, root, root) %doc AUTHORS COPYING README TODO COPYING.LIB ABOUT-NLS REQUIREMENTS DOCBUILDING RELEASE +%{_libdir}/libgstreamer-%{majorminor}.so.* +%{_libdir}/libgstcontrol-%{majorminor}.so.* +%dir %{_libdir}/gstreamer-%{majorminor} +%{_libdir}/gstreamer-%{majorminor}/libgstautoplugcache*.so* +%{_libdir}/gstreamer-%{majorminor}/libgstautoplugger*.so* +%{_libdir}/gstreamer-%{majorminor}/libgstbasicomega*.so* +%{_libdir}/gstreamer-%{majorminor}/libgstfastomega*.so* +%{_libdir}/gstreamer-%{majorminor}/libgstoptomega*.so* +%{_libdir}/gstreamer-%{majorminor}/libgstbasicwingo*.so* +%{_libdir}/gstreamer-%{majorminor}/libgstfastwingo*.so* +%{_libdir}/gstreamer-%{majorminor}/libgstoptwingoscheduler*.so +%{_libdir}/gstreamer-%{majorminor}/libgstelements*.so* +%{_libdir}/gstreamer-%{majorminor}/libgsttypes*.so* +%{_libdir}/gstreamer-%{majorminor}/libgststaticautoplug*.so* +%{_libdir}/gstreamer-%{majorminor}/libgstbytestream*.so* +%{_libdir}/gstreamer-%{majorminor}/libgstgetbits*.so* +%{_libdir}/gstreamer-%{majorminor}/libgstputbits*.so* +%{_libdir}/gstreamer-%{majorminor}/libgstspider*.so* +%{_libdir}/gstreamer-%{majorminor}/libgstcaches.so + +%files tools %{_bindir}/gst-complete %{_bindir}/gst-compprep %{_bindir}/gst-inspect @@ -134,23 +173,6 @@ ln -sf %{_datadir}/gtk-doc/html/gstreamer-libs %{_datadir}/devhelp/books %{_bindir}/gst-register %{_bindir}/gst-feedback %{_bindir}/gst-xmllaunch -%{_libdir}/libgstreamer-%{version}.so.* -%{_libdir}/gst/libgstautoplugcache*.so* -%{_libdir}/gst/libgstautoplugger*.so* -%{_libdir}/gst/libgstbasicomega*.so* -%{_libdir}/gst/libgstfastomega*.so* -%{_libdir}/gst/libgstoptomega*.so* -%{_libdir}/gst/libgstbasicwingo*.so* -%{_libdir}/gst/libgstfastwingo*.so* -%{_libdir}/gst/libgstoptwingoscheduler.so -%{_libdir}/gst/libgstelements*.so* -%{_libdir}/gst/libgsttypes*.so* -%{_libdir}/gst/libgststaticautoplug*.so* -%{_libdir}/gst/libgstbytestream*.so* -%{_libdir}/gst/libgstgetbits*.so* -%{_libdir}/gst/libgstputbits*.so* -%{_libdir}/gst/libgstspider*.so* -%{_libdir}/gst/libgstcaches.so %{_mandir}/man1/gst-feedback.* %{_mandir}/man1/gst-xmllaunch.* %{_mandir}/man1/gst-complete.* @@ -160,69 +182,85 @@ ln -sf %{_datadir}/gtk-doc/html/gstreamer-libs %{_datadir}/devhelp/books %{_mandir}/man1/gst-md5sum.* %{_mandir}/man1/gst-register.* -%{_libdir}/libgstcontrol*.so* %files devel %defattr(-, root, root) -%{_includedir}/%{name}-%{version}/gst +%dir %{_includedir}/%{name}-%{majorminor} +%dir %{_includedir}/%{name}-%{majorminor}/gst +%{_includedir}/%{name}-%{majorminor}/gst/*.h +%dir %{_includedir}/%{name}-%{majorminor}/gst/control +%{_includedir}/%{name}-%{majorminor}/gst/control/*.h +%dir %{_includedir}/%{name}-%{majorminor}/gst/bytestream +%{_includedir}/%{name}-%{majorminor}/gst/bytestream/bytestream.h +%dir %{_includedir}/%{name}-%{majorminor}/gst/getbits +%{_includedir}/%{name}-%{majorminor}/gst/getbits/getbits.h +%dir %{_includedir}/%{name}-%{majorminor}/gst/putbits +%{_includedir}/%{name}-%{majorminor}/gst/putbits/putbits.h # %{_libdir}/libgstreamer.a -%{_libdir}/libgstreamer.so -%{_libdir}/pkgconfig/gstreamer*.pc +%{_libdir}/libgstreamer-%{majorminor}.so +%{_libdir}/libgstcontrol-%{majorminor}.so +%{_libdir}/pkgconfig/gstreamer-%{majorminor}.pc ## we specify the API docs as regular files since %docs doesn't fail when # files aren't found anymore for RPM >= 4 # we list all of the files we really need to trap incomplete doc builds # then we catch the rest with *, you can safely ignore the errors from this ## gstreamer API -%{_datadir}/gtk-doc/html/gstreamer/autopluggers.html -%{_datadir}/gtk-doc/html/gstreamer/book1.html -%{_datadir}/gtk-doc/html/gstreamer/element-types.html -%{_datadir}/gtk-doc/html/gstreamer/gstautoplugfactory.html -%{_datadir}/gtk-doc/html/gstreamer/gstautoplug.html -%{_datadir}/gtk-doc/html/gstreamer/gstbin.html -%{_datadir}/gtk-doc/html/gstreamer/gstclock.html -%{_datadir}/gtk-doc/html/gstreamer/gstelement.html -%{_datadir}/gtk-doc/html/gstreamer/gst-index.html -%{_datadir}/gtk-doc/html/gstreamer/gstobject.html -%{_datadir}/gtk-doc/html/gstreamer/gstpad.html -%{_datadir}/gtk-doc/html/gstreamer/gstpipeline.html -%{_datadir}/gtk-doc/html/gstreamer/gstpluginfeature.html -# %{_datadir}/gtk-doc/html/gstreamer/gstreamer-cothreads.html -%{_datadir}/gtk-doc/html/gstreamer/gstreamer-gstbuffer.html -%{_datadir}/gtk-doc/html/gstreamer/gstreamer-gstbufferpool.html -%{_datadir}/gtk-doc/html/gstreamer/gstreamer-gstcaps.html -%{_datadir}/gtk-doc/html/gstreamer/gstreamer-gstcpu.html -%{_datadir}/gtk-doc/html/gstreamer/gstreamer-gstdata.html -%{_datadir}/gtk-doc/html/gstreamer/gstreamer-gstevent.html -%{_datadir}/gtk-doc/html/gstreamer/gstreamer-gst.html -%{_datadir}/gtk-doc/html/gstreamer/gstreamer-gstinfo.html -%{_datadir}/gtk-doc/html/gstreamer/gstreamer-gstparse.html -%{_datadir}/gtk-doc/html/gstreamer/gstreamer-gstplugin.html -%{_datadir}/gtk-doc/html/gstreamer/gstreamer-gstprops.html -%{_datadir}/gtk-doc/html/gstreamer/gstreamer-gststaticautoplug.html -%{_datadir}/gtk-doc/html/gstreamer/gstreamer-gststaticautoplugrender.html -%{_datadir}/gtk-doc/html/gstreamer/gstreamer-gsttee.html -%{_datadir}/gtk-doc/html/gstreamer/gstreamer-gsttype.html -%{_datadir}/gtk-doc/html/gstreamer/gstreamer-gstutils.html -%{_datadir}/gtk-doc/html/gstreamer/gstreamer.html -%{_datadir}/gtk-doc/html/gstreamer/gstschedulerfactory.html -%{_datadir}/gtk-doc/html/gstreamer/gstscheduler.html -%{_datadir}/gtk-doc/html/gstreamer/gstthread.html -%{_datadir}/gtk-doc/html/gstreamer/gsttypefactory.html -%{_datadir}/gtk-doc/html/gstreamer/gstxml.html -%{_datadir}/gtk-doc/html/gstreamer/index.sgml +%dir %{_datadir}/gtk-doc/html/%{name}-%{majorminor} +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/autopluggers.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/book1.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/element-types.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstautoplugfactory.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstautoplug.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstbin.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstclock.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstelement.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gst-index.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstobject.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstpad.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstpipeline.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstpluginfeature.html +# %{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-cothreads.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-gstbuffer.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-gstbufferpool.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-gstcaps.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-gstcpu.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-gstdata.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-gstevent.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-gst.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-gstinfo.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-gstparse.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-gstplugin.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-gstprops.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-gststaticautoplug.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-gststaticautoplugrender.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-gsttee.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-gsttype.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-gstutils.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstschedulerfactory.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstscheduler.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstthread.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gsttypefactory.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstxml.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/index.sgml ## gstreamer-libs API -%{_datadir}/gtk-doc/html/gstreamer-libs/book1.html -%{_datadir}/gtk-doc/html/gstreamer-libs/gstreamer-libs-gstcolorspace.html -%{_datadir}/gtk-doc/html/gstreamer-libs/gstreamer-libs-gstgetbits.html -%{_datadir}/gtk-doc/html/gstreamer-libs/gstreamer-libs.html -%{_datadir}/gtk-doc/html/gstreamer-libs/index.sgml +%dir %{_datadir}/gtk-doc/html/%{name}-libs-%{majorminor} +%{_datadir}/gtk-doc/html/%{name}-libs-%{majorminor}/book1.html +%{_datadir}/gtk-doc/html/%{name}-libs-%{majorminor}/%{name}-libs-gstcolorspace.html +%{_datadir}/gtk-doc/html/%{name}-libs-%{majorminor}/%{name}-libs-gstgetbits.html +%{_datadir}/gtk-doc/html/%{name}-libs-%{majorminor}/%{name}-libs.html +%{_datadir}/gtk-doc/html/%{name}-libs-%{majorminor}/index.sgml ## this catches all of the rest of the docs we might have forgotten %{_datadir}/gtk-doc/html/* -%{_datadir}/devhelp/specs/gstreamer.devhelp -%{_datadir}/devhelp/specs/gstreamer-libs.devhelp +%{_datadir}/devhelp/specs/%{name}-%{majorminor}.devhelp +%{_datadir}/devhelp/specs/%{name}-libs-%{majorminor}.devhelp %changelog +* Sat Dec 07 2002 Thomas Vander Stichele +- define majorminor and use it everywhere +- full parallel installability + * Tue Nov 05 2002 Christian Schaller - Add optwingo scheduler * Sat Oct 12 2002 Christian Schaller diff --git a/libs/gst/bytestream/Makefile.am b/libs/gst/bytestream/Makefile.am index ee255bd63f..e083bba7f0 100644 --- a/libs/gst/bytestream/Makefile.am +++ b/libs/gst/bytestream/Makefile.am @@ -1,9 +1,9 @@ -librarydir = $(libdir)/gst +librarydir = $(libdir)/gstreamer-@GST_MAJORMINOR@ library_LTLIBRARIES = libgstbytestream.la noinst_LTLIBRARIES = libgstbstest.la -libgstbytestreamincludedir = $(includedir)/gstreamer-@VERSION@/gst/bytestream +libgstbytestreamincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/bytestream libgstbytestreaminclude_HEADERS = bytestream.h libgstbytestream_la_SOURCES = bytestream.c diff --git a/libs/gst/control/Makefile.am b/libs/gst/control/Makefile.am index cc0951914c..04781a4db2 100644 --- a/libs/gst/control/Makefile.am +++ b/libs/gst/control/Makefile.am @@ -1,9 +1,9 @@ librarydir = $(libdir) -library_LTLIBRARIES = libgstcontrol.la +library_LTLIBRARIES = libgstcontrol-@GST_MAJORMINOR@.la -libgstcontrolincludedir = $(includedir)/gstreamer-@VERSION@/gst/control -libgstcontrolinclude_HEADERS = \ +libgstcontrol_@GST_MAJORMINOR@_includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/control +libgstcontrol_@GST_MAJORMINOR@_include_HEADERS = \ control.h \ dparammanager.h \ dparam.h \ @@ -12,7 +12,7 @@ libgstcontrolinclude_HEADERS = \ dparamcommon.h \ dplinearinterp.h -libgstcontrol_la_SOURCES = \ +libgstcontrol_@GST_MAJORMINOR@_la_SOURCES = \ control.c \ dparammanager.c \ dparam.c \ @@ -20,5 +20,6 @@ libgstcontrol_la_SOURCES = \ unitconvert.c \ dplinearinterp.c -libgstcontrol_la_CFLAGS = $(GST_CFLAGS) -finline-functions -ffast-math -libgstcontrol_la_LDFLAGS = @GST_LT_LDFLAGS@ -version-info @GST_LIBVERSION@ +libgstcontrol_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) -finline-functions -ffast-math +libgstcontrol_@GST_MAJORMINOR@_la_LDFLAGS = @GST_LT_LDFLAGS@ -version-info @GST_LIBVERSION@ + diff --git a/libs/gst/getbits/Makefile.am b/libs/gst/getbits/Makefile.am index 62d39efa3f..e809c1a062 100644 --- a/libs/gst/getbits/Makefile.am +++ b/libs/gst/getbits/Makefile.am @@ -1,4 +1,4 @@ -librarydir = $(libdir)/gst +librarydir = $(libdir)/gstreamer-@GST_MAJORMINOR@ library_LTLIBRARIES = libgstgetbits.la @@ -8,8 +8,9 @@ else GSTARCH_SRCS = endif -libgstgetbitsincludedir = $(includedir)/gstreamer-@VERSION@/gst/getbits +libgstgetbitsincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/getbits libgstgetbitsinclude_HEADERS = getbits.h +noinst_HEADERS = gstgetbits_inl.h libgstgetbits_la_SOURCES = getbits.c gstgetbits_inl.h gstgetbits_generic.c $(GSTARCH_SRCS) EXTRA_libgstgetbits_la_SOURCES = gstgetbits_i386.s @@ -17,6 +18,4 @@ EXTRA_libgstgetbits_la_SOURCES = gstgetbits_i386.s libgstgetbits_la_CFLAGS = $(GST_CFLAGS) -funroll-all-loops -finline-functions -ffast-math libgstgetbits_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -noinst_HEADERS = getbits.h gstgetbits_inl.h - # check_PROGRAMS = gbtest diff --git a/libs/gst/putbits/Makefile.am b/libs/gst/putbits/Makefile.am index 9dcbf7d3a6..5e154c9782 100644 --- a/libs/gst/putbits/Makefile.am +++ b/libs/gst/putbits/Makefile.am @@ -1,12 +1,10 @@ -librarydir = $(libdir)/gst +librarydir = $(libdir)/gstreamer-@GST_MAJORMINOR@ library_LTLIBRARIES = libgstputbits.la -libgstputbitsincludedir = $(includedir)/gstreamer-@VERSION@/gst/putbits +libgstputbitsincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/putbits libgstputbitsinclude_HEADERS = putbits.h libgstputbits_la_SOURCES = putbits.c libgstputbits_la_CFLAGS = $(GST_CFLAGS) -funroll-all-loops -finline-functions -ffast-math libgstputbits_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) - -noinst_HEADERS = putbits.h diff --git a/plugins/elements/Makefile.am b/plugins/elements/Makefile.am index 35007cb507..bfb42a2ffc 100644 --- a/plugins/elements/Makefile.am +++ b/plugins/elements/Makefile.am @@ -1,8 +1,8 @@ -plugindir = $(libdir)/gst +plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstelements.la -libgstelements_la_DEPENDENCIES = ../libgstreamer.la +libgstelements_la_DEPENDENCIES = ../libgstreamer-@GST_MAJORMINOR@.la libgstelements_la_SOURCES = \ gstelements.c \ gstfakesrc.c \ diff --git a/tools/Makefile.am b/tools/Makefile.am index 7a1d79b282..1e38f1d45c 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -36,7 +36,7 @@ gst_register_CFLAGS = $(GST_CFLAGS) -DGST_CONFIG_DIR=\"$(GST_CONFIG_DIR)\" \ -DGST_CACHE_DIR=\""$(GST_CACHE_DIR)"\" endif -gst_inspect_LDADD = $(GST_LIBS) ../libs/gst/control/libgstcontrol.la +gst_inspect_LDADD = $(GST_LIBS) ../libs/gst/control/libgstcontrol-@GST_MAJORMINOR@.la gst_inspect_CFLAGS = $(GST_CFLAGS) -DGST_CONFIG_DIR=\"$(GST_CONFIG_DIR)\" \ -DGST_CACHE_DIR=\""$(GST_CACHE_DIR)"\" diff --git a/tools/gst-register.c b/tools/gst-register.c index 6ecac1ac3e..726126edd3 100644 --- a/tools/gst-register.c +++ b/tools/gst-register.c @@ -39,14 +39,14 @@ static gint num_plugins = 0; static void plugin_added_func (GstRegistry *registry, GstPlugin *plugin, gpointer user_data) { - g_print ("added plugin %s with %d feature(s)\n", plugin->name, + g_print ("added plugin %s with %d feature(s)\n", plugin->name, plugin->numfeatures); num_features += plugin->numfeatures; num_plugins++; } -int main (int argc,char *argv[]) +int main (int argc,char *argv[]) { GList *registries; GList *path_spill = NULL; /* used for path spill from failing registries */ @@ -77,8 +77,8 @@ int main (int argc,char *argv[]) path_spill = NULL; } - g_signal_connect (G_OBJECT (registry), "plugin_added", - G_CALLBACK (plugin_added_func), NULL); + g_signal_connect (G_OBJECT (registry), "plugin_added", + G_CALLBACK (plugin_added_func), NULL); if (registry->flags & GST_REGISTRY_WRITABLE) { g_print ("rebuilding %s\n", registry->name); @@ -91,12 +91,11 @@ int main (int argc,char *argv[]) { g_print ("error loading %s\n", registry->name); /* move over paths from this registry to the next one */ - path_spill = g_list_concat (path_spill, + path_spill = g_list_concat (path_spill, gst_registry_get_path_list (registry)); g_assert (path_spill != NULL); } } - registries = g_list_next (registries); }