From 103dfea0df21cb7e6b6f8bae25366fa9243dbd43 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Fri, 3 Sep 2010 19:14:46 +0000 Subject: sorted out sample files, help patches and example files so they work as they should svn path=/trunk/externals/ekext/; revision=13960 --- Makefile | 4 +- beauty.wav | Bin 177644 -> 0 bytes drummach.wav | Bin 211724 -> 0 bytes examples/beauty.wav | Bin 0 -> 177644 bytes examples/drummach.wav | Bin 0 -> 211724 bytes examples/lpc-cross-synthesis.pd | 96 +++++++++++++++++++++------------------- examples/stink.wav | Bin 0 -> 213234 bytes stink.wav | Bin 213234 -> 0 bytes voicing_detector~-help.pd | 56 ++++++++++++----------- weightonset-help.pd | 2 +- 10 files changed, 82 insertions(+), 76 deletions(-) delete mode 100644 beauty.wav delete mode 100644 drummach.wav create mode 100644 examples/beauty.wav create mode 100644 examples/drummach.wav create mode 100755 examples/stink.wav delete mode 100755 stink.wav diff --git a/Makefile b/Makefile index 4c87183..17cd966 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ SOURCES = cup.c cupd.c doubledelta.c framescore~.c framespect~.c hasc~.c hssc~.c PDOBJECTS = count.pd # example patches and related files, in the 'examples' subfolder -EXAMPLES = lpc-cross-synthesis.pd peakit-listmoses.pd +EXAMPLES = lpc-cross-synthesis.pd peakit-listmoses.pd beauty.wav drummach.wav stink.wav # manuals and related files, in the 'manual' subfolder MANUAL = @@ -21,7 +21,7 @@ MANUAL = # list them here. This can be anything from header files, test patches, # documentation, etc. README.txt and LICENSE.txt are required and therefore # automatically included -EXTRA_DIST = peakit~_license.txt voicing_detector~test3-help.pd maskxor-test.pd beauty.wav drummach.wav stink.wav +EXTRA_DIST = peakit~_license.txt voicing_detector~test3-help.pd maskxor-test.pd diff --git a/beauty.wav b/beauty.wav deleted file mode 100644 index 689b25c..0000000 Binary files a/beauty.wav and /dev/null differ diff --git a/drummach.wav b/drummach.wav deleted file mode 100644 index cf8cd55..0000000 Binary files a/drummach.wav and /dev/null differ diff --git a/examples/beauty.wav b/examples/beauty.wav new file mode 100644 index 0000000..689b25c Binary files /dev/null and b/examples/beauty.wav differ diff --git a/examples/drummach.wav b/examples/drummach.wav new file mode 100644 index 0000000..cf8cd55 Binary files /dev/null and b/examples/drummach.wav differ diff --git a/examples/lpc-cross-synthesis.pd b/examples/lpc-cross-synthesis.pd index e49ea4a..9d17130 100644 --- a/examples/lpc-cross-synthesis.pd +++ b/examples/lpc-cross-synthesis.pd @@ -1,9 +1,9 @@ #N canvas 87 183 604 300 10; #X obj 247 210 hsl 121 15 100 10000 0 1 empty empty filter-f -2 -6 -0 8 -225280 -62784 -90133 3409 1; +0 8 -225280 -62784 -90133 2909 1; #X floatatom 244 225 0 0 0 0 - - -; #X obj 91 218 dac~; -#N canvas 0 0 453 387 lpc-resynth 0; +#N canvas 0 22 453 387 lpc-resynth 0; #X obj 27 199 lpreson~; #X obj 28 244 hip~ 18; #X obj 27 49 inlet~; @@ -61,21 +61,21 @@ #X connect 26 0 6 0; #X connect 27 0 26 1; #X restore 92 184 pd lpc-resynth; -#N canvas 0 0 450 300 graph2 0; -#X array voice 88800 float 0; +#N canvas 0 22 450 300 (subpatch) 0; +#X array \$0-voice 88800 float 0; #X coords 0 1 88799 -1 100 70 1; #X restore 358 49 graph; -#N canvas 0 0 450 300 graph2 0; -#X array sample 105840 float 0; +#N canvas 0 22 450 300 (subpatch) 0; +#X array \$0-sample 105840 float 0; #X coords 0 1 105839 -1 100 70 1; #X restore 358 121 graph; #X obj 75 55 bng 15 250 50 0 empty empty load-voice -38 -6 0 8 -262144 -1 -1; #X obj 111 55 bng 15 250 50 0 empty empty sample -10 -6 0 8 -262144 -1 -1; -#N canvas 0 0 450 300 play 0; -#X obj 82 157 tabplay~ voice; -#X obj 237 157 tabplay~ sample; +#N canvas 0 22 450 300 play 0; +#X obj 82 157 tabplay~ \$0-voice; +#X obj 237 157 tabplay~ \$0-sample; #X obj 291 71 inlet; #X obj 350 71 inlet; #X obj 52 66 inlet; @@ -104,45 +104,49 @@ #X floatatom 195 97 5 1 100 2 order - -; #X obj 210 142 tgl 15 1 empty empty select-excitation -25 -6 0 8 -262144 -1 -1 1 1; -#X obj 52 111 tgl 15 0 empty empty loop 0 -6 0 8 -262144 -1 -1 1 1 +#X obj 52 111 tgl 15 0 empty empty loop 0 -6 0 8 -262144 -1 -1 0 1 ; -#N canvas 0 0 450 300 load 0; -#X obj 77 135 soundfiler; -#X obj 77 169 outlet; -#X obj 161 186 soundfiler; -#X obj 161 220 outlet; -#X msg 161 169 read -resize drummach.wav sample; -#X obj 161 101 loadbang; -#X obj 80 84 openpanel; -#X obj 80 27 inlet; -#X msg 8 101 read -resize \$1 voice; -#X msg 218 152 read -resize \$1 sample; -#X obj 77 152 / 44.1; -#X obj 114 47 samplerate~; -#X obj 114 64 / 1000; -#X obj 218 135 openpanel; -#X obj 218 25 inlet; -#X obj 161 203 / 44.1; -#X msg 77 118 read -resize beauty.wav voice; -#X connect 0 0 10 0; -#X connect 2 0 15 0; -#X connect 4 0 2 0; -#X connect 5 0 16 0; -#X connect 5 0 4 0; +#N canvas 735 155 429 313 load 0; +#X obj 60 236 soundfiler; +#X obj 60 270 outlet; +#X obj 251 240 soundfiler; +#X obj 251 274 outlet; +#X obj 234 87 loadbang; +#X obj 60 84 openpanel; +#X obj 60 7 inlet; +#X obj 60 253 / 44.1; +#X obj 154 47 samplerate~; +#X obj 154 64 / 1000; +#X obj 308 122 openpanel; +#X obj 308 5 inlet; +#X obj 251 257 / 44.1; +#X msg 251 169 symbol drummach.wav; +#X msg 70 173 symbol beauty.wav; +#X obj 60 202 pack symbol \$0; +#X msg 60 219 read -resize \$1 \$2-voice; +#X msg 251 223 read -resize \$1 \$2-sample; +#X obj 251 205 pack symbol \$0; +#X connect 0 0 7 0; +#X connect 2 0 12 0; +#X connect 4 0 14 0; +#X connect 4 0 13 0; +#X connect 5 0 15 0; +#X connect 6 0 5 0; #X connect 6 0 8 0; -#X connect 7 0 6 0; -#X connect 7 0 11 0; -#X connect 8 0 0 0; -#X connect 9 0 2 0; -#X connect 10 0 1 0; -#X connect 11 0 12 0; -#X connect 12 0 10 1; -#X connect 12 0 15 1; -#X connect 13 0 9 0; -#X connect 14 0 13 0; -#X connect 14 0 11 0; -#X connect 15 0 3 0; +#X connect 7 0 1 0; +#X connect 8 0 9 0; +#X connect 9 0 7 1; +#X connect 9 0 12 1; +#X connect 10 0 18 0; +#X connect 11 0 10 0; +#X connect 11 0 8 0; +#X connect 12 0 3 0; +#X connect 13 0 18 0; +#X connect 14 0 15 0; +#X connect 15 0 16 0; #X connect 16 0 0 0; +#X connect 17 0 2 0; +#X connect 18 0 17 0; #X restore 75 70 pd load; #X text 192 70 filter; #X msg 244 80 32; @@ -165,7 +169,7 @@ #X msg 472 52 \; pd dsp \$1; #X obj 472 23 tgl 15 0 empty empty audio_on 0 -6 0 8 -262144 -1 -1 0 1; -#N canvas 0 0 450 300 graph11 0; +#N canvas 0 22 450 300 (subpatch) 0; #X array hanning 1024 float 1; #A 0 0 9.41236e-06 3.76491e-05 8.47091e-05 0.000150591 0.000235291 0.000338808 0.000461136 0.000602272 0.00076221 0.000940944 0.00113847 diff --git a/examples/stink.wav b/examples/stink.wav new file mode 100755 index 0000000..aec9986 Binary files /dev/null and b/examples/stink.wav differ diff --git a/stink.wav b/stink.wav deleted file mode 100755 index aec9986..0000000 Binary files a/stink.wav and /dev/null differ diff --git a/voicing_detector~-help.pd b/voicing_detector~-help.pd index 6faed88..6b863d6 100644 --- a/voicing_detector~-help.pd +++ b/voicing_detector~-help.pd @@ -1,4 +1,4 @@ -#N canvas 0 0 510 323 10; +#N canvas 109 182 510 323 10; #N canvas 119 189 450 300 voxdetect 0; #X obj 150 156 voicing_detector~; #X obj 150 99 inlet~; @@ -16,53 +16,55 @@ #X restore 96 199 pd voxdetect; #X obj 139 71 bng 15 250 50 0 empty empty load-voice -38 -6 0 8 -262144 -1 -1; -#N canvas 0 0 450 300 play 0; -#X obj 82 157 tabplay~ voice; +#N canvas 0 22 450 300 play 0; #X obj 190 66 inlet; #X obj 53 67 inlet; #X obj 111 66 inlet; #X obj 48 140 metro; #X obj 84 196 outlet~; -#X connect 0 0 5 0; -#X connect 1 0 4 1; -#X connect 2 0 0 0; -#X connect 3 0 4 0; -#X connect 4 0 0 0; +#X obj 82 157 tabplay~ \$0-voice; +#X connect 0 0 3 1; +#X connect 1 0 5 0; +#X connect 2 0 3 0; +#X connect 3 0 5 0; +#X connect 5 0 4 0; #X restore 95 139 pd play; #X obj 95 115 bng 15 250 50 0 empty empty play 0 -6 0 8 -262144 -1 -1; #X obj 117 102 tgl 15 0 empty empty loop 0 -6 0 8 -262144 -1 -1 0 1 ; -#N canvas 0 0 450 300 load 0; -#X obj 77 135 soundfiler; -#X obj 77 169 outlet; -#X obj 161 101 loadbang; +#N canvas 514 22 450 300 load 0; +#X obj 80 196 soundfiler; +#X obj 80 230 outlet; +#X obj 167 91 loadbang; #X obj 80 84 openpanel; #X obj 80 27 inlet; -#X msg 8 101 read -resize \$1 voice; -#X obj 77 152 / 44.1; +#X obj 80 213 / 44.1; #X obj 114 47 samplerate~; #X obj 114 64 / 1000; -#X msg 77 118 read -resize beauty.wav voice; -#X connect 0 0 6 0; -#X connect 2 0 9 0; -#X connect 3 0 5 0; +#X msg 167 108 symbol examples/beauty.wav; +#X msg 80 175 read -resize \$1 \$2-voice; +#X obj 80 152 pack symbol \$0; +#X connect 0 0 5 0; +#X connect 2 0 8 0; +#X connect 3 0 10 0; #X connect 4 0 3 0; -#X connect 4 0 7 0; -#X connect 5 0 0 0; -#X connect 6 0 1 0; -#X connect 7 0 8 0; -#X connect 8 0 6 1; +#X connect 4 0 6 0; +#X connect 5 0 1 0; +#X connect 6 0 7 0; +#X connect 7 0 5 1; +#X connect 8 0 10 0; #X connect 9 0 0 0; +#X connect 10 0 9 0; #X restore 139 86 pd load; -#N canvas 0 0 450 300 graph2 0; -#X array voice 1.31596e+06 float 0; -#X coords 0 1 1.31596e+06 -1 100 70 1; +#N canvas 0 22 450 300 (subpatch) 0; +#X array \$0-voice 88800 float 0; +#X coords 0 1 88799 -1 100 70 1; #X restore 281 55 graph; #X floatatom 96 234 5 0 0 0 - - -; #X obj 166 233 dac~; #X obj 217 44 vsl 15 101 0 100 0 0 empty empty empty 0 -8 0 8 -262144 --1 -1 3700 1; +-1 -1 0 1; #X floatatom 193 168 5 0 0 0 - - -; #X text 79 253 The voicing detector estimates whether a frame of speech is voiced (uses the vocal chords) or unvoiced (does not).; diff --git a/weightonset-help.pd b/weightonset-help.pd index 99985ac..28c43f7 100644 --- a/weightonset-help.pd +++ b/weightonset-help.pd @@ -90,7 +90,7 @@ from the FFT; #X obj 44 5 inlet; #X obj 113 227 s \$0-weightonset; #X obj 243 27 loadbang; -#X msg 119 27 ../sound/stink.wav; +#X msg 119 27 examples/stink.wav; #X connect 0 0 1 0; #X connect 1 0 2 0; #X connect 1 1 5 0; -- cgit v1.2.1