NO-OP; clean up script spacing and remove goto

[ardour.git] / gtk2_ardour / editor_markers.cc

diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc
index 1c339d9dd361bfa37bdf44daa574f2114516f8fc..bdc15f8dea787dc70eb73f1ad336c4b8f72c452b 100644 (file)
--- a/gtk2_ardour/editor_markers.cc
+++ b/gtk2_ardour/editor_markers.cc
@@ -646,7 +646,7 @@ Editor::mouse_add_new_marker (framepos_t where, bool is_cd)
                if (!choose_new_marker_name(markername)) {
                        return;
                }
-               Location *location = new Location (*_session, where, where, markername, (Location::Flags) flags);
+               Location *location = new Location (*_session, where, where, markername, (Location::Flags) flags, get_grid_music_divisions (0));
                begin_reversible_command (_("add marker"));
 
                XMLNode &before = _session->locations()->get_state();
@@ -838,9 +838,8 @@ Editor::marker_context_menu (GdkEventButton* ev, ArdourCanvas::Item* item)
 
        if (loc == transport_loop_location() || loc == transport_punch_location() || loc->is_session_range ()) {
 
-               if (transport_marker_menu == 0) {
-                       build_range_marker_menu (loc == transport_loop_location() || loc == transport_punch_location(), loc->is_session_range());
-               }
+               delete transport_marker_menu;
+               build_range_marker_menu (loc, loc == transport_loop_location() || loc == transport_punch_location(), loc->is_session_range());
 
                marker_menu_item = item;
                transport_marker_menu->popup (1, ev->time);
@@ -868,9 +867,9 @@ Editor::marker_context_menu (GdkEventButton* ev, ArdourCanvas::Item* item)
                        marker_menu->popup (1, ev->time);
 
        } else if (loc->is_range_marker()) {
-               if (range_marker_menu == 0) {
-                       build_range_marker_menu (false, false);
-               }
+               delete range_marker_menu;
+               build_range_marker_menu (loc, false, false);
+
                marker_menu_item = item;
                range_marker_menu->popup (1, ev->time);
        }
@@ -893,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");
 
@@ -916,9 +916,8 @@ Editor::build_marker_menu (Location* loc)
 
        items.push_back (CheckMenuElem (_("Glue to Bars and Beats")));
        Gtk::CheckMenuItem* glue_item = static_cast<Gtk::CheckMenuItem*> (&items.back());
-       if (loc->position_lock_style() == MusicTime) {
-               glue_item->set_active ();
-       }
+       glue_item->set_active (loc->position_lock_style() == MusicTime);
+
        glue_item->signal_activate().connect (sigc::mem_fun (*this, &Editor::toggle_marker_menu_glue));
 
        items.push_back (SeparatorElem());
@@ -927,13 +926,14 @@ Editor::build_marker_menu (Location* loc)
 }
 
 void
-Editor::build_range_marker_menu (bool loop_or_punch, bool session)
+Editor::build_range_marker_menu (Location* loc, bool loop_or_punch, bool session)
 {
        using namespace Menu_Helpers;
 
-       bool const loop_or_punch_or_session = loop_or_punch | 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 {
@@ -952,6 +952,13 @@ Editor::build_range_marker_menu (bool loop_or_punch, bool session)
 
        items.push_back (MenuElem (_("Zoom to Range"), sigc::mem_fun (*this, &Editor::marker_menu_zoom_to_range)));
 
+       items.push_back (SeparatorElem());
+       items.push_back (CheckMenuElem (_("Glue to Bars and Beats")));
+
+       Gtk::CheckMenuItem* glue_item = static_cast<Gtk::CheckMenuItem*> (&items.back());
+       glue_item->set_active (loc->position_lock_style() == MusicTime);
+       glue_item->signal_activate().connect (sigc::mem_fun (*this, &Editor::toggle_marker_menu_glue));
+
        items.push_back (SeparatorElem());
        items.push_back (MenuElem (_("Export Range..."), sigc::mem_fun(*this, &Editor::export_range)));
        items.push_back (SeparatorElem());
@@ -980,6 +987,7 @@ 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");
 
@@ -1006,6 +1014,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");
 
@@ -1027,6 +1036,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");
 
@@ -1213,17 +1223,18 @@ Editor::marker_menu_set_from_playhead ()
 
        Location* l;
        bool is_start;
+       const int32_t divisions = get_grid_music_divisions (0);
 
        if ((l = find_location_from_marker (marker, is_start)) != 0) {
 
                if (l->is_mark()) {
-                       l->set_start (_session->audible_frame ());
+                       l->set_start (_session->audible_frame (), false, true, divisions);
                }
                else {
                        if (is_start) {
-                               l->set_start (_session->audible_frame ());
+                               l->set_start (_session->audible_frame (), false, true, divisions);
                        } else {
-                               l->set_end (_session->audible_frame ());
+                               l->set_end (_session->audible_frame (), false, true, divisions);
                        }
                }
        }
@@ -1396,7 +1407,7 @@ Editor::toggle_marker_lock_style ()
                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);
+               _session->tempo_map().replace_meter (*msp, meter, bbt, msp->frame(), pls);
 
                XMLNode &after = _session->tempo_map().get_state();
                _session->add_command(new MementoCommand<TempoMap>(_session->tempo_map(), &before, &after));
@@ -1687,12 +1698,18 @@ Editor::toggle_marker_menu_glue ()
                return;
        }
 
+       begin_reversible_command (_("change marker lock style"));
+       XMLNode &before = _session->locations()->get_state();
+
        if (loc->position_lock_style() == MusicTime) {
                loc->set_position_lock_style (AudioTime);
        } else {
                loc->set_position_lock_style (MusicTime);
        }
 
+       XMLNode &after = _session->locations()->get_state();
+       _session->add_command(new MementoCommand<Locations>(*(_session->locations()), &before, &after));
+       commit_reversible_command ();
 }
 
 void