diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-07-11 09:11:53 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-07-11 09:11:53 -0400 |
| commit | 580520b12f90251e38d94a1a5d6a199b76142b0b (patch) | |
| tree | a20b79ac88794d4d92b88569e643ff67b515d6c3 /gtk2_ardour/ardour3_ui_default.conf | |
| parent | 0947791a800aa20ee0ea6a0334c789ab7a34fa90 (diff) | |
| parent | b649f0a21b711c68cba5e26945650fd36f657268 (diff) | |
fix conflicts caused by meterbridge merge
Diffstat (limited to 'gtk2_ardour/ardour3_ui_default.conf')
| -rw-r--r-- | gtk2_ardour/ardour3_ui_default.conf | 38 |
1 files changed, 30 insertions, 8 deletions
diff --git a/gtk2_ardour/ardour3_ui_default.conf b/gtk2_ardour/ardour3_ui_default.conf index 88970cbbd7..5208f5eb92 100644 --- a/gtk2_ardour/ardour3_ui_default.conf +++ b/gtk2_ardour/ardour3_ui_default.conf @@ -51,14 +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="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="effaa1ff"/> + <Option name="midi meter fill: 1" value="f2c97dff"/> + <Option name="midi meter fill: 2" value="f2c97dff"/> + <Option name="midi meter fill: 3" value="f48f52ff"/> + <Option name="midi meter fill: 4" value="f48f52ff"/> + <Option name="midi meter fill: 5" value="f83913ff"/> + <Option name="midi meter fill: 6" value="f83913ff"/> + <Option name="midi meter fill: 7" value="8fc78eff"/> + <Option name="midi meter fill: 8" value="8fc78eff"/> + <Option name="midi meter fill: 9" value="00f45600"/> <Option name="meter marker" value="f2425bff"/> <Option name="midi bus base" value="00000000"/> <Option name="midi frame base" value="393d3766"/> @@ -188,6 +202,9 @@ <Option name="monitor button: led active" value="ff0000ff"/> <Option name="monitor button: text" value="aaaaa3ff"/> <Option name="monitor button: text active" value="1a1a1aff"/> + <Option name="meterbridge label: fill start" value="444444ff"/> + <Option name="meterbridge label: fill end" value="333333ff"/> + <Option name="meterbridge label: text" value="c7c7d8ff"/> <Option name="solo isolate: fill start" value="5f5a58ff"/> <Option name="solo isolate: fill end" value="504442ff"/> <Option name="solo isolate: fill start active" value="5d5856ff"/> @@ -204,6 +221,11 @@ <Option name="solo safe: led active" value="ff0000ff"/> <Option name="solo safe: text" value="c7c7d8ff"/> <Option name="solo safe: text active" value="c8c8d9ff"/> + <Option name="meterbridge peaklabel" value="cc4422ff"/> + <Option name="meterbridge peakindicator: fill start" value="444444ff"/> + <Option name="meterbridge peakindicator: fill end" value="333333ff"/> + <Option name="meterbridge peakindicator on: fill start" value="ff0000ff"/> + <Option name="meterbridge peakindicator on: fill end" value="880000ff"/> <Option name="monitor section cut: fill start" value="5f5a58ff"/> <Option name="monitor section cut: fill end" value="4f4a48ff"/> <Option name="monitor section cut: fill start active" value="5f4943ff"/> |