remove cruft

[ardour.git] / gtk2_ardour / editor_markers.cc

diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc
index 351ba31126f9286b696e7294699e5fee18ee5840..1c339d9dd361bfa37bdf44daa574f2114516f8fc 100644 (file)
--- a/gtk2_ardour/editor_markers.cc
+++ b/gtk2_ardour/editor_markers.cc
@@ -807,7 +807,7 @@ Editor::tempo_or_meter_marker_context_menu (GdkEventButton* ev, ArdourCanvas::It
        bool can_remove = false;
 
        if (mm) {
-               can_remove = mm->meter().movable ();
+               can_remove = !mm->meter().initial ();
                delete meter_marker_menu;
                build_meter_marker_menu (mm, can_remove);
                meter_marker_menu->popup (1, ev->time);
@@ -815,7 +815,7 @@ Editor::tempo_or_meter_marker_context_menu (GdkEventButton* ev, ArdourCanvas::It
                if (!tm->tempo().active()) {
                        return;
                }
-               can_remove = tm->tempo().movable() && !tm->tempo().locked_to_meter();
+               can_remove = !tm->tempo().initial() && !tm->tempo().locked_to_meter();
                delete tempo_marker_menu;
                build_tempo_marker_menu (tm, can_remove);
                tempo_marker_menu->popup (1, ev->time);
@@ -1404,7 +1404,7 @@ Editor::toggle_marker_lock_style ()
        } else if (tm) {
                TempoSection* tsp = &tm->tempo();
 
-               const Tempo tempo (tsp->beats_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();
@@ -1431,7 +1431,7 @@ Editor::toggle_tempo_type ()
        if (tm) {
                TempoSection* tsp = &tm->tempo();
 
-               const Tempo tempo (tsp->beats_per_minute(), tsp->note_type());
+               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;