a reverb is a reverb is a reverb

[ardour.git] / gtk2_ardour / tempo_lines.cc

diff --git a/gtk2_ardour/tempo_lines.cc b/gtk2_ardour/tempo_lines.cc
index 4f6bd1d9edd2494125a522dda479f94a6fb55093..630e476adf82c263d68baae20a19c80edb16890d 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;
 
@@ -54,13 +54,12 @@ TempoLines::hide ()
 }
 
 void
-TempoLines::draw_ticks (const ARDOUR::TempoMap::BBTPointList::const_iterator& b,
-                        unsigned                                              divisions,
+TempoLines::draw_ticks (std::vector<ARDOUR::TempoMap::BBTPoint>& grid,
+                       unsigned                                              divisions,
                         framecnt_t                                            leftmost_frame,
                         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 */
@@ -70,11 +69,23 @@ TempoLines::draw_ticks (const ARDOUR::TempoMap::BBTPointList::const_iterator& b,
                                level = d;
                        }
                }
-
                /* 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));
+               framepos_t f = 0;
+
+               if (grid.begin()->c != 0.0) {
+                       const double beat_divisions = (l / ((double) divisions)) * (grid.begin()->tempo.note_type() / grid.begin()->meter.note_divisor());
+                       const double time_at_division = log (((grid.begin()->c * (beat_divisions)) /
+                                                          grid.begin()->tempo.beats_per_minute()) + 1) / grid.begin()->c;
+
+                       f = grid.begin()->frame + (framecnt_t) floor ((time_at_division * 60.0 * frame_rate) + 0.5);
+               } else {
+                       const double fpb  = grid.begin()->tempo.frames_per_beat (frame_rate)
+                               * (grid.begin()->tempo.note_type() / grid.begin()->meter.note_divisor());
+
+                       f = grid.begin()->frame + (l * (fpb / (double) divisions));
+               }
                if (f > leftmost_frame) {
                        lines.add (PublicEditor::instance().sample_to_pixel_unrounded (f), 1.0, c);
                }
@@ -82,13 +93,12 @@ TempoLines::draw_ticks (const ARDOUR::TempoMap::BBTPointList::const_iterator& b,
 }
 
 void
-TempoLines::draw (const ARDOUR::TempoMap::BBTPointList::const_iterator& begin,
-                  const ARDOUR::TempoMap::BBTPointList::const_iterator& end,
-                  unsigned                                              divisions,
+TempoLines::draw (std::vector<ARDOUR::TempoMap::BBTPoint>& grid,
+                 unsigned                                              divisions,
                   framecnt_t                                            leftmost_frame,
                   framecnt_t                                            frame_rate)
 {
-       ARDOUR::TempoMap::BBTPointList::const_iterator i;
+       std::vector<ARDOUR::TempoMap::BBTPoint>::const_iterator i;
        double  beat_density;
 
        uint32_t beats = 0;
@@ -97,14 +107,14 @@ TempoLines::draw (const ARDOUR::TempoMap::BBTPointList::const_iterator& begin,
 
        /* get the first bar spacing */
 
-       i = end;
+       i = grid.end();
        i--;
-       bars = (*i).bar - (*begin).bar; 
-       beats = distance (begin, end) - bars;
+       bars = (*i).bar - (*grid.begin()).bar;
+       beats = distance (grid.begin(), grid.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;
@@ -116,32 +126,33 @@ TempoLines::draw (const ARDOUR::TempoMap::BBTPointList::const_iterator& begin,
        }
 
        lines.clear ();
-
-       if (beat_density < 0.1 && 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);
+       if (beat_density <= 0.12 && grid.begin() != grid.end() && grid.begin()->frame > 0) {
+               /* draw subdivisions of the beat before the first visible beat line XX this shouldn't happen now */
+               std::vector<ARDOUR::TempoMap::BBTPoint> vec;
+               vec.push_back (*i);
+               draw_ticks (vec, divisions, leftmost_frame, frame_rate);
        }
 
-       for (i = begin; i != end; ++i) {
+       for (i = grid.begin(); i != grid.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);
+                       std::vector<ARDOUR::TempoMap::BBTPoint> vec;
+                       vec.push_back (*i);
+                       draw_ticks (vec, divisions, leftmost_frame, frame_rate);
                }
        }
 }