[SCM] calf/master: + gcc 4.3 warning-related fixes
js at users.alioth.debian.org
js at users.alioth.debian.org
Tue May 7 15:37:14 UTC 2013
The following commit has been merged in the master branch:
commit 9358297f88018f387ed3f140a179b7e81f4e3d87
Author: kfoltman <kfoltman at 78b06b96-2940-0410-b7fc-879d825d01d8>
Date: Sat May 17 12:27:02 2008 +0000
+ gcc 4.3 warning-related fixes
git-svn-id: https://calf.svn.sourceforge.net/svnroot/calf/trunk@182 78b06b96-2940-0410-b7fc-879d825d01d8
diff --git a/src/calf/giface.h b/src/calf/giface.h
index 6d95d09..04cd397 100644
--- a/src/calf/giface.h
+++ b/src/calf/giface.h
@@ -261,50 +261,55 @@ struct ladspa_wrapper
init_descriptor(i);
}
- void init_descriptor(ladspa_info &i)
+ void init_descriptor(ladspa_info &inf)
{
int ins = Module::in_count;
int outs = Module::out_count;
int params = Module::param_count;
- descriptor.UniqueID = i.unique_id;
- descriptor.Label = i.label;
- descriptor.Name = i.name;
- descriptor.Maker = i.maker;
- descriptor.Copyright = i.copyright;
+ descriptor.UniqueID = inf.unique_id;
+ descriptor.Label = inf.label;
+ descriptor.Name = inf.name;
+ descriptor.Maker = inf.maker;
+ descriptor.Copyright = inf.copyright;
descriptor.Properties = Module::rt_capable ? LADSPA_PROPERTY_HARD_RT_CAPABLE : 0;
descriptor.PortCount = ins + outs + params;
descriptor.PortNames = new char *[descriptor.PortCount];
descriptor.PortDescriptors = new LADSPA_PortDescriptor[descriptor.PortCount];
descriptor.PortRangeHints = new LADSPA_PortRangeHint[descriptor.PortCount];
- for (int i = 0; i < ins + outs + params; i++)
+ int i;
+ for (i = 0; i < ins + outs; i++)
{
LADSPA_PortRangeHint &prh = ((LADSPA_PortRangeHint *)descriptor.PortRangeHints)[i];
((int *)descriptor.PortDescriptors)[i] = i < ins ? LADSPA_PORT_INPUT | LADSPA_PORT_AUDIO
: i < ins + outs ? LADSPA_PORT_OUTPUT | LADSPA_PORT_AUDIO
: LADSPA_PORT_INPUT | LADSPA_PORT_CONTROL;
- if (i < ins + outs) {
- prh.HintDescriptor = 0;
- ((const char **)descriptor.PortNames)[i] = Module::port_names[i];
- } else {
- prh.HintDescriptor = LADSPA_HINT_BOUNDED_ABOVE | LADSPA_HINT_BOUNDED_BELOW;
- parameter_properties &pp = Module::param_props[i - ins - outs];
- ((const char **)descriptor.PortNames)[i] = pp.name;
- prh.LowerBound = pp.min;
- prh.UpperBound = pp.max;
- switch(pp.flags & PF_TYPEMASK) {
- case PF_BOOL:
- prh.HintDescriptor |= LADSPA_HINT_TOGGLED;
- break;
- case PF_INT:
- case PF_ENUM:
- prh.HintDescriptor |= LADSPA_HINT_INTEGER;
- break;
- }
- switch(pp.flags & PF_SCALEMASK) {
- case PF_SCALE_LOG:
- prh.HintDescriptor |= LADSPA_HINT_LOGARITHMIC;
- break;
- }
+ prh.HintDescriptor = 0;
+ ((const char **)descriptor.PortNames)[i] = Module::port_names[i];
+ }
+ for (; i < ins + outs + params; i++)
+ {
+ LADSPA_PortRangeHint &prh = ((LADSPA_PortRangeHint *)descriptor.PortRangeHints)[i];
+ ((int *)descriptor.PortDescriptors)[i] = i < ins ? LADSPA_PORT_INPUT | LADSPA_PORT_AUDIO
+ : i < ins + outs ? LADSPA_PORT_OUTPUT | LADSPA_PORT_AUDIO
+ : LADSPA_PORT_INPUT | LADSPA_PORT_CONTROL;
+ prh.HintDescriptor = LADSPA_HINT_BOUNDED_ABOVE | LADSPA_HINT_BOUNDED_BELOW;
+ parameter_properties &pp = Module::param_props[i - ins - outs];
+ ((const char **)descriptor.PortNames)[i] = pp.name;
+ prh.LowerBound = pp.min;
+ prh.UpperBound = pp.max;
+ switch(pp.flags & PF_TYPEMASK) {
+ case PF_BOOL:
+ prh.HintDescriptor |= LADSPA_HINT_TOGGLED;
+ break;
+ case PF_INT:
+ case PF_ENUM:
+ prh.HintDescriptor |= LADSPA_HINT_INTEGER;
+ break;
+ }
+ switch(pp.flags & PF_SCALEMASK) {
+ case PF_SCALE_LOG:
+ prh.HintDescriptor |= LADSPA_HINT_LOGARITHMIC;
+ break;
}
}
descriptor.ImplementationData = this;
diff --git a/src/calf/modules.h b/src/calf/modules.h
index 593bd52..11879ec 100644
--- a/src/calf/modules.h
+++ b/src/calf/modules.h
@@ -61,7 +61,7 @@ public:
float *outs[2];
float *params[1];
uint32_t srate;
- static const char *port_names[];
+ static const char *port_names[in_count + out_count];
static parameter_properties param_props[];
uint32_t process(uint32_t offset, uint32_t numsamples, uint32_t inputs_mask, uint32_t outputs_mask) {
if (!inputs_mask)
@@ -84,7 +84,7 @@ class flanger_audio_module: public null_audio_module
public:
enum { par_delay, par_depth, par_rate, par_fb, par_stereo, par_reset, par_amount, param_count };
enum { in_count = 2, out_count = 2, support_midi = false, rt_capable = true };
- static const char *port_names[];
+ static const char *port_names[in_count + out_count];
dsp::simple_flanger<float, 2048> left, right;
float *ins[in_count];
float *outs[out_count];
@@ -156,7 +156,7 @@ class phaser_audio_module: public null_audio_module
public:
enum { par_freq, par_depth, par_rate, par_fb, par_stages, par_stereo, par_reset, par_amount, param_count };
enum { in_count = 2, out_count = 2, support_midi = false, rt_capable = true };
- static const char *port_names[];
+ static const char *port_names[in_count + out_count];
float *ins[in_count];
float *outs[out_count];
float *params[param_count];
@@ -230,7 +230,7 @@ class reverb_audio_module: public null_audio_module
public:
enum { par_decay, par_hfdamp, par_roomsize, par_diffusion, par_amount, param_count };
enum { in_count = 2, out_count = 2, support_midi = false, rt_capable = true };
- static const char *port_names[];
+ static const char *port_names[in_count + out_count];
dsp::reverb<float> reverb;
uint32_t srate;
gain_smoothing amount;
@@ -437,7 +437,7 @@ public:
float *ins[in_count];
float *outs[out_count];
float *params[param_count];
- static const char *port_names[];
+ static const char *port_names[in_count + out_count];
float buffers[2][MAX_DELAY];
int bufptr, deltime_l, deltime_r, mixmode, medium, old_medium;
gain_smoothing amt_left, amt_right, fb_left, fb_right;
diff --git a/src/gui.cpp b/src/gui.cpp
index 2eea954..966f22a 100644
--- a/src/gui.cpp
+++ b/src/gui.cpp
@@ -648,7 +648,9 @@ void plugin_gui::xml_element_start(const char *element, const char *attributes[]
if (!strcmp(element, "if"))
{
if (!xam.count("cond") || xam["cond"].empty())
+ {
g_error("Incorrect <if cond=\"[!]symbol\"> element");
+ }
string cond = xam["cond"];
bool state = true;
if (cond.substr(0, 1) == "!") {
@@ -705,7 +707,9 @@ void plugin_gui::xml_element_end(void *data, const char *element)
return;
}
if (!strcmp(element, "if"))
+ {
return;
+ }
if (gui->current_control)
{
(*gui->container_stack.rbegin())->add(gui->current_control->widget, gui->current_control);
--
calf audio plugins packaging
More information about the pkg-multimedia-commits
mailing list