#include "tempo_lines.h"
#include "ui_config.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
using namespace std;
using namespace ARDOUR;
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<const MeterSection*>(*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<MeterSection*>(ms))));
+ if (ms->position_lock_style() == MusicTime) {
+ metric_marks.push_back (new MeterMarker (*this, *meter_group, UIConfiguration::instance().color ("meter marker music"), buf,
+ *(const_cast<MeterSection*>(ms))));
+ } else {
+ metric_marks.push_back (new MeterMarker (*this, *meter_group, UIConfiguration::instance().color ("meter marker"), buf,
+ *(const_cast<MeterSection*>(ms))));
+ }
} else if ((ts = dynamic_cast<const TempoSection*>(*i)) != 0) {
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), "%.3f", ts->beats_per_minute());
}
- if (ts->beats_per_minute() > max_tempo) {
- max_tempo = ts->beats_per_minute();
- }
- if (ts->beats_per_minute() < min_tempo) {
- min_tempo = ts->beats_per_minute();
- }
- tempo_curves.push_back (new TempoCurve (*this, *tempo_group, UIConfiguration::instance().color ("range drag rect"),
+
+ 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<TempoSection*>(ts)), ts->frame(), false));
- metric_marks.push_back (new TempoMarker (*this, *tempo_group, UIConfiguration::instance().color ("tempo marker"), buf,
+ if (ts->position_lock_style() == MusicTime) {
+ metric_marks.push_back (new TempoMarker (*this, *tempo_group, UIConfiguration::instance().color ("tempo marker music"), buf,
*(const_cast<TempoSection*>(ts))));
+ } else {
+ metric_marks.push_back (new TempoMarker (*this, *tempo_group, UIConfiguration::instance().color ("tempo marker"), buf,
+ *(const_cast<TempoSection*>(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;
}
+ for (Marks::iterator x = metric_marks.begin(); x != metric_marks.end(); ++x) {
+ TempoMarker* tempo_marker;
+
+ if ((tempo_marker = dynamic_cast<TempoMarker*> (*x)) != 0) {
+ tempo_marker->update_height_mark ((tempo_marker->tempo().beats_per_minute() - min_tempo) / max (10.0, max_tempo - min_tempo));
+ }
+ }
}
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<TempoMarker*> (*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);
- if (ts->beats_per_minute() > max_tempo) {
- max_tempo = ts->beats_per_minute();
- }
- if (ts->beats_per_minute() < min_tempo) {
- min_tempo = ts->beats_per_minute();
- }
+
+ max_tempo = max (max_tempo, ts->beats_per_minute());
+ min_tempo = min (min_tempo, ts->beats_per_minute());
}
}
if ((meter_marker = dynamic_cast<MeterMarker*> (*x)) != 0) {
}
}
}
+
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;
}
+ for (Marks::iterator x = metric_marks.begin(); x != metric_marks.end(); ++x) {
+ TempoMarker* tempo_marker;
+ if ((tempo_marker = dynamic_cast<TempoMarker*> (*x)) != 0) {
+ tempo_marker->update_height_mark ((tempo_marker->tempo().beats_per_minute() - min_tempo) / max (max_tempo - min_tempo, 10.0));
+ }
+ }
+
std::vector<TempoMap::BBTPoint> grid;
compute_current_bbt_points (grid, leftmost_frame, leftmost_frame + current_page_samples());
draw_measures (grid);
/* prevent negative values of leftmost from creeping into tempomap
*/
- const double lower_beat = floor (_session->tempo_map().beat_at_frame (leftmost));
+ const double lower_beat = floor (max (0.0, _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);
}
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<TempoMap>(map, &before, &after));
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), map.frame_time (requested), map.bbt_to_beats (requested), requested);
+ map.add_meter (Meter (bpb, note_type), beat, requested, map.frame_at_beat (beat), AudioTime);
}
_session->add_command(new MementoCommand<TempoMap>(map, &before, &map.get_state()));
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<TempoMap>(_session->tempo_map(), &before, &after));
commit_reversible_command ();
}
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();
projects / ardour.git / blobdiff