smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-10 08:36:32 +01:00
Code Issues Projects Releases Wiki Activity

Register colour aliases for tempo curve.

Browse source
This commit is contained in:
nick_m 2016-06-16 02:06:40 +10:00
parent 1413bca842
commit 8b0c5b8426
6 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
gtk2_ardour/editor_tempodisplay.cc
View file

@ -103,10 +103,10 @@ Editor::draw_metric_marks (const Metrics& metrics)
max_tempo = max (max_tempo, ts->beats_per_minute()); max_tempo = max (max_tempo, ts->beats_per_minute());
min_tempo = min (min_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)); *(const_cast<TempoSection*>(ts)), ts->frame(), false));
if (ts->position_lock_style() == MusicTime) { 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)))); *(const_cast<TempoSection*>(ts))));
} else { } else {
metric_marks.push_back (new TempoMarker (*this, *tempo_group, UIConfiguration::instance().color ("tempo marker"), buf, metric_marks.push_back (new TempoMarker (*this, *tempo_group, UIConfiguration::instance().color ("tempo marker"), buf,

2
gtk2_ardour/tempo_curve.cc
View file

@ -175,7 +175,7 @@ void
TempoCurve::set_color_rgba (uint32_t c) TempoCurve::set_color_rgba (uint32_t c)
{ {
_color = 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); _curve->set_outline_color (_color);
} }

2
gtk2_ardour/themes/blueberry-milk-ardour.colors
View file

@ -438,7 +438,9 @@
<ColorAlias name="stretch clock: text" alias="color 91"/> <ColorAlias name="stretch clock: text" alias="color 91"/>
<ColorAlias name="sync mark" alias="color 75"/> <ColorAlias name="sync mark" alias="color 75"/>
<ColorAlias name="tempo bar" alias="color 52"/> <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" alias="color 19"/>
<ColorAlias name="tempo marker music" alias="color 5"/>
<ColorAlias name="time axis frame" alias="color 4"/> <ColorAlias name="time axis frame" alias="color 4"/>
<ColorAlias name="time axis view item base" alias="color 94"/> <ColorAlias name="time axis view item base" alias="color 94"/>
<ColorAlias name="time stretch fill" alias="color 100"/> <ColorAlias name="time stretch fill" alias="color 100"/>

2
gtk2_ardour/themes/caineville-ardour.colors
View file

@ -432,7 +432,9 @@
<ColorAlias name="stereo panner text" alias="color 4"/> <ColorAlias name="stereo panner text" alias="color 4"/>
<ColorAlias name="sync mark" alias="color 75"/> <ColorAlias name="sync mark" alias="color 75"/>
<ColorAlias name="tempo bar" alias="color 46"/> <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" alias="color 19"/>
<ColorAlias name="tempo marker music" alias="color 5"/>
<ColorAlias name="time axis frame" alias="color 4"/> <ColorAlias name="time axis frame" alias="color 4"/>
<ColorAlias name="time axis view item base" alias="color 94"/> <ColorAlias name="time axis view item base" alias="color 94"/>
<ColorAlias name="time stretch fill" alias="color 100"/> <ColorAlias name="time stretch fill" alias="color 100"/>

2
gtk2_ardour/themes/cubasish-ardour.colors
View file

@ -432,7 +432,9 @@
<ColorAlias name="stereo panner text" alias="color 4"/> <ColorAlias name="stereo panner text" alias="color 4"/>
<ColorAlias name="sync mark" alias="color 75"/> <ColorAlias name="sync mark" alias="color 75"/>
<ColorAlias name="tempo bar" alias="color 46"/> <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" alias="color 19"/>
<ColorAlias name="tempo marker music" alias="color 5"/>
<ColorAlias name="time axis frame" alias="color 4"/> <ColorAlias name="time axis frame" alias="color 4"/>
<ColorAlias name="time axis view item base" alias="color 94"/> <ColorAlias name="time axis view item base" alias="color 94"/>
<ColorAlias name="time stretch fill" alias="color 100"/> <ColorAlias name="time stretch fill" alias="color 100"/>

2
gtk2_ardour/themes/dark-ardour.colors
View file

@ -442,7 +442,9 @@
<ColorAlias name="stretch clock: text" alias="color 91"/> <ColorAlias name="stretch clock: text" alias="color 91"/>
<ColorAlias name="sync mark" alias="color 75"/> <ColorAlias name="sync mark" alias="color 75"/>
<ColorAlias name="tempo bar" alias="color 46"/> <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" alias="color 19"/>
<ColorAlias name="tempo marker music" alias="color 5"/>
<ColorAlias name="time axis frame" alias="color 4"/> <ColorAlias name="time axis frame" alias="color 4"/>
<ColorAlias name="time axis view item base" alias="color 94"/> <ColorAlias name="time axis view item base" alias="color 94"/>
<ColorAlias name="time stretch fill" alias="color 100"/> <ColorAlias name="time stretch fill" alias="color 100"/>