pay some attention to the special guest of the night: KDE window stacking

[ardour.git] / gtk2_ardour / editor_markers.cc

diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc
index 74e35a246b304290ebdfb1c1bcf98c5f911fee25..6751f6424f70a9799c5a337fcb14db4599119bca 100644 (file)
--- a/gtk2_ardour/editor_markers.cc
+++ b/gtk2_ardour/editor_markers.cc
@@ -40,7 +40,7 @@
 #include "prompter.h"
 #include "editor_drag.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -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 ();
+               can_remove = tm->tempo().movable() && !tm->tempo().locked_to_meter();
                delete tempo_marker_menu;
                build_tempo_marker_menu (tm, can_remove);
                tempo_marker_menu->popup (1, ev->time);
@@ -997,7 +997,6 @@ Editor::build_tempo_marker_menu (TempoMarker* loc, bool can_remove)
 
        items.push_back (MenuElem (_("Edit..."), sigc::mem_fun(*this, &Editor::marker_menu_edit)));
        items.push_back (MenuElem (_("Remove"), sigc::mem_fun(*this, &Editor::marker_menu_remove)));
-
        items.back().set_sensitive (can_remove);
 }
 
@@ -1392,23 +1391,30 @@ Editor::toggle_marker_lock_style ()
                begin_reversible_command (_("change meter lock style"));
                XMLNode &before = _session->tempo_map().get_state();
                MeterSection* msp = &mm->meter();
-               if (mm->meter().position_lock_style() == AudioTime) {
-                       _session->tempo_map().replace_meter (*msp, Meter (msp->divisions_per_bar(), msp->note_divisor()), msp->bbt());
-               } else {
-                       _session->tempo_map().replace_meter (*msp, Meter (msp->divisions_per_bar(), msp->note_divisor()), msp->frame());
-               }
+
+               const Meter meter (msp->divisions_per_bar(), msp->note_divisor());
+               const Timecode::BBT_Time bbt (msp->bbt());
+               const PositionLockStyle pls = (msp->position_lock_style() == AudioTime) ? MusicTime : AudioTime;
+
+               _session->tempo_map().replace_meter (*msp, meter, bbt, pls);
+
                XMLNode &after = _session->tempo_map().get_state();
                _session->add_command(new MementoCommand<TempoMap>(_session->tempo_map(), &before, &after));
                commit_reversible_command ();
        } else if (tm) {
+               TempoSection* tsp = &tm->tempo();
+
+               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();
+               const PositionLockStyle pls = (tsp->position_lock_style() == AudioTime) ? MusicTime : AudioTime;
+
                begin_reversible_command (_("change tempo lock style"));
                XMLNode &before = _session->tempo_map().get_state();
-               TempoSection* tsp = &tm->tempo();
-               if (tsp->position_lock_style() == AudioTime) {
-                       _session->tempo_map().replace_tempo (*tsp, Tempo (tsp->beats_per_minute(), tsp->note_type()), tsp->pulse(), tsp->type());
-               } else {
-                       _session->tempo_map().replace_tempo (*tsp, Tempo (tsp->beats_per_minute(), tsp->note_type()), tsp->frame(), tsp->type());
-               }
+
+               _session->tempo_map().replace_tempo (*tsp, tempo, pulse, frame, type, pls);
+
                XMLNode &after = _session->tempo_map().get_state();
                _session->add_command(new MementoCommand<TempoMap>(_session->tempo_map(), &before, &after));
                commit_reversible_command ();
@@ -1423,12 +1429,19 @@ Editor::toggle_tempo_type ()
        dynamic_cast_marker_object (marker_menu_item->get_data ("marker"), &mm, &tm);
 
        if (tm) {
+               TempoSection* tsp = &tm->tempo();
+
+               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"));
                XMLNode &before = _session->tempo_map().get_state();
-               TempoSection* tsp = &tm->tempo();
-               _session->tempo_map().replace_tempo (*tsp, Tempo (tsp->beats_per_minute(), tsp->note_type())
-                                                    , (tsp->position_lock_style() == MusicTime) ? tsp->pulse() : tsp->frame()
-                                                    , (tsp->type() == TempoSection::Ramp) ? TempoSection::Constant : TempoSection::Ramp);
+
+               _session->tempo_map().replace_tempo (*tsp, tempo, pulse, frame, type, pls);
+
                XMLNode &after = _session->tempo_map().get_state();
                _session->add_command(new MementoCommand<TempoMap>(_session->tempo_map(), &before, &after));
                commit_reversible_command ();