Diff [fb7db6bb14bc4fb8e322f2a6522585f41fb91f36:fa7c03ae06c66de31c8b199380cea69d518394d2] for / – aubio

Makefile

-                      rfb7db6b
+                      rfa7c03a
 WAFCMD=python waf
-WAFURL=https://waf.io/waf-1.8.22
 SOX=sox
 …
 getwaf:
         @( which wget > /dev/null && wget -qO waf $(WAFURL) ) || ( which curl > /dev/null && curl $(WAFURL) > waf )
+        curl https://waf.io/waf-1.8.20 > waf
         @chmod +x waf

appveyor.yml

rfb7db6b	rfa7c03a
50	50
51	51	before_build:
52		- curl -fsS -o waf https://waf.io/waf-1.8.22
	52	- curl -fsS -o waf https://waf.io/waf-1.8.20
53	53	- curl -fsS -o waf.bat https://raw.githubusercontent.com/waf-project/waf/master/utils/waf.bat
54	54

doc/full.cfg

-                      rfb7db6b
+                      rfa7c03a
 # Doxyfile 1.8.8
+# Doxyfile 1.8.5
 # This file describes the settings to be used by the documentation system
 …
 CREATE_SUBDIRS         = NO
-# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
-# characters to appear in the names of generated files. If set to NO, non-ASCII
-# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
-# U+3044.
-# The default value is: NO.
-ALLOW_UNICODE_NAMES    = NO
 # The OUTPUT_LANGUAGE tag is used to specify the language in which all
 # documentation generated by doxygen is written. Doxygen will use this
 # information to generate all constant output in the proper language.
+# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese,
+# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States),
+# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian,
+# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages),
+# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian,
+# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian,
+# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish,
+# Ukrainian and Vietnamese.
+# Possible values are: Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-
+# Traditional, Croatian, Czech, Danish, Dutch, English, Esperanto, Farsi,
+# Finnish, French, German, Greek, Hungarian, Italian, Japanese, Japanese-en,
+# Korean, Korean-en, Latvian, Norwegian, Macedonian, Persian, Polish,
+# Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish, Swedish,
+# Turkish, Ukrainian and Vietnamese.
 # The default value is: English.
 …
 # using this tag. The format is ext=language, where ext is a file extension, and
 # language is one of the parsers supported by doxygen: IDL, Java, Javascript,
+# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran:
+# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran:
+# Fortran. In the later case the parser tries to guess whether the code is fixed
+# or free formatted code, this is the default for Fortran type files), VHDL. For
+# instance to make doxygen treat .inc files as Fortran files (default is PHP),
+# and .f files as C (default is Fortran), use: inc=Fortran f=C.
+# C#, C, C++, D, PHP, Objective-C, Python, Fortran, VHDL. For instance to make
+# doxygen treat .inc files as Fortran files (default is PHP), and .f files as C
+# (default is Fortran), use: inc=Fortran f=C.
+#
 # Note For files without extension you can use no_extension as a placeholder.
 …
 SHOW_INCLUDE_FILES     = YES
-# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
-# grouped member an include statement to the documentation, telling the reader
-# which file to include in order to use the member.
-# The default value is: NO.
-SHOW_GROUPED_MEMB_INC  = NO
 # If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
 # files with double quotes in the documentation rather than with sharp brackets.
 …
 # If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
 # descriptions of file, namespace and class members alphabetically by member
+# name. If set to NO the members will appear in declaration order. Note that
+# this will also influence the order of the classes in the class list.
+# name. If set to NO the members will appear in declaration order.
 # The default value is: NO.
 …
 # For LaTeX the style of the bibliography can be controlled using
 # LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
+# search path. See also \cite for info how to create references.
+# search path. Do not use file names with spaces, bibtex cannot handle them. See
+# also \cite for info how to create references.
 CITE_BIB_FILES         =
 …
 VERBATIM_HEADERS       = YES
-# If the CLANG_ASSISTED_PARSING tag is set to YES, then doxygen will use the
-# clang parser (see: http://clang.llvm.org/) for more accurate parsing at the
-# cost of reduced performance. This can be particularly helpful with template
-# rich C++ code for which doxygen's built-in parser lacks the necessary type
-# information.
-# Note: The availability of this option depends on whether or not doxygen was
-# compiled with the --with-libclang option.
-# The default value is: NO.
-CLANG_ASSISTED_PARSING = NO
-# If clang assisted parsing is enabled you can provide the compiler with command
-# line options that you would normally use when invoking the compiler. Note that
-# the include paths will already be set by doxygen for the files and directories
-# specified with INPUT and INCLUDE_PATH.
-# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
-CLANG_OPTIONS          =
 #---------------------------------------------------------------------------
 …
 HTML_STYLESHEET        =
 # The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined
 # cascading style sheets that are included after the standard style sheets
