X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftempo_lines.cc;h=8d1d183d3a8a6be6d9b2d33052da97b0e76f360d;hb=b976bf8986290e8f4812a50e7fdd98b9cbeb4249;hp=4f6bd1d9edd2494125a522dda479f94a6fb55093;hpb=2d3e6956e6842fb00801fccfe35e004be955392e;p=ardour.git diff --git a/gtk2_ardour/tempo_lines.cc b/gtk2_ardour/tempo_lines.cc index 4f6bd1d9ed..8d1d183d3a 100644 --- a/gtk2_ardour/tempo_lines.cc +++ b/gtk2_ardour/tempo_lines.cc @@ -22,23 +22,31 @@ #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; -TempoLines::TempoLines (ArdourCanvas::Container* group, double) +TempoLines::TempoLines (ArdourCanvas::Container* group, double, ARDOUR::BeatsFramesConverter* bfc) : lines (group, ArdourCanvas::LineSet::Vertical) + , _bfc (bfc) { lines.set_extent (ArdourCanvas::COORD_MAX); } +TempoLines::~TempoLines () +{ + delete _bfc; + _bfc = 0; +} + void -TempoLines::tempo_map_changed() +TempoLines::tempo_map_changed (framepos_t new_origin) { lines.clear (); + _bfc->set_origin_b (new_origin); } void @@ -54,13 +62,12 @@ TempoLines::hide () } void -TempoLines::draw_ticks (const ARDOUR::TempoMap::BBTPointList::const_iterator& b, - unsigned divisions, +TempoLines::draw_ticks (std::vector& 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 +77,11 @@ 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)); + const framepos_t f = _bfc->to (Evoral::Beats (grid.begin()->qn + (l / (double) divisions))) + _bfc->origin_b(); + if (f > leftmost_frame) { lines.add (PublicEditor::instance().sample_to_pixel_unrounded (f), 1.0, c); } @@ -82,29 +89,54 @@ 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& grid, + unsigned divisions, framecnt_t leftmost_frame, framecnt_t frame_rate) { - ARDOUR::TempoMap::BBTPointList::const_iterator i; + std::vector::const_iterator i; double beat_density; uint32_t beats = 0; uint32_t bars = 0; + const uint32_t bar_color = UIConfiguration::instance().color ("measure line bar"); + const uint32_t beat_color = UIConfiguration::instance().color_mod ("measure line beat", "measure line beat"); uint32_t color; + bool all_bars = false; /* 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; + + int32_t bar_mod = 4; + + if (bars < distance (grid.begin(), grid.end()) - 1) { + /* grid contains beats and bars */ + beats = distance (grid.begin(), grid.end()) - bars; + } else { + /* grid contains only bars */ + beats = distance (grid.begin(), grid.end()); - beat_density = (beats * 10.0f) / lines.canvas()->width(); + if (i != grid.begin()) { + const int32_t last_bar = (*i).bar; + i--; + bar_mod = (last_bar - (*i).bar) * 4; + } + + all_bars = true; + } + + double canvas_width_used = 1.0; + if (leftmost_frame < grid.front().frame) { + const framecnt_t frame_distance = max ((framecnt_t) 1, grid.back().frame - grid.front().frame); + canvas_width_used = 1.0 - ((grid.front().frame - leftmost_frame) / (double) (frame_distance + grid.front().frame)); + } - if (beat_density > 4.0f) { + beat_density = (beats * 10.0f) / (lines.canvas()->width() * canvas_width_used); + + if (beat_density > 2.0f) { /* if the lines are too close together, they become useless */ lines.clear (); return; @@ -116,32 +148,38 @@ 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 && !all_bars) { + /* draw subdivisions of the beat before the first visible beat line XX this shouldn't happen now */ + std::vector 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"); + /* keep all_bar beat density down */ + if (all_bars && beat_density > 0.3 && ((*i).bar % bar_mod) != 1) { + continue; + } + + color = bar_color; } 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 = beat_color; } 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 && !all_bars) { /* draw subdivisions of this beat */ - draw_ticks(i, divisions, leftmost_frame, frame_rate); + std::vector vec; + vec.push_back (*i); + draw_ticks (vec, divisions, leftmost_frame, frame_rate); } } }