a reverb is a reverb is a reverb

[ardour.git] / gtk2_ardour / editor_tempodisplay.cc

diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc
index adc7247e8bfb291afca44498310e2500ce8dfe35..727473e22e40ee6b09f5d53b2952ee55f4281991 100644 (file)
--- 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;
@@ -91,8 +91,13 @@ Editor::draw_metric_marks (const Metrics& metrics)
 
                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());
@@ -103,15 +108,28 @@ Editor::draw_metric_marks (const Metrics& metrics)
                        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 ("range drag rect"),
+                       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);
@@ -129,7 +147,7 @@ Editor::draw_metric_marks (const Metrics& metrics)
                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_tempo - min_tempo));
+                       tempo_marker->update_height_mark ((tempo_marker->tempo().beats_per_minute() - min_tempo) / max (10.0, max_tempo - min_tempo));
                }
        }
 }
@@ -203,6 +221,14 @@ 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);
@@ -258,7 +284,7 @@ Editor::compute_current_bbt_points (std::vector<TempoMap::BBTPoint>& 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;
+       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);
 }
 
@@ -300,7 +326,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_pulse (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));
@@ -332,17 +358,19 @@ 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_beat (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_frame (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()));
@@ -388,19 +416,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_bbt (*section, Meter (bpb, note_type), when);
-       } else {
-               _session->tempo_map().replace_meter_frame (*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 ();
 }
@@ -419,18 +448,24 @@ 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();
 
-       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, f, tempo_dialog.get_tempo_type(), tempo_dialog.get_lock_style());
+       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<TempoMap>(_session->tempo_map(), &before, &after));