X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_tempodisplay.cc;h=4630f1fe43829b48447b106499baab2b5d7d7571;hb=8f216afa245da108d1617dedb2a0a5197250eb18;hp=adf0f72fe37969518ec8c175ad700b22e2aacfe3;hpb=8f3bc6f8099d7fc3bcc7f0dc88434afa0084e35f;p=ardour.git diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc index adf0f72fe3..4630f1fe43 100644 --- a/gtk2_ardour/editor_tempodisplay.cc +++ b/gtk2_ardour/editor_tempodisplay.cc @@ -48,10 +48,10 @@ #include "rgb_macros.h" #include "gui_thread.h" #include "time_axis_view.h" -#include "tempo_lines.h" +#include "grid_lines.h" #include "ui_config.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace ARDOUR; @@ -75,11 +75,16 @@ Editor::remove_metric_marks () } tempo_curves.clear (); } - +struct CurveComparator { + bool operator() (TempoCurve const * a, TempoCurve const * b) { + return a->tempo().sample() < b->tempo().sample(); + } +}; void Editor::draw_metric_marks (const Metrics& metrics) { char buf[64]; + TempoSection* prev_ts = 0; double max_tempo = 0.0; double min_tempo = DBL_MAX; @@ -87,30 +92,46 @@ Editor::draw_metric_marks (const Metrics& metrics) for (Metrics::const_iterator i = metrics.begin(); i != metrics.end(); ++i) { const MeterSection *ms; - const TempoSection *ts; + 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, UIConfiguration::instance().color ("meter marker"), buf, - *(const_cast(ms)))); - } else if ((ts = dynamic_cast(*i)) != 0) { - if (UIConfiguration::instance().get_allow_non_quarter_pulse()) { - snprintf (buf, sizeof (buf), "%.3f/%.0f", ts->beats_per_minute(), ts->note_type()); + if (ms->position_lock_style() == MusicTime) { + metric_marks.push_back (new MeterMarker (*this, *meter_group, UIConfiguration::instance().color ("meter marker music"), buf, + *(const_cast(ms)))); } else { - snprintf (buf, sizeof (buf), "%.3f", ts->beats_per_minute()); + 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) { - max_tempo = max (max_tempo, ts->beats_per_minute()); - min_tempo = min (min_tempo, ts->beats_per_minute()); + max_tempo = max (max_tempo, ts->note_types_per_minute()); + max_tempo = max (max_tempo, ts->end_note_types_per_minute()); + min_tempo = min (min_tempo, ts->note_types_per_minute()); + min_tempo = min (min_tempo, ts->end_note_types_per_minute()); + uint32_t const tc_color = UIConfiguration::instance().color ("tempo curve"); - 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)))); + tempo_curves.push_back (new TempoCurve (*this, *tempo_group, tc_color, + *(const_cast(ts)), ts->sample(), false)); + const std::string tname (X_("")); + if (ts->position_lock_style() == MusicTime) { + metric_marks.push_back (new TempoMarker (*this, *tempo_group, UIConfiguration::instance().color ("tempo marker music"), tname, + *(const_cast(ts)))); + } else { + metric_marks.push_back (new TempoMarker (*this, *tempo_group, UIConfiguration::instance().color ("tempo marker"), tname, + *(const_cast(ts)))); + } + if (prev_ts && abs (prev_ts->end_note_types_per_minute() - ts->note_types_per_minute()) < 1.0) { + metric_marks.back()->set_points_color (UIConfiguration::instance().color ("tempo marker music")); + } else { + metric_marks.back()->set_points_color (UIConfiguration::instance().color ("tempo marker")); + } + prev_ts = ts; } } + tempo_curves.sort (CurveComparator()); const double min_tempo_range = 5.0; const double tempo_delta = fabs (max_tempo - min_tempo); @@ -126,10 +147,17 @@ Editor::draw_metric_marks (const Metrics& metrics) (*x)->set_min_tempo (min_tempo); ++tmp; if (tmp != tempo_curves.end()) { - (*x)->set_position ((*x)->tempo().frame(), (*tmp)->tempo().frame()); + (*x)->set_position ((*x)->tempo().sample(), (*tmp)->tempo().sample()); } else { - (*x)->set_position ((*x)->tempo().frame(), UINT32_MAX); + (*x)->set_position ((*x)->tempo().sample(), UINT32_MAX); } + + if (!(*x)->tempo().active()) { + (*x)->hide(); + } else { + (*x)->show(); + } + ++x; } @@ -137,7 +165,7 @@ Editor::draw_metric_marks (const Metrics& metrics) 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)); + tempo_marker->update_height_mark ((tempo_marker->tempo().note_types_per_minute() - min_tempo) / max (10.0, max_tempo - min_tempo)); } } } @@ -152,25 +180,16 @@ Editor::tempo_map_changed (const PropertyChange& /*ignored*/) ENSURE_GUI_THREAD (*this, &Editor::tempo_map_changed, ignored); - if (tempo_lines) { - tempo_lines->tempo_map_changed(); - } + compute_bbt_ruler_scale (_leftmost_sample, _leftmost_sample + current_page_samples()); - 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); -} + update_tempo_based_rulers (); -struct CurveComparator { - bool operator() (TempoCurve const * a, TempoCurve const * b) { - return a->position() < b->position(); - } -}; + maybe_draw_grid_lines (); +} void -Editor::marker_position_changed () +Editor::tempometric_position_changed (const PropertyChange& /*ignored*/) { if (!_session) { return; @@ -178,33 +197,38 @@ Editor::marker_position_changed () ENSURE_GUI_THREAD (*this, &Editor::tempo_map_changed); - if (tempo_lines) { - tempo_lines->tempo_map_changed(); - } - + TempoSection* prev_ts = 0; 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; + 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()); + tempo_marker->set_position (ts->sample ()); + + if (prev_ts && abs (prev_ts->end_note_types_per_minute() - ts->note_types_per_minute()) < 1.0) { + tempo_marker->set_points_color (UIConfiguration::instance().color ("tempo marker music")); + } else { + tempo_marker->set_points_color (UIConfiguration::instance().color ("tempo marker")); + } + + max_tempo = max (max_tempo, ts->note_types_per_minute()); + max_tempo = max (max_tempo, ts->end_note_types_per_minute()); + min_tempo = min (min_tempo, ts->note_types_per_minute()); + min_tempo = min (min_tempo, ts->end_note_types_per_minute()); + + prev_ts = ts; } } if ((meter_marker = dynamic_cast (*x)) != 0) { if ((ms = &meter_marker->meter()) != 0) { - meter_marker->set_position (ms->frame ()); + meter_marker->set_position (ms->sample ()); } } } @@ -225,48 +249,73 @@ Editor::marker_position_changed () (*x)->set_min_tempo (min_tempo); ++tmp; if (tmp != tempo_curves.end()) { - (*x)->set_position ((*x)->tempo().frame(), (*tmp)->tempo().frame()); + (*x)->set_position ((*x)->tempo().sample(), (*tmp)->tempo().sample()); + } else { + (*x)->set_position ((*x)->tempo().sample(), UINT32_MAX); + } + + if (!(*x)->tempo().active()) { + (*x)->hide(); } else { - (*x)->set_position ((*x)->tempo().frame(), UINT32_MAX); + (*x)->show(); } + ++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)); + tempo_marker->update_height_mark ((tempo_marker->tempo().note_types_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); + compute_bbt_ruler_scale (_leftmost_sample, _leftmost_sample + current_page_samples()); + + update_tempo_based_rulers (); + + maybe_draw_grid_lines (); } void -Editor::redisplay_tempo (bool immediate_redraw) +Editor::redisplay_grid (bool immediate_redraw) { if (!_session) { return; } if (immediate_redraw) { - 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 + update_tempo_based_rulers (); + update_grid(); + } else { - Glib::signal_idle().connect (sigc::bind_return (sigc::bind (sigc::mem_fun (*this, &Editor::redisplay_tempo), true), false)); + Glib::signal_idle().connect (sigc::bind_return (sigc::bind (sigc::mem_fun (*this, &Editor::redisplay_grid), true), false)); + } +} +void +Editor::tempo_curve_selected (TempoSection* ts, bool yn) +{ + if (ts == 0) { + return; + } + + for (Curves::iterator x = tempo_curves.begin(); x != tempo_curves.end(); ++x) { + if (&(*x)->tempo() == ts) { + if (yn) { + (*x)->set_color_rgba (UIConfiguration::instance().color ("location marker")); + } else { + (*x)->set_color_rgba (UIConfiguration::instance().color ("tempo curve")); + } + break; + } } } /* computes a grid starting a beat before and ending a beat after leftmost and rightmost respectively */ void -Editor::compute_current_bbt_points (std::vector& grid, framepos_t leftmost, framepos_t rightmost) +Editor::compute_current_bbt_points (std::vector& grid, samplepos_t leftmost, samplepos_t rightmost) { if (!_session) { return; @@ -274,35 +323,77 @@ Editor::compute_current_bbt_points (std::vector& grid, frame /* prevent negative values of leftmost from creeping into tempomap */ - 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); + const double lower_beat = floor (max (0.0, _session->tempo_map().beat_at_sample (leftmost))) - 1.0; + switch (bbt_ruler_scale) { + + case bbt_show_quarters: + case bbt_show_eighths: + case bbt_show_sixteenths: + case bbt_show_thirtyseconds: + _session->tempo_map().get_grid (grid, max (_session->tempo_map().sample_at_beat (lower_beat), (samplepos_t) 0), rightmost); + break; + + case bbt_show_1: + _session->tempo_map().get_grid (grid, max (_session->tempo_map().sample_at_beat (lower_beat), (samplepos_t) 0), rightmost, 1); + break; + + case bbt_show_4: + _session->tempo_map().get_grid (grid, max (_session->tempo_map().sample_at_beat (lower_beat), (samplepos_t) 0), rightmost, 4); + break; + + case bbt_show_16: + _session->tempo_map().get_grid (grid, max (_session->tempo_map().sample_at_beat (lower_beat), (samplepos_t) 0), rightmost, 16); + break; + + case bbt_show_64: + _session->tempo_map().get_grid (grid, max (_session->tempo_map().sample_at_beat (lower_beat), (samplepos_t) 0), rightmost, 64); + break; + + default: + /* bbt_show_many */ + _session->tempo_map().get_grid (grid, max (_session->tempo_map().sample_at_beat (lower_beat), (samplepos_t) 0), rightmost, 128); + break; + } } void -Editor::hide_measures () +Editor::hide_grid_lines () { - if (tempo_lines) { - tempo_lines->hide(); + if (grid_lines) { + grid_lines->hide(); } } void -Editor::draw_measures (std::vector& grid) +Editor::maybe_draw_grid_lines () { - if (_session == 0 || _show_measures == false || distance (grid.begin(), grid.end()) == 0) { + if ( _session == 0 ) { return; } - if (tempo_lines == 0) { - tempo_lines = new TempoLines (time_line_group, ArdourCanvas::LineSet::Vertical); + if (grid_lines == 0) { + grid_lines = new GridLines (time_line_group, ArdourCanvas::LineSet::Vertical); } - const unsigned divisions = get_grid_beat_divisions(leftmost_frame); - tempo_lines->draw (grid, divisions, leftmost_frame, _session->frame_rate()); + grid_marks.clear(); + samplepos_t rightmost_sample = _leftmost_sample + current_page_samples(); + + if ( grid_musical() ) { + metric_get_bbt (grid_marks, _leftmost_sample, rightmost_sample, 12); + } else if (_grid_type== GridTypeTimecode) { + metric_get_timecode (grid_marks, _leftmost_sample, rightmost_sample, 12); + } else if (_grid_type == GridTypeCDFrame) { + metric_get_minsec (grid_marks, _leftmost_sample, rightmost_sample, 12); + } else if (_grid_type == GridTypeMinSec) { + metric_get_minsec (grid_marks, _leftmost_sample, rightmost_sample, 12); + } + + grid_lines->draw ( grid_marks ); + grid_lines->show(); } void -Editor::mouse_add_new_tempo_event (framepos_t frame) +Editor::mouse_add_new_tempo_event (samplepos_t sample) { if (_session == 0) { return; @@ -311,12 +402,12 @@ Editor::mouse_add_new_tempo_event (framepos_t frame) TempoMap& map(_session->tempo_map()); begin_reversible_command (_("add tempo mark")); - const double pulse = map.pulse_at_frame (frame); + const double pulse = map.exact_qn_at_sample (sample, get_grid_music_divisions (0)) / 4.0; 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); + /* add music-locked ramped (?) tempo using the bpm/note type at sample*/ + map.add_tempo (map.tempo_at_sample (sample), pulse, 0, MusicTime); XMLNode &after = map.get_state(); _session->add_command(new MementoCommand(map, &before, &after)); @@ -327,7 +418,7 @@ Editor::mouse_add_new_tempo_event (framepos_t frame) } void -Editor::mouse_add_new_meter_event (framepos_t frame) +Editor::mouse_add_new_meter_event (samplepos_t sample) { if (_session == 0) { return; @@ -335,7 +426,7 @@ Editor::mouse_add_new_meter_event (framepos_t frame) TempoMap& map(_session->tempo_map()); - MeterDialog meter_dialog (map, frame, _("add")); + MeterDialog meter_dialog (map, sample, _("add")); switch (meter_dialog.run ()) { case RESPONSE_ACCEPT: @@ -348,17 +439,18 @@ 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 al_sample = map.sample_at_bbt (requested); begin_reversible_command (_("add meter mark")); - XMLNode &before = map.get_state(); + XMLNode &before = map.get_state(); if (meter_dialog.get_lock_style() == MusicTime) { - map.add_meter (Meter (bpb, note_type), map.beat_at_bbt (requested), requested, 0, MusicTime); + map.add_meter (Meter (bpb, note_type), requested, 0, MusicTime); } else { - map.add_meter (Meter (bpb, note_type), map.beat_at_bbt (requested), requested, map.frame_time (requested), AudioTime); + map.add_meter (Meter (bpb, note_type), requested, al_sample, AudioTime); } _session->add_command(new MementoCommand(map, &before, &map.get_state())); @@ -383,7 +475,7 @@ Editor::remove_tempo_marker (ArdourCanvas::Item* item) abort(); /*NOTREACHED*/ } - if (tempo_marker->tempo().movable()) { + if (!tempo_marker->tempo().locked_to_meter() && tempo_marker->tempo().active()) { Glib::signal_idle().connect (sigc::bind (sigc::mem_fun(*this, &Editor::real_remove_tempo_marker), &tempo_marker->tempo())); } } @@ -404,14 +496,17 @@ 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_time (when); + const samplepos_t sample = _session->tempo_map().sample_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(); + XMLNode &before = _session->tempo_map().get_state(); - _session->tempo_map().replace_meter (*section, Meter (bpb, note_type), when, frame, meter_dialog.get_lock_style()); + _session->tempo_map().replace_meter (*section, meter, when, sample, pls); XMLNode &after = _session->tempo_map().get_state(); _session->add_command(new MementoCommand(_session->tempo_map(), &before, &after)); @@ -431,22 +526,23 @@ Editor::edit_tempo_section (TempoSection* section) } double bpm = tempo_dialog.get_bpm (); + double end_bpm = tempo_dialog.get_end_bpm (); double nt = tempo_dialog.get_note_type (); - Timecode::BBT_Time when; + bpm = max (0.01, bpm); + const Tempo tempo (bpm, nt, end_bpm); + Timecode::BBT_Time when; tempo_dialog.get_bbt_time (when); - bpm = max (0.01, bpm); - begin_reversible_command (_("replace tempo mark")); XMLNode &before = _session->tempo_map().get_state(); 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); + samplepos_t const f = _session->tempo_map().predict_tempo_position (section, when).second; + _session->tempo_map().replace_tempo (*section, tempo, 0.0, f, AudioTime); } else { 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); + _session->tempo_map().replace_tempo (*section, tempo, p, 0, MusicTime); } XMLNode &after = _session->tempo_map().get_state(); @@ -495,7 +591,7 @@ Editor::remove_meter_marker (ArdourCanvas::Item* item) abort(); /*NOTREACHED*/ } - if (meter_marker->meter().movable()) { + if (!meter_marker->meter().initial()) { Glib::signal_idle().connect (sigc::bind (sigc::mem_fun(*this, &Editor::real_remove_meter_marker), &meter_marker->meter())); } }