From 8b0c5b8426497cc8e96d0d695efcd5ededdd419b Mon Sep 17 00:00:00 2001
From: nick_m <mainsbridge@gmail.com>
Date: Thu, 16 Jun 2016 02:06:40 +1000
Subject: Register colour aliases for tempo curve.

---
 gtk2_ardour/editor_tempodisplay.cc              | 4 ++--
 gtk2_ardour/tempo_curve.cc                      | 2 +-
 gtk2_ardour/themes/blueberry-milk-ardour.colors | 2 ++
 gtk2_ardour/themes/caineville-ardour.colors     | 2 ++
 gtk2_ardour/themes/cubasish-ardour.colors       | 2 ++
 gtk2_ardour/themes/dark-ardour.colors           | 2 ++
 6 files changed, 11 insertions(+), 3 deletions(-)

(limited to 'gtk2_ardour')

diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc
index c754942e22..fa7d22ec89 100644
--- a/gtk2_ardour/editor_tempodisplay.cc
+++ b/gtk2_ardour/editor_tempodisplay.cc
@@ -103,10 +103,10 @@ Editor::draw_metric_marks (const Metrics& metrics)
 			max_tempo = max (max_tempo, ts->beats_per_minute());
 			min_tempo = min (min_tempo, ts->beats_per_minute());
 
-			tempo_curves.push_back (new TempoCurve (*this, *tempo_group, UIConfiguration::instance().color ("color 62"),
+			tempo_curves.push_back (new TempoCurve (*this, *tempo_group, UIConfiguration::instance().color ("tempo curve"),
 								*(const_cast<TempoSection*>(ts)), ts->frame(), false));
 			if (ts->position_lock_style() == MusicTime) {
-				metric_marks.push_back (new TempoMarker (*this, *tempo_group, UIConfiguration::instance().color ("color 5"), buf,
+				metric_marks.push_back (new TempoMarker (*this, *tempo_group, UIConfiguration::instance().color ("tempo marker music"), buf,
 								 *(const_cast<TempoSection*>(ts))));
 			} else {
 				metric_marks.push_back (new TempoMarker (*this, *tempo_group, UIConfiguration::instance().color ("tempo marker"), buf,
diff --git a/gtk2_ardour/tempo_curve.cc b/gtk2_ardour/tempo_curve.cc
index b8fb661919..bc83bfaa42 100644
--- a/gtk2_ardour/tempo_curve.cc
+++ b/gtk2_ardour/tempo_curve.cc
@@ -175,7 +175,7 @@ void
 TempoCurve::set_color_rgba (uint32_t c)
 {
 	_color = c;
-	_curve->set_fill_color (UIConfiguration::instance().color_mod ("color 62", "selection rect"));
+	_curve->set_fill_color (UIConfiguration::instance().color_mod ("tempo curve", "selection rect"));
 	_curve->set_outline_color (_color);
 
 }
diff --git a/gtk2_ardour/themes/blueberry-milk-ardour.colors b/gtk2_ardour/themes/blueberry-milk-ardour.colors
index dd59348415..c61a130fe5 100755
--- a/gtk2_ardour/themes/blueberry-milk-ardour.colors
+++ b/gtk2_ardour/themes/blueberry-milk-ardour.colors
@@ -438,7 +438,9 @@
     <ColorAlias name="stretch clock: text" alias="color 91"/>
     <ColorAlias name="sync mark" alias="color 75"/>
     <ColorAlias name="tempo bar" alias="color 52"/>
+    <ColorAlias name="tempo curve" alias="color 62"/>
     <ColorAlias name="tempo marker" alias="color 19"/>
+    <ColorAlias name="tempo marker music" alias="color 5"/>
     <ColorAlias name="time axis frame" alias="color 4"/>
     <ColorAlias name="time axis view item base" alias="color 94"/>
     <ColorAlias name="time stretch fill" alias="color 100"/>
diff --git a/gtk2_ardour/themes/caineville-ardour.colors b/gtk2_ardour/themes/caineville-ardour.colors
index 1d4dce58b9..c721305831 100755
--- a/gtk2_ardour/themes/caineville-ardour.colors
+++ b/gtk2_ardour/themes/caineville-ardour.colors
@@ -432,7 +432,9 @@
     <ColorAlias name="stereo panner text" alias="color 4"/>
     <ColorAlias name="sync mark" alias="color 75"/>
     <ColorAlias name="tempo bar" alias="color 46"/>
+    <ColorAlias name="tempo curve" alias="color 62"/>
     <ColorAlias name="tempo marker" alias="color 19"/>
+    <ColorAlias name="tempo marker music" alias="color 5"/>
     <ColorAlias name="time axis frame" alias="color 4"/>
     <ColorAlias name="time axis view item base" alias="color 94"/>
     <ColorAlias name="time stretch fill" alias="color 100"/>
diff --git a/gtk2_ardour/themes/cubasish-ardour.colors b/gtk2_ardour/themes/cubasish-ardour.colors
index 68cb6668a2..2421e0adfe 100755
--- a/gtk2_ardour/themes/cubasish-ardour.colors
+++ b/gtk2_ardour/themes/cubasish-ardour.colors
@@ -432,7 +432,9 @@
     <ColorAlias name="stereo panner text" alias="color 4"/>
     <ColorAlias name="sync mark" alias="color 75"/>
     <ColorAlias name="tempo bar" alias="color 46"/>
+    <ColorAlias name="tempo curve" alias="color 62"/>
     <ColorAlias name="tempo marker" alias="color 19"/>
+    <ColorAlias name="tempo marker music" alias="color 5"/>
     <ColorAlias name="time axis frame" alias="color 4"/>
     <ColorAlias name="time axis view item base" alias="color 94"/>
     <ColorAlias name="time stretch fill" alias="color 100"/>
diff --git a/gtk2_ardour/themes/dark-ardour.colors b/gtk2_ardour/themes/dark-ardour.colors
index 5adbea71ba..7788ad774f 100644
--- a/gtk2_ardour/themes/dark-ardour.colors
+++ b/gtk2_ardour/themes/dark-ardour.colors
@@ -442,7 +442,9 @@
     <ColorAlias name="stretch clock: text" alias="color 91"/>
     <ColorAlias name="sync mark" alias="color 75"/>
     <ColorAlias name="tempo bar" alias="color 46"/>
+    <ColorAlias name="tempo curve" alias="color 62"/>
     <ColorAlias name="tempo marker" alias="color 19"/>
+    <ColorAlias name="tempo marker music" alias="color 5"/>
     <ColorAlias name="time axis frame" alias="color 4"/>
     <ColorAlias name="time axis view item base" alias="color 94"/>
     <ColorAlias name="time stretch fill" alias="color 100"/>
-- 
cgit v1.2.3