[SCM] calf/master: + Organ: new preset, more varied phase values + AutoHell: pre-release fixes and cleanups
js at users.alioth.debian.org
js at users.alioth.debian.org
Tue May 7 15:37:15 UTC 2013
The following commit has been merged in the master branch:
commit b3be2977a6889a4897d091950623e13e665f04dc
Author: kfoltman <kfoltman at 78b06b96-2940-0410-b7fc-879d825d01d8>
Date: Tue May 27 21:47:28 2008 +0000
+ Organ: new preset, more varied phase values
+ AutoHell: pre-release fixes and cleanups
git-svn-id: https://calf.svn.sourceforge.net/svnroot/calf/trunk@188 78b06b96-2940-0410-b7fc-879d825d01d8
diff --git a/configure.ac b/configure.ac
index b2d7ef1..f1d4c2b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.61)
-AC_INIT([calf],[0.0.11],[wdev at foltman.com])
+AC_INIT([calf],[0.0.12],[wdev at foltman.com])
AC_CONFIG_SRCDIR([config.h.in])
AC_CONFIG_HEADER([config.h])
diff --git a/presets.xml b/presets.xml
index ac9231a..52a0aff 100644
--- a/presets.xml
+++ b/presets.xml
@@ -1879,4 +1879,111 @@
<param name="vib_phase" value="180" />
<param name="vib_mode" value="0" />
</preset>
+<preset bank="0" program="0" plugin="organ" name="Mystic Pizzicato">
+ <param name="l1" value="4.04598" />
+ <param name="l2" value="4.04598" />
+ <param name="l3" value="8" />
+ <param name="l4" value="8" />
+ <param name="l5" value="8" />
+ <param name="l6" value="0" />
+ <param name="l7" value="0" />
+ <param name="l8" value="0" />
+ <param name="l9" value="0" />
+ <param name="f1" value="1" />
+ <param name="f2" value="1" />
+ <param name="f3" value="2" />
+ <param name="f4" value="2" />
+ <param name="f5" value="8" />
+ <param name="f6" value="8" />
+ <param name="f7" value="10" />
+ <param name="f8" value="12" />
+ <param name="f9" value="16" />
+ <param name="w1" value="34" />
+ <param name="w2" value="34" />
+ <param name="w3" value="34" />
+ <param name="w4" value="34" />
+ <param name="w5" value="31" />
+ <param name="w6" value="0" />
+ <param name="w7" value="0" />
+ <param name="w8" value="0" />
+ <param name="w9" value="0" />
+ <param name="detune1" value="-12" />
+ <param name="detune2" value="14" />
+ <param name="detune3" value="-8" />
+ <param name="detune4" value="8" />
+ <param name="detune5" value="0.5" />
+ <param name="detune6" value="0" />
+ <param name="detune7" value="0" />
+ <param name="detune8" value="0" />
+ <param name="detune9" value="0" />
+ <param name="phase1" value="0" />
+ <param name="phase2" value="61.2" />
+ <param name="phase3" value="118.8" />
+ <param name="phase4" value="21.6" />
+ <param name="phase5" value="0" />
+ <param name="phase6" value="0" />
+ <param name="phase7" value="0" />
+ <param name="phase8" value="0" />
+ <param name="phase9" value="0" />
+ <param name="pan1" value="-1" />
+ <param name="pan2" value="1" />
+ <param name="pan3" value="-1" />
+ <param name="pan4" value="1" />
+ <param name="pan5" value="0" />
+ <param name="pan6" value="0" />
+ <param name="pan7" value="0" />
+ <param name="pan8" value="0" />
+ <param name="pan9" value="0" />
+ <param name="routing1" value="1" />
+ <param name="routing2" value="1" />
+ <param name="routing3" value="0" />
+ <param name="routing4" value="0" />
+ <param name="routing5" value="2" />
+ <param name="routing6" value="0" />
+ <param name="routing7" value="0" />
+ <param name="routing8" value="0" />
+ <param name="routing9" value="0" />
+ <param name="foldnote" value="96" />
+ <param name="perc_decay" value="200" />
+ <param name="perc_level" value="0" />
+ <param name="perc_timbre" value="2" />
+ <param name="perc_trigger" value="0" />
+ <param name="filter_chain" value="0" />
+ <param name="master" value="0.535887" />
+ <param name="f1_cutoff" value="135.217" />
+ <param name="f1_res" value="0.7" />
+ <param name="f1_env1" value="9944" />
+ <param name="f1_env2" value="0" />
+ <param name="f1_env3" value="0" />
+ <param name="f1_keyf" value="1" />
+ <param name="f2_cutoff" value="170.228" />
+ <param name="f2_res" value="0.7" />
+ <param name="f2_env1" value="0" />
+ <param name="f2_env2" value="10800" />
+ <param name="f2_env3" value="0" />
+ <param name="f2_keyf" value="1.2" />
+ <param name="adsr_a" value="1" />
+ <param name="adsr_d" value="350" />
+ <param name="adsr_s" value="0.42" />
+ <param name="adsr_r" value="488.966" />
+ <param name="adsr_v" value="0" />
+ <param name="eg1_amp_ctl" value="4" />
+ <param name="adsr2_a" value="1" />
+ <param name="adsr2_d" value="1600.57" />
+ <param name="adsr2_s" value="0" />
+ <param name="adsr2_r" value="50" />
+ <param name="adsr2_v" value="0" />
+ <param name="eg2_amp_ctl" value="3" />
+ <param name="adsr3_a" value="1" />
+ <param name="adsr3_d" value="350" />
+ <param name="adsr3_s" value="0.5" />
+ <param name="adsr3_r" value="50" />
+ <param name="adsr3_v" value="0" />
+ <param name="eg3_amp_ctl" value="0" />
+ <param name="vib_rate" value="0.999758" />
+ <param name="vib_amt" value="0.5" />
+ <param name="vib_wet" value="0.5" />
+ <param name="vib_phase" value="180" />
+ <param name="vib_mode" value="4" />
+</preset>
</presets>
diff --git a/src/Makefile.am b/src/Makefile.am
index 2750673..6fdd26c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -102,7 +102,7 @@ if USE_LV2_GUI
rm -f $(DESTDIR)$(with_lv2_dir)/calf.lv2/calflv2gui.so
endif
rm -f $(DESTDIR)$(with_lv2_dir)/calf.lv2/calf.so
- rm -f $(DESTDIR)$(with_lv2_dir)/calf.lv2/calf.ttl $(DESTDIR)$(with_lv2_dir)/calf.lv2/manifest.ttl
+ rm -f $(DESTDIR)$(with_lv2_dir)/calf.lv2/{Filter,Flanger,Reverb,Monosynth,VintageDelay,Organ,RotarySpeaker,Phaser,manifest}.ttl
rmdir -p $(DESTDIR)$(with_lv2_dir)/calf.lv2 || true
endif
if USE_JACK
diff --git a/src/calf/Makefile.am b/src/calf/Makefile.am
index c61586f..76c4482 100644
--- a/src/calf/Makefile.am
+++ b/src/calf/Makefile.am
@@ -2,7 +2,7 @@ calfdir = $(includedir)/calf
calf_HEADERS = audio_fx.h benchmark.h biquad.h buffer.h custom_ctl.h \
delay.h fft.h fixed_point.h giface.h gui.h inertia.h \
- jackhost.h lv2_event.h lv2_uri_map.h lv2-midiport.h lv2wrap.h \
- modules.h modules_dev.h modules_synths.h \
- onepole.h organ.h osc.h osctl.h preset.h preset_gui.h primitives.h \
- synth.h wave.h
+ jackhost.h lv2_event.h lv2_ui.h lv2_uri_map.h lv2-midiport.h lv2wrap.h \
+ main_win.h modules.h modules_dev.h modules_synths.h \
+ onepole.h organ.h osc.h osctl.h osctlnet.h preset.h preset_gui.h primitives.h \
+ synth.h utils.h wave.h
diff --git a/src/modules.cpp b/src/modules.cpp
index 6f0e1ec..c38b740 100644
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -80,7 +80,7 @@ parameter_properties phaser_audio_module::param_props[] = {
{ 1, 0, 2, 0, PF_FLOAT | PF_SCALE_GAIN | PF_CTL_KNOB | PF_UNIT_COEF, NULL, "amount", "Amount" },
};
-static synth::ladspa_info phaser_info = { 0x847d, "phaser", "Calf Phaser", "Krzysztof Foltman", copyright, "PhaserPlugin" };
+static synth::ladspa_info phaser_info = { 0x847d, "Phaser", "Calf Phaser", "Krzysztof Foltman", copyright, "PhaserPlugin" };
ALL_WRAPPERS(phaser)
diff --git a/src/organ.cpp b/src/organ.cpp
index bea0a2e..d347625 100644
--- a/src/organ.cpp
+++ b/src/organ.cpp
@@ -565,7 +565,7 @@ static void padsynth(bandlimiter<ORGAN_WAVE_BITS> blSrc, bandlimiter<ORGAN_BIG_W
}
}
for (int i = 1; i <= ORGAN_BIG_WAVE_SIZE / 2; i++) {
- float phase = M_PI * 2 * (rand() & 127) / 128;
+ float phase = M_PI * 2 * (rand() & 255) / 256;
complex<float> shift = complex<float>(cos(phase), sin(phase));
blDest.spectrum[i] *= shift;
// printf("@%d = %f\n", i, abs(blDest.spectrum[i]));
--
calf audio plugins packaging
More information about the pkg-multimedia-commits
mailing list