+# The HTML_EXTRA_STYLESHEET tag can be used to specify an additional user-
+# defined cascading style sheet that is included after the standard style sheets
 # created by doxygen. Using this option one can overrule certain style aspects.
 # This is preferred over using HTML_STYLESHEET since it does not replace the
 # standard style sheet and is therefor more robust against future updates.
+# Doxygen will copy the style sheet files to the output directory.
+# Note: The order of the extra stylesheet files is of importance (e.g. the last
+# stylesheet in the list overrules the setting of the previous ones in the
+# list). For an example see the documentation.
+# Doxygen will copy the style sheet file to the output directory. For an example
+# see the documentation.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 …
 # The BINARY_TOC flag controls whether a binary table of contents is generated (
+# YES) or a normal table of contents ( NO) in the .chm file. Furthermore it
+# enables the Previous and Next buttons.
+# YES) or a normal table of contents ( NO) in the .chm file.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 …
 # When the SERVER_BASED_SEARCH tag is enabled the search engine will be
 # implemented using a web server instead of a web client using Javascript. There
 # are two flavors of web server based searching depending on the EXTERNAL_SEARCH
 # setting. When disabled, doxygen will generate a PHP script for searching and
 # an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
 # and searching needs to be provided by external tools. See the section
 # "External Indexing and Searching" for details.
+# are two flavours of web server based searching depending on the
+# EXTERNAL_SEARCH setting. When disabled, doxygen will generate a PHP script for
+# searching and an index file used by the script. When EXTERNAL_SEARCH is
+# enabled the indexing and searching needs to be provided by external tools. See
+# the section "External Indexing and Searching" for details.
 # The default value is: NO.
 # This tag requires that the tag SEARCHENGINE is set to YES.
 …
 # Note: Only use a user-defined header if you know what you are doing! The
 # following commands have a special meaning inside the header: $title,
 # $datetime, $date, $doxygenversion, $projectname, $projectnumber,
 # $projectbrief, $projectlogo. Doxygen will replace $title with the empy string,
 # for the replacement values of the other commands the user is refered to
 # HTML_HEADER.
+# $datetime, $date, $doxygenversion, $projectname, $projectnumber. Doxygen will
+# replace them by respectively the title of the page, the current date and time,
+# only the current date, the version number of doxygen, the project name (see
+# PROJECT_NAME), or the project number (see PROJECT_NUMBER).
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 …
 # The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
 # generated LaTeX document. The footer should contain everything after the last
+# chapter. If it is left blank doxygen will generate a standard footer. See
+# LATEX_HEADER for more information on how to generate a default footer and what
+# special commands can be used inside the footer.
+# chapter. If it is left blank doxygen will generate a standard footer.
+#
 # Note: Only use a user-defined footer if you know what you are doing!
 …
 PDF_HYPERLINKS         = YES
 # If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
+# If the LATEX_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
 # the PDF file directly from the LaTeX files. Set this option to YES to get a
 # higher quality PDF documentation.
 …
 MAN_EXTENSION          = .3
-# The MAN_SUBDIR tag determines the name of the directory created within
-# MAN_OUTPUT in which the man pages are placed. If defaults to man followed by
-# MAN_EXTENSION with the initial . removed.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-MAN_SUBDIR             =
 # If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
 # will generate one additional man file for each entity documented in the real
 …
 XML_OUTPUT             = xml
+# The XML_SCHEMA tag can be used to specify a XML schema, which can be used by a
+# validating XML parser to check the syntax of the XML files.
+# This tag requires that the tag GENERATE_XML is set to YES.
+XML_SCHEMA             =
+# The XML_DTD tag can be used to specify a XML DTD, which can be used by a
+# validating XML parser to check the syntax of the XML files.
+# This tag requires that the tag GENERATE_XML is set to YES.
+XML_DTD                =
 # If the XML_PROGRAMLISTING tag is set to YES doxygen will dump the program
 # listings (including syntax highlighting and cross-referencing information) to
 …
 DOCBOOK_OUTPUT         = docbook
