[SCM] calf/master: Clean up the mess from merge.
js at users.alioth.debian.org
js at users.alioth.debian.org
Tue May 7 15:40:09 UTC 2013
The following commit has been merged in the master branch:
commit a1e8f940f4e307f378993fb6183208360ca095fe
Author: Krzysztof <wdev at foltman.com>
Date: Wed May 5 00:06:01 2010 +0100
Clean up the mess from merge.
Remove the old exciter and saturator, remove members that were moved into a
template.
diff --git a/src/calf/metadata.h b/src/calf/metadata.h
index 23f1597..63788fe 100644
--- a/src/calf/metadata.h
+++ b/src/calf/metadata.h
@@ -456,26 +456,6 @@ struct wavetable_metadata: public plugin_metadata<wavetable_metadata>
PLUGIN_NAME_ID_LABEL("wavetable", "wavetable", "Wavetable")
};
-/// Markus's Saturator - metadata
-struct saturator_metadata: public plugin_metadata<saturator_metadata>
-{
- enum { in_count = 2, out_count = 2, ins_optional = 1, outs_optional = 1, support_midi = false, require_midi = false, rt_capable = true };
- enum { param_bypass, param_level_in, param_level_out, param_mix, param_meter_in,
- param_meter_out, param_clip_in, param_clip_out, param_drive, param_blend, param_meter_drive,
- param_lp_pre_freq, param_hp_pre_freq, param_lp_post_freq, param_hp_post_freq,
- param_p_freq, param_p_level, param_p_q, param_count };
- PLUGIN_NAME_ID_LABEL("saturator", "saturator", "Saturator")
-};
-/// Markus's Enhancer - metadata
-struct enhancer_metadata: public plugin_metadata<enhancer_metadata>
-{
- enum { in_count = 2, out_count = 2, ins_optional = 1, outs_optional = 1, support_midi = false, require_midi = false, rt_capable = true };
- enum { param_bypass, param_level_in, param_level_out, param_amount, param_meter_in,
- param_meter_out, param_clip_in, param_clip_out, param_drive, param_blend, param_meter_drive,
- param_freq, param_listen, param_count };
- PLUGIN_NAME_ID_LABEL("enhancer", "enhancer", "Enhancer")
-};
-
};
#endif
diff --git a/src/calf/modules.h b/src/calf/modules.h
index f8a6221..f66d4c2 100644
--- a/src/calf/modules.h
+++ b/src/calf/modules.h
@@ -614,9 +614,6 @@ private:
biquad_d2<float> p[2];
tap_distortion dist[2];
public:
- float *ins[in_count];
- float *outs[out_count];
- float *params[param_count];
uint32_t srate;
bool is_active;
saturator_audio_module();
@@ -655,9 +652,6 @@ private:
biquad_d2<float> lp[2][4];
tap_distortion dist[2];
public:
- float *ins[in_count];
- float *outs[out_count];
- float *params[param_count];
uint32_t srate;
bool is_active;
bassenhancer_audio_module();
diff --git a/src/modules.cpp b/src/modules.cpp
index 9de7d03..e87bbc7 100644
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -964,61 +964,6 @@ CALF_PORT_PROPS(wavetable) = {
////////////////////////////////////////////////////////////////////////////
-CALF_PORT_NAMES(saturator) = {"In L", "In R", "Out L", "Out R"};
-
-CALF_PORT_PROPS(saturator) = {
- { 0, 0, 1, 0, PF_BOOL | PF_CTL_TOGGLE, NULL, "bypass", "Bypass" },
- { 1, 0, 64, 0, PF_FLOAT | PF_SCALE_GAIN | PF_CTL_KNOB | PF_UNIT_COEF | PF_PROP_NOBOUNDS, NULL, "level_in", "Gain" },
- { 1, 0, 64, 0, PF_FLOAT | PF_SCALE_GAIN | PF_CTL_KNOB | PF_UNIT_COEF | PF_PROP_NOBOUNDS, NULL, "level_out", "Master" },
- { 0.5, 0, 1, 0, PF_FLOAT | PF_SCALE_PERC | PF_CTL_KNOB , NULL, "mix", "Mix" },
- { 0, 0, 1, 0, PF_FLOAT | PF_SCALE_GAIN | PF_CTL_METER | PF_CTLO_LABEL | PF_UNIT_DB | PF_PROP_OUTPUT | PF_PROP_OPTIONAL, NULL, "meter_in", "Input" },
- { 0, 0, 1, 0, PF_FLOAT | PF_SCALE_GAIN | PF_CTL_METER | PF_CTLO_LABEL | PF_UNIT_DB | PF_PROP_OUTPUT | PF_PROP_OPTIONAL, NULL, "meter_out", "Output" },
- { 0, 0, 1, 0, PF_FLOAT | PF_CTL_LED | PF_PROP_OUTPUT | PF_PROP_OPTIONAL, NULL, "clip_in", "0dB" },
- { 0, 0, 1, 0, PF_FLOAT | PF_CTL_LED | PF_PROP_OUTPUT | PF_PROP_OPTIONAL, NULL, "clip_out", "0dB" },
-
- { 2, 0.1, 10, 0, PF_FLOAT | PF_SCALE_LINEAR | PF_CTL_KNOB | PF_UNIT_COEF, NULL, "drive", "Drive" },
- { 10, -10, 10, 0, PF_FLOAT | PF_SCALE_LINEAR | PF_CTL_FADER | PF_UNIT_COEF, NULL, "blend", "Blend" },
- { 0, 0, 1, 0, PF_FLOAT | PF_SCALE_GAIN | PF_CTL_METER | PF_CTLO_LABEL | PF_UNIT_DB | PF_PROP_OUTPUT | PF_PROP_OPTIONAL, NULL, "meter_drive", "Drive" },
-
- { 20000, 10, 20000, 0, PF_FLOAT | PF_SCALE_LOG | PF_CTL_KNOB | PF_UNIT_HZ, NULL, "lp_pre_freq", "Lowpass" },
- { 10, 10, 20000, 0, PF_FLOAT | PF_SCALE_LOG | PF_CTL_KNOB | PF_UNIT_HZ, NULL, "hp_pre_freq", "Highpass" },
-
- { 20000, 10, 20000, 0, PF_FLOAT | PF_SCALE_LOG | PF_CTL_KNOB | PF_UNIT_HZ, NULL, "lp_post_freq", "Lowpass" },
- { 10, 10, 20000, 0, PF_FLOAT | PF_SCALE_LOG | PF_CTL_KNOB | PF_UNIT_HZ, NULL, "hp_post_freq", "Highpass" },
-
- { 2000, 80, 8000, 0, PF_FLOAT | PF_SCALE_LOG | PF_CTL_KNOB | PF_UNIT_HZ, NULL, "p_freq", "Tone" },
- { 1, 0.0625, 16, 0, PF_FLOAT | PF_SCALE_GAIN | PF_CTL_KNOB | PF_UNIT_DB, NULL, "p_level", "Amount" },
- { 1, 0.1, 10, 1, PF_FLOAT | PF_SCALE_LOG | PF_CTL_KNOB | PF_UNIT_COEF, NULL, "p_q", "Gradient" },
-};
-
-CALF_PLUGIN_INFO(saturator) = { 0x8519, "Saturator", "Calf Saturator", "Markus Schmidt / Krzysztof Foltman", calf_plugins::calf_copyright_info, "DistortionPlugin" };
-
-////////////////////////////////////////////////////////////////////////////
-
-CALF_PORT_NAMES(enhancer) = {"In L", "In R", "Out L", "Out R"};
-
-CALF_PORT_PROPS(enhancer) = {
- { 0, 0, 1, 0, PF_BOOL | PF_CTL_TOGGLE, NULL, "bypass", "Bypass" },
- { 1, 0, 64, 0, PF_FLOAT | PF_SCALE_GAIN | PF_CTL_KNOB | PF_UNIT_COEF | PF_PROP_NOBOUNDS, NULL, "level_in", "Input" },
- { 1, 0, 64, 0, PF_FLOAT | PF_SCALE_GAIN | PF_CTL_KNOB | PF_UNIT_COEF | PF_PROP_NOBOUNDS, NULL, "level_out", "Output" },
- { 1, 0, 64, 0, PF_FLOAT | PF_SCALE_GAIN | PF_CTL_KNOB | PF_UNIT_DB | PF_PROP_NOBOUNDS, NULL, "amount", "Amount" },
- { 0, 0, 1, 0, PF_FLOAT | PF_SCALE_GAIN | PF_CTL_METER | PF_CTLO_LABEL | PF_UNIT_DB | PF_PROP_OUTPUT | PF_PROP_OPTIONAL, NULL, "meter_in", "Input" },
- { 0, 0, 1, 0, PF_FLOAT | PF_SCALE_GAIN | PF_CTL_METER | PF_CTLO_LABEL | PF_UNIT_DB | PF_PROP_OUTPUT | PF_PROP_OPTIONAL, NULL, "meter_out", "Output" },
- { 0, 0, 1, 0, PF_FLOAT | PF_CTL_LED | PF_PROP_OUTPUT | PF_PROP_OPTIONAL, NULL, "clip_in", "0dB" },
- { 0, 0, 1, 0, PF_FLOAT | PF_CTL_LED | PF_PROP_OUTPUT | PF_PROP_OPTIONAL, NULL, "clip_out", "0dB" },
-
- { 8.5, 0.1, 10, 0, PF_FLOAT | PF_SCALE_LINEAR | PF_CTL_KNOB | PF_UNIT_COEF, NULL, "drive", "Harmonics" },
- { 0, -10, 10, 0, PF_FLOAT | PF_SCALE_LINEAR | PF_CTL_FADER | PF_UNIT_COEF, NULL, "blend", "Blend harmonics" },
- { 0, 0, 1, 0, PF_FLOAT | PF_SCALE_GAIN | PF_CTL_METER | PF_CTLO_LABEL | PF_UNIT_DB | PF_PROP_OUTPUT | PF_PROP_OPTIONAL, NULL, "meter_drive", "Harmonics level" },
-
- { 6000, 2000, 12000, 0, PF_FLOAT | PF_SCALE_LOG | PF_CTL_KNOB | PF_UNIT_HZ, NULL, "freq", "Scope" },
- { 0, 0, 1, 0, PF_BOOL | PF_CTL_TOGGLE, NULL, "listen", "Listen" },
-};
-
-CALF_PLUGIN_INFO(enhancer) = { 0x851A, "Enhancer", "Calf Enhancer", "Markus Schmidt / Krzysztof Foltman", calf_plugins::calf_copyright_info, "DistortionPlugin" };
-
-////////////////////////////////////////////////////////////////////////////
-
calf_plugins::plugin_registry::plugin_registry()
{
#define PER_MODULE_ITEM(name, isSynth, jackname) plugins.push_back((new name##_metadata));
--
calf audio plugins packaging
More information about the pkg-multimedia-commits
mailing list