smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-09 08:14:58 +01:00
Code Issues Projects Releases Wiki Activity

make LED meter style optional

Browse source
This commit is contained in:
Robin Gareus 2013-07-28 03:01:37 +02:00 • committed by Paul Davis
parent d4c74b1718
commit d4c864d803
3 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
gtk2_ardour/level_meter.cc
View file

@ -183,6 +183,10 @@ LevelMeterBase::parameter_changed (string p)
color_changed = true; color_changed = true;
setup_meters (meter_length, regular_meter_width, thin_meter_width); setup_meters (meter_length, regular_meter_width, thin_meter_width);
} }
else if (p == "meter-style-led") {
color_changed = true;
setup_meters (meter_length, regular_meter_width, thin_meter_width);
}
else if (p == "meter-peak") { else if (p == "meter-peak") {
vector<MeterInfo>::iterator i; vector<MeterInfo>::iterator i;
uint32_t n; uint32_t n;
@ -257,7 +261,7 @@ LevelMeterBase::setup_meters (int len, int initial_width, int thin_width)
uint32_t c[10]; uint32_t c[10];
uint32_t b[4]; uint32_t b[4];
float stp[4]; float stp[4];
int styleflags = 3; int styleflags = Config->get_meter_style_led() ? 3 : 1;
b[0] = ARDOUR_UI::config()->canvasvar_MeterBackgroundBot.get(); b[0] = ARDOUR_UI::config()->canvasvar_MeterBackgroundBot.get();
b[1] = ARDOUR_UI::config()->canvasvar_MeterBackgroundTop.get(); b[1] = ARDOUR_UI::config()->canvasvar_MeterBackgroundTop.get();
b[2] = 0x991122ff; // red highlight gradient Bot b[2] = 0x991122ff; // red highlight gradient Bot
@ -348,7 +352,6 @@ LevelMeterBase::setup_meters (int len, int initial_width, int thin_width)
stp[3] = 115.0 * meter_deflect_vu(-18); // +2 stp[3] = 115.0 * meter_deflect_vu(-18); // +2
c[0] = c[1] = c[2] = c[3] = c[4] = c[5] = 0x00aa00ff; c[0] = c[1] = c[2] = c[3] = c[4] = c[5] = 0x00aa00ff;
c[6] = c[7] = c[8] = c[9] = 0xff8800ff; c[6] = c[7] = c[8] = c[9] = 0xff8800ff;
styleflags = 1;
break; break;
default: // PEAK, RMS default: // PEAK, RMS
stp[1] = 77.5; // 115 * log_meter(-10) stp[1] = 77.5; // 115 * log_meter(-10)

9
gtk2_ardour/rc_option_editor.cc
View file

@ -1962,6 +1962,15 @@ RCOptionEditor::RCOptionEditor ()
_("Specify the audio signal level in dbFS at and above which the meter-peak indicator will flash red.")); _("Specify the audio signal level in dbFS at and above which the meter-peak indicator will flash red."));
add_option (S_("Preferences|GUI"), mpks); add_option (S_("Preferences|GUI"), mpks);
add_option (S_("Preferences|GUI"),
new BoolOption (
"meter-style-led",
_("LED meter style"),
sigc::mem_fun (*_rc_config, &RCConfiguration::get_meter_style_led),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_meter_style_led)
));
} }
void void

1
libs/ardour/ardour/rc_configuration_vars.h
View file

@ -152,6 +152,7 @@ CONFIG_VARIABLE (float, meter_falloff, "meter-falloff", 32.0f)
CONFIG_VARIABLE (VUMeterStandard, meter_vu_standard, "meter-vu-standard", MeteringVUstandard) CONFIG_VARIABLE (VUMeterStandard, meter_vu_standard, "meter-vu-standard", MeteringVUstandard)
CONFIG_VARIABLE (MeterLineUp, meter_line_up_level, "meter-line-up-level", MeteringLineUp18) CONFIG_VARIABLE (MeterLineUp, meter_line_up_level, "meter-line-up-level", MeteringLineUp18)
CONFIG_VARIABLE (float, meter_peak, "meter-peak", 0.0f) CONFIG_VARIABLE (float, meter_peak, "meter-peak", 0.0f)
CONFIG_VARIABLE (bool, meter_style_led, "meter-style-led", true)
/* miscellany */ /* miscellany */