[SCM] calf/master: + Monosynth: uses default <align> parameters to reduce xml size + Monosynth: allowed fine adjustment of key follow (not just on/off)
js at users.alioth.debian.org
js at users.alioth.debian.org
Tue May 7 15:36:51 UTC 2013
The following commit has been merged in the master branch:
commit 7d7ae77d709450035504a03496d70b2ef7769d2f
Author: kfoltman <kfoltman at 78b06b96-2940-0410-b7fc-879d825d01d8>
Date: Sat Dec 29 20:49:56 2007 +0000
+ Monosynth: uses default <align> parameters to reduce xml size
+ Monosynth: allowed fine adjustment of key follow (not just on/off)
git-svn-id: https://calf.svn.sourceforge.net/svnroot/calf/trunk@57 78b06b96-2940-0410-b7fc-879d825d01d8
diff --git a/src/monosynth.cpp b/src/monosynth.cpp
index d1a8c2b..ac7f7c2 100644
--- a/src/monosynth.cpp
+++ b/src/monosynth.cpp
@@ -73,9 +73,9 @@ static const char *monosynth_gui_xml =
"<hbox>"
"<vbox>"
" <label param=\"o12_detune\" />"
- " <align align-x=\"0.5\" align-y=\"0.5\"><knob param=\"o12_detune\" expand=\"0\" fill=\"0\"/></align><value param=\"o12_detune\"/>"
+ " <align><knob param=\"o12_detune\" expand=\"0\" fill=\"0\"/></align><value param=\"o12_detune\"/>"
"</vbox>"
- "<align align-x=\"0.5\" align-y=\"0.5\">"
+ "<align>"
" <vbox>"
" <label param=\"phase_mode\" />"
" <combo param=\"phase_mode\"/>"
@@ -83,14 +83,14 @@ static const char *monosynth_gui_xml =
"</align>"
"<vbox>"
" <label param=\"o2_xpose\" />"
- " <align align-x=\"0.5\" align-y=\"0.5\"><knob type=\"1\" param=\"o2_xpose\" expand=\"0\" fill=\"0\"/></align><value param=\"o2_xpose\"/>"
+ " <align><knob type=\"1\" param=\"o2_xpose\" expand=\"0\" fill=\"0\"/></align><value param=\"o2_xpose\"/>"
"</vbox>"
"</hbox>"
"</vbox>"
"</frame>"
"<frame label=\"Filter\">"
"<vbox border=\"10\">"
- "<align align-x=\"0.5\" align-y=\"0.5\">"
+ "<align>"
"<hbox>"
"<label param=\"filter\" /><combo param=\"filter\" />"
"<line-graph param=\"filter\" refresh=\"1\" width=\"80\" height=\"60\"/>"
@@ -99,15 +99,15 @@ static const char *monosynth_gui_xml =
"<hbox>"
"<vbox>"
" <label param=\"cutoff\" />"
- " <align align-x=\"0.5\" align-y=\"0.5\"><knob param=\"cutoff\" expand=\"0\" fill=\"0\"/></align><value param=\"cutoff\"/>"
+ " <align><knob param=\"cutoff\" expand=\"0\" fill=\"0\"/></align><value param=\"cutoff\"/>"
"</vbox>"
"<vbox>"
" <label param=\"res\" />"
- " <align align-x=\"0.5\" align-y=\"0.5\"><knob param=\"res\" expand=\"0\" fill=\"0\"/></align><value param=\"res\"/>"
+ " <align><knob param=\"res\" expand=\"0\" fill=\"0\"/></align><value param=\"res\"/>"
"</vbox>"
"<vbox>"
" <label param=\"filter_sep\" />"
- " <align align-x=\"0.5\" align-y=\"0.5\"><knob type=\"1\" param=\"filter_sep\" expand=\"0\" fill=\"0\"/></align><value param=\"filter_sep\"/>"
+ " <align><knob type=\"1\" param=\"filter_sep\" expand=\"0\" fill=\"0\"/></align><value param=\"filter_sep\"/>"
"</vbox>"
"</hbox>"
"</vbox>"
@@ -119,33 +119,33 @@ static const char *monosynth_gui_xml =
"<hbox>"
"<vbox>"
" <label param=\"adsr_a\" />"
- " <align align-x=\"0.5\" align-y=\"0.5\"><knob param=\"adsr_a\" expand=\"0\" fill=\"0\"/></align><value param=\"adsr_a\"/>"
+ " <align><knob param=\"adsr_a\" expand=\"0\" fill=\"0\"/></align><value param=\"adsr_a\"/>"
"</vbox>"
"<vbox>"
" <label param=\"adsr_d\" />"
- " <align align-x=\"0.5\" align-y=\"0.5\"><knob param=\"adsr_d\" expand=\"0\" fill=\"0\"/></align><value param=\"adsr_d\"/>"
+ " <align><knob param=\"adsr_d\" expand=\"0\" fill=\"0\"/></align><value param=\"adsr_d\"/>"
"</vbox>"
"<vbox>"
" <label param=\"adsr_s\" />"
- " <align align-x=\"0.5\" align-y=\"0.5\"><knob param=\"adsr_s\" expand=\"0\" fill=\"0\"/></align><value param=\"adsr_s\"/>"
+ " <align><knob param=\"adsr_s\" expand=\"0\" fill=\"0\"/></align><value param=\"adsr_s\"/>"
"</vbox>"
"<vbox>"
" <label param=\"adsr_r\" />"
- " <align align-x=\"0.5\" align-y=\"0.5\"><knob param=\"adsr_r\" expand=\"0\" fill=\"0\"/></align><value param=\"adsr_r\"/>"
+ " <align><knob param=\"adsr_r\" expand=\"0\" fill=\"0\"/></align><value param=\"adsr_r\"/>"
"</vbox>"
"</hbox>"
"<hbox>"
"<vbox>"
" <label param=\"env2cutoff\" />"
- " <align align-x=\"0.5\" align-y=\"0.5\"><knob type=\"1\" param=\"env2cutoff\" expand=\"0\" fill=\"0\"/></align><value param=\"env2cutoff\"/>"
+ " <align><knob type=\"1\" param=\"env2cutoff\" expand=\"0\" fill=\"0\"/></align><value param=\"env2cutoff\"/>"
"</vbox>"
"<vbox>"
" <label param=\"env2res\" />"
- " <align align-x=\"0.5\" align-y=\"0.5\"><knob param=\"env2res\" expand=\"0\" fill=\"0\"/></align><value param=\"env2res\"/>"
+ " <align><knob param=\"env2res\" expand=\"0\" fill=\"0\"/></align><value param=\"env2res\"/>"
"</vbox>"
"<vbox>"
" <label param=\"env2amp\" />"
- " <align align-x=\"0.5\" align-y=\"0.5\"><knob param=\"env2amp\" expand=\"0\" fill=\"0\"/></align><value param=\"env2amp\"/>"
+ " <align><knob param=\"env2amp\" expand=\"0\" fill=\"0\"/></align><value param=\"env2amp\"/>"
"</vbox>"
"</hbox>"
"</vbox>"
@@ -155,7 +155,8 @@ static const char *monosynth_gui_xml =
"<hbox>"
"<vbox>"
"<label param=\"key_follow\" />"
- "<align align-x=\"0.5\" align-y=\"0.5\"><toggle param=\"key_follow\" /></align>"
+ "<align><knob param=\"key_follow\" /></align>"
+ "<value param=\"key_follow\" />"
"</vbox>"
"<vbox>"
"<label param=\"legato\" expand=\"0\"/>"
@@ -165,15 +166,15 @@ static const char *monosynth_gui_xml =
"<hbox>"
"<vbox>"
" <label param=\"portamento\" />"
- " <align align-x=\"0.5\" align-y=\"0.5\"><knob param=\"portamento\" /></align><value param=\"portamento\"/>"
+ " <align><knob param=\"portamento\" /></align><value param=\"portamento\"/>"
"</vbox>"
"<vbox>"
" <label param=\"vel2filter\" />"
- " <align align-x=\"0.5\" align-y=\"0.5\"><knob param=\"vel2filter\" /></align><value param=\"vel2filter\"/>"
+ " <align><knob param=\"vel2filter\" /></align><value param=\"vel2filter\"/>"
"</vbox>"
"<vbox>"
" <label param=\"vel2amp\" />"
- " <align align-x=\"0.5\" align-y=\"0.5\"><knob param=\"vel2amp\" /></align><value param=\"vel2amp\"/>"
+ " <align><knob param=\"vel2amp\" /></align><value param=\"vel2amp\"/>"
"</vbox>"
"</hbox>"
"</vbox>"
@@ -201,7 +202,7 @@ parameter_properties monosynth_audio_module::param_props[] = {
{ 0.5, 0, 1, 1.01, PF_FLOAT | PF_SCALE_PERC, NULL, "adsr_s", "Sustain" },
{ 50, 10,20000, 1.01, PF_FLOAT | PF_SCALE_LOG | PF_CTL_KNOB | PF_UNIT_MSEC, NULL, "adsr_r", "Release" },
- { 0, 0, 1, 1.01, PF_BOOL | PF_CTL_TOGGLE, NULL, "key_follow", "Key Follow" },
+ { 0, 0, 2, 1.01, PF_FLOAT | PF_SCALE_PERC, NULL, "key_follow", "Key Follow" },
{ 0, 0, 3, 1.01, PF_ENUM | PF_CTL_COMBO, monosynth_legato_names, "legato", "Legato Mode" },
{ 1, 1, 2000, 1.01, PF_FLOAT | PF_SCALE_LOG | PF_CTL_KNOB | PF_UNIT_MSEC, NULL, "portamento", "Portamento" },
@@ -470,8 +471,8 @@ void monosynth_audio_module::calculate_step()
envelope.advance();
float env = envelope.value;
cutoff = *params[par_cutoff] * pow(2.0f, env * fltctl * *params[par_envmod] * (1.f / 1200.f));
- if (*params[par_keyfollow] >= 0.5f)
- cutoff *= freq / 264.0f;
+ if (*params[par_keyfollow] > 0.01f)
+ cutoff *= pow(freq / 264.f, *params[par_keyfollow]);
cutoff = dsp::clip(cutoff , 10.f, 18000.f);
float resonance = *params[par_resonance];
float e2r = *params[par_envtores];
--
calf audio plugins packaging
More information about the pkg-multimedia-commits
mailing list