-# If the DOCBOOK_PROGRAMLISTING tag is set to YES doxygen will include the
-# program listings (including syntax highlighting and cross-referencing
-# information) to the DOCBOOK output. Note that enabling this will significantly
-# increase the size of the DOCBOOK output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
-DOCBOOK_PROGRAMLISTING = NO
 #---------------------------------------------------------------------------
 …
 # If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
 # remove all references to function-like macros that are alone on a line, have
 # an all uppercase name, and do not end with a semicolon. Such function macros
 # are typically used for boiler-plate code, and will confuse the parser if not
+# remove all refrences to function-like macros that are alone on a line, have an
+# all uppercase name, and do not end with a semicolon. Such function macros are
+# typically used for boiler-plate code, and will confuse the parser if not
 # removed.
 # The default value is: YES.
 …
 # section "Linking to external documentation" for more information about the use
 # of tag files.
 # Note: Each tag file must have a unique name (where the name does NOT include
+# Note: Each tag file must have an unique name (where the name does NOT include
 # the path). If a tag file is not located in the directory in which doxygen is
 # run, you must also specify the path to the tagfile here.
 …
 MSCGEN_PATH            =
-# You can include diagrams made with dia in doxygen documentation. Doxygen will
-# then run dia to produce the diagram and insert it in the documentation. The
-# DIA_PATH tag allows you to specify the directory where the dia binary resides.
-# If left empty dia is assumed to be found in the default search path.
-DIA_PATH               =
 # If set to YES, the inheritance and collaboration graphs will hide inheritance
 # and usage relations if the target is undocumented or is not a class.
 …
 # Bell Labs. The other options in this section have no effect if this option is
 # set to NO
 # The default value is: YES.
+# The default value is: NO.
 HAVE_DOT               = NO
 …
 DOT_NUM_THREADS        = 0
 # When you want a differently looking font in the dot files that doxygen
+# When you want a differently looking font n the dot files that doxygen
 # generates you can specify the font name using DOT_FONTNAME. You need to make
 # sure dot is able to find the font, which can be done by putting it in a
 …
 # to make the SVG files visible in IE 9+ (other browsers do not have this
 # requirement).
+# Possible values are: png, png:cairo, png:cairo:cairo, png:cairo:gd, png:gd,
+# png:gd:gd, jpg, jpg:cairo, jpg:cairo:gd, jpg:gd, jpg:gd:gd, gif, gif:cairo,
+# gif:cairo:gd, gif:gd, gif:gd:gd and svg.
+# Possible values are: png, jpg, gif and svg.
 # The default value is: png.
 # This tag requires that the tag HAVE_DOT is set to YES.
 …
 MSCFILE_DIRS           =
-# The DIAFILE_DIRS tag can be used to specify one or more directories that
-# contain dia files that are included in the documentation (see the \diafile
-# command).
-DIAFILE_DIRS           =
-# When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the
-# path where java can find the plantuml.jar file. If left blank, it is assumed
-# PlantUML is not used or called during a preprocessing step. Doxygen will
-# generate a warning when it encounters a \startuml command in this case and
-# will not generate output for the diagram.
-# This tag requires that the tag HAVE_DOT is set to YES.
-PLANTUML_JAR_PATH      =
 # The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes

doc/web.cfg

-                      rfb7db6b
+                      rfa7c03a
 # Doxyfile 1.8.8
+# Doxyfile 1.8.5
 # This file describes the settings to be used by the documentation system
 …
 CREATE_SUBDIRS         = NO
-# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
-# characters to appear in the names of generated files. If set to NO, non-ASCII
-# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
-# U+3044.
-# The default value is: NO.
-ALLOW_UNICODE_NAMES    = NO
 # The OUTPUT_LANGUAGE tag is used to specify the language in which all
 # documentation generated by doxygen is written. Doxygen will use this
 # information to generate all constant output in the proper language.
+# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese,
+# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States),
+# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian,
+# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages),
+# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian,
+# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian,
+# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish,
+# Ukrainian and Vietnamese.
+# Possible values are: Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-
+# Traditional, Croatian, Czech, Danish, Dutch, English, Esperanto, Farsi,
+# Finnish, French, German, Greek, Hungarian, Italian, Japanese, Japanese-en,
+# Korean, Korean-en, Latvian, Norwegian, Macedonian, Persian, Polish,
+# Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish, Swedish,
+# Turkish, Ukrainian and Vietnamese.
 # The default value is: English.
 …
 # using this tag. The format is ext=language, where ext is a file extension, and
 # language is one of the parsers supported by doxygen: IDL, Java, Javascript,
+# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran:
+# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran:
+# Fortran. In the later case the parser tries to guess whether the code is fixed
+# or free formatted code, this is the default for Fortran type files), VHDL. For
+# instance to make doxygen treat .inc files as Fortran files (default is PHP),
+# and .f files as C (default is Fortran), use: inc=Fortran f=C.
+# C#, C, C++, D, PHP, Objective-C, Python, Fortran, VHDL. For instance to make
+# doxygen treat .inc files as Fortran files (default is PHP), and .f files as C
+# (default is Fortran), use: inc=Fortran f=C.
+#
 # Note For files without extension you can use no_extension as a placeholder.
 …
 SHOW_INCLUDE_FILES     = YES
-# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
-# grouped member an include statement to the documentation, telling the reader
-# which file to include in order to use the member.
-# The default value is: NO.
-SHOW_GROUPED_MEMB_INC  = NO
 # If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
 # files with double quotes in the documentation rather than with sharp brackets.
 …
 # If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
 # descriptions of file, namespace and class members alphabetically by member
+# name. If set to NO the members will appear in declaration order. Note that
+# this will also influence the order of the classes in the class list.
+# name. If set to NO the members will appear in declaration order.
 # The default value is: NO.
 …
 # For LaTeX the style of the bibliography can be controlled using
 # LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
+# search path. See also \cite for info how to create references.
+# search path. Do not use file names with spaces, bibtex cannot handle them. See
+# also \cite for info how to create references.
 CITE_BIB_FILES         =
 …
 VERBATIM_HEADERS       = YES
-# If the CLANG_ASSISTED_PARSING tag is set to YES, then doxygen will use the
-# clang parser (see: http://clang.llvm.org/) for more accurate parsing at the
-# cost of reduced performance. This can be particularly helpful with template
-# rich C++ code for which doxygen's built-in parser lacks the necessary type
-# information.
-# Note: The availability of this option depends on whether or not doxygen was
-# compiled with the --with-libclang option.
-# The default value is: NO.
-CLANG_ASSISTED_PARSING = NO
-# If clang assisted parsing is enabled you can provide the compiler with command
-# line options that you would normally use when invoking the compiler. Note that
-# the include paths will already be set by doxygen for the files and directories
-# specified with INPUT and INCLUDE_PATH.
-# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
-CLANG_OPTIONS          =
 #---------------------------------------------------------------------------
 # Configuration options related to the alphabetical class index
 …
 HTML_STYLESHEET        =
 # The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined
 # cascading style sheets that are included after the standard style sheets
+# The HTML_EXTRA_STYLESHEET tag can be used to specify an additional user-
+# defined cascading style sheet that is included after the standard style sheets
 # created by doxygen. Using this option one can overrule certain style aspects.
 # This is preferred over using HTML_STYLESHEET since it does not replace the
 # standard style sheet and is therefor more robust against future updates.
+# Doxygen will copy the style sheet files to the output directory.
+# Note: The order of the extra stylesheet files is of importance (e.g. the last
+# stylesheet in the list overrules the setting of the previous ones in the
+# list). For an example see the documentation.
+# Doxygen will copy the style sheet file to the output directory. For an example
+# see the documentation.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 …
 # The BINARY_TOC flag controls whether a binary table of contents is generated (
+# YES) or a normal table of contents ( NO) in the .chm file. Furthermore it
+# enables the Previous and Next buttons.
+# YES) or a normal table of contents ( NO) in the .chm file.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 …
 # When the SERVER_BASED_SEARCH tag is enabled the search engine will be
 # implemented using a web server instead of a web client using Javascript. There
 # are two flavors of web server based searching depending on the EXTERNAL_SEARCH
 # setting. When disabled, doxygen will generate a PHP script for searching and
 # an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
 # and searching needs to be provided by external tools. See the section
 # "External Indexing and Searching" for details.
+# are two flavours of web server based searching depending on the
+# EXTERNAL_SEARCH setting. When disabled, doxygen will generate a PHP script for
+# searching and an index file used by the script. When EXTERNAL_SEARCH is
+# enabled the indexing and searching needs to be provided by external tools. See
+# the section "External Indexing and Searching" for details.
 # The default value is: NO.
 # This tag requires that the tag SEARCHENGINE is set to YES.
 …
 # Note: Only use a user-defined header if you know what you are doing! The
 # following commands have a special meaning inside the header: $title,
 # $datetime, $date, $doxygenversion, $projectname, $projectnumber,
 # $projectbrief, $projectlogo. Doxygen will replace $title with the empy string,
 # for the replacement values of the other commands the user is refered to
 # HTML_HEADER.
