Add a colour for music-locked meters.

diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc
index 9c562a4d8697faf8026c14fd04c5c12c8ecf45fb..727473e22e40ee6b09f5d53b2952ee55f4281991 100644 (file)
--- 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 7b4fe2eb388727824acc93d4138413e3dd100ec1..40db9806ec41da73f5833ba0104f5fe47f289c40 100644 (file)
--- 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 c266e3842ca40bdfbb73b85231299b5eccb00f76..ad979f67a22b6831185d03b7aab19a61b2c9c5fe 100644 (file)
--- 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 c39450c54ebd9ca4269c22a0a154c52275dc3e03..00ea1e8b6ce0ed4757a802b94263b2172631b9bb 100644 (file)
--- 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 37cf1377b76480ef83229fe86d972e5a7ccd829b..321d482ae362eaa47d2bfae3640eaba8640562d3 100644 (file)
--- 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 176d690b52a89914cf69f5067a03122b3f06a2d9..15c8809383b6e3f1cbcb6ff235f700cf00c6a13c 100644 (file)
--- 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"/>