[SCM] calf/master: Merge branch 'master' into filterclavier
js at users.alioth.debian.org
js at users.alioth.debian.org
Tue May 7 15:39:02 UTC 2013
+ DSSI: do not set run_synth callback if the plugin doesn't handle MIDI
+ MultiChorus: clean up the GUI
+ Organ: unbreak graph for DSSI
+ DSSI: redraw parameter graphs on parameter changes
+ Monosynth: partially unbreak live graphs
+ DSSI: marshal cairo_iface as well
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: d6a3c1a63a147948535a50da009275278ad5e6a3
X-Git-Newrev: 34569260c452f0fa4c543155ebba174a42a343dc
The following commit has been merged in the master branch:
commit ddc81d4f4e1ee61c3161d58fdef6e4a9c4463618
Merge: 204942536a31849fea58b92e173b56735c27bfa3 4a57cf4a92beaddb11b03936ce3be43971593b8e
Author: Hans Baier <hansfbaier at googlemail.com>
Date: Fri Jan 23 10:20:56 2009 +0700
Merge branch 'master' into filterclavier
diff --combined src/modules.cpp
index 0c9642f,5acb432..df9e993
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@@ -26,7 -26,6 +26,7 @@@
#endif
#include <calf/giface.h>
#include <calf/metadata.h>
+#include <calf/audio_fx.h>
using namespace dsp;
using namespace calf_plugins;
@@@ -99,18 -98,12 +99,18 @@@ const char *filter_choices[] =
"12dB/oct Highpass",
"24dB/oct Highpass",
"36dB/oct Highpass",
+ "6dB/oct Bandpass",
+ "12dB/oct Bandpass",
+ "18dB/oct Bandpass",
};
CALF_PORT_PROPS(filter) = {
{ 2000, 10,20000, 0, PF_FLOAT | PF_SCALE_LOG | PF_CTL_KNOB | PF_UNIT_HZ | PF_PROP_GRAPH, NULL, "freq", "Frequency" },
{ 0.707, 0.707, 32, 0, PF_FLOAT | PF_SCALE_GAIN | PF_CTL_KNOB | PF_UNIT_COEF, NULL, "res", "Resonance" },
- { 0, 0, 5, 1, PF_ENUM | PF_CTL_COMBO, filter_choices, "mode", "Mode" },
+ { biquad_filter_module::mode_12db_lp,
+ biquad_filter_module::mode_12db_lp,
+ biquad_filter_module::mode_count - 1,
+ 1, PF_ENUM | PF_CTL_COMBO, filter_choices, "mode", "Mode" },
{ 20, 5, 100, 20, PF_FLOAT | PF_SCALE_LOG | PF_CTL_KNOB | PF_UNIT_MSEC, NULL, "inertia", "Inertia"},
};
@@@ -118,23 -111,6 +118,23 @@@ CALF_PLUGIN_INFO(filter) = { 0x847f, "F
////////////////////////////////////////////////////////////////////////////
+#if ENABLE_EXPERIMENTAL
+CALF_PORT_NAMES(filterclavier) = {"In L", "In R", "Out L", "Out R"};
+
+CALF_PORT_PROPS(filterclavier) = {
+ { 0, -48, 48, 48*2+1, PF_INT | PF_SCALE_LINEAR | PF_CTL_KNOB | PF_UNIT_SEMITONES, NULL, "transpose", "Transpose" },
+ { 0, -100, 100, 0, PF_INT | PF_SCALE_LINEAR | PF_CTL_KNOB | PF_UNIT_CENTS, NULL, "detune", "Detune" },
+ { biquad_filter_module::mode_6db_bp,
+ biquad_filter_module::mode_12db_lp,
+ biquad_filter_module::mode_count - 1,
+ 1, PF_ENUM | PF_CTL_COMBO, filter_choices, "mode", "Mode" },
+ { 20, 1, 2000, 20, PF_FLOAT | PF_SCALE_LOG | PF_CTL_KNOB | PF_UNIT_MSEC, NULL, "inertia", "Portamento time"}
+};
+
+CALF_PLUGIN_INFO(filterclavier) = { 0x849f, "Filterclavier", "Calf Filterclavier", "Krzysztof Foltman / Hans Baier", calf_plugins::calf_copyright_info, "FilterclavierPlugin" };
+#endif
+////////////////////////////////////////////////////////////////////////////
+
CALF_PORT_NAMES(vintage_delay) = {"In L", "In R", "Out L", "Out R"};
const char *vintage_delay_mixmodes[] = {
@@@ -251,13 -227,13 +251,13 @@@ const char *monosynth_filter_choices[]
CALF_PLUGIN_INFO(monosynth) = { 0x8480, "Monosynth", "Calf Monosynth", "Krzysztof Foltman", calf_plugins::calf_copyright_info, "SynthesizerPlugin" };
CALF_PORT_PROPS(monosynth) = {
- { monosynth_metadata::wave_saw, 0, monosynth_metadata::wave_count - 1, 1, PF_ENUM | PF_CTL_COMBO, monosynth_waveform_names, "o1_wave", "Osc1 Wave" },
- { monosynth_metadata::wave_sqr, 0, monosynth_metadata::wave_count - 1, 1, PF_ENUM | PF_CTL_COMBO, monosynth_waveform_names, "o2_wave", "Osc2 Wave" },
+ { monosynth_metadata::wave_saw, 0, monosynth_metadata::wave_count - 1, 1, PF_ENUM | PF_CTL_COMBO | PF_PROP_GRAPH, monosynth_waveform_names, "o1_wave", "Osc1 Wave" },
+ { monosynth_metadata::wave_sqr, 0, monosynth_metadata::wave_count - 1, 1, PF_ENUM | PF_CTL_COMBO | PF_PROP_GRAPH, monosynth_waveform_names, "o2_wave", "Osc2 Wave" },
{ 10, 0, 100, 0, PF_FLOAT | PF_SCALE_LINEAR | PF_CTL_KNOB | PF_UNIT_CENTS, NULL, "o12_detune", "O1<>2 Detune" },
{ 12, -24, 24, 0, PF_INT | PF_SCALE_LINEAR | PF_CTL_KNOB | PF_UNIT_SEMITONES, NULL, "o2_xpose", "Osc 2 transpose" },
{ 0, 0, 5, 0, PF_ENUM | PF_CTL_COMBO, monosynth_mode_names, "phase_mode", "Phase mode" },
{ 0.5, 0, 1, 0, PF_FLOAT | PF_SCALE_PERC, NULL, "o12_mix", "O1<>2 Mix" },
- { 1, 0, 7, 0, PF_ENUM | PF_CTL_COMBO, monosynth_filter_choices, "filter", "Filter" },
+ { 1, 0, 7, 0, PF_ENUM | PF_CTL_COMBO | PF_PROP_GRAPH, monosynth_filter_choices, "filter", "Filter" },
{ 33, 10,16000, 0, PF_FLOAT | PF_SCALE_LOG | PF_CTL_KNOB | PF_UNIT_HZ, NULL, "cutoff", "Cutoff" },
{ 2, 0.7, 8, 0, PF_FLOAT | PF_SCALE_LOG | PF_CTL_KNOB, NULL, "res", "Resonance" },
{ 0, -2400, 2400, 0, PF_FLOAT | PF_SCALE_LINEAR | PF_CTL_KNOB | PF_UNIT_CENTS, NULL, "filter_sep", "Separation" },
@@@ -412,7 -388,7 +412,7 @@@ CALF_PORT_PROPS(organ) =
{ 90, 0,360, 361, PF_FLOAT | PF_SCALE_LINEAR | PF_CTL_KNOB | PF_UNIT_DEG, NULL, "perc_stereo", "P: Stereo Phase" },
{ 0, 0, 1, 0, PF_BOOL | PF_CTL_TOGGLE, NULL, "filter_chain", "Filter 1 To 2" },
- { 0.1, 0, 1, 100, PF_FLOAT | PF_SCALE_GAIN | PF_CTL_KNOB | PF_PROP_OUTPUT_GAIN, NULL, "master", "Volume" },
+ { 0.1, 0, 1, 100, PF_FLOAT | PF_SCALE_GAIN | PF_CTL_KNOB | PF_PROP_OUTPUT_GAIN | PF_PROP_GRAPH, NULL, "master", "Volume" },
{ 2000, 20, 20000, 100, PF_FLOAT | PF_SCALE_LOG | PF_UNIT_HZ | PF_CTL_KNOB, NULL, "f1_cutoff", "F1 Cutoff" },
{ 2, 0.7, 8, 0, PF_FLOAT | PF_SCALE_LOG | PF_CTL_KNOB, NULL, "f1_res", "F1 Res" },
--
calf audio plugins packaging
More information about the pkg-multimedia-commits
mailing list