X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_tempodisplay.cc;h=177f82bd44b24946236f8031fc7d88cd951b3cc0;hb=2592a320d42dd4a157ee16101c042d875d3142be;hp=715adf72847c04ddcae87e9dca1b0c5a12c50adb;hpb=3ff9964885eee5f7654e5ae562cadfaa1e998fe9;p=ardour.git diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc index 715adf7284..177f82bd44 100644 --- a/gtk2_ardour/editor_tempodisplay.cc +++ b/gtk2_ardour/editor_tempodisplay.cc @@ -24,9 +24,10 @@ #include #include -#include +#include #include +#include #include #include @@ -34,20 +35,25 @@ #include #include #include +#include #include "editor.h" #include "marker.h" -#include "canvas-simpleline.h" +#include "simpleline.h" #include "tempo_dialog.h" #include "rgb_macros.h" #include "gui_thread.h" +#include "color.h" +#include "time_axis_view.h" #include "i18n.h" using namespace std; using namespace sigc; using namespace ARDOUR; +using namespace PBD; using namespace Gtk; +using namespace Gtkmm2ext; using namespace Editing; void @@ -64,10 +70,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 ()); @@ -80,20 +90,43 @@ 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)); - + 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; } @@ -103,37 +136,32 @@ Editor::tempo_map_changed (Change ignored) 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 (); } -ArdourCanvas::Line * +ArdourCanvas::SimpleLine * Editor::get_time_line () { - ArdourCanvas::Line *line; + ArdourCanvas::SimpleLine *line; if (free_measure_lines.empty()) { - line = new ArdourCanvas::Line (*time_line_group); - // cerr << "measure line @ " << line << endl; + line = new ArdourCanvas::SimpleLine (*time_line_group); used_measure_lines.push_back (line); } else { line = free_measure_lines.front(); @@ -144,6 +172,14 @@ Editor::get_time_line () return line; } +bool +Editor::lazy_hide_and_draw_measures () +{ + hide_measures (); + draw_measures (); + return false; +} + void Editor::draw_measures () { @@ -152,136 +188,119 @@ Editor::draw_measures () } TempoMap::BBTPointList::iterator i; - TempoMap::BBTPointList *all_bbt_points; - ArdourCanvas::Line *line; - gdouble xpos, last_xpos; - uint32_t cnt; + ArdourCanvas::SimpleLine *line; + 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 = p.frame / (gdouble) frames_per_unit; - 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 = all_bbt_points->begin(); i != all_bbt_points->end(); ++i) { - - TempoMap::BBTPoint& p = (*i); + for (i = current_bbt_points->begin(); i != current_bbt_points->end(); ++i) { - switch (p.type) { + switch ((*i).type) { case TempoMap::Bar: break; case TempoMap::Beat: - xpos = p.frame / (gdouble) frames_per_unit; - - if (p.beat == 1) { + + if ((*i).beat == 1) { color = color_map[cMeasureLineBeat]; } else { color = color_map[cMeasureLineBar]; - /* 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->set_property ("x1", xpos); - line->set_property ("x2", xpos); - line->set_property ("y2", (gdouble) canvas_height); - line->set_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; } - TempoMap& map(session->tempo_map()); TempoDialog tempo_dialog (map, frame, _("add")); - tempo_dialog.bpm_entry.signal_activate().connect (bind (mem_fun (tempo_dialog, &ArdourDialog::stop), 0)); - tempo_dialog.ok_button.signal_clicked().connect (bind (mem_fun (tempo_dialog, &ArdourDialog::stop), 0)); - tempo_dialog.cancel_button.signal_clicked().connect (bind (mem_fun (tempo_dialog, &ArdourDialog::stop), -1)); - tempo_dialog.set_position (Gtk::WIN_POS_MOUSE); - // GTK2FIX - // tempo_dialog.realize (); - // tempo_dialog.get_window()->set_decorations (Gdk::WMDecoration (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH)); + tempo_dialog.signal_realize().connect (bind (sigc::ptr_fun (set_decoration), &tempo_dialog, Gdk::WMDecoration (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH))); ensure_float (tempo_dialog); - tempo_dialog.run(); - - if (tempo_dialog.run_status() == 0) { - - double bpm = 0; - BBT_Time requested; - - bpm = tempo_dialog.get_bpm (); - bpm = max (0.01, bpm); - - tempo_dialog.get_bbt_time (requested); + switch (tempo_dialog.run()) { + case RESPONSE_ACCEPT: + break; + default: + return; + } - begin_reversible_command (_("add tempo mark")); - session->add_undo (map.get_memento()); - map.add_tempo (Tempo (bpm), requested); - session->add_redo_no_execute (map.get_memento()); - commit_reversible_command (); + double bpm = 0; + BBT_Time requested; + + bpm = tempo_dialog.get_bpm (); + bpm = max (0.01, bpm); + + tempo_dialog.get_bbt_time (requested); + + begin_reversible_command (_("add tempo mark")); + XMLNode &before = map.get_state(); + map.add_tempo (Tempo (bpm), requested); + XMLNode &after = map.get_state(); + session->add_command(new MementoCommand(map, &before, &after)); + commit_reversible_command (); + + map.dump (cerr); - 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; @@ -291,36 +310,35 @@ Editor::mouse_add_new_meter_event (jack_nframes_t frame) TempoMap& map(session->tempo_map()); MeterDialog meter_dialog (map, frame, _("add")); - meter_dialog.ok_button.signal_clicked().connect (bind (mem_fun (meter_dialog, &ArdourDialog::stop), 0)); - meter_dialog.cancel_button.signal_clicked().connect (bind (mem_fun (meter_dialog, &ArdourDialog::stop), -1)); - meter_dialog.set_position (Gtk::WIN_POS_MOUSE); - // GTK2FIX - // meter_dialog.realize (); - // meter_dialog.get_window()->set_decorations (Gdk::WMDecoration (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH)); + meter_dialog.signal_realize().connect (bind (sigc::ptr_fun (set_decoration), &meter_dialog, Gdk::WMDecoration (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH))); ensure_float (meter_dialog); - meter_dialog.run (); - - if (meter_dialog.run_status() == 0) { - - double bpb = meter_dialog.get_bpb (); - bpb = max (1.0, bpb); // XXX is this a reasonable limit? - - double note_type = meter_dialog.get_note_type (); - BBT_Time requested; - - meter_dialog.get_bbt_time (requested); + switch (meter_dialog.run ()) { + case RESPONSE_ACCEPT: + break; + default: + return; + } - begin_reversible_command (_("add meter mark")); - session->add_undo (map.get_memento()); - map.add_meter (Meter (bpb, note_type), requested); - session->add_redo_no_execute (map.get_memento()); - commit_reversible_command (); + double bpb = meter_dialog.get_bpb (); + bpb = max (1.0, bpb); // XXX is this a reasonable limit? + + double note_type = meter_dialog.get_note_type (); + BBT_Time requested; + + meter_dialog.get_bbt_time (requested); + + begin_reversible_command (_("add meter mark")); + XMLNode &before = map.get_state(); + map.add_meter (Meter (bpb, note_type), requested); + session->add_command(new MementoCommand(map, &before, &map.get_state())); + commit_reversible_command (); + + map.dump (cerr); - map.dump (cerr); - } + session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks); } void @@ -329,7 +347,7 @@ Editor::remove_tempo_marker (ArdourCanvas::Item* item) Marker* marker; TempoMarker* tempo_marker; - if ((marker = reinterpret_cast (gtk_object_get_data (GTK_OBJECT(item), "marker"))) == 0) { + if ((marker = reinterpret_cast (item->get_data ("marker"))) == 0) { fatal << _("programming error: tempo marker canvas item has no marker object pointer!") << endmsg; /*NOTREACHED*/ } @@ -349,31 +367,30 @@ Editor::edit_meter_section (MeterSection* section) { MeterDialog meter_dialog (*section, _("done")); - meter_dialog.ok_button.signal_clicked().connect (bind (mem_fun (meter_dialog, &ArdourDialog::stop), 0)); - meter_dialog.cancel_button.signal_clicked().connect (bind (mem_fun (meter_dialog, &ArdourDialog::stop), -1)); - meter_dialog.set_position (Gtk::WIN_POS_MOUSE); - // GTK2FIX - // meter_dialog.realize (); - // meter_dialog.get_window()->set_decorations (Gdk::WMDecoration (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH)); ensure_float (meter_dialog); - meter_dialog.run (); - - if (meter_dialog.run_status() == 0) { + switch (meter_dialog.run()) { + case RESPONSE_ACCEPT: + break; + default: + return; + } - double bpb = meter_dialog.get_bpb (); - bpb = max (1.0, bpb); // XXX is this a reasonable limit? + double bpb = meter_dialog.get_bpb (); + bpb = max (1.0, bpb); // XXX is this a reasonable limit? + + double note_type = meter_dialog.get_note_type (); - double note_type = meter_dialog.get_note_type (); + begin_reversible_command (_("replace tempo mark")); + XMLNode &before = session->tempo_map().get_state(); + session->tempo_map().replace_meter (*section, Meter (bpb, note_type)); + XMLNode &after = session->tempo_map().get_state(); + session->add_command(new MementoCommand(session->tempo_map(), &before, &after)); + commit_reversible_command (); - begin_reversible_command (_("replace tempo mark")); - session->add_undo (session->tempo_map().get_memento()); - session->tempo_map().replace_meter (*section, Meter (bpb, note_type)); - session->add_redo_no_execute (session->tempo_map().get_memento()); - commit_reversible_command (); - } + session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks); } void @@ -381,33 +398,31 @@ Editor::edit_tempo_section (TempoSection* section) { TempoDialog tempo_dialog (*section, _("done")); - tempo_dialog.bpm_entry.signal_activate().connect (bind (mem_fun (tempo_dialog, &ArdourDialog::stop), 0)); - tempo_dialog.ok_button.signal_clicked().connect (bind (mem_fun (tempo_dialog, &ArdourDialog::stop), 0)); - tempo_dialog.cancel_button.signal_clicked().connect (bind (mem_fun (tempo_dialog, &ArdourDialog::stop), -1)); - tempo_dialog.set_position (Gtk::WIN_POS_MOUSE); - // GTK2FIX - // tempo_dialog.realize (); - // tempo_dialog.get_window()->set_decorations (Gdk::WMDecoration (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH)); ensure_float (tempo_dialog); - tempo_dialog.run (); - - if (tempo_dialog.run_status() == 0) { + switch (tempo_dialog.run ()) { + case RESPONSE_ACCEPT: + break; + default: + return; + } - double bpm = tempo_dialog.get_bpm (); - BBT_Time when; - tempo_dialog.get_bbt_time(when); - bpm = max (0.01, bpm); + double bpm = tempo_dialog.get_bpm (); + BBT_Time when; + tempo_dialog.get_bbt_time(when); + bpm = max (0.01, bpm); + + begin_reversible_command (_("replace tempo mark")); + XMLNode &before = session->tempo_map().get_state(); + 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 (new MementoCommand(session->tempo_map(), &before, &after)); + commit_reversible_command (); - begin_reversible_command (_("replace tempo mark")); - session->add_undo (session->tempo_map().get_memento()); - session->tempo_map().replace_tempo (*section, Tempo (bpm)); - session->tempo_map().move_tempo (*section, when); - session->add_redo_no_execute (session->tempo_map().get_memento()); - commit_reversible_command (); - } + session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks); } void @@ -416,7 +431,7 @@ Editor::edit_tempo_marker (ArdourCanvas::Item *item) Marker* marker; TempoMarker* tempo_marker; - if ((marker = reinterpret_cast (gtk_object_get_data (GTK_OBJECT(item), "marker"))) == 0) { + if ((marker = reinterpret_cast (item->get_data ("marker"))) == 0) { fatal << _("programming error: tempo marker canvas item has no marker object pointer!") << endmsg; /*NOTREACHED*/ } @@ -435,7 +450,7 @@ Editor::edit_meter_marker (ArdourCanvas::Item *item) Marker* marker; MeterMarker* meter_marker; - if ((marker = reinterpret_cast (gtk_object_get_data (GTK_OBJECT(item), "marker"))) == 0) { + if ((marker = reinterpret_cast (item->get_data ("marker"))) == 0) { fatal << _("programming error: tempo marker canvas item has no marker object pointer!") << endmsg; /*NOTREACHED*/ } @@ -452,11 +467,14 @@ gint Editor::real_remove_tempo_marker (TempoSection *section) { begin_reversible_command (_("remove tempo mark")); - session->add_undo (session->tempo_map().get_memento()); + XMLNode &before = session->tempo_map().get_state(); session->tempo_map().remove_tempo (*section); - session->add_redo_no_execute (session->tempo_map().get_memento()); + XMLNode &after = session->tempo_map().get_state(); + session->add_command(new MementoCommand(session->tempo_map(), &before, &after)); commit_reversible_command (); + session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks); + return FALSE; } @@ -466,7 +484,7 @@ Editor::remove_meter_marker (ArdourCanvas::Item* item) Marker* marker; MeterMarker* meter_marker; - if ((marker = reinterpret_cast (gtk_object_get_data (GTK_OBJECT(item), "marker"))) == 0) { + if ((marker = reinterpret_cast (item->get_data ("marker"))) == 0) { fatal << _("programming error: meter marker canvas item has no marker object pointer!") << endmsg; /*NOTREACHED*/ } @@ -485,9 +503,13 @@ gint Editor::real_remove_meter_marker (MeterSection *section) { begin_reversible_command (_("remove tempo mark")); - session->add_undo (session->tempo_map().get_memento()); + XMLNode &before = session->tempo_map().get_state(); session->tempo_map().remove_meter (*section); - session->add_redo_no_execute (session->tempo_map().get_memento()); + XMLNode &after = session->tempo_map().get_state(); + session->add_command(new MementoCommand(session->tempo_map(), &before, &after)); commit_reversible_command (); + + session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks); + return FALSE; }