X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Feditor_tempodisplay.cc;h=e0eba936c81ca160fab835b87fa622e591c22f72;hb=ccf58b8de23619db9983a45f696fd97e13a15cce;hp=3d26df3f3a477ae4c47fd84bc8ca48c4a80b0543;hpb=8dc95efe31405293ef0b76dcc1e286a3899b60cb;p=ardour.git diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc index 3d26df3f3a..e0eba936c8 100644 --- a/gtk2_ardour/editor_tempodisplay.cc +++ b/gtk2_ardour/editor_tempodisplay.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2002 Paul Davis + Copyright (C) 2002 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ */ -#include // for sprintf, grrr +#include // for sprintf, grrr #include #include #include @@ -25,14 +25,14 @@ #include -#include -#include +#include "pbd/error.h" +#include "pbd/memento_command.h" #include #include -#include -#include +#include "ardour/session.h" +#include "ardour/tempo.h" #include #include @@ -44,6 +44,7 @@ #include "gui_thread.h" #include "time_axis_view.h" #include "ardour_ui.h" +#include "tempo_lines.h" #include "i18n.h" @@ -64,7 +65,7 @@ Editor::remove_metric_marks () delete_when_idle (*x); } metric_marks.clear (); -} +} void Editor::draw_metric_marks (const Metrics& metrics) @@ -73,21 +74,21 @@ 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) { - + 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, *meter_group, ARDOUR_UI::config()->canvasvar_MeterMarker.get(), buf, + 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, *tempo_group, ARDOUR_UI::config()->canvasvar_TempoMarker.get(), buf, + metric_marks.push_back (new TempoMarker (*this, *tempo_group, ARDOUR_UI::config()->canvasvar_TempoMarker.get(), buf, *(const_cast(ts)))); } - + } } @@ -100,15 +101,15 @@ Editor::tempo_map_changed (Change ignored) } ENSURE_GUI_THREAD(bind (mem_fun (*this, &Editor::tempo_map_changed), ignored)); - - redisplay_tempo (false); // redraw rulers and measures + + if (tempo_lines) + tempo_lines->tempo_map_changed(); + + 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 (); } -/** - * 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) { @@ -116,68 +117,65 @@ Editor::redisplay_tempo (bool immediate_redraw) return; } + compute_current_bbt_points (leftmost_frame, leftmost_frame + current_page_frames()); // redraw rulers and measures + + compute_current_bbt_points (leftmost_frame, leftmost_frame + current_page_frames()); + if (immediate_redraw) { + redraw_measures (); + } else { +#ifdef GTKOSX + redraw_measures (); +#else + Glib::signal_idle().connect (mem_fun (*this, &Editor::redraw_measures)); +#endif + } + update_tempo_based_rulers (); // redraw rulers and measures +} + +void +Editor::compute_current_bbt_points (nframes_t leftmost, nframes_t rightmost) +{ + 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); + session->bbt_time(leftmost, previous_beat); + session->bbt_time(rightmost, next_beat); if (previous_beat.beats > 1) { - previous_beat.beats -= 1; + previous_beat.beats -= 1; } else if (previous_beat.bars > 1) { - previous_beat.bars--; + 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) { + 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; - - if (current_bbt_points) { - delete current_bbt_points; - current_bbt_points = 0; - } - if (session) { - 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; - } + delete current_bbt_points; + current_bbt_points = 0; - if (immediate_redraw) { - - hide_measures (); - - if (session && current_bbt_points) { - draw_measures (); - } - - } else { - - if (session && current_bbt_points) { - Glib::signal_idle().connect (mem_fun (*this, &Editor::redraw_measures)); - } else { - hide_measures (); - } - } + current_bbt_points = session->tempo_map().get_points (session->tempo_map().frame_time (previous_beat), session->tempo_map().frame_time (next_beat) + 1); } void Editor::hide_measures () { - tempo_lines->hide(); - marker_tempo_lines->hide(); + if (tempo_lines) + tempo_lines->hide(); } bool Editor::redraw_measures () { - hide_measures (); draw_measures (); return false; } @@ -185,26 +183,20 @@ Editor::redraw_measures () void Editor::draw_measures () { - if (session == 0 || _show_measures == false - || !current_bbt_points || current_bbt_points->empty()) { + if (session == 0 || _show_measures == false || + !current_bbt_points || current_bbt_points->empty()) { return; } - tempo_lines->draw(*current_bbt_points, frames_per_unit); - marker_tempo_lines->draw(*current_bbt_points, frames_per_unit); - - /* the cursors are always on top of everything */ - - time_line_group->raise_to_top(); - marker_time_line_group->raise_to_top(); - - cursor_group->raise_to_top(); + if (tempo_lines == 0) { + tempo_lines = new TempoLines(*track_canvas, time_line_group, physical_screen_height); + } - return; + tempo_lines->draw(*current_bbt_points, frames_per_unit); } void -Editor::mouse_add_new_tempo_event (nframes_t frame) +Editor::mouse_add_new_tempo_event (nframes64_t frame) { if (session == 0) { return; @@ -212,9 +204,10 @@ Editor::mouse_add_new_tempo_event (nframes_t frame) TempoMap& map(session->tempo_map()); TempoDialog tempo_dialog (map, frame, _("add")); - + tempo_dialog.set_position (Gtk::WIN_POS_MOUSE); - tempo_dialog.signal_realize().connect (bind (sigc::ptr_fun (set_decoration), &tempo_dialog, 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); @@ -227,24 +220,25 @@ Editor::mouse_add_new_tempo_event (nframes_t frame) 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), requested); + 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); + + //map.dump (cerr); } void -Editor::mouse_add_new_meter_event (nframes_t frame) +Editor::mouse_add_new_meter_event (nframes64_t frame) { if (session == 0) { return; @@ -255,10 +249,12 @@ Editor::mouse_add_new_meter_event (nframes_t frame) MeterDialog meter_dialog (map, frame, _("add")); meter_dialog.set_position (Gtk::WIN_POS_MOUSE); - meter_dialog.signal_realize().connect (bind (sigc::ptr_fun (set_decoration), &meter_dialog, 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); - + switch (meter_dialog.run ()) { case RESPONSE_ACCEPT: break; @@ -268,19 +264,19 @@ Editor::mouse_add_new_meter_event (nframes_t frame) 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); } void @@ -297,7 +293,7 @@ Editor::remove_tempo_marker (ArdourCanvas::Item* item) if ((tempo_marker = dynamic_cast (marker)) == 0) { fatal << _("programming error: marker for tempo is not a tempo marker!") << endmsg; /*NOTREACHED*/ - } + } if (tempo_marker->tempo().movable()) { Glib::signal_idle().connect (bind (mem_fun(*this, &Editor::real_remove_tempo_marker), &tempo_marker->tempo())); @@ -322,7 +318,7 @@ Editor::edit_meter_section (MeterSection* section) 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")); @@ -341,7 +337,7 @@ Editor::edit_tempo_section (TempoSection* section) tempo_dialog.set_position (Gtk::WIN_POS_MOUSE); ensure_float (tempo_dialog); - + switch (tempo_dialog.run ()) { case RESPONSE_ACCEPT: break; @@ -350,15 +346,20 @@ Editor::edit_tempo_section (TempoSection* section) } 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)); + 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); - XMLNode &after = session->tempo_map().get_state(); + 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 (); } @@ -377,7 +378,7 @@ Editor::edit_tempo_marker (ArdourCanvas::Item *item) if ((tempo_marker = dynamic_cast (marker)) == 0) { fatal << _("programming error: marker for tempo is not a tempo marker!") << endmsg; /*NOTREACHED*/ - } + } edit_tempo_section (&tempo_marker->tempo()); } @@ -396,8 +397,8 @@ Editor::edit_meter_marker (ArdourCanvas::Item *item) if ((meter_marker = dynamic_cast (marker)) == 0) { fatal << _("programming error: marker for meter is not a meter marker!") << endmsg; /*NOTREACHED*/ - } - + } + edit_meter_section (&meter_marker->meter()); } @@ -428,7 +429,7 @@ Editor::remove_meter_marker (ArdourCanvas::Item* item) if ((meter_marker = dynamic_cast (marker)) == 0) { fatal << _("programming error: marker for meter is not a meter marker!") << endmsg; /*NOTREACHED*/ - } + } if (meter_marker->meter().movable()) { Glib::signal_idle().connect (bind (mem_fun(*this, &Editor::real_remove_meter_marker), &meter_marker->meter()));