X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_tempodisplay.cc;h=be7203f2db5f3044f821b898202a0954b08d67bf;hb=73a6b8ef25bb90ad6c66b25b17da5962a38291d2;hp=e9222999929f185f80c07f576e402025862fcede;hpb=e513d106d7ecf7e629f55c6eb554a2638f9c6443;p=ardour.git diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc index e922299992..be7203f2db 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 @@ -26,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 @@ -43,7 +42,9 @@ #include "tempo_dialog.h" #include "rgb_macros.h" #include "gui_thread.h" -#include "color.h" +#include "time_axis_view.h" +#include "ardour_ui.h" +#include "tempo_lines.h" #include "i18n.h" @@ -70,7 +71,7 @@ void Editor::draw_metric_marks (const Metrics& metrics) { - const MeterSection *ms; + const MeterSection *ms; const TempoSection *ts; char buf[64]; @@ -80,11 +81,11 @@ Editor::draw_metric_marks (const Metrics& metrics) 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, color_map[cMeterMarker], 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, color_map[cTempoMarker], buf, + metric_marks.push_back (new TempoMarker (*this, *tempo_group, ARDOUR_UI::config()->canvasvar_TempoMarker.get(), buf, *(const_cast(ts)))); } @@ -95,195 +96,107 @@ 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; + } - BBT_Time previous_beat, next_beat; // the beats previous to the leftmost frame and after the rightmost frame + ENSURE_GUI_THREAD(bind (mem_fun (*this, &Editor::tempo_map_changed), ignored)); - session->bbt_time(leftmost_frame, previous_beat); + if (tempo_lines) + tempo_lines->tempo_map_changed(); - previous_beat.ticks = 0; - if (previous_beat.beats > 1) { - previous_beat.beats -= 1; - } else if (previous_beat.bars > 1) { - previous_beat.bars--; - previous_beat.beats += 1; - } + 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 (); +} - session->bbt_time(leftmost_frame + current_page_frames(), next_beat); +void +Editor::redisplay_tempo (bool immediate_redraw) +{ + if (!session) { + return; + } + + compute_current_bbt_points (leftmost_frame, leftmost_frame + current_page_frames()); // redraw rulers and measures - if (session->tempo_map().meter_at(leftmost_frame + current_page_frames()).beats_per_bar () > next_beat.beats + 1) { - next_beat.beats += 1; - next_beat.ticks = 0; + compute_current_bbt_points (leftmost_frame, leftmost_frame + current_page_frames()); + if (immediate_redraw) { + redraw_measures (); } else { - next_beat.bars += 1; - next_beat.beats = 1; - next_beat.ticks = 0; +#ifdef GTKOSX + redraw_measures (); +#else + Glib::signal_idle().connect (mem_fun (*this, &Editor::redraw_measures)); +#endif } + update_tempo_based_rulers (); // redraw rulers and measures +} - if (current_bbt_points) { - delete current_bbt_points; - current_bbt_points = 0; +void +Editor::compute_current_bbt_points (nframes_t leftmost, nframes_t rightmost) +{ + if (!session) { + return; } - if (session) { - current_bbt_points = session->tempo_map().get_points (session->tempo_map().frame_time (previous_beat), session->tempo_map().frame_time (next_beat)); + BBT_Time previous_beat, next_beat; // the beats previous to the leftmost frame and after the rightmost frame - /* - TempoMap::BBTPointList::iterator i; - cerr << "******************" << endl << "current bbt points dump: " << endl; - for (i = current_bbt_points->begin(); i != current_bbt_points->end(); i++) { - cerr << (*i).bar << " : " << (*i).beat << endl; - } - cerr << "******************" << endl; - */ + session->bbt_time(leftmost, previous_beat); + session->bbt_time(rightmost, next_beat); - } else { - current_bbt_points = 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; - redisplay_tempo (); -} - -void -Editor::redisplay_tempo () -{ - - hide_measures (); - - if (session && current_bbt_points) { - Glib::signal_idle().connect (mem_fun (*this, &Editor::draw_measures)); - update_tempo_based_rulers (); + 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; + + 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 () { - for (TimeLineList::iterator i = used_measure_lines.begin(); i != used_measure_lines.end(); ++i) { - (*i)->hide(); - free_measure_lines.push_back (*i); - } - used_measure_lines.clear (); + if (tempo_lines) + tempo_lines->hide(); } -ArdourCanvas::SimpleLine * -Editor::get_time_line () +bool +Editor::redraw_measures () { - ArdourCanvas::SimpleLine *line; - - if (free_measure_lines.empty()) { - line = new ArdourCanvas::SimpleLine (*time_line_group); - used_measure_lines.push_back (line); - } else { - line = free_measure_lines.front(); - free_measure_lines.erase (free_measure_lines.begin()); - used_measure_lines.push_back (line); - } - - return line; + draw_measures (); + return false; } -bool +void Editor::draw_measures () { - if (session == 0 || _show_measures == false) { - return false; - } - - TempoMap::BBTPointList::iterator i; - ArdourCanvas::SimpleLine *line; - gdouble xpos, last_xpos; - uint32_t cnt; - uint32_t color; - - if (current_bbt_points == 0 || current_bbt_points->empty()) { - return false; - } - - cnt = 0; - last_xpos = 0; - - /* get the first bar spacing */ - - gdouble last_beat = DBL_MAX; - gdouble beat_spacing = 0; - - for (i = current_bbt_points->begin(); i != current_bbt_points->end() && beat_spacing == 0; ++i) { - TempoMap::BBTPoint& p = (*i); - - 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_spacing < 12.0) { - /* - if the lines are too close together, - they become useless - */ - return false; + if (session == 0 || _show_measures == false || + !current_bbt_points || current_bbt_points->empty()) { + return; } - double x1, x2, y1, y2; - track_canvas.get_scroll_region (x1, y1, x2, y2); - - for (i = current_bbt_points->begin(); i != current_bbt_points->end(); ++i) { - - TempoMap::BBTPoint& p = (*i); - - switch (p.type) { - case TempoMap::Bar: - break; - - case TempoMap::Beat: - xpos = frame_to_unit (p.frame); - - 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 (); - 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; - } - break; - } + if (tempo_lines == 0) { + tempo_lines = new TempoLines(*track_canvas, time_line_group, physical_screen_height); } - /* the cursors are always on top of everything */ - - cursor_group->raise_to_top(); - time_line_group->lower_to_bottom(); - return false; + 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; @@ -293,7 +206,8 @@ Editor::mouse_add_new_tempo_event (jack_nframes_t frame) 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); @@ -308,24 +222,23 @@ Editor::mouse_add_new_tempo_event (jack_nframes_t frame) 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); - - session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks); + //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; @@ -336,7 +249,9 @@ Editor::mouse_add_new_meter_event (jack_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); @@ -352,18 +267,16 @@ Editor::mouse_add_new_meter_event (jack_nframes_t frame) 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); - - session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks); + //map.dump (cerr); } void @@ -414,8 +327,6 @@ Editor::edit_meter_section (MeterSection* section) 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); } void @@ -426,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; @@ -435,19 +346,22 @@ 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 (); - - session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks); } void @@ -498,8 +412,6 @@ Editor::real_remove_tempo_marker (TempoSection *section) 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; } @@ -534,7 +446,5 @@ Editor::real_remove_meter_marker (MeterSection *section) 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; }