add nascent poly-phonic pressure to automation menu for MIDI tracks
[ardour.git] / gtk2_ardour / editor_selection.cc
index c46ef04a64331d47879d7cf40013158075c5067e..f2681b58e25e5ea32379c95a02314a26f05e1278 100644 (file)
@@ -30,6 +30,7 @@
 
 #include "control_protocol/control_protocol.h"
 
+#include "editor_drag.h"
 #include "editor.h"
 #include "actions.h"
 #include "audio_time_axis.h"
@@ -40,8 +41,9 @@
 #include "editor_regions.h"
 #include "editor_cursors.h"
 #include "midi_region_view.h"
+#include "sfdb_ui.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -190,17 +192,10 @@ Editor::set_selected_track_as_side_effect (Selection::Operation op)
                group = clicked_routeview->route()->route_group();
        }
 
-       bool had_tracks = !selection->tracks.empty();
-       RouteGroup& arg (_session->all_route_group());
-
        switch (op) {
        case Selection::Toggle:
                if (selection->selected (clicked_axisview)) {
-                       if (arg.is_select() && arg.is_active()) {
-                               for (TrackViewList::iterator i = track_views.begin(); i != track_views.end (); ++i) {
-                                       selection->remove(*i);
-                               }
-                       } else if (group && group->is_active()) {
+                       if (group && group->is_active()) {
                                for (TrackViewList::iterator i = track_views.begin(); i != track_views.end (); ++i) {
                                        if ((*i)->route_group() == group) {
                                                selection->remove(*i);
@@ -210,11 +205,7 @@ Editor::set_selected_track_as_side_effect (Selection::Operation op)
                                selection->remove (clicked_axisview);
                        }
                } else {
-                       if (arg.is_select() && arg.is_active()) {
-                               for (TrackViewList::iterator i = track_views.begin(); i != track_views.end (); ++i) {
-                                       selection->add(*i);
-                               }
-                       } else if (group && group->is_active()) {
+                       if (group && group->is_active()) {
                                for (TrackViewList::iterator i = track_views.begin(); i != track_views.end (); ++i) {
                                        if ((*i)->route_group() == group) {
                                                selection->add(*i);
@@ -227,14 +218,7 @@ Editor::set_selected_track_as_side_effect (Selection::Operation op)
                break;
 
        case Selection::Add:
-               if (!had_tracks && arg.is_select() && arg.is_active()) {
-                       /* nothing was selected already, and all group is active etc. so use
-                          all tracks.
-                       */
-                       for (TrackViewList::iterator i = track_views.begin(); i != track_views.end (); ++i) {
-                               selection->add(*i);
-                       }
-               } else if (group && group->is_active()) {
+               if (group && group->is_active()) {
                        for (TrackViewList::iterator i  = track_views.begin(); i != track_views.end (); ++i) {
                                if ((*i)->route_group() == group) {
                                        selection->add(*i);
@@ -247,14 +231,7 @@ Editor::set_selected_track_as_side_effect (Selection::Operation op)
 
        case Selection::Set:
                selection->clear();
-               if (!had_tracks && arg.is_select() && arg.is_active()) {
-                       /* nothing was selected already, and all group is active etc. so use
-                          all tracks.
-                       */
-                       for (TrackViewList::iterator i = track_views.begin(); i != track_views.end (); ++i) {
-                               selection->add(*i);
-                       }
-               } else if (group && group->is_active()) {
+               if (group && group->is_active()) {
                        for (TrackViewList::iterator i  = track_views.begin(); i != track_views.end (); ++i) {
                                if ((*i)->route_group() == group) {
                                        selection->add(*i);
@@ -274,7 +251,7 @@ Editor::set_selected_track_as_side_effect (Selection::Operation op)
 void
 Editor::set_selected_track (TimeAxisView& view, Selection::Operation op, bool no_remove)
 {
-       begin_reversible_selection_op(_("Set Selected Track"));
+       begin_reversible_selection_op (X_("Set Selected Track"));
 
        switch (op) {
        case Selection::Toggle:
@@ -326,18 +303,34 @@ Editor::set_selected_control_point_from_click (bool press, Selection::Operation
                return false;
        }
 
+       bool ret = false;
+
        switch (op) {
        case Selection::Set:
-               if (press) {
+               if (!selection->selected (clicked_control_point)) {
                        selection->set (clicked_control_point);
+                       ret = true;
+               } else {
+                       /* clicked on an already selected point */
+                       if (press) {
+                               break;
+                       } else {
+                               if (selection->points.size() > 1) {
+                                       selection->set (clicked_control_point);
+                                       ret = true;
+                               }
+                       }
                }
                break;
+
        case Selection::Add:
                if (press) {
                        selection->add (clicked_control_point);
+                       ret = true;
                }
                break;
        case Selection::Toggle:
+
                /* This is a bit of a hack; if we Primary-Click-Drag a control
                   point (for push drag) we want the point we clicked on to be
                   selected, otherwise we end up confusingly dragging an
@@ -352,9 +345,11 @@ Editor::set_selected_control_point_from_click (bool press, Selection::Operation
                        */
                        selection->toggle (clicked_control_point);
                        _control_point_toggled_on_press = true;
+                       ret = true;
                } else if (!press && !_control_point_toggled_on_press) {
                        /* This is the release, and the point wasn't toggled on the press, so do it now */
                        selection->toggle (clicked_control_point);
+                       ret = true;
                } else {
                        /* Reset our flag */
                        _control_point_toggled_on_press = false;
@@ -365,7 +360,7 @@ Editor::set_selected_control_point_from_click (bool press, Selection::Operation
                break;
        }
 
-       return true;
+       return ret;
 }
 
 void
@@ -453,7 +448,7 @@ Editor::mapover_tracks_with_unique_playlists (sigc::slot<void, RouteTimeAxisView
                        RouteTimeAxisView* v = dynamic_cast<RouteTimeAxisView*> (*i);
 
                        if (v && v->route()->route_group() == group) {
-                               
+
                                boost::shared_ptr<Track> t = v->track();
                                if (t) {
                                        if (playlists.insert (t->playlist()).second) {
@@ -626,7 +621,7 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op)
                                if (press) {
 
                                        if (selection->selected (clicked_routeview)) {
-                                               get_equivalent_regions (clicked_regionview, all_equivalent_regions, ARDOUR::Properties::select.property_id);
+                                               get_equivalent_regions (clicked_regionview, all_equivalent_regions, ARDOUR::Properties::group_select.property_id);
                                        } else {
                                                all_equivalent_regions.push_back (clicked_regionview);
                                        }
@@ -644,7 +639,7 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op)
 
                case Selection::Set:
                        if (!selection->selected (clicked_regionview)) {
-                               get_equivalent_regions (clicked_regionview, all_equivalent_regions, ARDOUR::Properties::select.property_id);
+                               get_equivalent_regions (clicked_regionview, all_equivalent_regions, ARDOUR::Properties::group_select.property_id);
                                selection->set (all_equivalent_regions);
                                commit = true;
                        } else {
@@ -652,9 +647,12 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op)
                                if (press)
                                        goto out;
                                else {
-                                       get_equivalent_regions(clicked_regionview, all_equivalent_regions, ARDOUR::Properties::select.property_id);
-                                       selection->set(all_equivalent_regions);
-                                       commit = true;
+                                       if (selection->regions.size() > 1) {
+                                               /* collapse region selection down to just this one region (and its equivalents) */
+                                               get_equivalent_regions(clicked_regionview, all_equivalent_regions, ARDOUR::Properties::group_select.property_id);
+                                               selection->set(all_equivalent_regions);
+                                               commit = true;
+                                       }
                                }
                        }
                        break;
@@ -793,7 +791,7 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op)
 
                                        RouteTimeAxisView* closest = 0;
                                        int distance = INT_MAX;
-                                       int key = rtv->route()->order_key ();
+                                       int key = rtv->route()->presentation_info().order ();
 
                                        for (RegionSelection::iterator x = selection->regions.begin(); x != selection->regions.end(); ++x) {
 
@@ -808,7 +806,7 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op)
                                                        if (result.second) {
                                                                /* newly added to already_in_selection */
 
-                                                               int d = artv->route()->order_key ();
+                                                               int d = artv->route()->presentation_info().order ();
 
                                                                d -= key;
 
@@ -824,7 +822,7 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op)
 
                                                /* now add all tracks between that one and this one */
 
-                                               int okey = closest->route()->order_key ();
+                                               int okey = closest->route()->presentation_info().order ();
 
                                                if (okey > key) {
                                                        swap (okey, key);
@@ -834,7 +832,7 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op)
                                                        RouteTimeAxisView* artv = dynamic_cast<RouteTimeAxisView*>(*x);
                                                        if (artv && artv != rtv) {
 
-                                                               int k = artv->route()->order_key ();
+                                                               int k = artv->route()->presentation_info().order ();
 
                                                                if (k >= okey && k <= key) {
 
@@ -881,7 +879,12 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op)
                if (!regions.empty()) {
                        selection->add (regions);
                        commit = true;
+               } else if (selection->regions.empty() && !selection->selected (clicked_regionview)) {
+                       /* ensure that at least the clicked regionview is selected. */
+                       selection->set (clicked_regionview);
+                       commit = true;
                }
+
        }
 
 out:
@@ -900,7 +903,7 @@ Editor::set_selected_regionview_from_region_list (boost::shared_ptr<Region> regi
                return;
        }
 
-       begin_reversible_selection_op (_("set selected regions"));
+       begin_reversible_selection_op (X_("set selected regions"));
 
        switch (op) {
        case Selection::Toggle:
@@ -943,7 +946,7 @@ Editor::set_selected_regionview_from_map_event (GdkEventAny* /*ev*/, StreamView*
                return true;
        }
 
-       begin_reversible_selection_op (_("set selected regions"));
+       begin_reversible_selection_op (X_("set selected regions"));
 
        selection->set (rv);
 
@@ -964,6 +967,7 @@ Editor::track_selection_changed ()
        }
 
        RouteNotificationListPtr routes (new RouteNotificationList);
+       StripableNotificationListPtr stripables (new StripableNotificationList);
 
        for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
 
@@ -987,6 +991,7 @@ Editor::track_selection_changed ()
                        RouteTimeAxisView* rtav = dynamic_cast<RouteTimeAxisView*> (*i);
                        if (rtav) {
                                routes->push_back (rtav->route());
+                               stripables->push_back (rtav->route());
                        }
                }
        }
@@ -994,17 +999,39 @@ Editor::track_selection_changed ()
        ActionManager::set_sensitive (ActionManager::track_selection_sensitive_actions, !selection->tracks.empty());
 
        /* notify control protocols */
-       
-       ControlProtocol::TrackSelectionChanged (routes);
+
+       ControlProtocol::StripableSelectionChanged (stripables);
+
+       if (sfbrowser && _session && !_session->deletion_in_progress()) {
+               uint32_t audio_track_cnt = 0;
+               uint32_t midi_track_cnt = 0;
+
+               for (TrackSelection::iterator x = selection->tracks.begin(); x != selection->tracks.end(); ++x) {
+                       AudioTimeAxisView* atv = dynamic_cast<AudioTimeAxisView*>(*x);
+
+                       if (atv) {
+                               if (atv->is_audio_track()) {
+                                       audio_track_cnt++;
+                               }
+
+                       } else {
+                               MidiTimeAxisView* mtv = dynamic_cast<MidiTimeAxisView*>(*x);
+
+                               if (mtv) {
+                                       if (mtv->is_midi_track()) {
+                                               midi_track_cnt++;
+                                       }
+                               }
+                       }
+               }
+
+               sfbrowser->reset (audio_track_cnt, midi_track_cnt);
+       }
 }
 
 void
 Editor::time_selection_changed ()
 {
-       if (Profile->get_sae()) {
-               return;
-       }
-
        /* XXX this is superficially inefficient. Hide the selection in all
         * tracks, then show it in all selected tracks.
         *
@@ -1027,6 +1054,19 @@ Editor::time_selection_changed ()
        } else {
                ActionManager::set_sensitive (ActionManager::time_selection_sensitive_actions, true);
        }
+
+       /* propagate into backend, but only when there is no drag or we are at
+        * the end of a drag, otherwise this is too expensive (could case a
+        * locate per mouse motion event.
+        */
+
+       if (_session && !_drags->active()) {
+               if (selection->time.length() != 0) {
+                       _session->set_range_selection (selection->time.start(), selection->time.end_frame());
+               } else {
+                       _session->clear_range_selection ();
+               }
+       }
 }
 
 /** Set all region actions to have a given sensitivity */
@@ -1053,7 +1093,6 @@ Editor::sensitize_all_region_actions (bool s)
 void
 Editor::sensitize_the_right_region_actions ()
 {
-
        RegionSelection rs = get_regions_from_selection_and_entered ();
        sensitize_all_region_actions (!rs.empty ());
 
@@ -1083,6 +1122,7 @@ Editor::sensitize_the_right_region_actions ()
        bool have_inactive_fade_out = false;
        bool have_active_fade_in = false;
        bool have_active_fade_out = false;
+       bool have_transients = false;
 
        for (list<RegionView*>::const_iterator i = rs.begin(); i != rs.end(); ++i) {
 
@@ -1138,6 +1178,10 @@ Editor::sensitize_the_right_region_actions ()
                        have_not_at_natural_position = true;
                }
 
+               if (r->has_transients ()){
+                       have_transients = true;
+               }
+
                if (ar) {
                        if (ar->envelope_active()) {
                                have_envelope_active = true;
@@ -1163,6 +1207,8 @@ Editor::sensitize_the_right_region_actions ()
                }
        }
 
+       _region_actions->get_action("split-region-at-transients")->set_sensitive (have_transients);
+
        if (rs.size() > 1) {
                _region_actions->get_action("show-region-list-editor")->set_sensitive (false);
                _region_actions->get_action("show-region-properties")->set_sensitive (false);
@@ -1191,6 +1237,7 @@ Editor::sensitize_the_right_region_actions ()
                _region_actions->get_action("quantize-region")->set_sensitive (false);
                _region_actions->get_action("legatize-region")->set_sensitive (false);
                _region_actions->get_action("remove-overlap")->set_sensitive (false);
+               _region_actions->get_action("transform-region")->set_sensitive (false);
                _region_actions->get_action("fork-region")->set_sensitive (false);
                _region_actions->get_action("insert-patch-change-context")->set_sensitive (false);
                _region_actions->get_action("insert-patch-change")->set_sensitive (false);
@@ -1224,10 +1271,13 @@ Editor::sensitize_the_right_region_actions ()
 
        } else {
 
-               _region_actions->get_action("analyze-region")->set_sensitive (false);
+               _region_actions->get_action("loudness-analyze-region")->set_sensitive (false);
+               _region_actions->get_action("spectral-analyze-region")->set_sensitive (false);
                _region_actions->get_action("reset-region-gain-envelopes")->set_sensitive (false);
                _region_actions->get_action("toggle-region-gain-envelope-active")->set_sensitive (false);
                _region_actions->get_action("pitch-shift-region")->set_sensitive (false);
+               _region_actions->get_action("strip-region-silence")->set_sensitive (false);
+               _region_actions->get_action("show-rhythm-ferret")->set_sensitive (false);
 
        }
 
@@ -1289,7 +1339,7 @@ Editor::sensitize_the_right_region_actions ()
        if (have_active_fade_out && have_inactive_fade_out) {
                // a->set_inconsistent ();
        }
-       
+
        bool const have_active_fade = have_active_fade_in || have_active_fade_out;
        bool const have_inactive_fade = have_inactive_fade_in || have_inactive_fade_out;
 
@@ -1299,7 +1349,7 @@ Editor::sensitize_the_right_region_actions ()
        if (have_active_fade && have_inactive_fade) {
                // a->set_inconsistent ();
        }
-       
+
        _ignore_region_action = false;
 
        _all_region_actions_sensitized = false;
@@ -1327,16 +1377,31 @@ Editor::region_selection_changed ()
        _regions->block_change_connection (false);
        editor_regions_selection_changed_connection.block(false);
 
-       if (!_all_region_actions_sensitized) {
-               /* This selection change might have changed what region actions
-                  are allowed, so sensitize them all in case a key is pressed.
-               */
-               sensitize_all_region_actions (true);
+       if (selection->regions.empty()) {
+               sensitize_all_region_actions (false);
+       } else {
+               if (!_all_region_actions_sensitized) {
+                       /* This selection change might have changed what region actions
+                          are allowed, so sensitize them all in case a key is pressed.
+                       */
+                       sensitize_all_region_actions (true);
+               }
        }
 
        if (_session && !_session->transport_rolling() && !selection->regions.empty()) {
                maybe_locate_with_edit_preroll (selection->regions.start());
        }
+
+       /* propagate into backend */
+
+       if (_session) {
+               if (!selection->regions.empty()) {
+                       _session->set_object_selection (selection->regions.start(), selection->regions.end_frame());
+               } else {
+                       _session->clear_object_selection ();
+               }
+       }
+
 }
 
 void
@@ -1356,7 +1421,7 @@ Editor::select_all_in_track (Selection::Operation op)
                return;
        }
 
-       begin_reversible_selection_op(_("Select All in Track"));
+       begin_reversible_selection_op (X_("Select All in Track"));
 
        clicked_routeview->get_selectables (0, max_framepos, 0, DBL_MAX, touched);
 
@@ -1420,7 +1485,7 @@ Editor::select_all_objects (Selection::Operation op)
        }
 
 
-       begin_reversible_selection_op (_("select all"));
+       begin_reversible_selection_op (X_("select all"));
        switch (op) {
        case Selection::Add:
                selection->add (touched);
@@ -1447,7 +1512,7 @@ Editor::invert_selection_in_track ()
                return;
        }
 
-       begin_reversible_selection_op(_("Invert Selection in Track"));
+       begin_reversible_selection_op (X_("Invert Selection in Track"));
        clicked_routeview->get_inverted_selectables (*selection, touched);
        selection->set (touched);
        commit_reversible_selection_op ();
@@ -1475,7 +1540,7 @@ Editor::invert_selection ()
                (*iter)->get_inverted_selectables (*selection, touched);
        }
 
-       begin_reversible_selection_op(_("Invert Selection"));
+       begin_reversible_selection_op (X_("Invert Selection"));
        selection->set (touched);
        commit_reversible_selection_op ();
 }
@@ -1509,7 +1574,7 @@ Editor::select_all_within (framepos_t start, framepos_t end, double top, double
 
        if (preserve_if_selected && op != Selection::Toggle) {
                list<Selectable*>::iterator i = found.begin();
-               while (i != found.end() && (*i)->get_selected()) {
+               while (i != found.end() && (*i)->selected()) {
                        ++i;
                }
 
@@ -1518,7 +1583,7 @@ Editor::select_all_within (framepos_t start, framepos_t end, double top, double
                }
        }
 
-       begin_reversible_selection_op (_("select all within"));
+       begin_reversible_selection_op (X_("select all within"));
        switch (op) {
        case Selection::Add:
                selection->add (found);
@@ -1544,16 +1609,26 @@ Editor::set_selection_from_region ()
                return;
        }
 
-       selection->set (selection->regions.start(), selection->regions.end_frame());
-       
-       //we must now select tracks, because otherwise set_selection_from_region would appear to do nothing
-       //perhaps too drastic; perhaps the user really only wants the region's track selected
-       //but I can't think of any use-case for that (why wouldn't you just select the region?)
-       select_all_tracks();    
-       
-       if (!Profile->get_sae()) {
-               set_mouse_mode (Editing::MouseRange, false);
+       /* find all the tracks that have selected regions */
+
+       set<TimeAxisView*> tracks;
+
+       for (RegionSelection::const_iterator r = selection->regions.begin(); r != selection->regions.end(); ++r) {
+               tracks.insert (&(*r)->get_time_axis_view());
        }
+
+       TrackViewList tvl;
+       tvl.insert (tvl.end(), tracks.begin(), tracks.end());
+
+       /* select range (this will clear the region selection) */
+
+       selection->set (selection->regions.start(), selection->regions.end_frame());
+
+       /* and select the tracks */
+
+       selection->set (tvl);
+
+       set_mouse_mode (Editing::MouseRange, false);
 }
 
 void
@@ -1582,13 +1657,11 @@ Editor::set_selection_from_loop()
 void
 Editor::set_selection_from_range (Location& loc)
 {
-       begin_reversible_selection_op (_("set selection from range"));
+       begin_reversible_selection_op (X_("set selection from range"));
        selection->set (loc.start(), loc.end());
        commit_reversible_selection_op ();
 
-       if (!Profile->get_sae()) {
-               set_mouse_mode (Editing::MouseRange, false);
-       }
+       set_mouse_mode (Editing::MouseRange, false);
 }
 
 void
@@ -1622,7 +1695,7 @@ Editor::select_all_selectables_using_time_selection ()
                (*iter)->get_selectables (start, end - 1, 0, DBL_MAX, touched);
        }
 
-       begin_reversible_selection_op (_("select all from range"));
+       begin_reversible_selection_op (X_("select all from range"));
        selection->set (touched);
        commit_reversible_selection_op ();
 }
@@ -1653,7 +1726,7 @@ Editor::select_all_selectables_using_punch()
                }
                (*iter)->get_selectables (location->start(), location->end() - 1, 0, DBL_MAX, touched);
        }
-       begin_reversible_selection_op (_("select all from punch"));
+       begin_reversible_selection_op (X_("select all from punch"));
        selection->set (touched);
        commit_reversible_selection_op ();
 
@@ -1684,7 +1757,7 @@ Editor::select_all_selectables_using_loop()
                }
                (*iter)->get_selectables (location->start(), location->end() - 1, 0, DBL_MAX, touched);
        }
-       begin_reversible_selection_op (_("select all from loop"));
+       begin_reversible_selection_op (X_("select all from loop"));
        selection->set (touched);
        commit_reversible_selection_op ();
 
@@ -1720,9 +1793,9 @@ Editor::select_all_selectables_using_cursor (EditorCursor *cursor, bool after)
        }
 
        if (after) {
-               begin_reversible_selection_op (_("select all after cursor"));
+               begin_reversible_selection_op (X_("select all after cursor"));
        } else {
-               begin_reversible_selection_op (_("select all before cursor"));
+               begin_reversible_selection_op (X_("select all before cursor"));
        }
 
        TrackViewList* ts;
@@ -1744,17 +1817,17 @@ Editor::select_all_selectables_using_cursor (EditorCursor *cursor, bool after)
 }
 
 void
-Editor::select_all_selectables_using_edit (bool after)
+Editor::select_all_selectables_using_edit (bool after, bool from_context_menu)
 {
        framepos_t start;
        framepos_t end;
        list<Selectable *> touched;
 
        if (after) {
-               start = get_preferred_edit_position(false, true);
+               start = get_preferred_edit_position(EDIT_IGNORE_NONE, from_context_menu);
                end = _session->current_end_frame();
        } else {
-               if ((end = get_preferred_edit_position(false, true)) > 1) {
+               if ((end = get_preferred_edit_position(EDIT_IGNORE_NONE, from_context_menu)) > 1) {
                        start = 0;
                        end -= 1;
                } else {
@@ -1771,9 +1844,9 @@ Editor::select_all_selectables_using_edit (bool after)
        }
 
        if (after) {
-               begin_reversible_selection_op (_("select all after edit"));
+               begin_reversible_selection_op (X_("select all after edit"));
        } else {
-               begin_reversible_selection_op (_("select all before edit"));
+               begin_reversible_selection_op (X_("select all before edit"));
        }
 
        TrackViewList* ts;
@@ -1828,7 +1901,7 @@ Editor::select_all_selectables_between (bool within)
                (*iter)->get_selectables (start, end, 0, DBL_MAX, touched, within);
        }
 
-       begin_reversible_selection_op(_("Select all Selectables Between"));
+       begin_reversible_selection_op (X_("Select all Selectables Between"));
        selection->set (touched);
        commit_reversible_selection_op ();
 }
@@ -1847,7 +1920,7 @@ Editor::select_range_between ()
                return;
        }
 
-       begin_reversible_selection_op(_("Select Range Between"));
+       begin_reversible_selection_op (X_("Select Range Between"));
        set_mouse_mode (MouseRange);
        selection->set (start, end);
        commit_reversible_selection_op ();
@@ -1871,7 +1944,7 @@ Editor::get_edit_op_range (framepos_t& start, framepos_t& end) const
                end = 0;
                return false;
        }
-       
+
 //     if (!mouse_frame (m, ignored)) {
 //             /* mouse is not in a canvas, try playhead+selected marker.
 //                this is probably most true when using menus.
@@ -1957,7 +2030,7 @@ Editor::get_edit_op_range (framepos_t& start, framepos_t& end) const
 void
 Editor::deselect_all ()
 {
-       begin_reversible_selection_op(_("Deselect All"));
+       begin_reversible_selection_op (X_("Deselect All"));
        selection->clear ();
        commit_reversible_selection_op ();
 }
@@ -1965,7 +2038,7 @@ Editor::deselect_all ()
 long
 Editor::select_range (framepos_t s, framepos_t e)
 {
-       begin_reversible_selection_op(_("Select Range"));
+       begin_reversible_selection_op (X_("Select Range"));
        selection->add (clicked_axisview);
        selection->time.clear ();
        long ret = selection->set (s, e);