fix last-minute code rearrangement in last commit that broke the intended functionality

[ardour.git] / gtk2_ardour / editor_markers.cc

diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc
index 5a37fe70cbce7d8f350fb4a3984e94949f9c4605..392b3bb6c1358f02eb178d4b2a03ffd1e48b0cf3 100644 (file)
--- a/gtk2_ardour/editor_markers.cc
+++ b/gtk2_ardour/editor_markers.cc
@@ -486,7 +486,7 @@ Editor::find_location_from_marker (Marker *marker, bool& is_start) const
 }
 
 void
-Editor::refresh_location_display_internal (Locations::LocationList& locations)
+Editor::refresh_location_display_internal (const Locations::LocationList& locations)
 {
        /* invalidate all */
 
@@ -496,7 +496,7 @@ Editor::refresh_location_display_internal (Locations::LocationList& locations)
 
        /* add new ones */
 
-       for (Locations::LocationList::iterator i = locations.begin(); i != locations.end(); ++i) {
+       for (Locations::LocationList::const_iterator i = locations.begin(); i != locations.end(); ++i) {
 
                LocationMarkerMap::iterator x;
 
@@ -636,30 +636,23 @@ Editor::LocationMarkers::setup_lines ()
 }
 
 void
-Editor::mouse_add_new_marker (framepos_t where, bool is_cd, bool is_xrun)
+Editor::mouse_add_new_marker (framepos_t where, bool is_cd)
 {
-       string markername, markerprefix;
+       string markername;
        int flags = (is_cd ? Location::IsCDMarker|Location::IsMark : Location::IsMark);
 
-       if (is_xrun) {
-               markerprefix = "xrun";
-               flags = Location::IsMark;
-       } else {
-               markerprefix = "mark";
-       }
-
        if (_session) {
-               _session->locations()->next_available_name(markername, markerprefix);
-               if (!is_xrun && !choose_new_marker_name(markername)) {
+               _session->locations()->next_available_name(markername, _("mark"));
+               if (!choose_new_marker_name(markername)) {
                        return;
                }
                Location *location = new Location (*_session, where, where, markername, (Location::Flags) flags);
-               _session->begin_reversible_command (_("add marker"));
+               begin_reversible_command (_("add marker"));
+
                XMLNode &before = _session->locations()->get_state();
                _session->locations()->add (location, true);
                XMLNode &after = _session->locations()->get_state();
                _session->add_command (new MementoCommand<Locations>(*(_session->locations()), &before, &after));
-               _session->commit_reversible_command ();
 
                /* find the marker we just added */
 
@@ -668,7 +661,41 @@ Editor::mouse_add_new_marker (framepos_t where, bool is_cd, bool is_xrun)
                        /* make it the selected marker */
                        selection->set (lam->start);
                }
+
+               commit_reversible_command ();
+       }
+}
+
+void
+Editor::mouse_add_new_loop (framepos_t where)
+{
+       if (!_session) {
+               return;
+       }
+
+       /* Make this marker 1/8th of the visible area of the session so that
+          it's reasonably easy to manipulate after creation.
+       */
+
+       framepos_t const end = where + current_page_samples() / 8;
+
+       set_loop_range (where, end,  _("set loop range"));
+}
+
+void
+Editor::mouse_add_new_punch (framepos_t where)
+{
+       if (!_session) {
+               return;
        }
+
+       /* Make this marker 1/8th of the visible area of the session so that
+          it's reasonably easy to manipulate after creation.
+       */
+
+       framepos_t const end = where + current_page_samples() / 8;
+
+       set_punch_range (where, end,  _("set punch range"));
 }
 
 void
@@ -704,7 +731,7 @@ Editor::remove_marker (ArdourCanvas::Item& item, GdkEvent*)
 
        if ((marker = static_cast<Marker*> (item.get_data ("marker"))) == 0) {
                fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
        }
 
        if (entered_marker == marker) {
@@ -721,12 +748,12 @@ Editor::remove_marker (ArdourCanvas::Item& item, GdkEvent*)
 gint
 Editor::really_remove_marker (Location* loc)
 {
-       _session->begin_reversible_command (_("remove marker"));
+       begin_reversible_command (_("remove marker"));
        XMLNode &before = _session->locations()->get_state();
        _session->locations()->remove (loc);
        XMLNode &after = _session->locations()->get_state();
        _session->add_command (new MementoCommand<Locations>(*(_session->locations()), &before, &after));
-       _session->commit_reversible_command ();
+       commit_reversible_command ();
        return FALSE;
 }
 
@@ -791,7 +818,7 @@ Editor::marker_context_menu (GdkEventButton* ev, ArdourCanvas::Item* item)
        Marker * marker;
        if ((marker = reinterpret_cast<Marker *> (item->get_data("marker"))) == 0) {
                fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
        }
 
        bool is_start;
@@ -976,7 +1003,7 @@ Editor::marker_menu_hide ()
 
        if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) {
                fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
        }
 
        Location* l;
@@ -994,7 +1021,7 @@ Editor::marker_menu_select_using_range ()
 
        if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) {
                fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
        }
 
        Location* l;
@@ -1012,7 +1039,7 @@ Editor::marker_menu_select_all_selectables_using_range ()
 
        if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) {
                fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
        }
 
        Location* l;
@@ -1031,7 +1058,7 @@ Editor::marker_menu_separate_regions_using_location ()
 
        if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) {
                fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
        }
 
        Location* l;
@@ -1050,7 +1077,7 @@ Editor::marker_menu_play_from ()
 
        if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) {
                fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
        }
 
        Location* l;
@@ -1080,7 +1107,7 @@ Editor::marker_menu_set_playhead ()
 
        if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) {
                fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
        }
 
        Location* l;
@@ -1111,7 +1138,7 @@ Editor::marker_menu_range_to_next ()
 
        if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) {
                fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
        }
 
        Location* l;
@@ -1141,7 +1168,7 @@ Editor::marker_menu_set_from_playhead ()
 
        if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) {
                fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
        }
 
        Location* l;
@@ -1169,7 +1196,7 @@ Editor::marker_menu_set_from_selection (bool /*force_regions*/)
 
        if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) {
                fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
        }
 
        Location* l;
@@ -1200,7 +1227,7 @@ Editor::marker_menu_play_range ()
 
        if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) {
                fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
        }
 
        Location* l;
@@ -1225,7 +1252,7 @@ Editor::marker_menu_loop_range ()
 
        if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) {
                fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
        }
 
        Location* l;
@@ -1276,7 +1303,7 @@ Editor::dynamic_cast_marker_object (void* p, MeterMarker** m, TempoMarker** t) c
        Marker* marker = reinterpret_cast<Marker*> (p);
        if (!marker) {
                fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
        }
 
        *m = dynamic_cast<MeterMarker*> (marker);
@@ -1320,7 +1347,7 @@ Editor::toggle_marker_menu_lock ()
 
        if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) {
                fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
        }
 
        Location* loc;
@@ -1346,7 +1373,7 @@ Editor::marker_menu_rename ()
 
        if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) {
                fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
        }
 
 
@@ -1540,7 +1567,7 @@ Editor::toggle_marker_menu_glue ()
 
        if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) {
                fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
        }
 
        Location* loc;