+# $datetime, $date, $doxygenversion, $projectname, $projectnumber. Doxygen will
+# replace them by respectively the title of the page, the current date and time,
+# only the current date, the version number of doxygen, the project name (see
+# PROJECT_NAME), or the project number (see PROJECT_NUMBER).
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 …
 # The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
 # generated LaTeX document. The footer should contain everything after the last
+# chapter. If it is left blank doxygen will generate a standard footer. See
+# LATEX_HEADER for more information on how to generate a default footer and what
+# special commands can be used inside the footer.
+# chapter. If it is left blank doxygen will generate a standard footer.
+#
 # Note: Only use a user-defined footer if you know what you are doing!
 …
 PDF_HYPERLINKS         = YES
 # If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
+# If the LATEX_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
 # the PDF file directly from the LaTeX files. Set this option to YES to get a
 # higher quality PDF documentation.
 …
 MAN_EXTENSION          = .3
-# The MAN_SUBDIR tag determines the name of the directory created within
-# MAN_OUTPUT in which the man pages are placed. If defaults to man followed by
-# MAN_EXTENSION with the initial . removed.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-MAN_SUBDIR             =
 # If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
 # will generate one additional man file for each entity documented in the real
 …
 XML_OUTPUT             = xml
+# The XML_SCHEMA tag can be used to specify a XML schema, which can be used by a
+# validating XML parser to check the syntax of the XML files.
+# This tag requires that the tag GENERATE_XML is set to YES.
+XML_SCHEMA             =
+# The XML_DTD tag can be used to specify a XML DTD, which can be used by a
+# validating XML parser to check the syntax of the XML files.
+# This tag requires that the tag GENERATE_XML is set to YES.
+XML_DTD                =
 # If the XML_PROGRAMLISTING tag is set to YES doxygen will dump the program
 # listings (including syntax highlighting and cross-referencing information) to
 …
 DOCBOOK_OUTPUT         = docbook
-# If the DOCBOOK_PROGRAMLISTING tag is set to YES doxygen will include the
-# program listings (including syntax highlighting and cross-referencing
-# information) to the DOCBOOK output. Note that enabling this will significantly
-# increase the size of the DOCBOOK output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
-DOCBOOK_PROGRAMLISTING = NO
 #---------------------------------------------------------------------------
 …
 # If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
 # remove all references to function-like macros that are alone on a line, have
 # an all uppercase name, and do not end with a semicolon. Such function macros
 # are typically used for boiler-plate code, and will confuse the parser if not
+# remove all refrences to function-like macros that are alone on a line, have an
+# all uppercase name, and do not end with a semicolon. Such function macros are
+# typically used for boiler-plate code, and will confuse the parser if not
 # removed.
 # The default value is: YES.
 …
 # section "Linking to external documentation" for more information about the use
 # of tag files.
 # Note: Each tag file must have a unique name (where the name does NOT include
+# Note: Each tag file must have an unique name (where the name does NOT include
 # the path). If a tag file is not located in the directory in which doxygen is
 # run, you must also specify the path to the tagfile here.
 …
 MSCGEN_PATH            =
-# You can include diagrams made with dia in doxygen documentation. Doxygen will
-# then run dia to produce the diagram and insert it in the documentation. The
-# DIA_PATH tag allows you to specify the directory where the dia binary resides.
-# If left empty dia is assumed to be found in the default search path.
-DIA_PATH               =
 # If set to YES, the inheritance and collaboration graphs will hide inheritance
 # and usage relations if the target is undocumented or is not a class.
 …
 # Bell Labs. The other options in this section have no effect if this option is
 # set to NO
 # The default value is: YES.
+# The default value is: NO.
 HAVE_DOT               = NO
 …
 DOT_NUM_THREADS        = 0
 # When you want a differently looking font in the dot files that doxygen
+# When you want a differently looking font n the dot files that doxygen
 # generates you can specify the font name using DOT_FONTNAME. You need to make
 # sure dot is able to find the font, which can be done by putting it in a
 …
 # to make the SVG files visible in IE 9+ (other browsers do not have this
 # requirement).
+# Possible values are: png, png:cairo, png:cairo:cairo, png:cairo:gd, png:gd,
+# png:gd:gd, jpg, jpg:cairo, jpg:cairo:gd, jpg:gd, jpg:gd:gd, gif, gif:cairo,
+# gif:cairo:gd, gif:gd, gif:gd:gd and svg.
+# Possible values are: png, jpg, gif and svg.
 # The default value is: png.
 # This tag requires that the tag HAVE_DOT is set to YES.
 …
 MSCFILE_DIRS           =
