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

Show tempo lines under marker bars.

Browse source
This commit is contained in:
David Robillard 2015-01-08 15:24:14 -05:00
parent fe71dd3d81
commit e70c9a3da1
2 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
gtk2_ardour/dark.colors
View file

@ -488,6 +488,7 @@
<Modifier name="ghost track midi fill" modifier="= alpha:0.3"/> <Modifier name="ghost track midi fill" modifier="= alpha:0.3"/>
<Modifier name="inactive crossfade" modifier="= alpha:0.4666"/> <Modifier name="inactive crossfade" modifier="= alpha:0.4666"/>
<Modifier name="loop rectangle" modifier="= alpha:0.9764"/> <Modifier name="loop rectangle" modifier="= alpha:0.9764"/>
<Modifier name="marker bar" modifier="= alpha:0.5"/>
<Modifier name="measure line beat" modifier="= alpha:0.8"/> <Modifier name="measure line beat" modifier="= alpha:0.8"/>
<Modifier name="midi frame base" modifier="= alpha:0.4"/> <Modifier name="midi frame base" modifier="= alpha:0.4"/>
<Modifier name="midi note" modifier="= alpha:0.686905"/> <Modifier name="midi note" modifier="= alpha:0.686905"/>

14
gtk2_ardour/editor_canvas.cc
View file

@ -123,7 +123,7 @@ Editor::initialize_canvas ()
transport_punch_range_rect->hide(); transport_punch_range_rect->hide();
/*a group to hold time (measure) lines */ /*a group to hold time (measure) lines */
time_line_group = new ArdourCanvas::Container (hv_scroll_group); time_line_group = new ArdourCanvas::Container (h_scroll_group);
CANVAS_DEBUG_NAME (time_line_group, "time line group"); CANVAS_DEBUG_NAME (time_line_group, "time line group");
_trackview_group = new ArdourCanvas::Container (hv_scroll_group); _trackview_group = new ArdourCanvas::Container (hv_scroll_group);
@ -899,22 +899,22 @@ Editor::color_handler()
playhead_cursor->set_color (ARDOUR_UI::config()->color ("play head")); playhead_cursor->set_color (ARDOUR_UI::config()->color ("play head"));
meter_bar->set_fill_color (ARDOUR_UI::config()->color ("meter bar")); meter_bar->set_fill_color (ARDOUR_UI::config()->color_mod ("meter bar", "marker bar"));
meter_bar->set_outline_color (ARDOUR_UI::config()->color ("marker bar separator")); meter_bar->set_outline_color (ARDOUR_UI::config()->color ("marker bar separator"));
tempo_bar->set_fill_color (ARDOUR_UI::config()->color ("tempo bar")); tempo_bar->set_fill_color (ARDOUR_UI::config()->color_mod ("tempo bar", "marker bar"));
tempo_bar->set_outline_color (ARDOUR_UI::config()->color ("marker bar separator")); tempo_bar->set_outline_color (ARDOUR_UI::config()->color ("marker bar separator"));
marker_bar->set_fill_color (ARDOUR_UI::config()->color ("marker bar")); marker_bar->set_fill_color (ARDOUR_UI::config()->color_mod ("marker bar", "marker bar"));
marker_bar->set_outline_color (ARDOUR_UI::config()->color ("marker bar separator")); marker_bar->set_outline_color (ARDOUR_UI::config()->color ("marker bar separator"));
cd_marker_bar->set_fill_color (ARDOUR_UI::config()->color ("cd marker bar")); cd_marker_bar->set_fill_color (ARDOUR_UI::config()->color_mod ("cd marker bar", "marker bar"));
cd_marker_bar->set_outline_color (ARDOUR_UI::config()->color ("marker bar separator")); cd_marker_bar->set_outline_color (ARDOUR_UI::config()->color ("marker bar separator"));
range_marker_bar->set_fill_color (ARDOUR_UI::config()->color ("range marker bar")); range_marker_bar->set_fill_color (ARDOUR_UI::config()->color_mod ("range marker bar", "marker bar"));
range_marker_bar->set_outline_color (ARDOUR_UI::config()->color ("marker bar separator")); range_marker_bar->set_outline_color (ARDOUR_UI::config()->color ("marker bar separator"));
transport_marker_bar->set_fill_color (ARDOUR_UI::config()->color ("transport marker bar")); transport_marker_bar->set_fill_color (ARDOUR_UI::config()->color_mod ("transport marker bar", "marker bar"));
transport_marker_bar->set_outline_color (ARDOUR_UI::config()->color ("marker bar separator")); transport_marker_bar->set_outline_color (ARDOUR_UI::config()->color ("marker bar separator"));
cd_marker_bar_drag_rect->set_fill_color (ARDOUR_UI::config()->color ("range drag bar rect")); cd_marker_bar_drag_rect->set_fill_color (ARDOUR_UI::config()->color ("range drag bar rect"));