diff options
author | Robin Gareus <robin@gareus.org> | 2013-07-04 01:29:59 +0200 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2013-07-10 15:27:07 +0200 |
commit | 8a16e61b1153042a0cb97be13c58521c2bd60309 (patch) | |
tree | 7ba6ebf7b6bb74007bb7ceb3240f8b22a846d71b /gtk2_ardour | |
parent | 571b2d70e9f6e7799f74bd3eec90835101fddbe6 (diff) |
make all meter-colors configurable,..
Diffstat (limited to 'gtk2_ardour')
-rw-r--r-- | gtk2_ardour/ardour3_ui_default.conf | 33 | ||||
-rw-r--r-- | gtk2_ardour/canvas_vars.h | 33 | ||||
-rw-r--r-- | gtk2_ardour/level_meter.cc | 41 |
3 files changed, 74 insertions, 33 deletions
diff --git a/gtk2_ardour/ardour3_ui_default.conf b/gtk2_ardour/ardour3_ui_default.conf index b029f88355..e2c348107f 100644 --- a/gtk2_ardour/ardour3_ui_default.conf +++ b/gtk2_ardour/ardour3_ui_default.conf @@ -51,17 +51,28 @@ <Option name="measure line bar" value="ffffff9c"/> <Option name="measure line beat" value="a29e9e76"/> <Option name="meter bar" value="626470cc"/> - <Option name="meter fill min" value="0000ffff"/> - <Option name="meter fill clip" value="ff0000ff"/> - <Option name="meter fill mid" value="73f9baff"/> - <Option name="meter fill max" value="00fd5dff"/> - <Option name="meter background bottom" value="333333ff"/> - <Option name="meter background mid" value="444444ff"/> - <Option name="meter background top" value="444444ff"/> - <Option name="midi meter fill min" value="effaa100"/> - <Option name="midi meter fill clip" value="f83913ff"/> - <Option name="midi meter fill mid" value="8fc78e00"/> - <Option name="midi meter fill max" value="00f45600"/> + <Option name="meter fill: 0" value="008800ff"/> + <Option name="meter fill: 1" value="008800ff"/> + <Option name="meter fill: 2" value="00ff00ff"/> + <Option name="meter fill: 3" value="00ff00ff"/> + <Option name="meter fill: 4" value="fff000ff"/> + <Option name="meter fill: 5" value="fff000ff"/> + <Option name="meter fill: 6" value="ff8000ff"/> + <Option name="meter fill: 7" value="ff8000ff"/> + <Option name="meter fill: 8" value="ff0000ff"/> + <Option name="meter fill: 9" value="ff0000ff"/> + <Option name="meter background: bottom" value="333333ff"/> + <Option name="meter background: top" value="444444ff"/> + <Option name="midi meter fill: 0" value="008850ff"/> + <Option name="midi meter fill: 1" value="008850ff"/> + <Option name="midi meter fill: 2" value="00ff50ff"/> + <Option name="midi meter fill: 3" value="00ff50ff"/> + <Option name="midi meter fill: 4" value="fff050ff"/> + <Option name="midi meter fill: 5" value="fff050ff"/> + <Option name="midi meter fill: 6" value="ff8050ff"/> + <Option name="midi meter fill: 7" value="ff8050ff"/> + <Option name="midi meter fill: 8" value="ff0050ff"/> + <Option name="midi meter fill: 9" value="ff0050ff"/> <Option name="meter marker" value="f2425bff"/> <Option name="midi bus base" value="00000000"/> <Option name="midi frame base" value="393d3766"/> diff --git a/gtk2_ardour/canvas_vars.h b/gtk2_ardour/canvas_vars.h index 7859ccd649..29477f98f0 100644 --- a/gtk2_ardour/canvas_vars.h +++ b/gtk2_ardour/canvas_vars.h @@ -65,17 +65,28 @@ CANVAS_VARIABLE(canvasvar_MeasureLineBar, "measure line bar") CANVAS_VARIABLE(canvasvar_MeasureLineBeat, "measure line beat") CANVAS_VARIABLE(canvasvar_MeterBar, "meter bar") CANVAS_VARIABLE(canvasvar_MeterBridgePeakLabel, "meterbridge peaklabel") -CANVAS_VARIABLE(canvasvar_MeterColorBase, "meter fill min") -CANVAS_VARIABLE(canvasvar_MeterColorClip, "meter fill clip") -CANVAS_VARIABLE(canvasvar_MeterColorMid, "meter fill mid") -CANVAS_VARIABLE(canvasvar_MeterColorTop, "meter fill max") -CANVAS_VARIABLE(canvasvar_MidiMeterColorBase, "midi meter fill min") -CANVAS_VARIABLE(canvasvar_MidiMeterColorClip, "midi meter fill clip") -CANVAS_VARIABLE(canvasvar_MidiMeterColorMid, "midi meter fill mid") -CANVAS_VARIABLE(canvasvar_MidiMeterColorTop, "midi meter fill max") -CANVAS_VARIABLE(canvasvar_MeterBackgroundBot, "meter background bottom") -CANVAS_VARIABLE(canvasvar_MeterBackgroundMid, "meter background mid") -CANVAS_VARIABLE(canvasvar_MeterBackgroundTop, "meter background top") +CANVAS_VARIABLE(canvasvar_MeterColor0, "meter fill: 0") +CANVAS_VARIABLE(canvasvar_MeterColor1, "meter fill: 1") +CANVAS_VARIABLE(canvasvar_MeterColor2, "meter fill: 2") +CANVAS_VARIABLE(canvasvar_MeterColor3, "meter fill: 3") +CANVAS_VARIABLE(canvasvar_MeterColor4, "meter fill: 4") +CANVAS_VARIABLE(canvasvar_MeterColor5, "meter fill: 5") +CANVAS_VARIABLE(canvasvar_MeterColor6, "meter fill: 6") +CANVAS_VARIABLE(canvasvar_MeterColor7, "meter fill: 7") +CANVAS_VARIABLE(canvasvar_MeterColor8, "meter fill: 8") +CANVAS_VARIABLE(canvasvar_MeterColor9, "meter fill: 9") +CANVAS_VARIABLE(canvasvar_MidiMeterColor0, "midi meter fill: 0") +CANVAS_VARIABLE(canvasvar_MidiMeterColor1, "midi meter fill: 1") +CANVAS_VARIABLE(canvasvar_MidiMeterColor2, "midi meter fill: 2") +CANVAS_VARIABLE(canvasvar_MidiMeterColor3, "midi meter fill: 3") +CANVAS_VARIABLE(canvasvar_MidiMeterColor4, "midi meter fill: 4") +CANVAS_VARIABLE(canvasvar_MidiMeterColor5, "midi meter fill: 5") +CANVAS_VARIABLE(canvasvar_MidiMeterColor6, "midi meter fill: 6") +CANVAS_VARIABLE(canvasvar_MidiMeterColor7, "midi meter fill: 7") +CANVAS_VARIABLE(canvasvar_MidiMeterColor8, "midi meter fill: 8") +CANVAS_VARIABLE(canvasvar_MidiMeterColor9, "midi meter fill: 9") +CANVAS_VARIABLE(canvasvar_MeterBackgroundBot, "meter background: bottom") +CANVAS_VARIABLE(canvasvar_MeterBackgroundTop, "meter background: top") CANVAS_VARIABLE(canvasvar_MeterMarker, "meter marker") CANVAS_VARIABLE(canvasvar_MidiBusBase, "midi bus base") CANVAS_VARIABLE(canvasvar_MidiFrameBase, "midi frame base") diff --git a/gtk2_ardour/level_meter.cc b/gtk2_ardour/level_meter.cc index 1c4a26a0c5..a25efcc7c7 100644 --- a/gtk2_ardour/level_meter.cc +++ b/gtk2_ardour/level_meter.cc @@ -181,24 +181,43 @@ LevelMeter::setup_meters (int len, int initial_width, int thin_width) //cerr << "LevelMeter::setup_meters() called color_changed = " << color_changed << " colors: " << endl;//DEBUG for (int32_t n = nmeters-1; nmeters && n >= 0 ; --n) { - uint32_t b, m, t, c; + uint32_t c[10]; + float stp[4] = {55.0, 77.5, 92.5, 100.0}; if (n < nmidi) { - b = ARDOUR_UI::config()->canvasvar_MidiMeterColorBase.get(); - m = ARDOUR_UI::config()->canvasvar_MidiMeterColorMid.get(); - t = ARDOUR_UI::config()->canvasvar_MidiMeterColorTop.get(); - c = ARDOUR_UI::config()->canvasvar_MeterColorClip.get(); + c[0] = ARDOUR_UI::config()->canvasvar_MidiMeterColor0.get(); + c[1] = ARDOUR_UI::config()->canvasvar_MidiMeterColor1.get(); + c[2] = ARDOUR_UI::config()->canvasvar_MidiMeterColor2.get(); + c[3] = ARDOUR_UI::config()->canvasvar_MidiMeterColor3.get(); + c[4] = ARDOUR_UI::config()->canvasvar_MidiMeterColor4.get(); + c[5] = ARDOUR_UI::config()->canvasvar_MidiMeterColor5.get(); + c[6] = ARDOUR_UI::config()->canvasvar_MidiMeterColor6.get(); + c[7] = ARDOUR_UI::config()->canvasvar_MidiMeterColor7.get(); + c[8] = ARDOUR_UI::config()->canvasvar_MidiMeterColor8.get(); + c[9] = ARDOUR_UI::config()->canvasvar_MidiMeterColor9.get(); + 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 { - b = ARDOUR_UI::config()->canvasvar_MeterColorBase.get(); - m = ARDOUR_UI::config()->canvasvar_MeterColorMid.get(); - t = ARDOUR_UI::config()->canvasvar_MeterColorTop.get(); - c = ARDOUR_UI::config()->canvasvar_MeterColorClip.get(); + c[0] = ARDOUR_UI::config()->canvasvar_MeterColor0.get(); + c[1] = ARDOUR_UI::config()->canvasvar_MeterColor1.get(); + c[2] = ARDOUR_UI::config()->canvasvar_MeterColor2.get(); + c[3] = ARDOUR_UI::config()->canvasvar_MeterColor3.get(); + c[4] = ARDOUR_UI::config()->canvasvar_MeterColor4.get(); + c[5] = ARDOUR_UI::config()->canvasvar_MeterColor5.get(); + c[6] = ARDOUR_UI::config()->canvasvar_MeterColor6.get(); + c[7] = ARDOUR_UI::config()->canvasvar_MeterColor7.get(); + c[8] = ARDOUR_UI::config()->canvasvar_MeterColor8.get(); + c[9] = ARDOUR_UI::config()->canvasvar_MeterColor9.get(); } if (meters[n].width != width || meters[n].length != len || color_changed) { delete meters[n].meter; meters[n].meter = new FastMeter ((uint32_t) floor (Config->get_meter_hold()), width, FastMeter::Vertical, len, - b, b, m, m, t, t, c, c, c, c, + c[0], c[1], c[2], c[3], c[4], + c[5], c[6], c[7], c[8], c[9], ARDOUR_UI::config()->canvasvar_MeterBackgroundBot.get(), - ARDOUR_UI::config()->canvasvar_MeterBackgroundTop.get() + ARDOUR_UI::config()->canvasvar_MeterBackgroundTop.get(), + stp[0], stp[1], stp[2], stp[3] ); meters[n].width = width; meters[n].length = len; |