-# The DIAFILE_DIRS tag can be used to specify one or more directories that
-# contain dia files that are included in the documentation (see the \diafile
-# command).
-DIAFILE_DIRS           =
-# When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the
-# path where java can find the plantuml.jar file. If left blank, it is assumed
-# PlantUML is not used or called during a preprocessing step. Doxygen will
-# generate a warning when it encounters a \startuml command in this case and
-# will not generate output for the diagram.
-# This tag requires that the tag HAVE_DOT is set to YES.
-PLANTUML_JAR_PATH      =
 # The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes

examples/aubionotes.c

-                      rfb7db6b
+                      rfa7c03a
 */
+#define AUBIO_UNSTABLE 1 // for fvec_median
 #include "utils.h"
 #define PROG_HAS_PITCH 1
 …
 #include "parse_args.h"
+aubio_notes_t *notes;
+uint_t lastnote = 0;
+uint_t median = 6;
+fvec_t *note_buffer;
+fvec_t *note_buffer2;
+smpl_t curnote = 0.;
+smpl_t newnote = 0.;
+uint_t isready = 0;
+aubio_pitch_t *pitch;
+aubio_onset_t *o;
+fvec_t *onset;
+fvec_t *pitch_obuf;
+/** append new note candidate to the note_buffer and return filtered value. we
+ * need to copy the input array as fvec_median destroy its input data.*/
+void note_append (fvec_t * note_buffer, smpl_t curnote);
+uint_t get_note (fvec_t * note_buffer, fvec_t * note_buffer2);
 void process_block (fvec_t *ibuf, fvec_t *obuf)
