X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_tempodisplay.cc;h=9bef055b57aec7e3e33d8c0f3b4c756fdd270969;hb=7e1b86aceeef477e13b4c35f524034d909acd92c;hp=4866028ffc94e07d10925ea34b11f9bb0d7ff4fd;hpb=1a3a77607768721f6834ddae09f532cdb6aec4a6;p=ardour.git diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc index 4866028ffc..9bef055b57 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 @@ -24,9 +23,10 @@ #include #include -#include +#include #include +#include #include #include @@ -34,20 +34,26 @@ #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 "time_axis_view.h" +#include "ardour_ui.h" +#include "tempo_lines.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,228 +70,175 @@ 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 ()); - metric_marks.push_back (new MeterMarker (*this, GNOME_CANVAS_GROUP(meter_group), color_map[cMeterMarker], buf, - *(const_cast(ms)), PublicEditor::canvas_meter_marker_event)); + metric_marks.push_back (new MeterMarker (*this, *meter_group, ARDOUR_UI::config()->canvasvar_MeterMarker.get(), buf, + *(const_cast(ms)))); } else if ((ts = dynamic_cast(*i)) != 0) { snprintf (buf, sizeof (buf), "%.2f", ts->beats_per_minute()); - metric_marks.push_back (new TempoMarker (*this, GNOME_CANVAS_GROUP(tempo_group), color_map[cTempoMarker], buf, - *(const_cast(ts)), PublicEditor::canvas_tempo_marker_event)); + metric_marks.push_back (new TempoMarker (*this, *tempo_group, ARDOUR_UI::config()->canvasvar_TempoMarker.get(), buf, + *(const_cast(ts)))); } } + } void Editor::tempo_map_changed (Change ignored) { - ENSURE_GUI_THREAD(bind (mem_fun(*this, &Editor::tempo_map_changed), ignored)); - - if (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()); - } else { - current_bbt_points = 0; + if (!session) { + return; } - redisplay_tempo (); -} - -void -Editor::redisplay_tempo () -{ - update_tempo_based_rulers (); + ENSURE_GUI_THREAD(bind (mem_fun (*this, &Editor::tempo_map_changed), ignored)); - remove_metric_marks (); - hide_measures (); + if (tempo_lines) + tempo_lines->tempo_map_changed(); - if (session && current_bbt_points) { - session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks); - draw_measures (); - } - + compute_current_bbt_points(leftmost_frame, leftmost_frame + current_page_frames()); + session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks); // redraw metric markers + redraw_measures (); } void -Editor::hide_measures () +Editor::redisplay_tempo (bool immediate_redraw) { - for (TimeLineList::iterator i = used_measure_lines.begin(); i != used_measure_lines.end(); ++i) { - gnome_canvas_item_hide (*i); - free_measure_lines.push_back (*i); + if (!session) { + return; } - used_measure_lines.clear (); -} + + compute_current_bbt_points (leftmost_frame, leftmost_frame + current_page_frames()); // redraw rulers and measures -GnomeCanvasItem * -Editor::get_time_line () -{ - GnomeCanvasItem *line; - - if (free_measure_lines.empty()) { - line = gnome_canvas_item_new (GNOME_CANVAS_GROUP(time_line_group), - gnome_canvas_simpleline_get_type(), - NULL); - // cerr << "measure line @ " << line << endl; - used_measure_lines.push_back (line); + compute_current_bbt_points (leftmost_frame, leftmost_frame + current_page_frames()); + if (immediate_redraw) { + redraw_measures (); } else { - line = free_measure_lines.front(); - free_measure_lines.erase (free_measure_lines.begin()); - used_measure_lines.push_back (line); +#ifdef GTKOSX + redraw_measures (); +#else + Glib::signal_idle().connect (mem_fun (*this, &Editor::redraw_measures)); +#endif } - - return line; + update_tempo_based_rulers (); // redraw rulers and measures } void -Editor::draw_measures () +Editor::compute_current_bbt_points (nframes_t leftmost, nframes_t rightmost) { - if (session == 0 || _show_measures == false) { + if (!session) { return; } - TempoMap::BBTPointList::iterator i; - TempoMap::BBTPointList *all_bbt_points; - GnomeCanvasItem *line; - gdouble xpos, last_xpos; - uint32_t cnt; - uint32_t color; - - if (current_bbt_points == 0 || current_bbt_points->empty()) { - return; - } + BBT_Time previous_beat, next_beat; // the beats previous to the leftmost frame and after the rightmost frame - all_bbt_points = session->tempo_map().get_points (leftmost_frame, leftmost_frame + current_page_frames()); + session->bbt_time(leftmost, previous_beat); + session->bbt_time(rightmost, next_beat); - cnt = 0; - last_xpos = 0; + 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; - /* get the first bar spacing */ + if (session->tempo_map().meter_at(rightmost).beats_per_bar () > next_beat.beats + 1) { + next_beat.beats += 1; + } else { + next_beat.bars += 1; + next_beat.beats = 1; + } + next_beat.ticks = 0; + + delete current_bbt_points; + current_bbt_points = 0; - gdouble last_beat = DBL_MAX; - gdouble beat_spacing = 0; + current_bbt_points = session->tempo_map().get_points (session->tempo_map().frame_time (previous_beat), session->tempo_map().frame_time (next_beat) + 1); +} - for (i = all_bbt_points->begin(); i != all_bbt_points->end() && beat_spacing == 0; ++i) { - TempoMap::BBTPoint& p = (*i); +void +Editor::hide_measures () +{ + if (tempo_lines) + tempo_lines->hide(); +} - switch (p.type) { - case TempoMap::Bar: - break; +bool +Editor::redraw_measures () +{ + draw_measures (); + return false; +} - case TempoMap::Beat: - xpos = p.frame / (gdouble) frames_per_unit; - if (last_beat < xpos) { - beat_spacing = xpos - last_beat; - } - last_beat = xpos; - } +void +Editor::draw_measures () +{ + if (session == 0 || _show_measures == false || + !current_bbt_points || current_bbt_points->empty()) { + return; } - for (i = all_bbt_points->begin(); i != all_bbt_points->end(); ++i) { - - TempoMap::BBTPoint& p = (*i); - - switch (p.type) { - case TempoMap::Bar: - break; - - case TempoMap::Beat: - xpos = p.frame / (gdouble) frames_per_unit; - - if (p.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) { - break; - } - } - - if (cnt == 0 || xpos - last_xpos > 4.0) { - line = get_time_line (); - gtk_object_set (GTK_OBJECT(line), - "x1", xpos, - "x2", xpos, - "y2", (gdouble) canvas_height, - "color_rgba", color, - NULL); - gnome_canvas_item_raise_to_top (line); - gnome_canvas_item_show (line); - last_xpos = xpos; - ++cnt; - } - break; - } + if (tempo_lines == 0) { + tempo_lines = new TempoLines(*track_canvas, time_line_group, physical_screen_height); } - delete all_bbt_points; - - /* the cursors are always on top of everything */ - - cursor_group->raise_to_top(); - time_line_group->lower_to_bottom(); + tempo_lines->draw(*current_bbt_points, frames_per_unit); } void -Editor::mouse_add_new_tempo_event (jack_nframes_t frame) +Editor::mouse_add_new_tempo_event (nframes64_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)); + //this causes compiz to display no border. + //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); - - 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 (); - - map.dump (cerr); + switch (tempo_dialog.run()) { + case RESPONSE_ACCEPT: + break; + default: + return; } + + double bpm = 0; + BBT_Time requested; + + bpm = tempo_dialog.get_bpm (); + double nt = tempo_dialog.get_note_type(); + 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,nt), requested); + XMLNode &after = map.get_state(); + 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 (nframes64_t frame) { if (session == 0) { return; @@ -295,45 +248,44 @@ 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)); + + //this causes compiz to display no border.. + //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; + switch (meter_dialog.run ()) { + case RESPONSE_ACCEPT: + break; + default: + return; + } - meter_dialog.get_bbt_time (requested); + 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; - 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 (); + meter_dialog.get_bbt_time (requested); - map.dump (cerr); - } + 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); } void -Editor::remove_tempo_marker (GnomeCanvasItem* item) +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*/ } @@ -353,31 +305,28 @@ 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) { - - double bpb = meter_dialog.get_bpb (); - bpb = max (1.0, bpb); // XXX is this a reasonable limit? + switch (meter_dialog.run()) { + case RESPONSE_ACCEPT: + break; + default: + return; + } - double note_type = meter_dialog.get_note_type (); + 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 (); - 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 (); - } + 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 (); } void @@ -385,42 +334,43 @@ 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) { - - 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")); - 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 (); + switch (tempo_dialog.run ()) { + case RESPONSE_ACCEPT: + break; + default: + return; } + + double bpm = tempo_dialog.get_bpm (); + double nt = tempo_dialog.get_note_type (); + BBT_Time when; + tempo_dialog.get_bbt_time(when); + bpm = max (0.01, bpm); + + cerr << "Editing tempo section to be at " << when << endl; + session->tempo_map().dump (cerr); + begin_reversible_command (_("replace tempo mark")); + XMLNode &before = session->tempo_map().get_state(); + session->tempo_map().replace_tempo (*section, Tempo (bpm,nt)); + session->tempo_map().dump (cerr); + session->tempo_map().move_tempo (*section, when); + session->tempo_map().dump (cerr); + XMLNode &after = session->tempo_map().get_state(); + session->add_command (new MementoCommand(session->tempo_map(), &before, &after)); + commit_reversible_command (); } void -Editor::edit_tempo_marker (GnomeCanvasItem *item) +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*/ } @@ -434,12 +384,12 @@ Editor::edit_tempo_marker (GnomeCanvasItem *item) } void -Editor::edit_meter_marker (GnomeCanvasItem *item) +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*/ } @@ -456,21 +406,22 @@ 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 (); return FALSE; } void -Editor::remove_meter_marker (GnomeCanvasItem* item) +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*/ } @@ -489,9 +440,11 @@ 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 (); + return FALSE; }