[SCM] calf/master: Merge branch 'master' into filterclavier
js at users.alioth.debian.org
js at users.alioth.debian.org
Tue May 7 15:38:58 UTC 2013
+ DSSI: unbreak dot display in Compressor and MultiChorus
+ DSSI: basic version of live graphs (still doesn't serialize cairo attributes, compressor doesn't work, resolution is poor, and there may be more bugs)
+ Compressor: do not display frequency grid lines/legend in the graph
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 ccf1d631d63cd2a348d5a9f618b4bcca54e42e33
Merge: b2a45d609873f050be0b6b12074b11e07a2c189f 04fed021ee93e5eb11b6635eca6537c58804f1fc
Author: Hans Baier <hansfbaier at googlemail.com>
Date: Thu Jan 22 11:47:15 2009 +0700
Merge branch 'master' into filterclavier
diff --combined src/modules.cpp
index bb62bfe,74b3790..7a02a1d
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@@ -111,28 -111,6 +111,28 @@@ CALF_PLUGIN_INFO(filter) = { 0x847f, "F
////////////////////////////////////////////////////////////////////////////
+CALF_PORT_NAMES(filterclavier) = {"In L", "In R", "Out L", "Out R"};
+
+const char *filterclavier_choices[] = {
+ "12dB/oct Lowpass",
+ "24dB/oct Lowpass",
+ "36dB/oct Lowpass",
+ "12dB/oct Highpass",
+ "24dB/oct Highpass",
+ "36dB/oct Highpass",
+};
+
+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" },
+ { 0, 0, 5, 1, PF_ENUM | PF_CTL_COMBO, filterclavier_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" };
+
+////////////////////////////////////////////////////////////////////////////
+
CALF_PORT_NAMES(vintage_delay) = {"In L", "In R", "Out L", "Out R"};
const char *vintage_delay_mixmodes[] = {
@@@ -185,8 -163,8 +185,8 @@@ CALF_PORT_NAMES(multichorus) = {"In L"
CALF_PORT_PROPS(multichorus) = {
{ 5, 0.1, 10, 0, PF_FLOAT | PF_SCALE_LOG | PF_CTL_KNOB | PF_UNIT_MSEC | PF_PROP_GRAPH, NULL, "min_delay", "Minimum delay" },
- { 6, 0.1, 10, 0, PF_FLOAT | PF_SCALE_LOG | PF_CTL_KNOB | PF_UNIT_MSEC, NULL, "mod_depth", "Modulation depth" },
- { 0.5, 0.01, 20, 0, PF_FLOAT | PF_SCALE_LOG | PF_CTL_KNOB | PF_UNIT_HZ, NULL, "mod_rate", "Modulation rate" },
+ { 6, 0.1, 10, 0, PF_FLOAT | PF_SCALE_LOG | PF_CTL_KNOB | PF_UNIT_MSEC| PF_PROP_GRAPH, NULL, "mod_depth", "Modulation depth" },
+ { 0.5, 0.01, 20, 0, PF_FLOAT | PF_SCALE_LOG | PF_CTL_KNOB | PF_UNIT_HZ| PF_PROP_GRAPH, NULL, "mod_rate", "Modulation rate" },
{ 180, 0, 360, 91, PF_FLOAT | PF_SCALE_LINEAR | PF_CTL_KNOB | PF_UNIT_DEG, NULL, "stereo", "Stereo phase" },
{ 4, 1, 8, 8, PF_INT | PF_SCALE_LINEAR | PF_CTL_FADER, NULL, "voices", "Voices"},
{ 64, 0, 360, 91, PF_FLOAT | PF_SCALE_LINEAR | PF_CTL_KNOB | PF_UNIT_DEG, NULL, "vphase", "Inter-voice phase" },
diff --combined src/modules_dsp.cpp
index 351e79d,2ba618b..3f01f9b
--- a/src/modules_dsp.cpp
+++ b/src/modules_dsp.cpp
@@@ -64,31 -64,34 +64,34 @@@ static void set_channel_color(cairo_ifa
context->set_line_width(1.5);
}
- static bool get_freq_gridline(int subindex, float &pos, bool &vertical, std::string &legend, cairo_iface *context)
+ static bool get_freq_gridline(int subindex, float &pos, bool &vertical, std::string &legend, cairo_iface *context, bool use_frequencies = true)
{
- if (subindex < 28)
+ if (use_frequencies)
{
- vertical = true;
- if (subindex == 9) legend = "100 Hz";
- if (subindex == 18) legend = "1 kHz";
- if (subindex == 27) legend = "10 kHz";
- float freq = 100;
- if (subindex < 9)
- freq = 10 * (subindex + 1);
- else if (subindex < 18)
- freq = 100 * (subindex - 9 + 1);
- else if (subindex < 27)
- freq = 1000 * (subindex - 18 + 1);
- else
- freq = 10000 * (subindex - 27 + 1);
- pos = log(freq / 20.0) / log(1000);
- if (!legend.empty())
- context->set_source_rgba(0.25, 0.25, 0.25, 0.75);
- else
- context->set_source_rgba(0.25, 0.25, 0.25, 0.5);
- return true;
+ if (subindex < 28)
+ {
+ vertical = true;
+ if (subindex == 9) legend = "100 Hz";
+ if (subindex == 18) legend = "1 kHz";
+ if (subindex == 27) legend = "10 kHz";
+ float freq = 100;
+ if (subindex < 9)
+ freq = 10 * (subindex + 1);
+ else if (subindex < 18)
+ freq = 100 * (subindex - 9 + 1);
+ else if (subindex < 27)
+ freq = 1000 * (subindex - 18 + 1);
+ else
+ freq = 10000 * (subindex - 27 + 1);
+ pos = log(freq / 20.0) / log(1000);
+ if (!legend.empty())
+ context->set_source_rgba(0.25, 0.25, 0.25, 0.75);
+ else
+ context->set_source_rgba(0.25, 0.25, 0.25, 0.5);
+ return true;
+ }
+ subindex -= 28;
}
- subindex -= 28;
float gain = 16.0 / (1 << subindex);
pos = dB_grid(gain);
if (pos < -1)
@@@ -228,31 -231,11 +231,31 @@@ bool filter_audio_module::get_graph(in
bool filter_audio_module::get_gridline(int index, int subindex, float &pos, bool &vertical, std::string &legend, cairo_iface *context)
{
- if (index == par_cutoff)
+ if (index == par_cutoff) {
return get_freq_gridline(subindex, pos, vertical, legend, context);
+ }
+ return false;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////
+
+bool filterclavier_audio_module::get_graph(int index, int subindex, float *data, int points, cairo_iface *context)
+{
+ if (!is_active) {
+ return false;
+ }
+ if (!subindex) {
+ context->set_line_width(1.5);
+ return ::get_graph(*this, subindex, data, points);
+ }
return false;
}
+bool filterclavier_audio_module::get_gridline(int index, int subindex, float &pos, bool &vertical, std::string &legend, cairo_iface *context)
+{
+ return get_freq_gridline(subindex, pos, vertical, legend, context);
+}
+
///////////////////////////////////////////////////////////////////////////////////////////////
rotary_speaker_audio_module::rotary_speaker_audio_module()
@@@ -457,7 -440,7 +460,7 @@@ bool compressor_audio_module::get_gridl
{
bool tmp;
vertical = (subindex & 1) != 0;
- bool result = get_freq_gridline(subindex >> 1, pos, tmp, legend, context);
+ bool result = get_freq_gridline(subindex >> 1, pos, tmp, legend, context, false);
if (result && vertical) {
if ((subindex & 4) && !legend.empty()) {
legend = "";
--
calf audio plugins packaging
More information about the pkg-multimedia-commits
mailing list