+{
+  aubio_notes_do (notes, ibuf, obuf);
+  // did we get a note off?
+  if (obuf->data[2] != 0) {
+    send_noteon(obuf->data[2], 0);
+  smpl_t new_pitch, curlevel;
+  fvec_zeros(obuf);
+  aubio_onset_do(o, ibuf, onset);
+  aubio_pitch_do (pitch, ibuf, pitch_obuf);
+  new_pitch = fvec_get_sample(pitch_obuf, 0);
+  if(median){
+    note_append(note_buffer, new_pitch);
+  }
+  // did we get a note on?
+  if (obuf->data[0] != 0) {
+    send_noteon(obuf->data[0], obuf->data[1]);
+    lastnote = (uint_t) floor(obuf->data[0]);
+  /* curlevel is negatif or 1 if silence */
+  curlevel = aubio_level_detection(ibuf, silence_threshold);
+  if (fvec_get_sample(onset, 0)) {
+    /* test for silence */
+    if (curlevel == 1.) {
+      if (median) isready = 0;
+      /* send note off */
+      send_noteon(curnote,0);
+    } else {
+      if (median) {
+        isready = 1;
+      } else {
+        /* kill old note */
+        send_noteon(curnote,0);
+        /* get and send new one */
+        send_noteon(new_pitch,127+(int)floor(curlevel));
+        curnote = new_pitch;
+      }
+    }
+  } else {
+    if (median) {
+      if (isready > 0)
+        isready++;
+      if (isready == median)
+      {
+        /* kill old note */
+        send_noteon(curnote,0);
+        newnote = get_note(note_buffer, note_buffer2);
+        curnote = newnote;
+        /* get and send new one */
+        if (curnote>45){
+          send_noteon(curnote,127+(int)floor(curlevel));
+        }
+      }
+    } // if median
+  }
+}
 …
+{
   //if (verbose) outmsg("%f\n",pitch_obuf->data[0]);
+}
+void
+note_append (fvec_t * note_buffer, smpl_t curnote)
+{
+  uint_t i = 0;
+  for (i = 0; i < note_buffer->length - 1; i++) {
+    note_buffer->data[i] = note_buffer->data[i + 1];
+  }
+  note_buffer->data[note_buffer->length - 1] = curnote;
+  return;
+}
+uint_t
+get_note (fvec_t * note_buffer, fvec_t * note_buffer2)
+{
+  uint_t i;
+  for (i = 0; i < note_buffer->length; i++) {
+    note_buffer2->data[i] = note_buffer->data[i];
+  }
+  return fvec_median (note_buffer2);
+}
 …
   verbmsg ("tolerance: %f\n", pitch_tolerance);
+  notes = new_aubio_notes ("default", buffer_size, hop_size, samplerate);
+  o = new_aubio_onset (onset_method, buffer_size, hop_size, samplerate);
+  if (onset_threshold != 0.) aubio_onset_set_threshold (o, onset_threshold);
+  onset = new_fvec (1);
+  pitch = new_aubio_pitch (pitch_method, buffer_size * 4, hop_size, samplerate);
+  if (pitch_tolerance != 0.) aubio_pitch_set_tolerance (pitch, pitch_tolerance);
+  pitch_obuf = new_fvec (1);
+  if (median) {
+      note_buffer = new_fvec (median);
+      note_buffer2 = new_fvec (median);
+  }
   examples_common_process((aubio_process_func_t)process_block, process_print);
   // send a last note off
   send_noteon (lastnote, 0);
+  send_noteon (curnote, 0);
+  del_aubio_notes (notes);
+  del_aubio_pitch (pitch);
+  if (median) {
+      del_fvec (note_buffer);
+      del_fvec (note_buffer2);
+  }
+  del_fvec (pitch_obuf);
   examples_common_del();

examples/wscript_build

-                      rfb7db6b
+                      rfa7c03a
 # vim:set syntax=python:
-import os.path
 uselib = ['aubio']
 …
 # loop over all *.c filenames in examples to build them all
 for source_file in programs_source:
-    target = os.path.basename(os.path.splitext(str(source_file))[0])
     bld(features = 'c cprogram',
             source = source_file,
             target = target,
+            target = str(source_file).split('.')[0],
             includes = includes,
             use = uselib + ['utilsio'],

python/README

rfb7db6b	rfa7c03a
57	57	And to try out the demos:
58	58
59		$ ./demos/demo_source.py /path/to/sound/sample.wav
	59	$ ./demos/demo_source.wav /path/to/sound/sample.wav
60	60
61	61	You need to install additional modules to run some of the demos. For

python/lib/gen_code.py

-                      rfb7db6b
+                      rfa7c03a
         'onset': '1',
         'pitch': '1',
-        'notes': '3',
         'wavetable': 'self->hop_size',
         'sampler': 'self->hop_size',
 …
         'filterbank': 'self->n_filters',
         'tss': 'self->hop_size',
+        }
-objinputsize = {
-        'mfcc': 'self->buf_size / 2 + 1',
-        'notes': 'self->hop_size',
-        'onset': 'self->hop_size',
-        'pitch': 'self->hop_size',
-        'sampler': 'self->hop_size',
-        'specdesc': 'self->buf_size / 2 + 1',
-        'tempo': 'self->hop_size',
-        'wavetable': 'self->hop_size',
+        }
 …
         return NULL;
     }}""".format(input_param, pytoaubio = pytoaubio_fn[input_param['type']])
+        if self.shortname in objinputsize:
+            out += """
+    if (self->{0[name]}.length != {expected_size}) {{
+        PyErr_Format (PyExc_ValueError,
+            "input size of {shortname} should be %d, not %d",
+            {expected_size}, self->{0[name]}.length);
+        return NULL;
+    }}""".format(input_param, expected_size = objinputsize[self.shortname], **self.__dict__)
+        else:
+            out += """
+        out += """
     // TODO: check input sizes"""

python/tests/test_mfcc.py

-                      rfb7db6b
+                      rfa7c03a
             mfcc(samplerate = -1)
-    def test_wrong_input_size(self):
-        m = mfcc(buf_size = 1024)
-        with self.assertRaises(ValueError):
-            m(cvec(512))
 class aubio_mfcc_compute(TestCase):

python/tests/test_specdesc.py

rfb7db6b	rfa7c03a
127	127	def test_spread(self):
128	128	o = specdesc("spread")
129		c = cvec(~~1024~~)
	129	c = cvec(2048)
130	130	ramp = arange(c.length, dtype=float_type)
131	131	assert_equal( 0., o(c))

scripts/setenv_local.sh

rfb7db6b	rfa7c03a
13	13	AUBIODIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )"
14	14	AUBIOLIB=$AUBIODIR/build/src
15		AUBIOPYTHON=$AUBIODIR/build/lib.$PYTHON_PLATFORM
	15	AUBIOPYTHON=$AUBIODIR/python/build/lib.$PYTHON_PLATFORM
16	16
17	17	if [ "$(dirname $PWD)" == "scripts" ]; then

src/aubio.h

rfb7db6b	rfa7c03a
183	183	#include "onset/onset.h"
184	184	#include "tempo/tempo.h"
185		~~#include "notes/notes.h"~~
186	185	#include "io/source.h"
187	186	#include "io/sink.h"

