From: Andy W. <wi...@us...> - 2002-08-31 18:17:16
|
CVS Root: /cvsroot/gstreamer Module: gstreamer Changes by: wingo Date: Sat Aug 31 2002 11:17:15 PDT Log message: * add core elements to the registry pool plugin list * fix python check Modified files: docs/gst/tmpl : gstbin.sgml gstbuffer.sgml gstobject.sgml gstpad.sgml gstreamer-unused.sgml gstregistry.sgml docs/xsl : fo.xsl html.xsl gst : gstparse.c gstregistry.c Added files: docs/devhelp : html2xml.py.in Removed files: docs/devhelp : html2xml.py Links: http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/docs/devhelp/html2xml.py http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/docs/devhelp/html2xml.py.in?rev=1.1&content-type=text/vnd.viewcvs-markup http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/docs/gst/tmpl/gstbin.sgml.diff?r1=1.20&r2=1.21 http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/docs/gst/tmpl/gstbuffer.sgml.diff?r1=1.28&r2=1.29 http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/docs/gst/tmpl/gstobject.sgml.diff?r1=1.20&r2=1.21 http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/docs/gst/tmpl/gstpad.sgml.diff?r1=1.42&r2=1.43 http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/docs/gst/tmpl/gstreamer-unused.sgml.diff?r1=1.64&r2=1.65 http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/docs/gst/tmpl/gstregistry.sgml.diff?r1=1.2&r2=1.3 http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/docs/xsl/fo.xsl.diff?r1=1.2&r2=1.3 http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/docs/xsl/html.xsl.diff?r1=1.3&r2=1.4 http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstparse.c.diff?r1=1.56&r2=1.57 http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstregistry.c.diff?r1=1.10&r2=1.11 ====Begin Diffs==== --- html2xml.py DELETED --- --- NEW FILE: html2xml.py.in --- #!@PYTHON@ import formatter import htmllib import os import os.path import sgmllib import string import sys base_dict = { 'glib' : 'http://developer.gnome.org/doc/API/glib/', 'gdk' : 'http://developer.gnome.org/doc/API/gdk/', 'gtk' : 'http://developer.gnome.org/doc/API/gtk/', 'gdk-pixbuf' : 'http://developer.gnome.org/doc/API/gdk-pixbuf/', 'glib-2.0' : 'http://developer.gnome.org/doc/API/2.0/glib/', 'gobject-2.0' : 'http://developer.gnome.org/doc/API/2.0/gobject/', 'atk' : 'http://developer.gnome.org/doc/API/2.0/atk/', 'pango' : 'http://developer.gnome.org/doc/API/2.0/pango/', 'gdk-2.0' : 'http://developer.gnome.org/doc/API/2.0/gdk/', 'gtk-2.0' : 'http://developer.gnome.org/doc/API/2.0/gtk/', 'gdk-pixbuf-2.0' : 'http://developer.gnome.org/doc/API/2.0/gdk-pixbuf/', 'gnome-vfs-2.0' : 'http://developer.gnome.org/doc/API/2.0/gnome-vfs/', 'libxml-2' : 'http://xmlsoft.org/html/', 'libgnome' : 'http://developer.gnome.org/doc/API/2.0/libgnome/', 'libgnomeui' : 'http://developer.gnome.org/doc/API/2.0/libgnomeui/', } def does_dict_have_keys (dict, keys): for key in keys: if not dict.has_key (key): return 0 if len(dict) != len(keys): return 0 return 1 class BookParser (sgmllib.SGMLParser): def __init__ (self): sgmllib.SGMLParser.__init__ (self) self.a = self.parents = [] self.dict = {} self.last = self.link = "" self.is_a = self.level = 0 self.first = 1 def unknown_starttag (self, tag, attrs): if tag == 'a': self.is_a = 1 for attr in attrs: if attr[0] == "href": self.link = attr[1] break if tag in ['dd', 'ul']: self.parents.append (self.last) self.level = self.level + 1 def unknown_endtag (self, tag): if tag == 'a': self.is_a = 0 if tag in ['dd', 'ul']: self.level = self.level - 1 self.parents.pop() def handle_data (self, data): data = string.strip (data) if not data or data in [ ">", "<" ]: return if self.first: self.dict['name'] = data self.first = 0 return if data == self.dict['name'] or data in [ "Next Page", "Previous Page", "Home", "Next"]: return if len (self.parents) == 0: dict = self.dict elif len (self.parents) == 1: dict = self.dict[self.parents[0]] elif len (self.parents) == 2: dict = self.dict[self.parents[0]][self.parents[1]] elif len (self.parents) == 3: dict = self.dict[self.parents[0]][self.parents[1]][self.parents[2]] else: dict = None if self.is_a: if dict == None: return if not dict.has_key (data): dict[data] = {} if not dict.has_key ('order'): dict['order'] = [] dict['order'].append (data) dict[data]['link'] = self.link self.last = data class FunctionParser (htmllib.HTMLParser): SKIP_DATA = [ "Next Page", "Previous Page", "Home", "Next", "Up", "<", ">", "Figure 1", "[1]"] is_a = 0 a = [] link = "" def anchor_bgn (self, href, name, type): self.is_a = 1 self.link = href def anchor_end (self): self.is_a = 0 def handle_data (self, data): data = string.strip (data) if data in self.SKIP_DATA: return if not '#' in self.link: return if self.link[:2] == "..": return if self.is_a and self.link: self.a.append ((data, self.link)) def parse_file_for_functions (fd): try: p = FunctionParser (formatter.NullFormatter ()) p.feed (fd.read ()) p.close () except KeyboardInterrupt: raise SystemExit return p.a def output_chapter (fd, main_dict, level=1): if not main_dict.has_key ('order'): return for sub in main_dict['order']: dict = main_dict[sub] if not does_dict_have_keys (dict, ['link']): fd.write (' '*(level*4)) fd.write ('<sub name="%s" link="%s">\n' % (sub, dict['link'])) output_chapter (fd, dict, level+1) fd.write (' '*(level*4)) fd.write ('</sub>\n') else: fd.write (' '*(level*4)) fd.write ('<sub name="%s" link="%s"/>\n' % (sub, dict['link'])) def get_functions (dir): function_list = [] for file in os.listdir (dirname): if file[-5:] != ".html": continue fd = open (dirname + os.sep + file) functions = parse_file_for_functions (fd) for function in functions: if not function in function_list: function_list.append (function) return function_list def get_index_filename (dir): dir = os.path.abspath (dir) filename = dir + os.sep + 'index.html' if os.path.exists (filename): return filename filename = dir + os.sep + 'book1.html' if os.path.exists (filename): return filename else: raise SystemExit, "Can't find an index file" def output_xml (fd, filename, bookname, version): global base_dict templ = \ '<book title="%(title)s"\n' \ ' name="%(name)s"\n%(version)s' \ ' base="%(base)s"\n' \ ' link="%(link)s">\n\n' link = os.path.basename (filename) input_fd = open (filename) p = BookParser () p.feed (input_fd.read ()) p.close () fd.write ('<?xml version="1.0"?>\n') full = book_full_name (bookname, version) if base_dict.has_key (full): base = base_dict[full] else: base = "" if version: version = ' version="%s"\n' % version fd.write (templ % { 'title' : p.dict['name'], 'name' : bookname, 'version' : version, 'base' : base, 'link' : link }) fd.write ('<chapters>\n') output_chapter (fd, p.dict) fd.write ('</chapters>\n\n') fd.flush () def output_functions (fd, dirname): functions = get_functions (dirname) functions.sort () fd.write ('<functions>\n') for name, link in functions: fd.write (' <function name="%s" link="%s"/>\n' % (name, link)) fd.write ('</functions>\n\n') def dirname_to_bookname (dirname): dirname = os.path.basename (dirname) if string.find (dirname, '-') == -1: return (dirname, "") else: pos = string.rfind (dirname, '-') return (dirname[:pos], dirname[pos+1:]) def book_full_name (book, version): if version: return "%s-%s" % (book, version) else: return book if __name__ == "__main__": if len (sys.argv) != 2 and \ len (sys.argv) != 3: print 'Usage: %s dirname [output]' % sys.argv[0] raise SystemExit index_filename = get_index_filename (sys.argv[1]) dirname = os.path.abspath (sys.argv[1]) book, version = dirname_to_bookname (sys.argv[1]) if len (sys.argv) != 2: if sys.argv[2] == "-s": fd = sys.stdout else: output_filename = sys.argv[2] fd = open (output_filename, 'w') else: output_filename = book_full_name (book, version) + '.devhelp' fd = open (output_filename, 'w') output_xml (fd, index_filename, book, version) output_functions (fd, dirname) fd.write ('</book>\n') fd.close () Index: gstbin.sgml =================================================================== RCS file: /cvsroot/gstreamer/gstreamer/docs/gst/tmpl/gstbin.sgml,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- gstbin.sgml 12 Jul 2002 23:21:19 -0000 1.20 +++ gstbin.sgml 31 Aug 2002 18:16:59 -0000 1.21 @@ -151,17 +151,6 @@ @Returns: -<!-- ##### FUNCTION gst_bin_set_state_type ##### --> -<para> - -</para> - -@bin: -@state: -@type: -@Returns: - - <!-- ##### FUNCTION gst_bin_iterate ##### --> <para> Index: gstbuffer.sgml =================================================================== RCS file: /cvsroot/gstreamer/gstreamer/docs/gst/tmpl/gstbuffer.sgml,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- gstbuffer.sgml 30 Aug 2002 14:32:12 -0000 1.28 +++ gstbuffer.sgml 31 Aug 2002 18:16:59 -0000 1.29 @@ -345,8 +345,10 @@ If the refcount is 1, this function just returns the original buffer. </para> -@buffer: a #GstBuffer to copy. +@buf: @Returns: the #GstBuffer that can safely be written to. +<!-- # Unused Parameters # --> +@buffer: a #GstBuffer to copy. <!-- ##### MACRO gst_buffer_free ##### --> @@ -355,6 +357,8 @@ It is dangerous to use this function, you should use gst_buffer_unref() instead. </para> +@buf: +<!-- # Unused Parameters # --> @buffer: a #GstBuffer to free. Index: gstobject.sgml =================================================================== RCS file: /cvsroot/gstreamer/gstreamer/docs/gst/tmpl/gstobject.sgml,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- gstobject.sgml 12 Jul 2002 23:21:19 -0000 1.20 +++ gstobject.sgml 31 Aug 2002 18:16:59 -0000 1.21 @@ -297,6 +297,14 @@ @gstobject: the object which received the signal. @arg1: the new parent +<!-- ##### SIGNAL GstObject::parent-unset ##### --> +<para> + +</para> + +@gstobject: the object which received the signal. +@arg1: + <!-- ##### ARG GstObject:name ##### --> <para> The name of the object Index: gstpad.sgml =================================================================== RCS file: /cvsroot/gstreamer/gstreamer/docs/gst/tmpl/gstpad.sgml,v retrieving revision 1.42 retrieving revision 1.43 diff -u -d -r1.42 -r1.43 --- gstpad.sgml 12 Jul 2002 23:21:19 -0000 1.42 +++ gstpad.sgml 31 Aug 2002 18:17:00 -0000 1.43 @@ -258,12 +258,15 @@ The different supported query types </para> +@GST_PAD_QUERY_NONE: @GST_PAD_QUERY_TOTAL: Query the total stream time @GST_PAD_QUERY_POSITION: Query the current stream position @GST_PAD_QUERY_LATENCY: Query the latency on the pad @GST_PAD_QUERY_JITTER: Query the average jitter beteen optimal processing and current processing. +@GST_PAD_QUERY_START: @GST_PAD_QUERY_SEGMENT_END: Query the end position of the currently executing segment +@GST_PAD_QUERY_RATE: <!-- ##### USER_FUNCTION GstPadQueryFunction ##### --> <para> @@ -912,9 +915,11 @@ @caps: @filter: @appfilter: +@getcapsfunc: @direction: @sched: @sched_private: +@connectfunc: @peer: @bufpen: @chainfunc: @@ -923,13 +928,14 @@ @gethandler: @eventfunc: @eventhandler: +@eventmaskfunc: +@ghostpads: @convertfunc: @queryfunc: +@formatsfunc: +@querytypefunc: @intconnfunc: -@getcapsfunc: -@connectfunc: @bufferpoolfunc: -@ghostpads: <!-- ##### MACRO GST_RPAD_SCHED ##### --> <para> Index: gstreamer-unused.sgml =================================================================== RCS file: /cvsroot/gstreamer/gstreamer/docs/gst/tmpl/gstreamer-unused.sgml,v retrieving revision 1.64 retrieving revision 1.65 diff -u -d -r1.64 -r1.65 --- gstreamer-unused.sgml 12 Jul 2002 23:21:19 -0000 1.64 +++ gstreamer-unused.sgml 31 Aug 2002 18:17:00 -0000 1.65 @@ -467,8 +467,7 @@ <!-- ##### SECTION ./tmpl/gstmd5sink.sgml:Long_Description ##### --> <para> -MD5 Sink can be used to automate regression tests on media pipelines by -computing a hash on the resulting buffers. + </para> @@ -479,7 +478,7 @@ <!-- ##### SECTION ./tmpl/gstmd5sink.sgml:Short_Description ##### --> -Compute a hash on buffer data. + <!-- ##### SECTION ./tmpl/gstmd5sink.sgml:Title ##### --> @@ -5293,6 +5292,16 @@ @element: @manager: + +<!-- ##### FUNCTION gst_bin_set_state_type ##### --> +<para> + +</para> + +@bin: +@state: +@type: +@Returns: <!-- ##### FUNCTION gst_buffer_add_meta ##### --> <para> Index: gstregistry.sgml =================================================================== RCS file: /cvsroot/gstreamer/gstreamer/docs/gst/tmpl/gstregistry.sgml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- gstregistry.sgml 12 Jul 2002 23:21:20 -0000 1.2 +++ gstregistry.sgml 31 Aug 2002 18:17:01 -0000 1.3 @@ -32,6 +32,7 @@ @GST_REGISTRY_READABLE: @GST_REGISTRY_WRITABLE: +@GST_REGISTRY_EXISTS: @GST_REGISTRY_REMOTE: @GST_REGISTRY_DELAYED_LOADING: Index: fo.xsl =================================================================== RCS file: /cvsroot/gstreamer/gstreamer/docs/xsl/fo.xsl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- fo.xsl 11 Jul 2002 19:40:06 -0000 1.2 +++ fo.xsl 31 Aug 2002 18:17:01 -0000 1.3 @@ -7,10 +7,13 @@ <!-- This file is for customizing the default XSL stylesheets. --> <!-- We include them here (this one is for print output): --> <xsl:import - href="http://docbook.sourceforge.net/release/xsl/1.49/fo/docbook.xsl"/> + href="http://docbook.sourceforge.net/release/xsl/1.50.0/fo/docbook.xsl"/> <!-- .. and customize them here: --> <xsl:include href="ulink.xsl"/> <xsl:include href="keycombo.xsl"/> +<xsl:param name="body.font.family" select="'serif'"/> +<xsl:param name="sans.font.family" select="'sans-serif'"/> +<xsl:param name="title.font.family" select="'sans-serif'"/> </xsl:stylesheet> Index: html.xsl =================================================================== RCS file: /cvsroot/gstreamer/gstreamer/docs/xsl/html.xsl,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- html.xsl 11 Jul 2002 16:30:59 -0000 1.3 +++ html.xsl 31 Aug 2002 18:17:01 -0000 1.4 @@ -15,4 +15,6 @@ <!-- <xsl:include href="admon.xsl"/> --> <xsl:include href="css.xsl"/> +<xsl:param name="generate.component.toc" select="0"/> + </xsl:stylesheet> Index: gstparse.c =================================================================== RCS file: /cvsroot/gstreamer/gstreamer/gst/gstparse.c,v retrieving revision 1.56 retrieving revision 1.57 diff -u -d -r1.56 -r1.57 --- gstparse.c 26 Jul 2002 21:49:32 -0000 1.56 +++ gstparse.c 31 Aug 2002 18:17:01 -0000 1.57 @@ -458,6 +458,8 @@ const gchar **argvp, *arg; gchar *tmp; + g_return_val_if_fail (argv != NULL, NULL); + /* let's give it a nice size. */ str = g_string_sized_new (1024); Index: gstregistry.c =================================================================== RCS file: /cvsroot/gstreamer/gstreamer/gst/gstregistry.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- gstregistry.c 8 Jul 2002 19:07:27 -0000 1.10 +++ gstregistry.c 31 Aug 2002 18:17:02 -0000 1.11 @@ -537,7 +537,7 @@ walk = g_list_next (walk); } - return result; + return g_list_concat (_gst_registry_pool_plugins, result); } /** |