X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_tempodisplay.cc;h=722490c26e030844c6c6ce34cf86096b49ba3690;hb=c17b4fd13580629c71388144db5ad957d1316372;hp=127a258c567b082bb38572fdf4a772215884f00d;hpb=105999956e8a4b2fc344e5665e1c06801256c126;p=ardour.git diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc index 127a258c56..722490c26e 100644 --- a/gtk2_ardour/editor_tempodisplay.cc +++ b/gtk2_ardour/editor_tempodisplay.cc @@ -51,7 +51,7 @@ #include "tempo_lines.h" #include "ui_config.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace ARDOUR; @@ -69,19 +69,25 @@ 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 ()); @@ -89,16 +95,56 @@ Editor::draw_metric_marks (const Metrics& metrics) *(const_cast(ms)))); } else if ((ts = dynamic_cast(*i)) != 0) { if (UIConfiguration::instance().get_allow_non_quarter_pulse()) { - snprintf (buf, sizeof (buf), "%.2f/%.0f", ts->beats_per_minute(), ts->note_type()); + 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, UIConfiguration::instance().color ("tempo marker"), 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)); + } + } } @@ -122,6 +168,12 @@ Editor::tempo_map_changed (const PropertyChange& /*ignored*/) 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 () { @@ -134,18 +186,25 @@ Editor::marker_position_changed () if (tempo_lines) { tempo_lines->tempo_map_changed(); } - TempoMarker* tempo_marker; - MeterMarker* meter_marker; - const TempoSection *ts; - const MeterSection *ms; + + 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), "%.2f", ts->beats_per_minute()); + 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) { @@ -154,6 +213,37 @@ Editor::marker_position_changed () } } } + + 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); @@ -189,7 +279,8 @@ Editor::compute_current_bbt_points (std::vector& grid, frame /* prevent negative values of leftmost from creeping into tempomap */ - _session->tempo_map().get_grid (grid, 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 @@ -230,7 +321,7 @@ Editor::mouse_add_new_tempo_event (framepos_t frame) 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), pulse, TempoSection::Ramp); + map.add_tempo (map.tempo_at_frame (frame), pulse, 0, TempoSection::Ramp, MusicTime); XMLNode &after = map.get_state(); _session->add_command(new MementoCommand(map, &before, &after)); @@ -251,9 +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))); - switch (meter_dialog.run ()) { case RESPONSE_ACCEPT: break; @@ -265,17 +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(); + if (meter_dialog.get_lock_style() == MusicTime) { - map.add_meter (Meter (bpb, note_type), map.bbt_to_beats (requested), requested); + map.add_meter (Meter (bpb, note_type), beat, requested, map.frame_at_beat (beat), MusicTime); } else { - map.add_meter (Meter (bpb, note_type), frame, meter_dialog.get_lock_style()); + 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 (); @@ -319,19 +411,20 @@ Editor::edit_meter_section (MeterSection* section) bpb = max (1.0, bpb); // XXX is this a reasonable limit? 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); - framepos_t const frame = _session->tempo_map().frame_at_beat (_session->tempo_map().bbt_to_beats (when)); + meter_dialog.get_bbt_time (when); + + 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(); - section->set_position_lock_style (meter_dialog.get_lock_style()); - if (meter_dialog.get_lock_style() == MusicTime) { - _session->tempo_map().replace_meter (*section, Meter (bpb, note_type), when); - } else { - _session->tempo_map().replace_meter (*section, Meter (bpb, note_type), frame); - } - 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 (); } @@ -350,23 +443,23 @@ Editor::edit_tempo_section (TempoSection* section) double bpm = tempo_dialog.get_bpm (); double nt = tempo_dialog.get_note_type (); - Timecode::BBT_Time when; + bpm = max (0.01, bpm); + const Tempo tempo (bpm, nt); + Timecode::BBT_Time when; tempo_dialog.get_bbt_time (when); - bpm = max (0.01, bpm); + const TempoSection::Type ttype (tempo_dialog.get_tempo_type()); begin_reversible_command (_("replace tempo mark")); XMLNode &before = _session->tempo_map().get_state(); - if (tempo_dialog.get_lock_style() == MusicTime) { - section->set_position_lock_style (MusicTime); - framepos_t const f = _session->tempo_map().predict_tempo_frame (section, when); - double const p = _session->tempo_map().predict_tempo_pulse (section, f); - _session->tempo_map().replace_tempo (*section, Tempo (bpm, nt), p, tempo_dialog.get_tempo_type()); + 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 { - framepos_t const f = _session->tempo_map().predict_tempo_frame (section, when); - _session->tempo_map().replace_tempo (*section, Tempo (bpm, nt), f, tempo_dialog.get_tempo_type()); + 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();