src/fmat.h

rfb7db6b	rfa7c03a
157	157	void fmat_copy(const fmat_t s, fmat_t t);
158	158
159		/** compute the product of a matrix by a vector
	159	/* compute the product of a matrix by a vector
160	160
161	161	\param s matrix to compute product with

src/io/source_avcodec.c

-                      rfb7db6b
+                      rfa7c03a
 void aubio_source_avcodec_readframe(aubio_source_avcodec_t *s, uint_t * read_samples);
-uint_t aubio_source_avcodec_has_network_url(aubio_source_avcodec_t *s);
-uint_t aubio_source_avcodec_has_network_url(aubio_source_avcodec_t *s) {
-  char proto[20], authorization[256], hostname[128], uripath[256];
-  int proto_size = 20, authorization_size = 256, hostname_size = 128,
-      *port_ptr = 0, path_size = 256;
-  av_url_split(proto, proto_size, authorization, authorization_size, hostname,
-      hostname_size, port_ptr, uripath, path_size, s->path);
-  if (strlen(proto)) {
-    return 1;
+  }
-  return 0;
+}
 aubio_source_avcodec_t * new_aubio_source_avcodec(const char_t * path, uint_t samplerate, uint_t hop_size) {
   aubio_source_avcodec_t * s = AUBIO_NEW(aubio_source_avcodec_t);
 …
   av_register_all();
+  if (aubio_source_avcodec_has_network_url(s)) {
+    avformat_network_init();
+  }
+  // if path[0] != '/'
+  //avformat_network_init();
   // try opening the file and get some info about it

src/mathutils.c

rfb7db6b	rfa7c03a
565	565
566	566	smpl_t
567		aubio_level_detection (~~const~~ fvec_t * o, smpl_t threshold)
	567	aubio_level_detection (fvec_t * o, smpl_t threshold)
568	568	{
569	569	smpl_t db_spl = aubio_db_spl (o);

src/musicutils.h

rfb7db6b	rfa7c03a
155	155
156	156	*/
157		smpl_t aubio_level_detection (~~const~~ fvec_t * v, smpl_t threshold);
	157	smpl_t aubio_level_detection (fvec_t * v, smpl_t threshold);
158	158
159	159	#ifdef __cplusplus

src/tempo/tempo.h

-                      rfb7db6b
+                      rfa7c03a
 smpl_t aubio_tempo_get_confidence(aubio_tempo_t * o);
 /** set number of tatum per beat
+/* set number of tatum per beat
    \param o beat tracking object
 …
 uint_t aubio_tempo_set_tatum_signature(aubio_tempo_t *o, uint_t signature);
 /** check whether a tatum was detected in the current frame
+/* check whether a tatum was detected in the current frame
    \param o beat tracking object
 …
 uint_t aubio_tempo_was_tatum(aubio_tempo_t *o);
 /** get position of last_tatum, in samples
+/* get position of last_tatum, in samples
    \param o beat tracking object

tests/wscript_build

-                      rfb7db6b
+                      rfa7c03a
 # vim:set syntax=python:
-import os.path
 uselib = ['aubio']
 …
 for source_file in programs_sources:
-    target = os.path.basename(os.path.splitext(str(source_file))[0])
     bld(features = 'c cprogram test',
             source = source_file,
             target = target,
+            target = str(source_file).split('.')[0],
             includes = includes,
             use = uselib,

wscript

-                      rfb7db6b
+                      rfa7c03a
 # have Python installed, you do *not* need to install anything to build aubio.
 # For more info about waf, see http://code.google.com/p/waf/ .
-import sys
 APPNAME = 'aubio'
 …
     ctx.check(header_name='unistd.h', mandatory = False)
     target_platform = sys.platform
+    target_platform = Options.platform
     if ctx.options.target_platform:
         target_platform = ctx.options.target_platform

aubio

Context Navigation

Changes in / [fb7db6b:fa7c03a]

Legend:

Makefile

appveyor.yml

doc/full.cfg

doc/web.cfg

examples/aubionotes.c

examples/wscript_build

python/README

python/lib/gen_code.py

python/tests/test_mfcc.py

python/tests/test_specdesc.py

scripts/setenv_local.sh

src/aubio.h

src/fmat.h

src/io/source_avcodec.c

src/mathutils.c

src/musicutils.h

src/tempo/tempo.h

tests/wscript_build

wscript

Download in other formats: