X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_tempodisplay.cc;h=722490c26e030844c6c6ce34cf86096b49ba3690;hb=cf52d6e4b40111eb04b244ec054055a4ec15dbe0;hp=b997d3bb5d94714ece8beb2b89007162f5c4880a;hpb=fe6c5612a2c46d6dbad32517d487b120bb8b65c4;p=ardour.git diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc index b997d3bb5d..722490c26e 100644 --- a/gtk2_ardour/editor_tempodisplay.cc +++ b/gtk2_ardour/editor_tempodisplay.cc @@ -40,6 +40,7 @@ #include "canvas/canvas.h" #include "canvas/item.h" +#include "canvas/line_set.h" #include "editor.h" #include "marker.h" @@ -47,11 +48,10 @@ #include "rgb_macros.h" #include "gui_thread.h" #include "time_axis_view.h" -#include "ardour_ui.h" #include "tempo_lines.h" -#include "utils.h" +#include "ui_config.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace ARDOUR; @@ -69,38 +69,85 @@ Editor::remove_metric_marks () delete_when_idle (*x); } metric_marks.clear (); + + for (Curves::iterator x = tempo_curves.begin(); x != tempo_curves.end(); ++x) { + delete (*x); + } + tempo_curves.clear (); } void Editor::draw_metric_marks (const Metrics& metrics) { - - const MeterSection *ms; - const TempoSection *ts; char buf[64]; + double max_tempo = 0.0; + double min_tempo = DBL_MAX; - remove_metric_marks (); + remove_metric_marks (); // also clears tempo curves for (Metrics::const_iterator i = metrics.begin(); i != metrics.end(); ++i) { + const MeterSection *ms; + const TempoSection *ts; if ((ms = dynamic_cast(*i)) != 0) { snprintf (buf, sizeof(buf), "%g/%g", ms->divisions_per_bar(), ms->note_divisor ()); - metric_marks.push_back (new MeterMarker (*this, *meter_group, ARDOUR_UI::config()->get_canvasvar_MeterMarker(), buf, + metric_marks.push_back (new MeterMarker (*this, *meter_group, UIConfiguration::instance().color ("meter marker"), buf, *(const_cast(ms)))); } else if ((ts = dynamic_cast(*i)) != 0) { - if (Config->get_allow_non_quarter_pulse()) { - snprintf (buf, sizeof (buf), "%.2f/%.0f", ts->beats_per_minute(), ts->note_type()); + if (UIConfiguration::instance().get_allow_non_quarter_pulse()) { + snprintf (buf, sizeof (buf), "%.3f/%.0f", ts->beats_per_minute(), ts->note_type()); } else { - snprintf (buf, sizeof (buf), "%.2f", ts->beats_per_minute()); + snprintf (buf, sizeof (buf), "%.3f", ts->beats_per_minute()); } - metric_marks.push_back (new TempoMarker (*this, *tempo_group, ARDOUR_UI::config()->get_canvasvar_TempoMarker(), buf, + + max_tempo = max (max_tempo, ts->beats_per_minute()); + min_tempo = min (min_tempo, ts->beats_per_minute()); + + tempo_curves.push_back (new TempoCurve (*this, *tempo_group, UIConfiguration::instance().color ("tempo curve"), + *(const_cast(ts)), ts->frame(), false)); + if (ts->position_lock_style() == MusicTime) { + metric_marks.push_back (new TempoMarker (*this, *tempo_group, UIConfiguration::instance().color ("tempo marker music"), buf, + *(const_cast(ts)))); + } else { + metric_marks.push_back (new TempoMarker (*this, *tempo_group, UIConfiguration::instance().color ("tempo marker"), buf, *(const_cast(ts)))); + } + } } + const double min_tempo_range = 5.0; + const double tempo_delta = fabs (max_tempo - min_tempo); + + if (tempo_delta < min_tempo_range) { + max_tempo += min_tempo_range - tempo_delta; + min_tempo += tempo_delta - min_tempo_range; + } + + for (Curves::iterator x = tempo_curves.begin(); x != tempo_curves.end(); ) { + Curves::iterator tmp = x; + (*x)->set_max_tempo (max_tempo); + (*x)->set_min_tempo (min_tempo); + ++tmp; + if (tmp != tempo_curves.end()) { + (*x)->set_position ((*x)->tempo().frame(), (*tmp)->tempo().frame()); + } else { + (*x)->set_position ((*x)->tempo().frame(), UINT32_MAX); + } + ++x; + } + + for (Marks::iterator x = metric_marks.begin(); x != metric_marks.end(); ++x) { + TempoMarker* tempo_marker; + + if ((tempo_marker = dynamic_cast (*x)) != 0) { + tempo_marker->update_height_mark ((tempo_marker->tempo().beats_per_minute() - min_tempo) / max (10.0, max_tempo - min_tempo)); + } + } } + void Editor::tempo_map_changed (const PropertyChange& /*ignored*/) { @@ -114,13 +161,93 @@ Editor::tempo_map_changed (const PropertyChange& /*ignored*/) tempo_lines->tempo_map_changed(); } - ARDOUR::TempoMap::BBTPointList::const_iterator begin; - ARDOUR::TempoMap::BBTPointList::const_iterator end; - - compute_current_bbt_points (leftmost_frame, leftmost_frame + current_page_samples(), begin, end); + std::vector grid; + compute_current_bbt_points (grid, leftmost_frame, leftmost_frame + current_page_samples()); _session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks); // redraw metric markers - draw_measures (begin, end); - update_tempo_based_rulers (begin, end); + draw_measures (grid); + update_tempo_based_rulers (grid); +} + +struct CurveComparator { + bool operator() (TempoCurve const * a, TempoCurve const * b) { + return a->position() < b->position(); + } +}; + +void +Editor::marker_position_changed () +{ + if (!_session) { + return; + } + + ENSURE_GUI_THREAD (*this, &Editor::tempo_map_changed); + + if (tempo_lines) { + tempo_lines->tempo_map_changed(); + } + + double max_tempo = 0.0; + double min_tempo = DBL_MAX; + + for (Marks::iterator x = metric_marks.begin(); x != metric_marks.end(); ++x) { + TempoMarker* tempo_marker; + MeterMarker* meter_marker; + const TempoSection *ts; + const MeterSection *ms; + + if ((tempo_marker = dynamic_cast (*x)) != 0) { + if ((ts = &tempo_marker->tempo()) != 0) { + tempo_marker->set_position (ts->frame ()); + char buf[64]; + snprintf (buf, sizeof (buf), "%.3f", ts->beats_per_minute()); + tempo_marker->set_name (buf); + + max_tempo = max (max_tempo, ts->beats_per_minute()); + min_tempo = min (min_tempo, ts->beats_per_minute()); + } + } + if ((meter_marker = dynamic_cast (*x)) != 0) { + if ((ms = &meter_marker->meter()) != 0) { + meter_marker->set_position (ms->frame ()); + } + } + } + + tempo_curves.sort (CurveComparator()); + + const double min_tempo_range = 5.0; + const double tempo_delta = fabs (max_tempo - min_tempo); + + if (tempo_delta < min_tempo_range) { + max_tempo += min_tempo_range - tempo_delta; + min_tempo += tempo_delta - min_tempo_range; + } + + for (Curves::iterator x = tempo_curves.begin(); x != tempo_curves.end(); ) { + Curves::iterator tmp = x; + (*x)->set_max_tempo (max_tempo); + (*x)->set_min_tempo (min_tempo); + ++tmp; + if (tmp != tempo_curves.end()) { + (*x)->set_position ((*x)->tempo().frame(), (*tmp)->tempo().frame()); + } else { + (*x)->set_position ((*x)->tempo().frame(), UINT32_MAX); + } + ++x; + } + + for (Marks::iterator x = metric_marks.begin(); x != metric_marks.end(); ++x) { + TempoMarker* tempo_marker; + if ((tempo_marker = dynamic_cast (*x)) != 0) { + tempo_marker->update_height_mark ((tempo_marker->tempo().beats_per_minute() - min_tempo) / max (max_tempo - min_tempo, 10.0)); + } + } + + std::vector grid; + compute_current_bbt_points (grid, leftmost_frame, leftmost_frame + current_page_samples()); + draw_measures (grid); + update_tempo_based_rulers (grid); } void @@ -131,23 +258,20 @@ Editor::redisplay_tempo (bool immediate_redraw) } if (immediate_redraw) { - ARDOUR::TempoMap::BBTPointList::const_iterator current_bbt_points_begin; - ARDOUR::TempoMap::BBTPointList::const_iterator current_bbt_points_end; - - compute_current_bbt_points (leftmost_frame, leftmost_frame + current_page_samples(), - current_bbt_points_begin, current_bbt_points_end); - draw_measures (current_bbt_points_begin, current_bbt_points_end); - update_tempo_based_rulers (current_bbt_points_begin, current_bbt_points_end); // redraw rulers and measures - + std::vector grid; + + compute_current_bbt_points (grid, leftmost_frame, leftmost_frame + current_page_samples()); + draw_measures (grid); + update_tempo_based_rulers (grid); // redraw rulers and measure lines + } else { Glib::signal_idle().connect (sigc::bind_return (sigc::bind (sigc::mem_fun (*this, &Editor::redisplay_tempo), true), false)); } } +/* computes a grid starting a beat before and ending a beat after leftmost and rightmost respectively */ void -Editor::compute_current_bbt_points (framepos_t leftmost, framepos_t rightmost, - ARDOUR::TempoMap::BBTPointList::const_iterator& begin, - ARDOUR::TempoMap::BBTPointList::const_iterator& end) +Editor::compute_current_bbt_points (std::vector& grid, framepos_t leftmost, framepos_t rightmost) { if (!_session) { return; @@ -155,8 +279,8 @@ Editor::compute_current_bbt_points (framepos_t leftmost, framepos_t rightmost, /* prevent negative values of leftmost from creeping into tempomap */ - - _session->tempo_map().get_grid (begin, end, max (leftmost, (framepos_t) 0), rightmost); + const double lower_beat = floor (_session->tempo_map().beat_at_frame (leftmost)) - 1.0; + _session->tempo_map().get_grid (grid, max (_session->tempo_map().frame_at_beat (lower_beat), (framepos_t) 0), rightmost); } void @@ -168,18 +292,18 @@ Editor::hide_measures () } void -Editor::draw_measures (ARDOUR::TempoMap::BBTPointList::const_iterator& begin, - ARDOUR::TempoMap::BBTPointList::const_iterator& end) +Editor::draw_measures (std::vector& grid) { - if (_session == 0 || _show_measures == false || distance (begin, end) == 0) { + if (_session == 0 || _show_measures == false || distance (grid.begin(), grid.end()) == 0) { return; } if (tempo_lines == 0) { - tempo_lines = new TempoLines (*_track_canvas, time_line_group, ArdourCanvas::COORD_MAX); + tempo_lines = new TempoLines (time_line_group, ArdourCanvas::LineSet::Vertical); } - - tempo_lines->draw (begin, end, samples_per_pixel); + + const unsigned divisions = get_grid_beat_divisions(leftmost_frame); + tempo_lines->draw (grid, divisions, leftmost_frame, _session->frame_rate()); } void @@ -190,36 +314,20 @@ Editor::mouse_add_new_tempo_event (framepos_t frame) } TempoMap& map(_session->tempo_map()); - TempoDialog tempo_dialog (map, frame, _("add")); - //this causes compiz to display no border. - //tempo_dialog.signal_realize().connect (sigc::bind (sigc::ptr_fun (set_decoration), &tempo_dialog, Gdk::WMDecoration (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH))); + begin_reversible_command (_("add tempo mark")); + const double pulse = map.pulse_at_frame (frame); - ensure_float (tempo_dialog); + if (pulse > 0.0) { + XMLNode &before = map.get_state(); + /* add music-locked ramped (?) tempo using the bpm/note type at frame*/ + map.add_tempo (map.tempo_at_frame (frame), pulse, 0, TempoSection::Ramp, MusicTime); - switch (tempo_dialog.run()) { - case RESPONSE_ACCEPT: - break; - default: - return; + XMLNode &after = map.get_state(); + _session->add_command(new MementoCommand(map, &before, &after)); + commit_reversible_command (); } - double bpm = 0; - Timecode::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); } @@ -234,11 +342,6 @@ Editor::mouse_add_new_meter_event (framepos_t frame) TempoMap& map(_session->tempo_map()); MeterDialog meter_dialog (map, frame, _("add")); - //this causes compiz to display no border.. - //meter_dialog.signal_realize().connect (sigc::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; @@ -250,13 +353,21 @@ Editor::mouse_add_new_meter_event (framepos_t frame) bpb = max (1.0, bpb); // XXX is this a reasonable limit? double note_type = meter_dialog.get_note_type (); - Timecode::BBT_Time requested; + Timecode::BBT_Time requested; meter_dialog.get_bbt_time (requested); + const double beat = map.beat_at_bbt (requested); + begin_reversible_command (_("add meter mark")); XMLNode &before = map.get_state(); - map.add_meter (Meter (bpb, note_type), requested); + + if (meter_dialog.get_lock_style() == MusicTime) { + map.add_meter (Meter (bpb, note_type), beat, requested, map.frame_at_beat (beat), MusicTime); + } else { + map.add_meter (Meter (bpb, note_type), beat, requested, map.frame_at_beat (beat), AudioTime); + } + _session->add_command(new MementoCommand(map, &before, &map.get_state())); commit_reversible_command (); @@ -266,17 +377,17 @@ Editor::mouse_add_new_meter_event (framepos_t frame) void Editor::remove_tempo_marker (ArdourCanvas::Item* item) { - Marker* marker; + ArdourMarker* marker; TempoMarker* tempo_marker; - if ((marker = reinterpret_cast (item->get_data ("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*/ + abort(); /*NOTREACHED*/ } if ((tempo_marker = dynamic_cast (marker)) == 0) { fatal << _("programming error: marker for tempo is not a tempo marker!") << endmsg; - /*NOTREACHED*/ + abort(); /*NOTREACHED*/ } if (tempo_marker->tempo().movable()) { @@ -287,9 +398,7 @@ Editor::remove_tempo_marker (ArdourCanvas::Item* item) void Editor::edit_meter_section (MeterSection* section) { - MeterDialog meter_dialog (*section, _("done")); - - ensure_float (meter_dialog); + MeterDialog meter_dialog (_session->tempo_map(), *section, _("done")); switch (meter_dialog.run()) { case RESPONSE_ACCEPT: @@ -301,15 +410,21 @@ 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 (); + double const note_type = meter_dialog.get_note_type (); + const Meter meter (bpb, note_type); Timecode::BBT_Time when; - meter_dialog.get_bbt_time(when); + meter_dialog.get_bbt_time (when); - begin_reversible_command (_("replace tempo mark")); + framepos_t const frame = _session->tempo_map().frame_at_bbt (when); + const PositionLockStyle pls = (meter_dialog.get_lock_style() == AudioTime) ? AudioTime : MusicTime; + + begin_reversible_command (_("replace meter mark")); XMLNode &before = _session->tempo_map().get_state(); - _session->tempo_map().replace_meter (*section, Meter (bpb, note_type), when); - XMLNode &after = _session->tempo_map().get_state(); + + _session->tempo_map().replace_meter (*section, meter, when, frame, pls); + + XMLNode &after = _session->tempo_map().get_state(); _session->add_command(new MementoCommand(_session->tempo_map(), &before, &after)); commit_reversible_command (); } @@ -317,9 +432,7 @@ Editor::edit_meter_section (MeterSection* section) void Editor::edit_tempo_section (TempoSection* section) { - TempoDialog tempo_dialog (*section, _("done")); - - ensure_float (tempo_dialog); + TempoDialog tempo_dialog (_session->tempo_map(), *section, _("done")); switch (tempo_dialog.run ()) { case RESPONSE_ACCEPT: @@ -330,54 +443,40 @@ Editor::edit_tempo_section (TempoSection* section) double bpm = tempo_dialog.get_bpm (); double nt = tempo_dialog.get_note_type (); - Timecode::BBT_Time when; - tempo_dialog.get_bbt_time(when); bpm = max (0.01, bpm); + const Tempo tempo (bpm, nt); + + Timecode::BBT_Time when; + tempo_dialog.get_bbt_time (when); + + const TempoSection::Type ttype (tempo_dialog.get_tempo_type()); begin_reversible_command (_("replace tempo mark")); XMLNode &before = _session->tempo_map().get_state(); - _session->tempo_map().replace_tempo (*section, Tempo (bpm, nt), when); + + if (tempo_dialog.get_lock_style() == AudioTime) { + framepos_t const f = _session->tempo_map().predict_tempo_position (section, when).second; + _session->tempo_map().replace_tempo (*section, tempo, 0.0, f, ttype, AudioTime); + } else { + double const p = _session->tempo_map().predict_tempo_position (section, when).first; + _session->tempo_map().replace_tempo (*section, tempo, p, 0, ttype, MusicTime); + } + 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 (ArdourCanvas::Item *item) +Editor::edit_tempo_marker (TempoMarker& tm) { - Marker* marker; - TempoMarker* tempo_marker; - - if ((marker = reinterpret_cast (item->get_data ("marker"))) == 0) { - fatal << _("programming error: tempo marker canvas item has no marker object pointer!") << endmsg; - /*NOTREACHED*/ - } - - 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()); + edit_tempo_section (&tm.tempo()); } void -Editor::edit_meter_marker (ArdourCanvas::Item *item) +Editor::edit_meter_marker (MeterMarker& mm) { - Marker* marker; - MeterMarker* meter_marker; - - if ((marker = reinterpret_cast (item->get_data ("marker"))) == 0) { - fatal << _("programming error: tempo marker canvas item has no marker object pointer!") << endmsg; - /*NOTREACHED*/ - } - - 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()); + edit_meter_section (&mm.meter()); } gint @@ -396,17 +495,17 @@ Editor::real_remove_tempo_marker (TempoSection *section) void Editor::remove_meter_marker (ArdourCanvas::Item* item) { - Marker* marker; + ArdourMarker* marker; MeterMarker* meter_marker; - if ((marker = reinterpret_cast (item->get_data ("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*/ + abort(); /*NOTREACHED*/ } if ((meter_marker = dynamic_cast (marker)) == 0) { fatal << _("programming error: marker for meter is not a meter marker!") << endmsg; - /*NOTREACHED*/ + abort(); /*NOTREACHED*/ } if (meter_marker->meter().movable()) {