X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_tempodisplay.cc;h=be7203f2db5f3044f821b898202a0954b08d67bf;hb=73a6b8ef25bb90ad6c66b25b17da5962a38291d2;hp=339c335fa3c8613712be6bf2dc175b68b08a1dbe;hpb=4b35fc4c68fbd4845f7f8f3d2307e97412d7a4d8;p=ardour.git diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc index 339c335fa3..be7203f2db 100644 --- a/gtk2_ardour/editor_tempodisplay.cc +++ b/gtk2_ardour/editor_tempodisplay.cc @@ -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 @@ -42,8 +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)))); } @@ -100,17 +101,39 @@ 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) +{ + if (!session) { + 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; @@ -118,18 +141,18 @@ Editor::redisplay_tempo (bool immediate_redraw) 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; @@ -137,67 +160,22 @@ Editor::redisplay_tempo (bool immediate_redraw) } next_beat.ticks = 0; - if (current_bbt_points) { - delete current_bbt_points; - current_bbt_points = 0; - } + 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; - } - - 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::lazy_hide_and_draw_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 () { - 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 (); -} - -ArdourCanvas::SimpleLine * -Editor::get_time_line () -{ - 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; + if (tempo_lines) + tempo_lines->hide(); } bool -Editor::lazy_hide_and_draw_measures () +Editor::redraw_measures () { - hide_measures (); draw_measures (); return false; } @@ -205,82 +183,20 @@ Editor::lazy_hide_and_draw_measures () void Editor::draw_measures () { - if (session == 0 || _show_measures == false) { - return; - } - - TempoMap::BBTPointList::iterator i; - 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()) { + if (session == 0 || _show_measures == false || + !current_bbt_points || current_bbt_points->empty()) { return; } - 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 */ - - i = current_bbt_points->end(); - i--; - bars = (*i).bar - (*current_bbt_points->begin()).bar; - beats = current_bbt_points->size() - bars; - - beat_density = (beats * 10.0f) / track_canvas.get_width (); - - if (beat_density > 4.0f) { - /* if the lines are too close together, they become useless - */ - return; + if (tempo_lines == 0) { + tempo_lines = new TempoLines(*track_canvas, time_line_group, physical_screen_height); } - for (i = current_bbt_points->begin(); i != current_bbt_points->end(); ++i) { - - switch ((*i).type) { - case TempoMap::Bar: - break; - - case TempoMap::Beat: - - if ((*i).beat == 1) { - color = color_map[cMeasureLineBar]; - } else { - color = color_map[cMeasureLineBeat]; - - if (beat_density > 2.0) { - /* only draw beat lines if the gaps between beats are large. - */ - break; - } - } - - 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; - } - } - - /* the cursors are always on top of everything */ - - cursor_group->raise_to_top(); - time_line_group->lower_to_bottom(); - 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; @@ -290,7 +206,8 @@ Editor::mouse_add_new_tempo_event (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); @@ -305,22 +222,23 @@ Editor::mouse_add_new_tempo_event (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); + //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; @@ -331,7 +249,9 @@ 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); @@ -347,16 +267,16 @@ Editor::mouse_add_new_meter_event (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); + //map.dump (cerr); } void @@ -417,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; @@ -426,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 (); }