extend strict-i/o to include route outputs.

[ardour.git] / gtk2_ardour / tempo_lines.cc

diff --git a/gtk2_ardour/tempo_lines.cc b/gtk2_ardour/tempo_lines.cc
index 4f6bd1d9edd2494125a522dda479f94a6fb55093..bb86011458427b6a2004de2f352d5b0d14192e2c 100644 (file)
--- a/gtk2_ardour/tempo_lines.cc
+++ b/gtk2_ardour/tempo_lines.cc
@@ -22,10 +22,10 @@
 #include "canvas/canvas.h"
 #include "canvas/debug.h"
 
-#include "ardour_ui.h"
+#include "tempo_lines.h"
 #include "public_editor.h"
 #include "rgb_macros.h"
-#include "tempo_lines.h"
+#include "ui_config.h"
 
 using namespace std;
 
@@ -60,7 +60,7 @@ TempoLines::draw_ticks (const ARDOUR::TempoMap::BBTPointList::const_iterator& b,
                         framecnt_t                                            frame_rate)
 {
        const double   fpb  = b->tempo->frames_per_beat(frame_rate);
-       const uint32_t base = ARDOUR_UI::config()->color_mod("measure line beat", "measure line beat");
+       const uint32_t base = UIConfiguration::instance().color_mod("measure line beat", "measure line beat");
 
        for (unsigned l = 1; l < divisions; ++l) {
                /* find the coarsest division level this tick falls on */
@@ -72,7 +72,7 @@ TempoLines::draw_ticks (const ARDOUR::TempoMap::BBTPointList::const_iterator& b,
                }
 
                /* draw line with alpha corresponding to coarsest level */
-               const uint8_t    a = max(0, (int)rint(UINT_RGBA_A(base) / (0.75 * log2(level))));
+               const uint8_t    a = max(8, (int)rint(UINT_RGBA_A(base) / (0.8 * log2(level))));
                const uint32_t   c = UINT_RGBA_CHANGE_A(base, a);
                const framepos_t f = b->frame + (l * (fpb / (double)divisions));
                if (f > leftmost_frame) {
@@ -99,12 +99,12 @@ TempoLines::draw (const ARDOUR::TempoMap::BBTPointList::const_iterator& begin,
 
        i = end;
        i--;
-       bars = (*i).bar - (*begin).bar; 
+       bars = (*i).bar - (*begin).bar;
        beats = distance (begin, end) - bars;
 
        beat_density = (beats * 10.0f) / lines.canvas()->width();
 
-       if (beat_density > 4.0f) {
+       if (beat_density > 2.0f) {
                /* if the lines are too close together, they become useless */
                lines.clear ();
                return;
@@ -117,7 +117,7 @@ TempoLines::draw (const ARDOUR::TempoMap::BBTPointList::const_iterator& begin,
 
        lines.clear ();
 
-       if (beat_density < 0.1 && begin != end && begin->frame > 0) {
+       if (beat_density <= 0.12 && begin != end && begin->frame > 0) {
                /* draw subdivisions of the beat before the first visible beat line */
                ARDOUR::TempoMap::BBTPointList::const_iterator prev = begin;
                --prev;
@@ -127,19 +127,19 @@ TempoLines::draw (const ARDOUR::TempoMap::BBTPointList::const_iterator& begin,
        for (i = begin; i != end; ++i) {
 
                if ((*i).is_bar()) {
-                       color = ARDOUR_UI::config()->color ("measure line bar");
+                       color = UIConfiguration::instance().color ("measure line bar");
                } else {
                        if (beat_density > 0.3) {
                                continue; /* only draw beat lines if the gaps between beats are large. */
                        }
-                       color = ARDOUR_UI::config()->color_mod ("measure line beat", "measure line beat");
+                       color = UIConfiguration::instance().color_mod ("measure line beat", "measure line beat");
                }
 
                ArdourCanvas::Coord xpos = PublicEditor::instance().sample_to_pixel_unrounded ((*i).frame);
 
                lines.add (xpos, 1.0, color);
 
-               if (beat_density < 0.1) {
+               if (beat_density <= 0.12) {
                        /* draw subdivisions of this beat */
                        draw_ticks(i, divisions, leftmost_frame, frame_rate);
                }