mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-26 19:51:11 +00:00
doc and configure updates, and the beginnings of gst-xmllaunch
Original commit message from CVS: doc and configure updates, and the beginnings of gst-xmllaunch
This commit is contained in:
Andy Wingo
parent
f38969ff25
commit
57dc4b544d
5 changed files with 80 additions and 27 deletions
|
|
@ -90,7 +90,7 @@ else AC_DEFINE(HAVE_NASM, 1, [Define if NASM, the netwide assembler, is availabl
|
|||
fi
|
||||
|
||||
dnl check for gtk-doc
|
||||
AC_ARG_WITH(html-dir, [ --with-html-dir=PATH path to installed docs ])
|
||||
AC_ARG_WITH(html-dir, AC_HELP_STRING([--with-html-dir=PATH], [path to installed docs]))
|
||||
|
||||
if test "x$with_html_dir" = "x" ; then
|
||||
HTML_DIR='${datadir}/gst/html'
|
||||
|
|
@ -123,7 +123,7 @@ AC_SUBST(GTK_DOC_SCANOBJ)
|
|||
dnl check for docbook tools
|
||||
AC_CHECK_PROG(HAVE_XSLTPROC, xsltproc, true, false)
|
||||
AC_CHECK_PROG(HAVE_PDFTOPS, pdftops, true, false)
|
||||
dnl this does not yet work properly, at least on debain -- wingo
|
||||
dnl this does not yet work properly, at least on debian -- wingo
|
||||
HAVE_PDFXMLTEX=false
|
||||
|
||||
dnl check for image conversion tool
|
||||
|
|
@ -241,6 +241,11 @@ GST_CHECK_FEATURE(GLIB2, [use of glib-2.0 and GObject], , [
|
|||
GLIB_CFLAGS=$GLIB2_CFLAGS
|
||||
AC_SUBST(GLIB_LIBS)
|
||||
AC_SUBST(GLIB_CFLAGS)
|
||||
# if we've gotten this far, the user has specifically asked that glib2 be
|
||||
# used. if we have no glib2, that is an error.
|
||||
if test "x$HAVE_GLIB2" = "xno"; then
|
||||
AC_MSG_ERROR(no glib2 found)
|
||||
fi
|
||||
], disabled, [
|
||||
AC_DEFINE(USE_GLIB2)
|
||||
GST_EXT_CFLAGS="$GST_EXT_CFLAGS -DUSE_GLIB2"
|
||||
|
|
|
|||
|
|
@ -120,7 +120,7 @@ tmpl.stamp: tmpl-build.stamp
|
|||
|
||||
#### sgml ####
|
||||
|
||||
sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml
|
||||
sgml-build.stamp: tmpl.stamp $(CFILE_GLOB)
|
||||
@echo '*** Building SGML ***'
|
||||
cd $(srcdir) && \
|
||||
gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS)
|
||||
|
|
|
|||
|
|
@ -43,7 +43,6 @@
|
|||
<!entity GstFakeSink SYSTEM "sgml/gstfakesink.sgml">
|
||||
<!entity GstFileSrc SYSTEM "sgml/gstfilesrc.sgml">
|
||||
<!entity GstDiskSink SYSTEM "sgml/gstdisksink.sgml">
|
||||
<!entity GstHttpSrc SYSTEM "sgml/gsthttpsrc.sgml">
|
||||
<!entity GstFdSrc SYSTEM "sgml/gstfdsrc.sgml">
|
||||
<!entity GstFdSink SYSTEM "sgml/gstfdsink.sgml">
|
||||
<!entity GstIdentity SYSTEM "sgml/gstidentity.sgml">
|
||||
|
|
@ -120,8 +119,6 @@ with some more specialized elements.</para>
|
|||
&GstFileSrc;
|
||||
&GstDiskSink;
|
||||
|
||||
&GstHttpSrc;
|
||||
|
||||
&GstFdSrc;
|
||||
&GstFdSink;
|
||||
|
||||
|
|
|
|||
|
|
@ -383,6 +383,7 @@ gst_bin_details
|
|||
<TITLE>GstParse</TITLE>
|
||||
GstParseErrors
|
||||
gst_parse_launch
|
||||
gst_parse_launchv
|
||||
</SECTION>
|
||||
|
||||
<SECTION>
|
||||
|
|
@ -541,6 +542,7 @@ gst_element_remove_ghost_pad
|
|||
gst_element_request_compatible_pad
|
||||
gst_element_request_pad_by_name
|
||||
gst_element_connect
|
||||
gst_element_connect_filtered
|
||||
gst_element_disconnect
|
||||
gst_element_set_state
|
||||
gst_element_get_state
|
||||
|
|
@ -550,7 +552,6 @@ gst_element_info
|
|||
gst_element_error
|
||||
gst_element_get_factory
|
||||
gst_element_set_eos
|
||||
gst_element_restore_thyself
|
||||
gst_element_install_std_props
|
||||
gst_element_send_event
|
||||
gst_element_interrupt
|
||||
|
|
@ -705,25 +706,27 @@ GST_PAD_REALIZE
|
|||
GST_PAD_DIRECTION
|
||||
GST_PAD_CAPS
|
||||
GST_PAD_PEER
|
||||
GST_PAD_CONNECTED
|
||||
GST_PAD_CAN_PULL
|
||||
GST_PAD_IS_SINK
|
||||
GST_PAD_IS_SRC
|
||||
GST_PAD_IS_CONNECTED
|
||||
|
||||
GstPad
|
||||
GstPadChainFunction
|
||||
GstPadGetFunction
|
||||
GstPadGetRegionFunction
|
||||
GstPadNewCapsFunction
|
||||
GstPadBufferPoolFunction
|
||||
|
||||
GstPadNegotiateReturn
|
||||
GstPadNegotiateFunction
|
||||
GstPadGetCapsFunction
|
||||
|
||||
GstRegionType
|
||||
GstPadPullRegionFunction
|
||||
GstPadEventFunction
|
||||
GstPadConnectFunction
|
||||
GstPadConnectReturn
|
||||
|
||||
GstPadDirection
|
||||
GstPadFlags
|
||||
|
||||
gst_pad_new
|
||||
gst_pad_destroy
|
||||
gst_pad_new_from_template
|
||||
|
|
@ -731,10 +734,10 @@ gst_pad_get_direction
|
|||
gst_pad_set_chain_function
|
||||
gst_pad_set_get_function
|
||||
gst_pad_set_getregion_function
|
||||
gst_pad_set_negotiate_function
|
||||
gst_pad_set_newcaps_function
|
||||
gst_pad_set_bufferpool_function
|
||||
gst_pad_set_caps
|
||||
gst_pad_set_connect_function
|
||||
gst_pad_set_getcaps_function
|
||||
gst_pad_try_set_caps
|
||||
gst_pad_get_caps
|
||||
gst_pad_check_compatibility
|
||||
gst_pad_set_name
|
||||
|
|
@ -751,17 +754,20 @@ gst_pad_remove_ghost_pad
|
|||
gst_pad_get_ghost_pad_list
|
||||
gst_pad_get_peer
|
||||
gst_pad_connect
|
||||
gst_pad_try_connect
|
||||
gst_pad_connect_filtered
|
||||
gst_pad_reconnect_filtered
|
||||
gst_pad_try_reconnect_filtered
|
||||
gst_pad_disconnect
|
||||
gst_pad_push
|
||||
gst_pad_pull
|
||||
gst_pad_pullregion
|
||||
gst_pad_get_bufferpool
|
||||
gst_pad_load_and_connect
|
||||
gst_pad_negotiate_proxy
|
||||
gst_pad_renegotiate
|
||||
gst_pad_proxy_connect
|
||||
gst_pad_get_padtemplate
|
||||
gst_pad_get_padtemplate_caps
|
||||
gst_pad_get_allowed_caps
|
||||
gst_pad_recalc_allowed_caps
|
||||
gst_pad_ghost_save_thyself
|
||||
gst_pad_peek
|
||||
gst_pad_select
|
||||
|
|
@ -771,7 +777,6 @@ gst_pad_event_default
|
|||
gst_pad_set_event_function
|
||||
|
||||
|
||||
|
||||
GstRealPad
|
||||
GST_RPAD_LEN
|
||||
GST_RPAD_OFFSET
|
||||
|
|
@ -782,17 +787,18 @@ GST_RPAD_CAPS
|
|||
GST_RPAD_PEER
|
||||
GST_RPAD_BUFPEN
|
||||
GST_RPAD_CHAINFUNC
|
||||
GST_RPAD_FILTER
|
||||
GST_RPAD_APPFILTER
|
||||
GST_RPAD_GETFUNC
|
||||
GST_RPAD_GETREGIONFUNC
|
||||
GST_RPAD_PULLREGIONFUNC
|
||||
GST_RPAD_NEGOTIATEFUNC
|
||||
GST_RPAD_NEWCAPSFUNC
|
||||
GST_RPAD_BUFFERPOOLFUNC
|
||||
GST_RPAD_CHAINHANDLER
|
||||
GST_RPAD_EVENTFUNC
|
||||
GST_RPAD_EVENTHANDLER
|
||||
GST_RPAD_GETHANDLER
|
||||
|
||||
GST_RPAD_CONNECTFUNC
|
||||
GST_RPAD_GETCAPSFUNC
|
||||
|
||||
GST_GPAD_REALPAD
|
||||
GstGhostPad
|
||||
|
|
@ -845,6 +851,8 @@ GST_PADTEMPLATE_PRESENCE
|
|||
GST_PADTEMPLATE_NEW
|
||||
GST_PADTEMPLATE_FACTORY
|
||||
GST_PADTEMPLATE_GET
|
||||
GST_PADTEMPLATE_FIXED
|
||||
GST_PADTEMPLATE_IS_FIXED
|
||||
gst_padtemplate_new
|
||||
gst_padtemplate_load_thyself
|
||||
gst_padtemplate_save_thyself
|
||||
|
|
@ -1015,8 +1023,11 @@ GST_CAPS_UNLOCK
|
|||
GST_CAPS_NEW
|
||||
GST_CAPS_FACTORY
|
||||
GST_CAPS_GET
|
||||
GST_CAPS_IS_CHAINED
|
||||
GST_CAPS_IS_FIXED
|
||||
GstCaps
|
||||
gst_caps_new
|
||||
gst_caps_new_id
|
||||
gst_caps_destroy
|
||||
gst_caps_ref
|
||||
gst_caps_unref
|
||||
|
|
@ -1034,8 +1045,11 @@ gst_caps_get_mime
|
|||
gst_caps_set_props
|
||||
gst_caps_get_props
|
||||
gst_caps_check_compatibility
|
||||
gst_caps_has_property
|
||||
gst_caps_normalize
|
||||
|
||||
gst_caps_set
|
||||
gst_caps_intersect
|
||||
gst_caps_get_boolean
|
||||
gst_caps_get_by_name
|
||||
gst_caps_get_fourcc_int
|
||||
|
|
@ -1046,6 +1060,7 @@ gst_caps_get_float
|
|||
|
||||
gst_caps_save_thyself
|
||||
gst_caps_load_thyself
|
||||
gst_caps_debug
|
||||
<SUBSECTION Standard>
|
||||
GST_CAPS
|
||||
</SECTION>
|
||||
|
|
@ -1058,12 +1073,16 @@ GST_MAKE_FOURCC
|
|||
GST_STR_FOURCC
|
||||
GST_PROPS_LIST
|
||||
GST_PROPS_INT
|
||||
GST_PROPS_INT_ANY
|
||||
GST_PROPS_INT_RANGE
|
||||
GST_PROPS_INT_NEGATIVE
|
||||
GST_PROPS_FOURCC
|
||||
GST_PROPS_BOOLEAN
|
||||
GST_PROPS_STRING
|
||||
GST_PROPS_FLOAT
|
||||
GST_PROPS_FLOAT_RANGE
|
||||
GST_PROPS_INT_POSITIVE
|
||||
GST_PROPS_ENTRY_IS_VARIABLE
|
||||
gst_props_new
|
||||
gst_props_newv
|
||||
gst_props_merge
|
||||
|
|
@ -1073,12 +1092,16 @@ gst_props_destroy
|
|||
gst_props_ref
|
||||
gst_props_unref
|
||||
gst_props_check_compatibility
|
||||
gst_props_has_property
|
||||
gst_props_normalize
|
||||
gst_props_set
|
||||
gst_props_get_boolean
|
||||
gst_props_get_fourcc_int
|
||||
gst_props_get_int
|
||||
gst_props_get_string
|
||||
gst_props_get_float
|
||||
gst_props_intersect
|
||||
gst_props_debug
|
||||
gst_props_save_thyself
|
||||
gst_props_load_thyself
|
||||
<SUBSECTION Standard>
|
||||
|
|
@ -1114,6 +1137,7 @@ gst_xml_parse_doc
|
|||
gst_xml_parse_memory
|
||||
gst_xml_parse_file
|
||||
gst_xml_write
|
||||
gst_xml_write_file
|
||||
gst_xml_get_element
|
||||
gst_xml_get_topelements
|
||||
<SUBSECTION Standard>
|
||||
|
|
|
|||
|
|
@ -80,6 +80,34 @@ event_func (GstElement *element, GstEvent *event)
|
|||
}
|
||||
}
|
||||
|
||||
static GstElement*
|
||||
xmllaunch_parse_cmdline (gint argc, const gchar **argv)
|
||||
{
|
||||
GstElement *pipeline = NULL;
|
||||
GstXML *xml;
|
||||
gboolean err;
|
||||
GList *l;
|
||||
|
||||
if (argc < 2) {
|
||||
g_print ("usage: %s <file.xml> [ element.property=value ... ]\n", argv[0]);
|
||||
exit (1);
|
||||
}
|
||||
|
||||
xml = gst_xml_new ();
|
||||
err = gst_xml_parse_file(xml, argv[1], NULL);
|
||||
|
||||
if (err != TRUE) {
|
||||
fprintf (stderr, "ERROR: parse of xml file '%s' failed\n", argv[1]);
|
||||
exit (1);
|
||||
}
|
||||
|
||||
l = gst_xml_get_topelements (xml);
|
||||
if (!l)
|
||||
return NULL;
|
||||
else
|
||||
return l->data;
|
||||
}
|
||||
|
||||
int
|
||||
main(int argc, char *argv[])
|
||||
{
|
||||
|
|
@ -107,13 +135,12 @@ main(int argc, char *argv[])
|
|||
launch_argc = argc;
|
||||
launch_argv = argv;
|
||||
|
||||
if (strstr (argv[0], "gst-xmllaunch")) {
|
||||
pipeline = xmllaunch_parse_cmdline (argc, argv);
|
||||
} else {
|
||||
/* make a null-terminated version of argv */
|
||||
argvn = g_new0 (char *,argc);
|
||||
memcpy (argvn, argv+1, sizeof (char*) * (argc-1));
|
||||
|
||||
if (strstr (argv[0], "gst-xmllaunch")) {
|
||||
// pipeline = gst_xmllaunch_parse_cmdline (argc, argv);
|
||||
} else {
|
||||
pipeline = (GstElement*) gst_parse_launchv (argvn);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue