void
Editor::draw_metric_marks (const Metrics& metrics)
{
+
+ const MeterSection *ms;
+ const TempoSection *ts;
+ char buf[64];
+
+ remove_metric_marks ();
+
for (Metrics::const_iterator i = metrics.begin(); i != metrics.end(); ++i) {
- const MeterSection *ms;
- const TempoSection *ts;
- char buf[64];
if ((ms = dynamic_cast<const MeterSection*>(*i)) != 0) {
snprintf (buf, sizeof(buf), "%g/%g", ms->beats_per_bar(), ms->note_divisor ());
}
}
+
}
void
Editor::tempo_map_changed (Change ignored)
{
- ENSURE_GUI_THREAD(bind (mem_fun(*this, &Editor::tempo_map_changed), ignored));
-
+ ENSURE_GUI_THREAD(bind (mem_fun(*this, &Editor::tempo_map_changed), ignored));
+
+ BBT_Time previous_beat, next_beat; // the beats previous to the leftmost frame and after the rightmost frame
+
+ session->bbt_time(leftmost_frame, previous_beat);
+ session->bbt_time(leftmost_frame + current_page_frames(), next_beat);
+
+ if (previous_beat.beats > 1) {
+ previous_beat.beats -= 1;
+ } else if (previous_beat.bars > 1) {
+ previous_beat.bars--;
+ previous_beat.beats += 1;
+ }
+ previous_beat.ticks = 0;
+
+ if (session->tempo_map().meter_at(leftmost_frame + current_page_frames()).beats_per_bar () > next_beat.beats + 1) {
+ next_beat.beats += 1;
+ } else {
+ next_beat.bars += 1;
+ next_beat.beats = 1;
+ }
+ next_beat.ticks = 0;
+
if (current_bbt_points) {
- delete current_bbt_points;
+ delete current_bbt_points;
current_bbt_points = 0;
}
if (session) {
- current_bbt_points = session->tempo_map().get_points (leftmost_frame, leftmost_frame + current_page_frames());
+ current_bbt_points = session->tempo_map().get_points (session->tempo_map().frame_time (previous_beat), session->tempo_map().frame_time (next_beat));
+ update_tempo_based_rulers ();
} else {
current_bbt_points = 0;
}
void
Editor::redisplay_tempo ()
-{
- update_tempo_based_rulers ();
-
- remove_metric_marks ();
- hide_measures ();
+{
if (session && current_bbt_points) {
- session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks);
- draw_measures ();
+ Glib::signal_idle().connect (mem_fun (*this, &Editor::lazy_hide_and_draw_measures));
+ } else {
+ hide_measures ();
}
-
}
void
Editor::hide_measures ()
{
for (TimeLineList::iterator i = used_measure_lines.begin(); i != used_measure_lines.end(); ++i) {
- (*i)->hide();
+ (*i)->hide();
free_measure_lines.push_back (*i);
}
used_measure_lines.clear ();
return line;
}
+bool
+Editor::lazy_hide_and_draw_measures ()
+{
+ hide_measures ();
+ draw_measures ();
+ return false;
+}
+
void
Editor::draw_measures ()
{
}
TempoMap::BBTPointList::iterator i;
- TempoMap::BBTPointList *all_bbt_points;
ArdourCanvas::SimpleLine *line;
- gdouble xpos, last_xpos;
- uint32_t cnt;
+ gdouble xpos;
+ double x1, x2, y1, y2, beat_density;
+
+ uint32_t beats = 0;
+ uint32_t bars = 0;
uint32_t color;
if (current_bbt_points == 0 || current_bbt_points->empty()) {
return;
}
- all_bbt_points = session->tempo_map().get_points (leftmost_frame, leftmost_frame + current_page_frames());
-
- cnt = 0;
- last_xpos = 0;
+ track_canvas.get_scroll_region (x1, y1, x2, y2);
/* get the first bar spacing */
- gdouble last_beat = DBL_MAX;
- gdouble beat_spacing = 0;
+ i = current_bbt_points->end();
+ i--;
+ bars = (*i).bar - (*current_bbt_points->begin()).bar;
+ beats = current_bbt_points->size() - bars;
- for (i = all_bbt_points->begin(); i != all_bbt_points->end() && beat_spacing == 0; ++i) {
- TempoMap::BBTPoint& p = (*i);
-
- switch (p.type) {
- case TempoMap::Bar:
- break;
+ beat_density = (beats * 10.0f) / track_canvas.get_width ();
- case TempoMap::Beat:
- xpos = frame_to_unit (p.frame);
- if (last_beat < xpos) {
- beat_spacing = xpos - last_beat;
- }
- last_beat = xpos;
- }
+ if (beat_density > 2.0f) {
+ /*
+ if the lines are too close together,
+ they become useless
+ */
+ return;
}
- double x1, x2, y1, y2;
- track_canvas.get_scroll_region (x1, y1, x2, y2);
-
- for (i = all_bbt_points->begin(); i != all_bbt_points->end(); ++i) {
+ for (i = current_bbt_points->begin(); i != current_bbt_points->end(); ++i) {
- TempoMap::BBTPoint& p = (*i);
-
- switch (p.type) {
+ switch ((*i).type) {
case TempoMap::Bar:
break;
case TempoMap::Beat:
- xpos = frame_to_unit (p.frame);
- if (p.beat == 1) {
+ if ((*i).beat == 1) {
color = color_map[cMeasureLineBeat];
} else {
color = color_map[cMeasureLineBar];
are large.
*/
- if (beat_spacing < 25.0) {
- break;
+ if (beat_density > 0.25) {
+ break;
}
}
-
- if (cnt == 0 || xpos - last_xpos > 4.0) {
- line = get_time_line ();
- line->property_x1() = xpos;
- line->property_x2() = xpos;
- line->property_y2() = y2;
- line->property_color_rgba() = color;
- line->raise_to_top();
- line->show();
- last_xpos = xpos;
- ++cnt;
- }
+
+ xpos = frame_to_unit ((*i).frame);
+ line = get_time_line ();
+ line->property_x1() = xpos;
+ line->property_x2() = xpos;
+ line->property_y2() = y2;
+ line->property_color_rgba() = color;
+ //line->raise_to_top();
+ line->show();
break;
}
}
- delete all_bbt_points;
-
/* the cursors are always on top of everything */
cursor_group->raise_to_top();
time_line_group->lower_to_bottom();
+ return;
}
void
-Editor::mouse_add_new_tempo_event (jack_nframes_t frame)
+Editor::mouse_add_new_tempo_event (nframes_t frame)
{
if (session == 0) {
return;
commit_reversible_command ();
map.dump (cerr);
+
+ session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks);
}
void
-Editor::mouse_add_new_meter_event (jack_nframes_t frame)
+Editor::mouse_add_new_meter_event (nframes_t frame)
{
if (session == 0) {
return;
commit_reversible_command ();
map.dump (cerr);
+
+ session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks);
}
void
XMLNode &after = session->tempo_map().get_state();
session->add_command(new MementoCommand<TempoMap>(session->tempo_map(), &before, &after));
commit_reversible_command ();
+
+ session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks);
}
void
XMLNode &after = session->tempo_map().get_state();
session->add_command (new MementoCommand<TempoMap>(session->tempo_map(), &before, &after));
commit_reversible_command ();
+
+ session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks);
}
void
session->add_command(new MementoCommand<TempoMap>(session->tempo_map(), &before, &after));
commit_reversible_command ();
+ session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks);
+
return FALSE;
}
XMLNode &after = session->tempo_map().get_state();
session->add_command(new MementoCommand<TempoMap>(session->tempo_map(), &before, &after));
commit_reversible_command ();
+
+ session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks);
+
return FALSE;
}
projects / ardour.git / blobdiff