allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

Add a colour for music-locked meters.

Browse Source
This commit is contained in:
nick_m
2016-08-20 04:33:51 +10:00
parent 91757960cc
commit 949dd8245d
6 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gtk2_ardour/editor_tempodisplay.cc
View File

@@ -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());

1
gtk2_ardour/themes/caineville-ardour.colors
View File

@@ -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"/>

1
gtk2_ardour/themes/clear-gray-ardour.colors
View File

@@ -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"/>

1
gtk2_ardour/themes/cubasish-ardour.colors
View File

@@ -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"/>

1
gtk2_ardour/themes/dark-ardour.colors
View File

@@ -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"/>

1
gtk2_ardour/themes/unastudia-ardour.colors
View File

@@ -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"/>