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 6aa6494f3658f5e9bb70b87cefb044cb2b545414..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());
@@ -279,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);
 }
 
@@ -353,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 (Meter (bpb, note_type), map.beat_at_bbt (requested), requested,  map.frame_at_bbt (requested), MusicTime);
+               map.add_meter (Meter (bpb, note_type), beat, requested,  map.frame_at_beat (beat), MusicTime);
        } else {
-               map.add_meter (Meter (bpb, note_type), map.beat_at_bbt (requested), requested, map.frame_at_bbt (requested), AudioTime);
+               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()));
@@ -409,14 +416,18 @@ 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_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();
 
-       _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, frame, pls);
 
        XMLNode &after = _session->tempo_map().get_state();
        _session->add_command(new MementoCommand<TempoMap>(_session->tempo_map(), &before, &after));
@@ -437,21 +448,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() == 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);
+               _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 (bpm, nt), p, 0, tempo_dialog.get_tempo_type(), MusicTime);
+               _session->tempo_map().replace_tempo (*section, tempo, p, 0, ttype, MusicTime);
        }
 
        XMLNode &after = _session->tempo_map().get_state();