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 1a3fdaed2e0c82432a75260c39cbc6eaa70f07ec..bb86011458427b6a2004de2f352d5b0d14192e2c 100644 (file)
--- a/gtk2_ardour/tempo_lines.cc
+++ b/gtk2_ardour/tempo_lines.cc
@@ -23,8 +23,9 @@
 #include "canvas/debug.h"
 
 #include "tempo_lines.h"
-#include "ardour_ui.h"
 #include "public_editor.h"
+#include "rgb_macros.h"
+#include "ui_config.h"
 
 using namespace std;
 
@@ -53,8 +54,39 @@ TempoLines::hide ()
 }
 
 void
-TempoLines::draw (const ARDOUR::TempoMap::BBTPointList::const_iterator& begin, 
-                 const ARDOUR::TempoMap::BBTPointList::const_iterator& end)
+TempoLines::draw_ticks (const ARDOUR::TempoMap::BBTPointList::const_iterator& b,
+                        unsigned                                              divisions,
+                        framecnt_t                                            leftmost_frame,
+                        framecnt_t                                            frame_rate)
+{
+       const double   fpb  = b->tempo->frames_per_beat(frame_rate);
+       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 */
+               unsigned level = divisions;
+               for (unsigned d = divisions; d >= 4; d /= 2) {
+                       if (l % (divisions / d) == 0) {
+                               level = d;
+                       }
+               }
+
+               /* draw line with alpha corresponding to coarsest 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) {
+                       lines.add (PublicEditor::instance().sample_to_pixel_unrounded (f), 1.0, c);
+               }
+       }
+}
+
+void
+TempoLines::draw (const ARDOUR::TempoMap::BBTPointList::const_iterator& begin,
+                  const ARDOUR::TempoMap::BBTPointList::const_iterator& end,
+                  unsigned                                              divisions,
+                  framecnt_t                                            leftmost_frame,
+                  framecnt_t                                            frame_rate)
 {
        ARDOUR::TempoMap::BBTPointList::const_iterator i;
        double  beat_density;
@@ -67,33 +99,50 @@ 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;
        }
 
+       /* constrain divisions to a log2 factor to cap line density */
+       while (divisions > 3 && beat_density * divisions > 0.4) {
+               divisions /= 2;
+       }
+
        lines.clear ();
 
+       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;
+               draw_ticks(prev, divisions, leftmost_frame, frame_rate);
+       }
+
        for (i = begin; i != end; ++i) {
 
                if ((*i).is_bar()) {
-                       color = ARDOUR_UI::config()->get_canvasvar_MeasureLineBar();
+                       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()->get_canvasvar_MeasureLineBeat();
+                       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.12) {
+                       /* draw subdivisions of this beat */
+                       draw_ticks(i, divisions, leftmost_frame, frame_rate);
+               }
        }
 }