[SCM] calf/master: new mode switches for analyzer
js at users.alioth.debian.org
js at users.alioth.debian.org
Tue May 7 15:41:03 UTC 2013
The following commit has been merged in the master branch:
commit e36df91bda78b87e46d08093a915d0667781bca2
Author: Markus Schmidt <schmidt at boomshop.net>
Date: Fri Mar 9 23:36:41 2012 +0100
new mode switches for analyzer
diff --git a/gui/gui-analyzer.xml b/gui/gui-analyzer.xml
index fe829b4..c0d4a31 100644
--- a/gui/gui-analyzer.xml
+++ b/gui/gui-analyzer.xml
@@ -15,12 +15,11 @@
<hbox>
<vbox spacing="3">
<hbox>
- <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"/>
+ <combo param="analyzer_smoothing" expand="0" fill="0"/>
+ <combo param="analyzer_view" expand="0" fill="0"/>
+ <combo param="analyzer_post" expand="0" fill="0"/>
+ <combo param="analyzer_scale" expand="0" fill="0"/>
+ <combo param="analyzer_mode" expand="0" fill="0"/>
</hbox>
<line-graph refresh="1" width="560" height="240" param="analyzer_level" expand="1" fill="1" use_fade="1" fade="0.6"/>
<hbox>
@@ -28,22 +27,16 @@
<hbox expand="0" fill="0" spacing="12">
<label text="Accuracy" />
<knob param="analyzer_accuracy" size="1" expand="0" fill="0"/>
- <label text=" " />
+ <label text=" " />
<label text="Speed" />
<knob param="analyzer_speed" size="1" expand="0" fill="0"/>
- <label text=" " />
+ <label text=" " />
<label text="Hold" />
<toggle param="analyzer_hold" size="1" expand="0" fill="0" />
- <label text=" " />
+ <label text=" " />
<label text="Freeze" />
<toggle param="analyzer_freeze" size="1" expand="0" fill="0" />
- <label text=" " />
- <label text="Linear" />
- <toggle param="analyzer_linear" size="1" expand="0" fill="0" />
- <label text=" " />
- <label text="Bars" />
- <toggle param="analyzer_bars" size="1" expand="0" fill="0" />
- <label text=" " />
+ <label text=" " />
<label text="Display" />
<toggle param="analyzer_display" size="1" expand="0" fill="0" />
</hbox>
diff --git a/src/calf/metadata.h b/src/calf/metadata.h
index f02a24b..07434c3 100644
--- a/src/calf/metadata.h
+++ b/src/calf/metadata.h
@@ -409,7 +409,11 @@ 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_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_analyzer_level, param_analyzer_mode,
+ param_analyzer_scale, param_analyzer_post,
+ param_analyzer_view, param_analyzer_smoothing,
+ param_analyzer_accuracy, param_analyzer_speed,
+ param_analyzer_display, param_analyzer_hold, param_analyzer_freeze,
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 4a6b504..414dd37 100644
--- a/src/metadata.cpp
+++ b/src/metadata.cpp
@@ -983,38 +983,41 @@ 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_source_names[] = { "Average", "Left Channel", "Right Channel" };
-const char *analyzer_smooth_names[] = { "Falling", "Smoothing", "Off" };
-const char *analyzer_mode_names[] = { "Analyzer Normalized", "Analyzer Additive", "Analyzer Denoised Peaks", "Stereo Difference", "Stereo Image" };
+const char *analyzer_mode_names[] = { "Analyzer Average", "Analyzer Left", "Analyzer Right", "Analyzer Stereo", "Stereo Image", "Stereo Difference" };
+const char *analyzer_smooth_names[] = { "Off", "Falling", "Smoothing" };
+const char *analyzer_post_names[] = { "Normalized", "Additive", "Denoised Peaks" };
+const char *analyzer_view_names[] = { "Bars", "Lines", "Cubic Splines" };
+const char *analyzer_scale_names[] = { "Loagrithmic", "Linear" };
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" },
{ 0, 0, 1, 0, PF_FLOAT | PF_CTL_LED | PF_PROP_OUTPUT | PF_PROP_OPTIONAL, NULL, "clip_L", "Clip L" },
{ 0, 0, 1, 0, PF_FLOAT | PF_CTL_LED | PF_PROP_OUTPUT | PF_PROP_OPTIONAL, NULL, "clip_R", "Clip R" },
- { 1.33, 0.5, 2, 0, PF_FLOAT | PF_SCALE_LOG | PF_CTL_KNOB | PF_UNIT_COEF | PF_PROP_NOBOUNDS, NULL, "analyzer_level", "Analyzer Level" },
- { 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.125, 8, 0, PF_FLOAT | PF_SCALE_GAIN | PF_CTL_KNOB | PF_UNIT_COEF | PF_PROP_NOBOUNDS, NULL, "analyzer_level", "Analyzer Level" },
+ { 0, 0, 5, 0, PF_ENUM | PF_CTL_COMBO, analyzer_mode_names, "analyzer_mode", "Analyzer Mode" },
+ { 0, 0, 1, 2, PF_ENUM | PF_CTL_COMBO, analyzer_scale_names, "analyzer_scale", "Analyzer Scale" },
+ { 1, 0, 2, 0, PF_ENUM | PF_CTL_COMBO, analyzer_post_names, "analyzer_post", "Analyzer Post FFT" },
+ { 1, 0, 2, 2, PF_ENUM | PF_CTL_COMBO , analyzer_view_names, "analyzer_view", "Analyzer View" },
+ { 1, 0, 2, 0, PF_ENUM | PF_CTL_COMBO, analyzer_smooth_names, "analyzer_smoothing", "Analyzer Smoothing" },
+ { 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" },
- { 0, 0, 2, 0, PF_ENUM | PF_CTL_COMBO, analyzer_smooth_names, "analyzer_smoothing", "Analyzer Smoothing" },
{ 0, 0, 1, 0, PF_BOOL | PF_CTL_TOGGLE, NULL, "analyzer_hold", "Analyzer Hold" },
- { 0, 0, 1, 2, PF_BOOL | PF_CTL_TOGGLE , NULL, "analyzer_freeze", "Analyzer Freeze" },
- { 0, 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, 4, 0, PF_ENUM | PF_CTL_COMBO, analyzer_mode_names, "analyzer_mode", "Analyzer Mode" },
+ { 0, 0, 1, 2, PF_BOOL | PF_CTL_TOGGLE , NULL, "analyzer_freeze", "Analyzer Freeze" },
- { 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.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" },
{ 1, 0, 1, 0, PF_BOOL | PF_CTL_TOGGLE, NULL, "gonio_use_fade", "Gonio Fade Active" },
- { 0.5f, 0.f, 1.f, 0, PF_FLOAT | PF_SCALE_LINEAR | PF_CTL_KNOB | PF_UNIT_COEF | PF_PROP_GRAPH, NULL, "gonio_fade", "Gonio Fade" },
- { 4, 1, 5, 0, PF_INT | PF_SCALE_LINEAR | PF_CTL_KNOB | PF_UNIT_COEF | PF_PROP_GRAPH, NULL, "gonio_accuracy", "Gonio Accuracy" },
+ { 0.5f, 0.f, 1.f, 0, PF_FLOAT | PF_SCALE_LINEAR | PF_CTL_KNOB | PF_UNIT_COEF | PF_PROP_GRAPH, NULL, "gonio_fade", "Gonio Fade" },
+ { 4, 1, 5, 0, PF_INT | PF_SCALE_LINEAR | PF_CTL_KNOB | PF_UNIT_COEF | PF_PROP_GRAPH, NULL, "gonio_accuracy", "Gonio Accuracy" },
{ 1, 0, 1, 0, PF_BOOL | PF_CTL_TOGGLE, NULL, "gonio_display", "Gonio Display" },
{}
};
-CALF_PLUGIN_INFO(analyzer) = { 0x8588, "Analyzer", "Calf Analyzer", "Markus Schmidt / Christian Holschuh", calf_plugins::calf_copyright_info, "Analyzer" };
+CALF_PLUGIN_INFO(analyzer) = { 0x8588, "Analyzer", "Calf Analyzer", "Christian Holschuh / Markus Schmidt", calf_plugins::calf_copyright_info, "Analyzer" };
+
////////////////////////////////////////////////////////////////////////////
--
calf audio plugins packaging
More information about the pkg-multimedia-commits
mailing list