From: Paul Brossier Date: Wed, 1 Dec 2004 02:03:26 +0000 (+0000) Subject: cleaned up verbose output X-Git-Tag: bzr2git~952 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9cba1ebbc1de8191dc6c8055e2c1a76cbd2ed4cf;p=aubio.git cleaned up verbose output --- diff --git a/ChangeLog b/ChangeLog index 2f8b4957..0adeb7e3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,9 @@ * configure.ac: added -lmx on macosx * python/aubiocut: seeks for local minima before peak * src/pitchyinc.c: adds draft for all-in-one faster function + * examples/*.c: added ladcca client (needs work) + * examples/aubioonset.c: cleaned up verbose stdout + * doc/aubio.css: updated 2004-10-28 Paul Brossier * src/Makefile.am: added config.h installation diff --git a/TODO b/TODO index bbe249f9..3328c01c 100644 --- a/TODO +++ b/TODO @@ -1,10 +1,27 @@ TODO +==== -- test zero crossing in python/aubiocut +Doc +--- + +- update doc - complete manpages -- drop the multichannel bits ? -- drop the midi/jack bits ? -- move mathutils and sample to use gsl or some faster library ? + +Library +------- + - code cleanup and optimisation +- drop the multichannelling functions ? +- get rid of the midi/jack code ? +- move mathutils and sample to use gsl or some faster library ? - really enable ladcca support -- mix with libsoundtouch and make a melodyne gui + +Interface +--------- + +- test zero crossing in python/aubiocut +- aubioonset: save to hydrogen patch file +- aubionotes: save to midi/sf2 file +- fix and enhance wavesurfer plugin +- get the patches in audacity upstream +- make a melodyne like gui with libsoundtouch diff --git a/doc/aubio.css b/doc/aubio.css index d1e0d488..c8ef7d9b 100644 --- a/doc/aubio.css +++ b/doc/aubio.css @@ -1,208 +1,26 @@ -/* general stuff added by piem */ -body { - background: transparent; - font-family: sans-serif; - width: 80%; - padding-left: 10%; - } - -a { - color: black; - /*background: #fff3ff;*/ - background: #dbf5db; - text-shadow: black; -} - -a:link { - color: black; - background: #dbf5db; - text-decoration: none; -} - -a:visited { - color: black; - text-decoration: none -} - -a:active { - color: black; - text-decoration: none -} - - -/* further default content modified */ -H1 { +body { + font-family: Sans-Serif; + font-size: 1em; + //background: url("aubioback-1-1.gif"); no-repeat bottom center; + background-color: #999; + color: #333; + padding-right : 10em; + padding-left : 10em; + padding-top : 2em; + padding-bottom : 2em; +} + +h1 { text-align: center; - font-family: Geneva, Arial, Helvetica, sans-serif; -} -H2 { - font-family: Geneva, Arial, Helvetica, sans-serif; -} -CAPTION { font-family: Geneva, Arial, Helvetica, sans-serif; font-weight: bold } -DIV.qindex { width: 80%; - text-align: center; - margin-bottom: 2px; - margin-left: 10%; - border: solid 1px; -} -A.qindex { text-decoration: none; font-weight: bold; background: #dbf5db; } -A.qindex:visited { text-decoration: none; font-weight: bold; } -A.qindex:hover { text-decoration: none; } -A.qindexHL { text-decoration: none; font-weight: bold; - background-color: #fff3ff; - } -A.el { text-decoration: none; font-weight: bold } -A.el:hover { text-decoration: underline} -A.elRef { font-weight: bold } -A.code { text-decoration: none; font-weight: normal; color: #4444ee } -A.codeRef { font-weight: normal; color: #4444ee } -DL.el { margin-left: -1cm } -DIV.fragment { - width: 98%; - border: 1px solid #CCCCCC; - background-color: #fefefe; - padding-left: 4px; - margin: 4px; -} -DIV.ah { background-color: black; font-weight: bold; color: #ffffff; margin-bottom: 3px; margin-top: 3px } -TD.md { background-color: #f2f2ff; font-weight: bold; } -TD.mdname1 { background-color: #f2f2ff; font-weight: bold; color: #602020; } -TD.mdname { background-color: #f2f2ff; font-weight: bold; color: #602020; width: 600px; } -DIV.groupHeader { margin-left: 16px; margin-top: 12px; margin-bottom: 6px; font-weight: bold } -DIV.groupText { margin-left: 16px; font-style: italic; font-size: smaller } -BODY { - background: white; - color: black; - margin-right: 20px; - margin-left: 20px; -} -TD.indexkey { - background-color: lightyellow; - font-weight: bold; - padding-right : 10px; - padding-top : 2px; - padding-left : 10px; - padding-bottom : 2px; - margin-left : 0px; - margin-right : 0px; - margin-top : 2px; - margin-bottom : 2px -} -TD.indexvalue { - background-color: lightyellow; - font-style: italic; - padding-right : 10px; - padding-top : 2px; - padding-left : 10px; - padding-bottom : 2px; - margin-left : 0px; - margin-right : 0px; - margin-top : 2px; - margin-bottom : 2px -} -TR.memlist { - background-color: #f0f0f0; -} -P.formulaDsp { text-align: center; } -IMG.formulaDsp { } -IMG.formulaInl { vertical-align: middle; } -SPAN.keyword { color: #008000 } -SPAN.keywordtype { color: #604020 } -SPAN.keywordflow { color: #e08000 } -SPAN.comment { color: #800000 } -SPAN.preprocessor { color: #806020 } -SPAN.stringliteral { color: #002080 } -SPAN.charliteral { color: #008080 } -.mdTable { - border: 1px solid #868686; - background-color: #f2f2ff; -} - -.mdRow { - padding: 8px 20px; -} - -.mdescLeft { - font-size: smaller; - font-family: Arial, Helvetica, sans-serif; - background-color: #FAFAFA; - padding-left: 8px; - border-top: 1px none #E0E0E0; - border-right: 1px none #E0E0E0; - border-bottom: 1px none #E0E0E0; - border-left: 1px none #E0E0E0; - margin: 0px; -} - -.mdescRight { - font-size: smaller; - font-family: Arial, Helvetica, sans-serif; - font-style: italic; - background-color: #FAFAFA; - padding-left: 4px; - border-top: 1px none #E0E0E0; - border-right: 1px none #E0E0E0; - border-bottom: 1px none #E0E0E0; - border-left: 1px none #E0E0E0; - margin: 0px; - padding-bottom: 0px; - padding-right: 8px; -} - -.memItemLeft { - padding: 1px 0px 0px 8px; - margin: 4px; - border-top-width: 1px; - border-right-width: 1px; - border-bottom-width: 1px; - border-left-width: 1px; - border-top-style: solid; - border-top-color: #E0E0E0; - border-right-color: #E0E0E0; - border-bottom-color: #E0E0E0; - border-left-color: #E0E0E0; - border-right-style: none; - border-bottom-style: none; - border-left-style: none; - background-color: #FAFAFA; - font-family: Geneva, Arial, Helvetica, sans-serif; - font-size: 12px; -} - -.memItemRight { - padding: 1px 0px 0px 8px; - margin: 4px; - border-top-width: 1px; - border-right-width: 1px; - border-bottom-width: 1px; - border-left-width: 1px; - border-top-style: solid; - border-top-color: #E0E0E0; - border-right-color: #E0E0E0; - border-bottom-color: #E0E0E0; - border-left-color: #E0E0E0; - border-right-style: none; - border-bottom-style: none; - border-left-style: none; - background-color: #FAFAFA; - font-family: Geneva, Arial, Helvetica, sans-serif; - font-size: 13px; -} - -.search { - font-weight: bold; -} - -FORM.search { - margin-bottom: 0px; - margin-top: 0px; + background-color: #888; + border: 2px dashed black; } -INPUT.search { font-size: 75%; - color: #000080; - font-weight: normal; - background-color: lightyellow; +h2 { + text-align: left; + background-color: #AAA; } -TD.tiny { font-size: 75%; +p { + text-align: justify; } diff --git a/doc/devel.cfg b/doc/devel.cfg index 69632d87..0df0ae6b 100644 --- a/doc/devel.cfg +++ b/doc/devel.cfg @@ -23,7 +23,7 @@ PROJECT_NAME = aubio # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 0.1.6 +PROJECT_NUMBER = 0.1.7 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff --git a/examples/aubioonset.c b/examples/aubioonset.c index f63902bc..36c8aa4c 100644 --- a/examples/aubioonset.c +++ b/examples/aubioonset.c @@ -94,8 +94,8 @@ int aubio_process(float **input, float **output, int nframes) { for (pos = 0; pos < overlap_size; pos++) obuf->data[0][pos] = 0.; } - /* end of block loop */ //aubio_pvoc_rdo(pv,fftgrain, obuf); + /* end of block loop */ pos = -1; /* so it will be zero next j loop */ } pos++; @@ -116,7 +116,7 @@ int main(int argc, char **argv) { { debug("Opening files ...\n"); file = new_file_ro (input_filename); - file_info(file); + if (verbose) file_info(file); channels = aubio_file_channels(file); if (output_filename != NULL) fileout = new_file_wo(file, output_filename); @@ -143,7 +143,6 @@ int main(int argc, char **argv) { onset2 = new_fvec(1 , channels); } - // command line argument parsing if(usejack) { #ifdef JACK_SUPPORT aubio_jack_t * jack_setup; @@ -172,7 +171,7 @@ int main(int argc, char **argv) { /* output times in seconds, taking back some * delay to ensure the label is _before_ the * actual onset */ - if (isonset && verbose) { + if (isonset && output_filename == NULL) { outmsg("%f\n",(frames-4)*overlap_size/(float)samplerate); } if (output_filename != NULL) { diff --git a/examples/utils.c b/examples/utils.c index 81ded93a..47e1a785 100644 --- a/examples/utils.c +++ b/examples/utils.c @@ -117,17 +117,17 @@ int parse_args (int argc, char **argv) { while (next_option != -1); if (input_filename != NULL) { - errmsg ("Input file : %s\n", input_filename ); + debug ("Input file : %s\n", input_filename ); } else if (input_filename != NULL && output_filename != NULL) { - errmsg ("Input file : %s\n", input_filename ); - errmsg ("Output file : %s\n", output_filename ); + debug ("Input file : %s\n", input_filename ); + debug ("Output file : %s\n", output_filename ); } else { if (JACK_SUPPORT) { - errmsg ("Jack input output\n"); + debug ("Jack input output\n"); usejack = 1; } else { - errmsg ("Error: Could not switch to jack mode\n aubio was compiled without jack support\n"); + debug ("Error: Could not switch to jack mode\n aubio was compiled without jack support\n"); exit(1); } }