Import Dialog is Window. Dialog Esc behavior needs to be emulated.

[ardour.git] / gtk2_ardour / editor_markers.cc

diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc
index 95c88b132f6371e99422ca3b0cbb901f68ccacf4..7ec3a63a8e2da5f6c41229278c0d8368454849ef 100644 (file)
--- a/gtk2_ardour/editor_markers.cc
+++ b/gtk2_ardour/editor_markers.cc
@@ -892,6 +892,7 @@ Editor::build_marker_menu (Location* loc)
        using namespace Menu_Helpers;
 
        marker_menu = new Menu;
+
        MenuList& items = marker_menu->items();
        marker_menu->set_name ("ArdourContextMenu");
 
@@ -931,7 +932,8 @@ Editor::build_range_marker_menu (Location* loc, bool loop_or_punch, bool session
 
        bool const loop_or_punch_or_session = loop_or_punch || session;
 
-       Menu *markerMenu = new Menu;
+       Menu* markerMenu = new Menu;
+
        if (loop_or_punch_or_session) {
                transport_marker_menu = markerMenu;
        } else {
@@ -985,13 +987,30 @@ Editor::build_tempo_marker_menu (TempoMarker* loc, bool can_remove)
        using namespace Menu_Helpers;
 
        tempo_marker_menu = new Menu;
+
        MenuList& items = tempo_marker_menu->items();
        tempo_marker_menu->set_name ("ArdourContextMenu");
 
-       if (loc->tempo().type() == TempoSection::Constant) {
-               items.push_back (MenuElem (_("Make Ramped"), sigc::mem_fun(*this, &Editor::toggle_tempo_type)));
-       } else {
-               items.push_back (MenuElem (_("Make Constant"), sigc::mem_fun(*this, &Editor::toggle_tempo_type)));
+       if (!loc->tempo().initial()) {
+               if (loc->tempo().clamped()) {
+                       items.push_back (MenuElem (_("Unlock Continue"), sigc::mem_fun(*this, &Editor::toggle_tempo_clamped)));
+               } else {
+                       items.push_back (MenuElem (_("Lock Continue"), sigc::mem_fun(*this, &Editor::toggle_tempo_clamped)));
+               }
+
+               TempoSection* prev_ts = _session->tempo_map().previous_tempo_section (&loc->tempo());
+               if (prev_ts && prev_ts->end_note_types_per_minute() != loc->tempo().note_types_per_minute()) {
+                       items.push_back (MenuElem (_("Continue"), sigc::mem_fun(*this, &Editor::continue_previous_tempo)));
+               }
+       }
+
+       TempoSection* next_ts = _session->tempo_map().next_tempo_section (&loc->tempo());
+       if (next_ts && next_ts->note_types_per_minute() != loc->tempo().end_note_types_per_minute()) {
+               items.push_back (MenuElem (_("Ramp to Next"), sigc::mem_fun(*this, &Editor::ramp_to_next_tempo)));
+       }
+
+       if (loc->tempo().type() == TempoSection::Ramp) {
+               items.push_back (MenuElem (_("Set Constant"), sigc::mem_fun(*this, &Editor::toggle_tempo_type)));
        }
 
        if (loc->tempo().position_lock_style() == AudioTime && can_remove) {
@@ -1011,6 +1030,7 @@ Editor::build_meter_marker_menu (MeterMarker* loc, bool can_remove)
        using namespace Menu_Helpers;
 
        meter_marker_menu = new Menu;
+
        MenuList& items = meter_marker_menu->items();
        meter_marker_menu->set_name ("ArdourContextMenu");
 
@@ -1032,6 +1052,7 @@ Editor::build_new_transport_marker_menu ()
        using namespace Menu_Helpers;
 
        new_transport_marker_menu = new Menu;
+
        MenuList& items = new_transport_marker_menu->items();
        new_transport_marker_menu->set_name ("ArdourContextMenu");
 
@@ -1305,14 +1326,11 @@ Editor::marker_menu_loop_range ()
        bool is_start;
 
        if ((l = find_location_from_marker (marker, is_start)) != 0) {
-               Location* l2;
-               if ((l2 = transport_loop_location()) != 0) {
-                       l2->set (l->start(), l->end());
-
-                       // enable looping, reposition and start rolling
-                       _session->request_locate (l2->start(), true);
-                       _session->request_play_loop(true);
+               if (l != transport_loop_location()) {
+                       set_loop_range (l->start(), l->end(), _("loop range from marker"));
                }
+               _session->request_locate (l->start(), true);
+               _session->request_play_loop (true);
        }
 }
 
@@ -1410,23 +1428,22 @@ Editor::toggle_marker_lock_style ()
        } 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;
+               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 ()
 {
@@ -1440,13 +1457,40 @@ Editor::toggle_tempo_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;
                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));
+               commit_reversible_command ();
+       }
+}
+/* clamped locks the previous section end tempo to the start tempo */
+void
+Editor::toggle_tempo_clamped ()
+{
+       TempoMarker* tm;
+       MeterMarker* mm;
+       dynamic_cast_marker_object (marker_menu_item->get_data ("marker"), &mm, &tm);
+
+       if (tm) {
+               begin_reversible_command (_("Clamp Tempo"));
+               XMLNode &before = _session->tempo_map().get_state();
+
+               TempoSection* tsp = &tm->tempo();
+               TempoSection* prev = _session->tempo_map().previous_tempo_section (tsp);
+
+               if (prev) {
+                       /* set to the end tempo of the previous section */
+                       Tempo new_tempo (prev->end_note_types_per_minute(), prev->note_type(), tsp->end_note_types_per_minute());
+                       _session->tempo_map().gui_change_tempo (tsp, new_tempo);
+               }
+
+               tsp->set_clamped (!tsp->clamped());
 
                XMLNode &after = _session->tempo_map().get_state();
                _session->add_command(new MementoCommand<TempoMap>(_session->tempo_map(), &before, &after));
@@ -1454,6 +1498,64 @@ Editor::toggle_tempo_type ()
        }
 }
 
+void
+Editor::continue_previous_tempo ()
+{
+       TempoMarker* tm;
+       MeterMarker* mm;
+       dynamic_cast_marker_object (marker_menu_item->get_data ("marker"), &mm, &tm);
+
+       if (tm) {
+               TempoMap& tmap (_session->tempo_map());
+               TempoSection* tsp = &tm->tempo();
+               TempoSection* prev_ts = tmap.previous_tempo_section (&tm->tempo());
+               if (prev_ts) {
+                       const Tempo tempo (prev_ts->end_note_types_per_minute(), tsp->note_type(), tsp->end_note_types_per_minute());
+                       const double pulse = tsp->pulse();
+                       const framepos_t frame = tsp->frame();
+                       const PositionLockStyle pls = tsp->position_lock_style();
+
+                       begin_reversible_command (_("continue previous tempo"));
+                       XMLNode &before = _session->tempo_map().get_state();
+
+                       tmap.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 ();
+               }
+       }
+}
+
+void
+Editor::ramp_to_next_tempo ()
+{
+       TempoMarker* tm;
+       MeterMarker* mm;
+       dynamic_cast_marker_object (marker_menu_item->get_data ("marker"), &mm, &tm);
+
+       if (tm) {
+               TempoMap& tmap (_session->tempo_map());
+               TempoSection* tsp = &tm->tempo();
+               TempoSection* next_ts = tmap.next_tempo_section (&tm->tempo());
+               if (next_ts) {
+                       const Tempo tempo (tsp->note_types_per_minute(), tsp->note_type(), next_ts->note_types_per_minute());
+                       const double pulse = tsp->pulse();
+                       const framepos_t frame = tsp->frame();
+                       const PositionLockStyle pls = tsp->position_lock_style();
+
+                       begin_reversible_command (_("ramp to next tempo"));
+                       XMLNode &before = _session->tempo_map().get_state();
+
+                       tmap.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 ();
+               }
+       }
+}
+
 void
 Editor::toggle_marker_menu_lock ()
 {