[SCM] calf/master: Merge branch 'master' into stringport
js at users.alioth.debian.org
js at users.alioth.debian.org
Tue May 7 15:38:38 UTC 2013
+ GUI: improve GUI resizing for plugins containing live graphs
Merge branch 'master' of ssh://repo.or.cz/srv/git/calf
+ Compressor: Took out expansion support, increased makeup gain range to +36dB
Merge branch 'master' of ssh://repo.or.cz/srv/git/calf
+ Compressor: Can now expand 4:1, operates 100% log scale. :)
+ Flanger: improve GUI resizability
+ Compressor: Fixed spazzing caused by thread issues.
+ Compressor: Added logarithmic mode.
+ Compressor: one more stab
+ Compressor: another stab at layout
+ Compressor: another attempt at GUI
+ Compressor: initial version of the GUI (without VU meters)
+ Line graph: add square mode (force 1:1 aspect ratio)
+ Compressor: switch active graphs when bypass is on
Merge branch 'master' of ssh://repo.or.cz/srv/git/calf
+ Compressor: Changed knee range to 18 dB and combined graph/compression code into one inline function.
+ AutoHell: allow disabling LADSPA and LV2 plugins via configure option
+ LV2: attempt at fixing compilation with no LV2
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 e13fbb3e61f3f30549f405a5216b448a18ce896f
Merge: a67de89306575143f2f6dc2b95290f4a82aeeb6b 93986df1a0c9d3b30a330c6dd6b8f9203e98ed5c
Author: Krzysztof Foltman <wdev at foltman.com>
Date: Wed Nov 26 18:30:56 2008 +0000
Merge branch 'master' into stringport
diff --combined src/gui.cpp
index 0c377a9,5dc5ca6..20f8d2d
--- a/src/gui.cpp
+++ b/src/gui.cpp
@@@ -52,10 -52,8 +52,10 @@@ void param_control::update_label(
void param_control::hook_params()
{
- if (param_no != -1)
+ if (param_no != -1) {
gui->add_param_ctl(param_no, this);
+ }
+ gui->params.push_back(this);
}
param_control::~param_control()
@@@ -409,7 -407,7 +409,7 @@@ struct curve_param_control_callback: pu
ss << data.size() << endl;
for (size_t i = 0; i < data.size(); i++)
ss << data[i].first << " " << data[i].second << endl;
- ctl->gui->send_configure(ctl->attribs["key"].c_str(), ss.str().c_str());
+ ctl->gui->plugin->configure(ctl->attribs["key"].c_str(), ss.str().c_str());
}
virtual void clip(CalfCurve *src, int pt, float &x, float &y, bool &hide)
{
@@@ -473,6 -471,7 +473,7 @@@ GtkWidget *line_graph_param_control::cr
CalfLineGraph *clg = CALF_LINE_GRAPH(widget);
widget->requisition.width = get_int("width", 40);
widget->requisition.height = get_int("height", 40);
+ calf_line_graph_set_square(clg, get_int("square", 0));
clg->source = gui->plugin->get_line_graph_iface();
clg->source_id = param_no;
@@@ -570,8 -569,10 +571,10 @@@ void table_container::add(GtkWidget *wi
base->require_int_attribute("attach-y");
int x = base->get_int("attach-x"), y = base->get_int("attach-y");
int w = base->get_int("attach-w", 1), h = base->get_int("attach-h", 1);
- int fillx = (base->get_int("fill-x", 1) ? GTK_FILL : 0) | (base->get_int("expand-x", 1) ? GTK_EXPAND : 0) | (base->get_int("shrink-x", 0) ? GTK_SHRINK : 0);
- int filly = (base->get_int("fill-y", 1) ? GTK_FILL : 0) | (base->get_int("expand-y", 1) ? GTK_EXPAND : 0) | (base->get_int("shrink-y", 0) ? GTK_SHRINK : 0);
+ int shrinkx = base->get_int("shrink-x", 0);
+ int shrinky = base->get_int("shrink-y", 0);
+ int fillx = (base->get_int("fill-x", !shrinkx) ? GTK_FILL : 0) | (base->get_int("expand-x", !shrinkx) ? GTK_EXPAND : 0) | (shrinkx ? GTK_SHRINK : 0);
+ int filly = (base->get_int("fill-y", !shrinky) ? GTK_FILL : 0) | (base->get_int("expand-y", !shrinky) ? GTK_EXPAND : 0) | (base->get_int("shrink-y", 0) ? GTK_SHRINK : 0);
int padx = base->get_int("pad-x", 2);
int pady = base->get_int("pad-y", 2);
gtk_table_attach(GTK_TABLE(container), widget, x, x + w, y, y + h, (GtkAttachOptions)fillx, (GtkAttachOptions)filly, padx, pady);
@@@ -773,6 -774,7 +776,6 @@@ void plugin_gui::xml_element_start(cons
current_control->init_xml(element);
current_control->set();
current_control->hook_params();
- params.push_back(current_control);
return;
}
}
@@@ -834,26 -836,22 +837,26 @@@ GtkWidget *plugin_gui::create_from_xml(
void plugin_gui::send_configure(const char *key, const char *value)
{
- plugin->configure(key, value);
+ // XXXKF this should really be replaced by a separate list of SCI-capable param controls
+ for (unsigned int i = 0; i < params.size(); i++)
+ {
+ assert(params[i] != NULL);
+ send_configure_iface *sci = dynamic_cast<send_configure_iface *>(params[i]);
+ if (sci)
+ sci->send_configure(key, value);
+ }
}
void plugin_gui::on_idle()
{
for (unsigned int i = 0; i < params.size(); i++)
{
- if (params[i] != NULL)
- {
- parameter_properties &props = *plugin->get_param_props(params[i]->param_no);
- bool is_output = (props.flags & PF_PROP_OUTPUT) != 0;
- if (is_output) {
- params[i]->set();
- }
- params[i]->on_idle();
+ parameter_properties &props = *plugin->get_param_props(params[i]->param_no);
+ bool is_output = (props.flags & PF_PROP_OUTPUT) != 0;
+ if (is_output) {
+ params[i]->set();
}
+ params[i]->on_idle();
}
// XXXKF iterate over par2ctl, too...
}
@@@ -862,10 -860,13 +865,10 @@@ void plugin_gui::refresh(
{
for (unsigned int i = 0; i < params.size(); i++)
{
- if (params[i] != NULL)
- params[i]->set();
+ params[i]->set();
send_configure_iface *sci = dynamic_cast<send_configure_iface *>(params[i]);
if (sci)
- {
plugin->send_configures(sci);
- }
}
}
@@@ -1109,7 -1110,6 +1112,7 @@@ void plugin_gui_window::create(plugin_c
source_id = g_timeout_add_full(G_PRIORITY_LOW, 1000/30, on_idle, this, NULL); // 30 fps should be enough for everybody
gtk_ui_manager_ensure_update(ui_mgr);
+ gui->plugin->send_configures(gui);
}
void plugin_gui_window::close()
diff --combined src/modules.cpp
index bdd6057,4f0d1af..59b6c39
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@@ -99,7 -99,7 +99,7 @@@ 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" },
- { 20, 5, 100, 20, PF_FLOAT | PF_SCALE_LOG | PF_CTL_KNOB | PF_UNIT_MSEC, NULL, "inertia", "Inertia"},
+ { 20, 5, 100, 20, PF_FLOAT | PF_SCALE_LOG | PF_CTL_KNOB | PF_UNIT_MSEC | PF_PROP_MSGCONTEXT, NULL, "inertia", "Inertia"},
};
CALF_PLUGIN_INFO(filter) = { 0x847f, "Filter", "Calf Filter", "Krzysztof Foltman", calf_plugins::calf_copyright_info, "FilterPlugin" };
@@@ -178,18 -178,18 +178,18 @@@ const char *compressor_stereo_link_name
CALF_PORT_PROPS(compressor) = {
{ 0.0625, 0, 1, 0, PF_FLOAT | PF_SCALE_GAIN | PF_CTL_KNOB | PF_UNIT_DB, NULL, "threshold", "Threshold" },
- { 5, 1, 100, 101, PF_FLOAT | PF_SCALE_LOG_INF | PF_CTL_KNOB | PF_UNIT_COEF, NULL, "ratio", "Ratio" },
+ { 5, 1, 20, 21, PF_FLOAT | PF_SCALE_LOG_INF | PF_CTL_KNOB | PF_UNIT_COEF, NULL, "ratio", "Ratio" },
{ 15, 0.01, 2000, 0, PF_FLOAT | PF_SCALE_LOG | PF_CTL_KNOB | PF_UNIT_MSEC, NULL, "attack", "Attack" },
{ 150, 0.01, 2000, 0, PF_FLOAT | PF_SCALE_LOG | PF_CTL_KNOB | PF_UNIT_MSEC, NULL, "release", "Release" },
- { 2, 1, 16, 0, PF_FLOAT | PF_SCALE_GAIN | PF_CTL_KNOB | PF_UNIT_DB, NULL, "makeup", "Makeup Gain" },
- { 2, 1, 4, 0, PF_FLOAT | PF_SCALE_GAIN | PF_CTL_KNOB | PF_UNIT_DB, NULL, "knee", "Knee" },
+ { 2, 1, 64, 0, PF_FLOAT | PF_SCALE_GAIN | PF_CTL_KNOB | PF_UNIT_DB, NULL, "makeup", "Makeup Gain" },
+ { 1, 1, 8, 0, PF_FLOAT | PF_SCALE_GAIN | PF_CTL_KNOB | PF_UNIT_DB, NULL, "knee", "Knee" },
{ 0, 0, 1, 0, PF_ENUM | PF_CTL_COMBO, compressor_detection_names, "detection", "Detection" },
{ 0, 0, 1, 0, PF_ENUM | PF_CTL_COMBO, compressor_stereo_link_names, "stereo_link", "Stereo Link" },
{ 0, 0, 1, 0, PF_BOOL | PF_CTL_TOGGLE, NULL, "aweighting", "A-weighting" },
{ 0, 0.03125, 1, 0, PF_FLOAT | PF_SCALE_GAIN | PF_CTL_METER | PF_CTLO_LABEL | PF_CTLO_REVERSE | PF_UNIT_DB | PF_PROP_OUTPUT | PF_PROP_OPTIONAL| PF_PROP_GRAPH, NULL, "compression", "Compression" },
{ 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, "peak", "Peak" },
{ 0, 0, 1, 0, PF_BOOL | PF_CTL_LED | PF_PROP_OUTPUT | PF_PROP_OPTIONAL, NULL, "clip", "Clip" },
- { 0, 0, 1, 0, PF_BOOL | PF_CTL_TOGGLE, NULL, "bypass", "Bypass" },
+ { 0, 0, 1, 0, PF_BOOL | PF_CTL_TOGGLE, NULL, "bypass", "Bypass" }
};
CALF_PLUGIN_INFO(compressor) = { 0x8502, "Compressor", "Calf Compressor", "Thor Harald Johansen", calf_plugins::calf_copyright_info, "CompressorPlugin" };
@@@ -289,8 -289,6 +289,8 @@@ const char *organ_ampctl_names[] = { "N
const char *organ_vibrato_mode_names[] = { "None", "Direct", "Flt 1", "Flt 2", "Voice", "Global" };
+const char *organ_init_map_curve = "2\n0 1\n1 1\n";
+
CALF_PORT_PROPS(organ) = {
{ 8, 0, 8, 80, PF_FLOAT | PF_SCALE_LINEAR | PF_CTL_FADER, NULL, "l1", "16'" },
{ 8, 0, 8, 80, PF_FLOAT | PF_SCALE_LINEAR | PF_CTL_FADER, NULL, "l2", "5 1/3'" },
@@@ -430,8 -428,6 +430,8 @@@
{ -12, -24, 24, 49, PF_INT | PF_SCALE_LINEAR | PF_CTL_KNOB | PF_UNIT_SEMITONES, NULL, "transpose", "Transpose" },
{ 0, -100, 100, 201, PF_FLOAT | PF_SCALE_LINEAR | PF_CTL_KNOB | PF_UNIT_CENTS, NULL, "detune", "Detune" },
+
+ { 0, 0, 0, 0, PF_STRING | PF_PROP_MSGCONTEXT, &organ_init_map_curve, "map_curve", "Key mapping curve" },
};
////////////////////////////////////////////////////////////////////////////
--
calf audio plugins packaging
More information about the pkg-multimedia-commits
mailing list