From: Paul Brossier Date: Wed, 1 Dec 2004 20:34:40 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 0.4.0-beta1~1473 X-Git-Url: https://git.aubio.org/?p=aubio.git;a=commitdiff_plain;h=e997b1af642cbc14d067302f897f90d740571bf2 --- diff --git a/doc/Makefile.am b/doc/Makefile.am index eaac4ccf..f6124e7c 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -4,6 +4,7 @@ EXTRA_DIST = devel.cfg examples.cfg user.cfg aubio.css \ aubionotes.sgml aubioonset.sgml +man_MANS = aubionotes.1 aubioonset.1 #docbook_docs = aubio-devdoc.xml #DOCBOOK_STYLESHEET ?= http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl @@ -36,9 +37,10 @@ doc-examples: doxygen examples.cfg cp aubio.css examples -man: - docbook-to-man aubionotes.sgml > aubionotes.1 - docbook-to-man aubioonset.sgml > aubioonset.1 +%.sgml: + +%.1: %.sgml + docbook-to-man $< > $*.1 # Update docs for distribution #dist-hook: diff --git a/doc/Makefile.in b/doc/Makefile.in index a0974aa6..a58658a7 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -158,12 +158,17 @@ target_alias = @target_alias@ EXTRA_DIST = devel.cfg examples.cfg user.cfg aubio.css \ aubionotes.sgml aubioonset.sgml + +man_MANS = aubionotes.1 aubioonset.1 subdir = doc ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/src/config.h CONFIG_CLEAN_FILES = DIST_SOURCES = + +NROFF = nroff +MANS = $(man_MANS) DIST_COMMON = $(srcdir)/Makefile.in Makefile.am all: all-am @@ -183,6 +188,53 @@ clean-libtool: distclean-libtool: -rm -f libtool uninstall-info-am: + +man1dir = $(mandir)/man1 +install-man1: $(man1_MANS) $(man_MANS) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(man1dir) + @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.1*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ + else file=$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 1*) ;; \ + *) ext='1' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \ + $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \ + done +uninstall-man1: + @$(NORMAL_UNINSTALL) + @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.1*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 1*) ;; \ + *) ext='1' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \ + rm -f $(DESTDIR)$(man1dir)/$$inst; \ + done tags: TAGS TAGS: @@ -223,9 +275,10 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile +all-am: Makefile $(MANS) installdirs: + $(mkinstalldirs) $(DESTDIR)$(man1dir) install: install-am install-exec: install-exec-am install-data: install-data-am @@ -266,13 +319,13 @@ info: info-am info-am: -install-data-am: +install-data-am: install-man install-exec-am: install-info: install-info-am -install-man: +install-man: install-man1 installcheck-am: @@ -293,18 +346,20 @@ ps: ps-am ps-am: -uninstall-am: uninstall-info-am +uninstall-am: uninstall-info-am uninstall-man + +uninstall-man: uninstall-man1 .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am info info-am install install-am install-data \ install-data-am install-exec install-exec-am install-info \ - install-info-am install-man install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ + install-info-am install-man install-man1 install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic maintainer-clean-local mostlyclean \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-info-am - + uninstall uninstall-am uninstall-info-am uninstall-man \ + uninstall-man1 #docbook_docs = aubio-devdoc.xml #DOCBOOK_STYLESHEET ?= http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl @@ -338,9 +393,10 @@ doc-examples: doxygen examples.cfg cp aubio.css examples -man: - docbook-to-man aubionotes.sgml > aubionotes.1 - docbook-to-man aubioonset.sgml > aubioonset.1 +%.sgml: + +%.1: %.sgml + docbook-to-man $< > $*.1 # Update docs for distribution #dist-hook: diff --git a/doc/aubionotes.sgml b/doc/aubionotes.sgml index 5d3a90e9..ba23ddc6 100644 --- a/doc/aubionotes.sgml +++ b/doc/aubionotes.sgml @@ -57,7 +57,9 @@ manpage.1: manpage.sgml &dhpackage; - an sound file onset detector + a command line tool for real time wav to midi + conversion + diff --git a/examples/Makefile.am b/examples/Makefile.am index e0f4fdbc..7a3b82d9 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -18,8 +18,7 @@ noinst_PROGRAMS = \ midialsa \ testforclam -man_MANS = aubionotes.1 aubioonset.1 -EXTRA_DIST = utils.h $(man_MANS) +EXTRA_DIST = utils.h # optionally add sources file for these programs diff --git a/examples/Makefile.in b/examples/Makefile.in index d22a97f2..7d4af58c 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -173,8 +173,7 @@ noinst_PROGRAMS = \ testforclam -man_MANS = aubionotes.1 aubioonset.1 -EXTRA_DIST = utils.h $(man_MANS) +EXTRA_DIST = utils.h # optionally add sources file for these programs aubioonset_SOURCES = aubioonset.c utils.c @@ -246,9 +245,6 @@ LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ DIST_SOURCES = $(aubionotes_SOURCES) $(aubionotesmedian_SOURCES) \ $(aubioonset_SOURCES) midialsa.c midiparse.c midiplay.c \ $(testforclam_SOURCES) - -NROFF = nroff -MANS = $(man_MANS) DIST_COMMON = $(srcdir)/Makefile.in Makefile.am SOURCES = $(aubionotes_SOURCES) $(aubionotesmedian_SOURCES) $(aubioonset_SOURCES) midialsa.c midiparse.c midiplay.c $(testforclam_SOURCES) @@ -377,53 +373,6 @@ distclean-libtool: -rm -f libtool uninstall-info-am: -man1dir = $(mandir)/man1 -install-man1: $(man1_MANS) $(man_MANS) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(man1dir) - @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ - l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ - for i in $$l2; do \ - case "$$i" in \ - *.1*) list="$$list $$i" ;; \ - esac; \ - done; \ - for i in $$list; do \ - if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ - else file=$$i; fi; \ - ext=`echo $$i | sed -e 's/^.*\\.//'`; \ - case "$$ext" in \ - 1*) ;; \ - *) ext='1' ;; \ - esac; \ - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ - inst=`echo $$inst | sed -e 's/^.*\///'`; \ - inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \ - $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \ - done -uninstall-man1: - @$(NORMAL_UNINSTALL) - @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ - l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ - for i in $$l2; do \ - case "$$i" in \ - *.1*) list="$$list $$i" ;; \ - esac; \ - done; \ - for i in $$list; do \ - ext=`echo $$i | sed -e 's/^.*\\.//'`; \ - case "$$ext" in \ - 1*) ;; \ - *) ext='1' ;; \ - esac; \ - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ - inst=`echo $$inst | sed -e 's/^.*\///'`; \ - inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \ - rm -f $(DESTDIR)$(man1dir)/$$inst; \ - done - ETAGS = etags ETAGSFLAGS = @@ -511,10 +460,10 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(PROGRAMS) $(MANS) +all-am: Makefile $(PROGRAMS) installdirs: - $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir) + $(mkinstalldirs) $(DESTDIR)$(bindir) install: install-am install-exec: install-exec-am install-data: install-data-am @@ -558,13 +507,13 @@ info: info-am info-am: -install-data-am: install-man +install-data-am: install-exec-am: install-binPROGRAMS install-info: install-info-am -install-man: install-man1 +install-man: installcheck-am: @@ -586,9 +535,7 @@ ps: ps-am ps-am: -uninstall-am: uninstall-binPROGRAMS uninstall-info-am uninstall-man - -uninstall-man: uninstall-man1 +uninstall-am: uninstall-binPROGRAMS uninstall-info-am .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ clean-generic clean-libtool clean-noinstPROGRAMS ctags \ @@ -596,12 +543,11 @@ uninstall-man: uninstall-man1 distclean-tags distdir dvi dvi-am info info-am install \ install-am install-binPROGRAMS install-data install-data-am \ install-exec install-exec-am install-info install-info-am \ - install-man install-man1 install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-binPROGRAMS \ - uninstall-info-am uninstall-man uninstall-man1 + install-man install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ + uninstall-am uninstall-binPROGRAMS uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/python/aubiocut b/python/aubiocut index 418f6281..79e94b6f 100755 --- a/python/aubiocut +++ b/python/aubiocut @@ -7,7 +7,7 @@ from aubio.aubioclass import * import sys -bufsize = 512 +bufsize = 1024 hopsize = bufsize/2 def getonsets(filein,threshold): @@ -33,10 +33,7 @@ def getonsets(filein,threshold): while ovalist[i-1] < ovalist[i] and i > 0: i -= 1 now = (frameread+1-i)*hopsize/(srate+0.) - #del fileo - #fileo = sndfile("%s%f%s" % ("/tmp/",now,filein[-4:]),model=filei) mylist.append(now) - #writesize = fileo.write(readsize,myoldvec) frameread += 1 return mylist