complete changes to tempo type.

[ardour.git] / gtk2_ardour / editor_markers.cc

diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc
index 7918cec6cb3fd9e536c07f4141e74d4d2179778d..23ab470f7c0d4e93795a4d7eb5a86ec07692fc1c 100644 (file)
--- a/gtk2_ardour/editor_markers.cc
+++ b/gtk2_ardour/editor_markers.cc
@@ -1417,21 +1417,20 @@ Editor::toggle_marker_lock_style ()
 
                const double pulse = tsp->pulse();
                const framepos_t frame = tsp->frame();
-               const TempoSection::Type type = tsp->type();
                const PositionLockStyle pls = (tsp->position_lock_style() == AudioTime) ? MusicTime : AudioTime;
                const Tempo tempo (tsp->note_types_per_minute(), tsp->note_type(), tsp->end_note_types_per_minute());
 
                begin_reversible_command (_("change tempo lock style"));
                XMLNode &before = _session->tempo_map().get_state();
 
-               _session->tempo_map().replace_tempo (*tsp, tempo, pulse, frame, type, pls);
+               _session->tempo_map().replace_tempo (*tsp, tempo, pulse, frame, pls);
 
                XMLNode &after = _session->tempo_map().get_state();
                _session->add_command(new MementoCommand<TempoMap>(_session->tempo_map(), &before, &after));
                commit_reversible_command ();
        }
 }
-
+/* actally just resets the ts to constant using initial tempo */
 void
 Editor::toggle_tempo_type ()
 {
@@ -1442,16 +1441,15 @@ Editor::toggle_tempo_type ()
        if (tm) {
                TempoSection* tsp = &tm->tempo();
 
-               const Tempo tempo (tsp->note_types_per_minute(), tsp->note_type(), tsp->end_note_types_per_minute());
+               const Tempo tempo (tsp->note_types_per_minute(), tsp->note_type());
                const double pulse = tsp->pulse();
                const framepos_t frame = tsp->frame();
-               const TempoSection::Type type = (tsp->type() == TempoSection::Ramp) ? TempoSection::Constant : TempoSection::Ramp;
                const PositionLockStyle pls = tsp->position_lock_style();
 
-               begin_reversible_command (_("change tempo type"));
+               begin_reversible_command (_("set tempo to constant"));
                XMLNode &before = _session->tempo_map().get_state();
 
-               _session->tempo_map().replace_tempo (*tsp, tempo, pulse, frame, type, pls);
+               _session->tempo_map().replace_tempo (*tsp, tempo, pulse, frame, pls);
 
                XMLNode &after = _session->tempo_map().get_state();
                _session->add_command(new MementoCommand<TempoMap>(_session->tempo_map(), &before, &after));