X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_tempodisplay.cc;h=7fe87596390436f0a73fae47b9f2216c672535ef;hb=cd9fdb935f08966cc8c7170a39870e8adcae69d8;hp=045608785971c19debb3192143ad91b577d5c08f;hpb=b7bffbe7a249356a93d25a41f7c472cc9dd8f27f;p=ardour.git diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc index 0456087859..7fe8759639 100644 --- a/gtk2_ardour/editor_tempodisplay.cc +++ b/gtk2_ardour/editor_tempodisplay.cc @@ -15,7 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id$ */ #include // for sprintf, grrr @@ -27,6 +26,7 @@ #include #include +#include #include #include @@ -43,6 +43,7 @@ #include "rgb_macros.h" #include "gui_thread.h" #include "color.h" +#include "time_axis_view.h" #include "i18n.h" @@ -68,10 +69,14 @@ Editor::remove_metric_marks () 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(*i)) != 0) { snprintf (buf, sizeof(buf), "%g/%g", ms->beats_per_bar(), ms->note_divisor ()); @@ -84,47 +89,89 @@ Editor::draw_metric_marks (const Metrics& metrics) } } + } void Editor::tempo_map_changed (Change ignored) { - ENSURE_GUI_THREAD(bind (mem_fun(*this, &Editor::tempo_map_changed), ignored)); + if (!session) { + return; + } + + ENSURE_GUI_THREAD(bind (mem_fun (*this, &Editor::tempo_map_changed), ignored)); + + redisplay_tempo (false); // redraw rulers and measures + session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks); // redraw metric markers +} + +/** + * This code was originally in tempo_map_changed, but this is called every time the canvas scrolls horizontally. + * That's why this is moved in here. The new tempo_map_changed is called when the ARDOUR::TempoMap actually changed. + */ +void +Editor::redisplay_tempo (bool immediate_redraw) +{ + if (!session) { + return; + } + + 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; } - redisplay_tempo (); -} + if (immediate_redraw) { -void -Editor::redisplay_tempo () -{ - update_tempo_based_rulers (); + hide_measures (); - remove_metric_marks (); - hide_measures (); + if (session && current_bbt_points) { + draw_measures (); + } + + } else { - if (session && current_bbt_points) { - session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks); - draw_measures (); + if (session && current_bbt_points) { + 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 (); @@ -133,10 +180,10 @@ Editor::hide_measures () ArdourCanvas::SimpleLine * Editor::get_time_line () { - ArdourCanvas::SimpleLine *line; + ArdourCanvas::SimpleLine *line; if (free_measure_lines.empty()) { - line = new ArdourCanvas::SimpleLine (*time_line_group); + line = new ArdourCanvas::SimpleLine (*time_line_group); used_measure_lines.push_back (line); } else { line = free_measure_lines.front(); @@ -147,6 +194,14 @@ Editor::get_time_line () return line; } +bool +Editor::lazy_hide_and_draw_measures () +{ + hide_measures (); + draw_measures (); + return false; +} + void Editor::draw_measures () { @@ -155,95 +210,77 @@ 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); + y2 = TimeAxisView::hLargest*5000; // five thousand largest tracks should be enough.. :) /* 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); + beat_density = (beats * 10.0f) / track_canvas.get_width (); - switch (p.type) { - case TempoMap::Bar: - break; - - case TempoMap::Beat: - xpos = frame_to_unit (p.frame); - if (last_beat < xpos) { - beat_spacing = xpos - last_beat; - } - last_beat = xpos; - } + if (beat_density > 4.0f) { + /* if the lines are too close together, they become useless + */ + return; } + + for (i = current_bbt_points->begin(); i != current_bbt_points->end(); ++i) { - 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) { - - 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) { - color = color_map[cMeasureLineBeat]; - } else { + if ((*i).beat == 1) { color = color_map[cMeasureLineBar]; + } else { + color = color_map[cMeasureLineBeat]; - /* only draw beat lines if the gaps between beats - are large. - */ - - if (beat_spacing < 25.0) { + if (beat_density > 2.0) { + /* only draw beat lines if the gaps between beats are large. + */ 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; @@ -276,14 +313,14 @@ Editor::mouse_add_new_tempo_event (jack_nframes_t frame) XMLNode &before = map.get_state(); map.add_tempo (Tempo (bpm), requested); XMLNode &after = map.get_state(); - session->add_command(MementoCommand(map, before, after)); + session->add_command(new MementoCommand(map, &before, &after)); commit_reversible_command (); map.dump (cerr); } void -Editor::mouse_add_new_meter_event (jack_nframes_t frame) +Editor::mouse_add_new_meter_event (nframes_t frame) { if (session == 0) { return; @@ -316,7 +353,7 @@ Editor::mouse_add_new_meter_event (jack_nframes_t frame) begin_reversible_command (_("add meter mark")); XMLNode &before = map.get_state(); map.add_meter (Meter (bpb, note_type), requested); - session->add_command(MementoCommand(map, before, map.get_state())); + session->add_command(new MementoCommand(map, &before, &map.get_state())); commit_reversible_command (); map.dump (cerr); @@ -367,8 +404,8 @@ Editor::edit_meter_section (MeterSection* section) begin_reversible_command (_("replace tempo mark")); XMLNode &before = session->tempo_map().get_state(); session->tempo_map().replace_meter (*section, Meter (bpb, note_type)); - XMLNode &before = session->tempo_map().get_state(); - session->add_command(MementoCommand(session->tempo_map(), before, after)); + XMLNode &after = session->tempo_map().get_state(); + session->add_command(new MementoCommand(session->tempo_map(), &before, &after)); commit_reversible_command (); } @@ -398,7 +435,7 @@ Editor::edit_tempo_section (TempoSection* section) session->tempo_map().replace_tempo (*section, Tempo (bpm)); session->tempo_map().move_tempo (*section, when); XMLNode &after = session->tempo_map().get_state(); - session->add_command (MementoCommand(session->tempo_map(), before, after)); + session->add_command (new MementoCommand(session->tempo_map(), &before, &after)); commit_reversible_command (); } @@ -447,7 +484,7 @@ Editor::real_remove_tempo_marker (TempoSection *section) XMLNode &before = session->tempo_map().get_state(); session->tempo_map().remove_tempo (*section); XMLNode &after = session->tempo_map().get_state(); - session->add_command(MementoCommand(session->tempo_map(), before, after)); + session->add_command(new MementoCommand(session->tempo_map(), &before, &after)); commit_reversible_command (); return FALSE; @@ -481,7 +518,8 @@ Editor::real_remove_meter_marker (MeterSection *section) XMLNode &before = session->tempo_map().get_state(); session->tempo_map().remove_meter (*section); XMLNode &after = session->tempo_map().get_state(); - session->add_command(MementoCommand(session->tempo_map(), before, after)); + session->add_command(new MementoCommand(session->tempo_map(), &before, &after)); commit_reversible_command (); + return FALSE; }