From ba4d1cd1c1d5e4b47e288cd83c81011e7399207b Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 21 Oct 2014 22:55:08 -0400 Subject: remove "canvasvar_" from all functions related to obtaining values from ARDOUR_UI::config() --- gtk2_ardour/level_meter.cc | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'gtk2_ardour/level_meter.cc') diff --git a/gtk2_ardour/level_meter.cc b/gtk2_ardour/level_meter.cc index 9f50f6cc05..1257c7a6b3 100644 --- a/gtk2_ardour/level_meter.cc +++ b/gtk2_ardour/level_meter.cc @@ -273,36 +273,36 @@ LevelMeterBase::setup_meters (int len, int initial_width, int thin_width) uint32_t b[4]; float stp[4]; int styleflags = Config->get_meter_style_led() ? 3 : 1; - b[0] = ARDOUR_UI::config()->get_canvasvar_MeterBackgroundBot(); - b[1] = ARDOUR_UI::config()->get_canvasvar_MeterBackgroundTop(); + b[0] = ARDOUR_UI::config()->get_MeterBackgroundBot(); + b[1] = ARDOUR_UI::config()->get_MeterBackgroundTop(); b[2] = 0x991122ff; // red highlight gradient Bot b[3] = 0x551111ff; // red highlight gradient Top if (n < nmidi) { - c[0] = ARDOUR_UI::config()->get_canvasvar_MidiMeterColor0(); - c[1] = ARDOUR_UI::config()->get_canvasvar_MidiMeterColor1(); - c[2] = ARDOUR_UI::config()->get_canvasvar_MidiMeterColor2(); - c[3] = ARDOUR_UI::config()->get_canvasvar_MidiMeterColor3(); - c[4] = ARDOUR_UI::config()->get_canvasvar_MidiMeterColor4(); - c[5] = ARDOUR_UI::config()->get_canvasvar_MidiMeterColor5(); - c[6] = ARDOUR_UI::config()->get_canvasvar_MidiMeterColor6(); - c[7] = ARDOUR_UI::config()->get_canvasvar_MidiMeterColor7(); - c[8] = ARDOUR_UI::config()->get_canvasvar_MidiMeterColor8(); - c[9] = ARDOUR_UI::config()->get_canvasvar_MidiMeterColor9(); + c[0] = ARDOUR_UI::config()->get_MidiMeterColor0(); + c[1] = ARDOUR_UI::config()->get_MidiMeterColor1(); + c[2] = ARDOUR_UI::config()->get_MidiMeterColor2(); + c[3] = ARDOUR_UI::config()->get_MidiMeterColor3(); + c[4] = ARDOUR_UI::config()->get_MidiMeterColor4(); + c[5] = ARDOUR_UI::config()->get_MidiMeterColor5(); + c[6] = ARDOUR_UI::config()->get_MidiMeterColor6(); + c[7] = ARDOUR_UI::config()->get_MidiMeterColor7(); + c[8] = ARDOUR_UI::config()->get_MidiMeterColor8(); + c[9] = ARDOUR_UI::config()->get_MidiMeterColor9(); stp[0] = 115.0 * 32.0 / 128.0; stp[1] = 115.0 * 64.0 / 128.0; stp[2] = 115.0 * 100.0 / 128.0; stp[3] = 115.0 * 112.0 / 128.0; } else { - c[0] = ARDOUR_UI::config()->get_canvasvar_MeterColor0(); - c[1] = ARDOUR_UI::config()->get_canvasvar_MeterColor1(); - c[2] = ARDOUR_UI::config()->get_canvasvar_MeterColor2(); - c[3] = ARDOUR_UI::config()->get_canvasvar_MeterColor3(); - c[4] = ARDOUR_UI::config()->get_canvasvar_MeterColor4(); - c[5] = ARDOUR_UI::config()->get_canvasvar_MeterColor5(); - c[6] = ARDOUR_UI::config()->get_canvasvar_MeterColor6(); - c[7] = ARDOUR_UI::config()->get_canvasvar_MeterColor7(); - c[8] = ARDOUR_UI::config()->get_canvasvar_MeterColor8(); - c[9] = ARDOUR_UI::config()->get_canvasvar_MeterColor9(); + c[0] = ARDOUR_UI::config()->get_MeterColor0(); + c[1] = ARDOUR_UI::config()->get_MeterColor1(); + c[2] = ARDOUR_UI::config()->get_MeterColor2(); + c[3] = ARDOUR_UI::config()->get_MeterColor3(); + c[4] = ARDOUR_UI::config()->get_MeterColor4(); + c[5] = ARDOUR_UI::config()->get_MeterColor5(); + c[6] = ARDOUR_UI::config()->get_MeterColor6(); + c[7] = ARDOUR_UI::config()->get_MeterColor7(); + c[8] = ARDOUR_UI::config()->get_MeterColor8(); + c[9] = ARDOUR_UI::config()->get_MeterColor9(); switch (meter_type) { case MeterK20: -- cgit v1.2.3