diff --git a/externals/Makefile b/externals/Makefile index 1eb1312d04479429483a2ae7f10e8ead571e2509..70dcd0f62493c162e01911386c20a37c3cfebb15 100644 --- a/externals/Makefile +++ b/externals/Makefile @@ -128,7 +128,7 @@ CXXFLAGS = $(CFLAGS) # # WARNING! this MUST be all on one line because the automatic package # building scripts rely on it being that way. -LIB_TARGETS = adaptive arraysize bassemu boids bsaylor comport creb cxc cyclone earplug ekext ext13 fftease freeverb ggee hcs iem_ambi iem_bin_ambi iemlib iemgui iemguts iem_adaptfilt iemmatrix iemxmlrpc iem_delay iem_roomsim iem_spec2 iem_tab jasch_lib loaders-hexloader loaders-libdir lyonpotpourri mapping markex maxlib mjlib moocow moonlib motex mrpeach oscx pan pdcontainer pddp pdogg plugin pmpd sigpack smlib tof unauthorized vbap windowing zexy flext +LIB_TARGETS = adaptive arraysize autotune bassemu boids bsaylor comport creb cxc cyclone earplug ekext ext13 fftease freeverb ggee hcs iem_ambi iem_bin_ambi iemlib iemgui iemguts iem_adaptfilt iemmatrix iemxmlrpc iem_delay iem_roomsim iem_spec2 iem_tab jasch_lib loaders-hexloader loaders-libdir lyonpotpourri mapping markex maxlib mjlib moocow moonlib motex mrpeach oscx pan pdcontainer pddp pdogg plugin pmpd sigpack smlib tof unauthorized vbap windowing zexy flext # DISABLED: flatgui @@ -305,6 +305,19 @@ apple_install: apple_clean: make -C $(externals_src)/apple clean +#------------------------------------------------------------------------------# +# AUTOTUNE +autotune: + make -C $(externals_src)/autotune PD_PATH=$(pd_src) CFLAGS="$(CFLAGS)" + +autotune_install: + make -C $(externals_src)/autotune DESTDIR="$(DESTDIR)" \ + objectsdir="$(objectsdir)" install + install -p $(externals_src)/autotune/autotune_scale_warp.png \ + $(DESTDIR)/$(objectsdir)/images + +autotune_clean: + make -C $(externals_src)/autotune clean #------------------------------------------------------------------------------# # ARRAYSIZE diff --git a/externals/autotune/LICENSE.txt b/externals/autotune/LICENSE.txt new file mode 100644 index 0000000000000000000000000000000000000000..118c0f6adb28943c75323e0a42dc2a775814e2fd --- /dev/null +++ b/externals/autotune/LICENSE.txt @@ -0,0 +1,13 @@ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. diff --git a/l2ork_addons/autotune/Makefile b/externals/autotune/Makefile similarity index 100% rename from l2ork_addons/autotune/Makefile rename to externals/autotune/Makefile diff --git a/externals/autotune/README.txt b/externals/autotune/README.txt new file mode 100644 index 0000000000000000000000000000000000000000..d79e24368ba1cf0e216caf55d187e8bcb5213775 --- /dev/null +++ b/externals/autotune/README.txt @@ -0,0 +1,19 @@ +An auto-tuning PD External, based on +autotalent an auto-tuning LADSPA plugin and an older port by Maxus Germanus + +Free software by Thomas A. Baran. +http://web.mit.edu/tbaran/www/autotune.html +VERSION 0.2 + +Ivica Ico Bukvic <ico.bukvic.net> +VERSION 0.9.1 +changes: + *added ability to specify FFT size + *added ability to specify hop (window) size--requires further refinement + to allow for more nimble pitch readjustment + *added pull 2 value where pitch pull is relative to the closest pitch + *circumvented segfaults due to NANs--may require a better fix + +VERSION 0.9 +changes: + *compatible with the latest version of autotalent diff --git a/l2ork_addons/autotune/autotune_scale_warp.png b/externals/autotune/autotune_scale_warp.png similarity index 100% rename from l2ork_addons/autotune/autotune_scale_warp.png rename to externals/autotune/autotune_scale_warp.png diff --git a/l2ork_addons/autotune/autotune~-help.pd b/externals/autotune/autotune~-help.pd similarity index 100% rename from l2ork_addons/autotune/autotune~-help.pd rename to externals/autotune/autotune~-help.pd diff --git a/externals/autotune/autotune~-meta.pd b/externals/autotune/autotune~-meta.pd new file mode 100644 index 0000000000000000000000000000000000000000..af65af4ace5243963f70fa67d0023712e884a10b --- /dev/null +++ b/externals/autotune/autotune~-meta.pd @@ -0,0 +1,8 @@ +#N canvas 671 360 200 200 10; +#N canvas 603 108 420 300 META 1; +#X text 10 25 AUTHOR Thomas A. Baran; +#X text 10 10 VERSION 0.9.1; +#X text 10 80 LICENSE GPL v2+; +#X text 10 42 NAME autotune; +#X text 10 62 DESCRIPTION an autotuning PD external; +#X restore 10 10 pd META; diff --git a/l2ork_addons/autotune/autotune~.c b/externals/autotune/autotune~.c similarity index 92% rename from l2ork_addons/autotune/autotune~.c rename to externals/autotune/autotune~.c index 506b883edab1ac284490bd6536a54cdf4a3372a4..71dc9343e037182561ea9041389821401f74b9fd 100644 --- a/l2ork_addons/autotune/autotune~.c +++ b/externals/autotune/autotune~.c @@ -1,41 +1,3 @@ -/* - autotune.c - - An auto-tuning PD External, based on - autotalent an auto-tuning LADSPA plugin and an older port by Maxus Germanus - - Free software by Thomas A. Baran. - http://web.mit.edu/tbaran/www/autotune.html - VERSION 0.2 - - Ivica Ico Bukvic <ico.bukvic.net> - VERSION 0.9.1 - changes: - *added ability to specify FFT size - *added ability to specify hop (window) size--requires further refinement - to allow for more nimble pitch readjustment - *added pull 2 value where pitch pull is relative to the closest pitch - *circumvented segfaults due to NANs--may require a better fix - - VERSION 0.9 - changes: - *compatible with the latest version of autotalent - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - #include <stdlib.h> #include <stdio.h> #include <math.h> diff --git a/l2ork_addons/tar_em_up.sh b/l2ork_addons/tar_em_up.sh index b717a093d95e2bdd896aefadaee4aef92527bc6d..2dab71f8e6491dcd1d741ac9ef148f3f8e2ab6a8 100755 --- a/l2ork_addons/tar_em_up.sh +++ b/l2ork_addons/tar_em_up.sh @@ -337,13 +337,6 @@ then cp -rf lib ../../packages/linux_make/build$inst_dir/lib/pd-l2ork/extra cp -rf scores ../../packages/linux_make/build$inst_dir/lib/pd-l2ork/extra cd ../ - # install autotune~ plugin - cd autotune/ - make - cp -f autotune~.pd_linux ../../packages/linux_make/build$inst_dir/lib/pd-l2ork/extra - cp -f autotune~-help.pd ../../packages/linux_make/build$inst_dir/lib/pd-l2ork/extra - cp -f autotune_scale_warp.png ../../packages/linux_make/build$inst_dir/lib/pd-l2ork/extra/images - cd ../ echo "done with l2ork addons." cd ../ # finish install