diff options
| author | nick_m <mainsbridge@gmail.com> | 2016-08-20 04:33:51 +1000 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2016-08-20 04:33:51 +1000 |
| commit | 949dd8245d1f6c6b0f6815d9f0bd911c38cbfe89 (patch) | |
| tree | 332fd17b0613b1e79cc92c2706018944f7cef168 /gtk2_ardour | |
| parent | 91757960cc708f87fcbd384e611d093a08e2b9c5 (diff) | |
Add a colour for music-locked meters.
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/editor_tempodisplay.cc | 9 | ||||
| -rw-r--r-- | gtk2_ardour/themes/caineville-ardour.colors | 1 | ||||
| -rw-r--r-- | gtk2_ardour/themes/clear-gray-ardour.colors | 1 | ||||
| -rw-r--r-- | gtk2_ardour/themes/cubasish-ardour.colors | 1 | ||||
| -rw-r--r-- | gtk2_ardour/themes/dark-ardour.colors | 1 | ||||
| -rw-r--r-- | gtk2_ardour/themes/unastudia-ardour.colors | 1 |
6 files changed, 12 insertions, 2 deletions
diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc index 9c562a4d86..727473e22e 100644 --- a/gtk2_ardour/editor_tempodisplay.cc +++ b/gtk2_ardour/editor_tempodisplay.cc @@ -91,8 +91,13 @@ Editor::draw_metric_marks (const Metrics& metrics) if ((ms = dynamic_cast<const MeterSection*>(*i)) != 0) { snprintf (buf, sizeof(buf), "%g/%g", ms->divisions_per_bar(), ms->note_divisor ()); - metric_marks.push_back (new MeterMarker (*this, *meter_group, UIConfiguration::instance().color ("meter marker"), buf, - *(const_cast<MeterSection*>(ms)))); + if (ms->position_lock_style() == MusicTime) { + metric_marks.push_back (new MeterMarker (*this, *meter_group, UIConfiguration::instance().color ("meter marker music"), buf, + *(const_cast<MeterSection*>(ms)))); + } else { + metric_marks.push_back (new MeterMarker (*this, *meter_group, UIConfiguration::instance().color ("meter marker"), buf, + *(const_cast<MeterSection*>(ms)))); + } } else if ((ts = dynamic_cast<const TempoSection*>(*i)) != 0) { if (UIConfiguration::instance().get_allow_non_quarter_pulse()) { snprintf (buf, sizeof (buf), "%.3f/%.0f", ts->beats_per_minute(), ts->note_type()); diff --git a/gtk2_ardour/themes/caineville-ardour.colors b/gtk2_ardour/themes/caineville-ardour.colors index 7b4fe2eb38..40db9806ec 100644 --- a/gtk2_ardour/themes/caineville-ardour.colors +++ b/gtk2_ardour/themes/caineville-ardour.colors @@ -240,6 +240,7 @@ <ColorAlias name="meter bar" alias="color 7"/> <ColorAlias name="meter color BBC" alias="color 8"/> <ColorAlias name="meter marker" alias="color 19"/> + <ColorAlias name="meter marker music" alias="color 5"/> <ColorAlias name="meterbridge label: fill" alias="color 34"/> <ColorAlias name="meterbridge label: fill active" alias="color 46"/> <ColorAlias name="meterbridge label: led" alias="color 9"/> diff --git a/gtk2_ardour/themes/clear-gray-ardour.colors b/gtk2_ardour/themes/clear-gray-ardour.colors index c266e3842c..ad979f67a2 100644 --- a/gtk2_ardour/themes/clear-gray-ardour.colors +++ b/gtk2_ardour/themes/clear-gray-ardour.colors @@ -240,6 +240,7 @@ <ColorAlias name="meter bar" alias="color 7"/> <ColorAlias name="meter color BBC" alias="color 8"/> <ColorAlias name="meter marker" alias="color 19"/> + <ColorAlias name="meter marker music" alias="color 5"/> <ColorAlias name="meterbridge label: fill" alias="color 81"/> <ColorAlias name="meterbridge label: fill active" alias="color 48"/> <ColorAlias name="meterbridge label: led" alias="meter color8"/> diff --git a/gtk2_ardour/themes/cubasish-ardour.colors b/gtk2_ardour/themes/cubasish-ardour.colors index c39450c54e..00ea1e8b6c 100644 --- a/gtk2_ardour/themes/cubasish-ardour.colors +++ b/gtk2_ardour/themes/cubasish-ardour.colors @@ -240,6 +240,7 @@ <ColorAlias name="meter bar" alias="color 7"/> <ColorAlias name="meter color BBC" alias="color 8"/> <ColorAlias name="meter marker" alias="color 19"/> + <ColorAlias name="meter marker music" alias="color 5"/> <ColorAlias name="meterbridge label: fill" alias="color 34"/> <ColorAlias name="meterbridge label: fill active" alias="color 46"/> <ColorAlias name="meterbridge label: led" alias="color 9"/> diff --git a/gtk2_ardour/themes/dark-ardour.colors b/gtk2_ardour/themes/dark-ardour.colors index 37cf1377b7..321d482ae3 100644 --- a/gtk2_ardour/themes/dark-ardour.colors +++ b/gtk2_ardour/themes/dark-ardour.colors @@ -240,6 +240,7 @@ <ColorAlias name="meter bar" alias="color 7"/> <ColorAlias name="meter color BBC" alias="color 8"/> <ColorAlias name="meter marker" alias="color 19"/> + <ColorAlias name="meter marker music" alias="color 5"/> <ColorAlias name="meterbridge label: fill" alias="color 34"/> <ColorAlias name="meterbridge label: fill active" alias="color 46"/> <ColorAlias name="meterbridge label: led" alias="color 9"/> diff --git a/gtk2_ardour/themes/unastudia-ardour.colors b/gtk2_ardour/themes/unastudia-ardour.colors index 176d690b52..15c8809383 100644 --- a/gtk2_ardour/themes/unastudia-ardour.colors +++ b/gtk2_ardour/themes/unastudia-ardour.colors @@ -245,6 +245,7 @@ <ColorAlias name="meter bar" alias="color 67"/> <ColorAlias name="meter color BBC" alias="color 1"/> <ColorAlias name="meter marker" alias="color 108"/> + <ColorAlias name="meter marker music" alias="color 5"/> <ColorAlias name="meterbridge label: fill" alias="color 42"/> <ColorAlias name="meterbridge label: fill active" alias="color 1"/> <ColorAlias name="meterbridge label: led" alias="color 9"/> |