X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_tempodisplay.cc;h=7af6fef05979db04b521db1b7614e6ff5e1baaf4;hb=a5ae129a066747901ff1ed95368729b63cb6a70d;hp=6e28b32e77ce5263c177f161259a45da507b98de;hpb=c7ff67004a51ae3f0453531c3d64bd9876f1df3b;p=ardour.git diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc index 6e28b32e77..7af6fef059 100644 --- a/gtk2_ardour/editor_tempodisplay.cc +++ b/gtk2_ardour/editor_tempodisplay.cc @@ -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,51 @@ 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()); } + + 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 ("color 62"), + *(const_cast(ts)), ts->frame(), false)); 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)); + } + } } @@ -116,13 +157,18 @@ Editor::tempo_map_changed (const PropertyChange& /*ignored*/) } 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 (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 () { @@ -135,15 +181,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), "%.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) { @@ -152,6 +208,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); @@ -185,12 +272,10 @@ Editor::compute_current_bbt_points (std::vector& grid, frame return; } - framecnt_t beat_before_lower_pos = _session->tempo_map().frame_at_beat (floor(_session->tempo_map().beat_at_frame (leftmost))); - framecnt_t beat_after_upper_pos = _session->tempo_map().frame_at_beat (floor (_session->tempo_map().beat_at_frame (rightmost)) + 1.0); - /* prevent negative values of leftmost from creeping into tempomap */ - _session->tempo_map().get_grid (grid, max (beat_before_lower_pos, (framepos_t) 0), beat_after_upper_pos); + 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 @@ -224,35 +309,19 @@ 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))); - switch (tempo_dialog.run()) { - case RESPONSE_ACCEPT: - break; - default: - return; - } + begin_reversible_command (_("add tempo mark")); + const double pulse = map.pulse_at_frame (frame); - double bpm = 0; - Timecode::BBT_Time requested; - bpm = tempo_dialog.get_bpm (); - double nt = tempo_dialog.get_note_type(); - bpm = max (0.01, bpm); + 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); - tempo_dialog.get_bbt_time (requested); - begin_reversible_command (_("add tempo mark")); - XMLNode &before = map.get_state(); - if (tempo_dialog.get_lock_style() == MusicTime) { - map.add_tempo (Tempo (bpm,nt), map.bbt_to_beats (requested), tempo_dialog.get_tempo_type()); - } else { - map.add_tempo (Tempo (bpm,nt), frame, tempo_dialog.get_tempo_type()); + XMLNode &after = map.get_state(); + _session->add_command(new MementoCommand(map, &before, &after)); + commit_reversible_command (); } - XMLNode &after = map.get_state(); - _session->add_command(new MementoCommand(map, &before, &after)); - commit_reversible_command (); //map.dump (cerr); } @@ -268,9 +337,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; @@ -288,11 +354,13 @@ Editor::mouse_add_new_meter_event (framepos_t frame) 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), map.beat_at_bbt (requested), requested, 0, MusicTime); } else { - map.add_meter (Meter (bpb, note_type), frame, meter_dialog.get_lock_style()); + map.add_meter (Meter (bpb, note_type), map.beat_at_bbt (requested), requested, map.frame_at_bbt (requested), AudioTime); } + _session->add_command(new MementoCommand(map, &before, &map.get_state())); commit_reversible_command (); @@ -335,19 +403,17 @@ 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 (); 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); - begin_reversible_command (_("replace tempo mark")); + begin_reversible_command (_("replace meter mark")); XMLNode &before = _session->tempo_map().get_state(); - 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), section->frame()); - } - XMLNode &after = _session->tempo_map().get_state(); + + _session->tempo_map().replace_meter (*section, Meter (bpb, note_type), when, frame, meter_dialog.get_lock_style()); + + XMLNode &after = _session->tempo_map().get_state(); _session->add_command(new MementoCommand(_session->tempo_map(), &before, &after)); commit_reversible_command (); } @@ -366,20 +432,23 @@ Editor::edit_tempo_section (TempoSection* section) double bpm = tempo_dialog.get_bpm (); double nt = tempo_dialog.get_note_type (); - double beat; Timecode::BBT_Time when; - tempo_dialog.get_bbt_time(when); + tempo_dialog.get_bbt_time (when); + bpm = max (0.01, bpm); - beat = _session->tempo_map().bbt_to_beats (when); begin_reversible_command (_("replace tempo mark")); XMLNode &before = _session->tempo_map().get_state(); - if (tempo_dialog.get_lock_style() == MusicTime) { - _session->tempo_map().replace_tempo (*section, Tempo (bpm, nt), beat, 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 (bpm, nt), 0.0, f, tempo_dialog.get_tempo_type(), AudioTime); } else { - _session->tempo_map().replace_tempo (*section, Tempo (bpm, nt), section->frame(), tempo_dialog.get_tempo_type()); + double const p = _session->tempo_map().predict_tempo_position (section, when).first; + _session->tempo_map().replace_tempo (*section, Tempo (bpm, nt), p, 0, tempo_dialog.get_tempo_type(), MusicTime); } + XMLNode &after = _session->tempo_map().get_state(); _session->add_command (new MementoCommand(_session->tempo_map(), &before, &after)); commit_reversible_command ();