[SCM] calf/master: Identifiers changed
js at users.alioth.debian.org
js at users.alioth.debian.org
Tue May 7 15:40:58 UTC 2013
The following commit has been merged in the master branch:
commit 5039f83892dd1a5cece41a3ad174485520c70aa6
Author: Markus Schmidt <schmidt at boomshop.net>
Date: Tue Mar 6 05:53:30 2012 +0100
Identifiers changed
diff --git a/gui/gui-analyzer.xml b/gui/gui-analyzer.xml
index 93d50d2..ee0fc4b 100644
--- a/gui/gui-analyzer.xml
+++ b/gui/gui-analyzer.xml
@@ -15,9 +15,12 @@
<hbox>
<vbox spacing="3">
<hbox>
- <combo param="analyzer_mode" expand="0" fill="0"/>
- <combo param="analyzer_smoothing" expand="0" fill="0"/>
- <combo param="analyzer_correction" expand="0" fill="0"/>
+ <label text="Source" fill="0" expand="0" />
+ <combo param="analyzer_source" expand="1" fill="1"/>
+ <label text=" Smoothing" fill="0" expand="0"/>
+ <combo param="analyzer_smoothing" expand="1" fill="1"/>
+ <label text=" Mode" fill="0" expand="0" />
+ <combo param="analyzer_mode" expand="1" fill="1"/>
</hbox>
<line-graph refresh="1" width="560" height="240" param="analyzer_level" expand="1" fill="1" use_fade="1" fade="0.6"/>
<hbox>
diff --git a/src/calf/metadata.h b/src/calf/metadata.h
index b2beb59..f02a24b 100644
--- a/src/calf/metadata.h
+++ b/src/calf/metadata.h
@@ -409,7 +409,7 @@ struct analyzer_metadata: public plugin_metadata<analyzer_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_meter_L, param_meter_R, param_clip_L, param_clip_R,
- param_analyzer_level, param_analyzer_mode, param_analyzer_accuracy, param_analyzer_speed, param_analyzer_display, param_analyzer_smoothing, param_analyzer_hold, param_analyzer_freeze, param_analyzer_linear, param_analyzer_bars, param_analyzer_correction,
+ param_analyzer_level, param_analyzer_source, param_analyzer_accuracy, param_analyzer_speed, param_analyzer_display, param_analyzer_smoothing, param_analyzer_hold, param_analyzer_freeze, param_analyzer_linear, param_analyzer_bars, param_analyzer_mode,
param_gonio_level, param_gonio_mode, param_gonio_use_fade, param_gonio_fade, param_gonio_accuracy, param_gonio_display,
param_count };
PLUGIN_NAME_ID_LABEL("analyzer", "analyzer", "Analyzer")
diff --git a/src/metadata.cpp b/src/metadata.cpp
index f0c8fed..d6a53bb 100644
--- a/src/metadata.cpp
+++ b/src/metadata.cpp
@@ -983,9 +983,9 @@ CALF_PLUGIN_INFO(stereo) = { 0x8588, "StereoTools", "Calf Stereo Tools", "Markus
CALF_PORT_NAMES(analyzer) = {"In L", "In R", "Out L", "Out R"};
const char *gonio_mode_names[] = { "Small Dots", "Medium Dots", "Big Dots", "Fields", "Lines" };
-const char *analyzer_mode_names[] = { "Average", "Left Channel", "Right Channel" };
+const char *analyzer_source_names[] = { "Average", "Left Channel", "Right Channel" };
const char *analyzer_smooth_names[] = { "Falling", "Smoothing", "Off" };
-const char *analyzer_correction_names[] = { "Off", "Additive", "Denoised Peaks", "Phase by Frequeny" };
+const char *analyzer_mode_names[] = { "Normalized", "Additive", "Denoised Peaks", "Stereo Image" };
CALF_PORT_PROPS(analyzer) = {
{ 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_L", "Level L" },
{ 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_R", "Level R" },
@@ -993,7 +993,7 @@ CALF_PORT_PROPS(analyzer) = {
{ 0, 0, 1, 0, PF_FLOAT | PF_CTL_LED | PF_PROP_OUTPUT | PF_PROP_OPTIONAL, NULL, "clip_R", "Clip R" },
{ 1, 0.125, 8, 0, PF_FLOAT | PF_SCALE_GAIN | PF_CTL_KNOB | PF_UNIT_COEF | PF_PROP_NOBOUNDS, NULL, "analyzer_level", "Analyzer Level" },
- { 0, 0, 2, 0, PF_ENUM | PF_CTL_COMBO, analyzer_mode_names, "analyzer_mode", "Analyzer Mode" },
+ { 0, 0, 2, 0, PF_ENUM | PF_CTL_COMBO, analyzer_source_names, "analyzer_source", "Analyzer Source" },
{ 6, 2, 8, 0, PF_INT | PF_SCALE_LINEAR | PF_CTL_KNOB | PF_UNIT_COEF | PF_PROP_GRAPH, NULL, "analyzer_accuracy", "Analyzer Accuracy" },
{ 13, 1, 15, 0, PF_INT | PF_SCALE_LINEAR | PF_CTL_KNOB | PF_UNIT_COEF | PF_PROP_GRAPH, NULL, "analyzer_speed", "Analyzer Speed" },
{ 1, 0, 1, 0, PF_BOOL | PF_CTL_TOGGLE, NULL, "analyzer_display", "Analyzer Display" },
@@ -1002,7 +1002,7 @@ CALF_PORT_PROPS(analyzer) = {
{ 0, 0, 1, 2, PF_BOOL | PF_CTL_TOGGLE , NULL, "analyzer_freeze", "Analyzer Freeze" },
{ 1, 0, 1, 2, PF_BOOL | PF_CTL_TOGGLE , NULL, "analyzer_linear", "Analyzer Linear" },
{ 1, 0, 1, 2, PF_BOOL | PF_CTL_TOGGLE , NULL, "analyzer_bars", "Analyzer Bars" },
- { 1, 0, 3, 0, PF_ENUM | PF_CTL_COMBO, analyzer_correction_names, "analyzer_correction", "Analyzer Correction" },
+ { 1, 0, 3, 0, PF_ENUM | PF_CTL_COMBO, analyzer_mode_names, "analyzer_mode", "Analyzer Mode" },
{ 1, 0.125, 8, 0, PF_FLOAT | PF_SCALE_GAIN | PF_CTL_KNOB | PF_UNIT_COEF | PF_PROP_NOBOUNDS, NULL, "gonio_level", "Gonio Level" },
{ 1, 0, 4, 0, PF_ENUM | PF_CTL_COMBO, gonio_mode_names, "gonio_mode", "Gonio Mode" },
diff --git a/src/modules.cpp b/src/modules.cpp
index 6d29aa3..f8eaa1d 100644
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -1014,7 +1014,7 @@ bool analyzer_audio_module::get_graph(int index, int subindex, float *data, int
fftw_real valL;
fftw_real valR;
- switch((int)*params[param_analyzer_mode]) {
+ switch((int)*params[param_analyzer_source]) {
case 0:
default:
// average
@@ -1031,7 +1031,7 @@ bool analyzer_audio_module::get_graph(int index, int subindex, float *data, int
}
// store value in analyzer buffer
fft_in[i] = (fftw_real)val;
- if(*params[param_analyzer_correction] == 3) {
+ if(*params[param_analyzer_mode] == 3) {
valL = L;
valR = R;
fft_inL[i] = valL;
@@ -1062,7 +1062,7 @@ bool analyzer_audio_module::get_graph(int index, int subindex, float *data, int
// non-normalized
rfftw_one(fft_plan, fft_in, fft_out);
//run fft for left and right channel while in "phase by freq" mode
- if(*params[param_analyzer_correction] == 3) {
+ if(*params[param_analyzer_mode] == 3) {
rfftw_one(fft_plan, fft_inL, fft_outL);
rfftw_one(fft_plan, fft_inR, fft_outR);
}
@@ -1099,7 +1099,7 @@ bool analyzer_audio_module::get_graph(int index, int subindex, float *data, int
float var1 = 0.f;
float var2 = 0.f;
- switch((int)*params[param_analyzer_correction]) {
+ switch((int)*params[param_analyzer_mode]) {
case 0:
// nothing to do
break;
@@ -1176,12 +1176,12 @@ bool analyzer_audio_module::get_graph(int index, int subindex, float *data, int
fft_freeze[iter] = val;
}
data[i] = dB_grid(fabs(val) / _accuracy * 2.f);
- if(*params[param_analyzer_correction] == 3) {
+ if(*params[param_analyzer_mode] == 3) {
if(i) data[i] = fft_out[iter];
else data[i] = 0.f;
if(fabs(data[i])>1.f) printf("mehr als 1!!!!!!!!!! bei %5d bei iter %4d und _iter %4d\n",i,iter,_iter);
}
- } //else if(*params[param_analyzer_correction] == 2) {
+ } //else if(*params[param_analyzer_mode] == 2) {
// data[i] = dB_grid(fabs(1e-20) / _accuracy * 2.f);
// }
else {
@@ -1193,7 +1193,7 @@ bool analyzer_audio_module::get_graph(int index, int subindex, float *data, int
// subtle hold line
context->set_source_rgba(0.35, 0.4, 0.2, 0.2);
}
- if (*params[param_analyzer_correction] == 3) {
+ if (*params[param_analyzer_mode] == 3) {
// draw centered bars
*mode = 3;
} else if(*params[param_analyzer_bars]) {
--
calf audio plugins packaging
More information about the pkg-multimedia-commits
mailing list