Use lines between marker bars from the SAE profile.

git-svn-id: svn://localhost/ardour2/branches/3.0@8517 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/ardour3_ui_default.conf b/gtk2_ardour/ardour3_ui_default.conf
index 2159fa452d1de202824dd90476cdcba88c9de914..62a1f98f39ac06d075f0f1ba86e722aed6b4f138 100644 (file)
--- a/gtk2_ardour/ardour3_ui_default.conf
+++ b/gtk2_ardour/ardour3_ui_default.conf
@@ -44,7 +44,7 @@
     <Option name="location punch" value="7c3a3aff"/>
     <Option name="location range" value="497a59ff"/>
     <Option name="marker bar" value="99a1adff"/>
-    <Option name="marker bar separator" value="aaaaaaff"/>
+    <Option name="marker bar separator" value="555555ff"/>
     <Option name="marker drag line" value="004f00f9"/>
     <Option name="marker label" value="000000ff"/>
     <Option name="marker track" value="ddddd8ff"/>

diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc
index f52f8852caad03b8e39cf3299e5b41701fb1e087..a98f48a8a214de3aa91b9b7df62a289c9984e3f0 100644 (file)
--- a/gtk2_ardour/editor_canvas.cc
+++ b/gtk2_ardour/editor_canvas.cc
@@ -163,64 +163,34 @@ Editor::initialize_canvas ()
        _region_motion_group = new ArdourCanvas::Group (*_trackview_group);
 
        meter_bar_group = new ArdourCanvas::Group (*track_canvas->root ());
-       if (Profile->get_sae()) {
-               meter_bar = new ArdourCanvas::SimpleRect (*meter_bar_group, 0.0, 0.0, phys_width, timebar_height - 1);
-               meter_bar->property_outline_pixels() = 1;
-       } else {
-               meter_bar = new ArdourCanvas::SimpleRect (*meter_bar_group, 0.0, 0.0, phys_width, timebar_height);
-               meter_bar->property_outline_pixels() = 0;
-       }
-       meter_bar->property_outline_what() = (0x1 | 0x8);
+       meter_bar = new ArdourCanvas::SimpleRect (*meter_bar_group, 0.0, 0.0, phys_width, timebar_height - 1);
+       meter_bar->property_outline_pixels() = 1;
+       meter_bar->property_outline_what() = 0x8;
 
        tempo_bar_group = new ArdourCanvas::Group (*track_canvas->root ());
-       if (Profile->get_sae()) {
-               tempo_bar = new ArdourCanvas::SimpleRect (*tempo_bar_group, 0.0, 0.0, phys_width, (timebar_height - 1));
-               tempo_bar->property_outline_pixels() = 1;
-       } else {
-               tempo_bar = new ArdourCanvas::SimpleRect (*tempo_bar_group, 0.0, 0.0, phys_width, (timebar_height));
-               tempo_bar->property_outline_pixels() = 0;
-       }
-       tempo_bar->property_outline_what() = (0x1 | 0x8);
+       tempo_bar = new ArdourCanvas::SimpleRect (*tempo_bar_group, 0.0, 0.0, phys_width, (timebar_height - 1));
+       tempo_bar->property_outline_pixels() = 1;
+       tempo_bar->property_outline_what() = 0x8;
 
        range_marker_bar_group = new ArdourCanvas::Group (*track_canvas->root ());
-       if (Profile->get_sae()) {
-               range_marker_bar = new ArdourCanvas::SimpleRect (*range_marker_bar_group, 0.0, 0.0, phys_width, (timebar_height - 1));
-               range_marker_bar->property_outline_pixels() = 1;
-       } else {
-               range_marker_bar = new ArdourCanvas::SimpleRect (*range_marker_bar_group, 0.0, 0.0, phys_width, (timebar_height));
-               range_marker_bar->property_outline_pixels() = 0;
-       }
-       range_marker_bar->property_outline_what() = (0x1 | 0x8);
+       range_marker_bar = new ArdourCanvas::SimpleRect (*range_marker_bar_group, 0.0, 0.0, phys_width, (timebar_height - 1));
+       range_marker_bar->property_outline_pixels() = 1;
+       range_marker_bar->property_outline_what() = 0x8;
 
        transport_marker_bar_group = new ArdourCanvas::Group (*track_canvas->root ());
-       if (Profile->get_sae()) {
-               transport_marker_bar = new ArdourCanvas::SimpleRect (*transport_marker_bar_group, 0.0, 0.0,  phys_width, (timebar_height - 1));
-               transport_marker_bar->property_outline_pixels() = 1;
-       } else {
-               transport_marker_bar = new ArdourCanvas::SimpleRect (*transport_marker_bar_group, 0.0, 0.0,  phys_width, (timebar_height));
-               transport_marker_bar->property_outline_pixels() = 0;
-       }
-       transport_marker_bar->property_outline_what() = (0x1 | 0x8);
+       transport_marker_bar = new ArdourCanvas::SimpleRect (*transport_marker_bar_group, 0.0, 0.0,  phys_width, (timebar_height - 1));
+       transport_marker_bar->property_outline_pixels() = 1;
+       transport_marker_bar->property_outline_what() = 0x8;
 
        marker_bar_group = new ArdourCanvas::Group (*track_canvas->root ());
-       if (Profile->get_sae()) {
-               marker_bar = new ArdourCanvas::SimpleRect (*marker_bar_group, 0.0, 0.0, phys_width, (timebar_height - 1));
-               marker_bar->property_outline_pixels() = 1;
-       } else {
-               marker_bar = new ArdourCanvas::SimpleRect (*marker_bar_group, 0.0, 0.0, phys_width, (timebar_height));
-               marker_bar->property_outline_pixels() = 0;
-       }
-       marker_bar->property_outline_what() = (0x1 | 0x8);
+       marker_bar = new ArdourCanvas::SimpleRect (*marker_bar_group, 0.0, 0.0, phys_width, (timebar_height - 1));
+       marker_bar->property_outline_pixels() = 1;
+       marker_bar->property_outline_what() = 0x8;
 
        cd_marker_bar_group = new ArdourCanvas::Group (*track_canvas->root ());
-       if (Profile->get_sae()) {
-               cd_marker_bar = new ArdourCanvas::SimpleRect (*cd_marker_bar_group, 0.0, 0.0, phys_width, (timebar_height - 1));
-               cd_marker_bar->property_outline_pixels() = 1;
-       } else {
-               cd_marker_bar = new ArdourCanvas::SimpleRect (*cd_marker_bar_group, 0.0, 0.0, phys_width, (timebar_height));
-               cd_marker_bar->property_outline_pixels() = 0;
-       }
-       cd_marker_bar->property_outline_what() = (0x1 | 0x8);
+       cd_marker_bar = new ArdourCanvas::SimpleRect (*cd_marker_bar_group, 0.0, 0.0, phys_width, (timebar_height - 1));
+       cd_marker_bar->property_outline_pixels() = 1;
+       cd_marker_bar->property_outline_what() = 0x8;
 
        timebar_group =  new ArdourCanvas::Group (*track_canvas->root(), 0.0, 0.0);
        cursor_group = new ArdourCanvas::Group (*track_canvas->root(), 0.0, 0.0);