flip a coin for a difficult GUI design question, and leave 4 region edit actions...
[ardour.git] / gtk2_ardour / editor_selection.cc
index be7daf4ce42e424101c966eb983a8b1451fe671d..b98a7afd731e5b2559ce79e70cda2379f9a0c127 100644 (file)
@@ -51,9 +51,9 @@ using namespace Editing;
 
 struct TrackViewByPositionSorter
 {
-    bool operator() (const TimeAxisView* a, const TimeAxisView *b) {
-           return a->y_position() < b->y_position();
-    }
+       bool operator() (const TimeAxisView* a, const TimeAxisView *b) {
+               return a->y_position() < b->y_position();
+       }
 };
 
 bool
@@ -184,20 +184,20 @@ Editor::set_selected_track_as_side_effect (Selection::Operation op, bool /*force
        }
 
 #if 1
-        if (!clicked_routeview) {
-                return;
-        }
-
-        bool had_tracks = !selection->tracks.empty();
-        RouteGroup* group = clicked_routeview->route()->route_group();
-        RouteGroup& arg (_session->all_route_group());
-        
+       if (!clicked_routeview) {
+               return;
+       }
+
+       bool had_tracks = !selection->tracks.empty();
+       RouteGroup* group = clicked_routeview->route()->route_group();
+       RouteGroup& arg (_session->all_route_group());
+
        switch (op) {
-       case Selection::Toggle: 
+       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);
+                                       selection->remove(*i);
                                }
                        } else if (group && group->is_active()) {
                                for (TrackViewList::iterator i = track_views.begin(); i != track_views.end (); ++i) {
@@ -206,64 +206,64 @@ Editor::set_selected_track_as_side_effect (Selection::Operation op, bool /*force
                                }
                        } else {
                                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);
+                                       selection->add(*i);
                                }
                        } else 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);
                                }
-                        } else {
-                                selection->add (clicked_axisview);
-                        }
+                       } else {
+                               selection->add (clicked_axisview);
+                       }
                }
-                break;
-       
-       case Selection::Add: 
+               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.
-                        */
+                       /* 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);
+                               selection->add(*i);
                        }
                } else 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);
                        }
-                } else {
+               } else {
                        selection->add (clicked_axisview);
-                }
-                break;
-               
+               }
+               break;
+
        case Selection::Set:
-                selection->clear();
+               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.
-                        */
+                       /* 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);
+                               selection->add(*i);
                        }
                } else 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);
                        }
-                } else {
+               } else {
                        selection->set (clicked_axisview);
-                }
-                break;
-       
-       case Selection::Extend: 
+               }
+               break;
+
+       case Selection::Extend:
                selection->clear();
                cerr << ("Editor::set_selected_track_as_side_effect  case  Selection::Add  not yet implemented\n");
-                break;
+               break;
        }
 
 #else // the older version
@@ -329,7 +329,7 @@ Editor::set_selected_control_point_from_click (Selection::Operation op, bool /*n
        if (!clicked_control_point) {
                return false;
        }
-       
+
        switch (op) {
        case Selection::Set:
                selection->set (clicked_control_point);
@@ -351,11 +351,11 @@ Editor::set_selected_control_point_from_click (Selection::Operation op, bool /*n
 void
 Editor::get_onscreen_tracks (TrackViewList& tvl)
 {
-       for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
-               if ((*i)->y_position() < _canvas_height) {
-                       tvl.push_back (*i);
-               }
-       }
+       for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
+               if ((*i)->y_position() < _canvas_height) {
+                       tvl.push_back (*i);
+               }
+       }
 }
 
 /** Call a slot for a given `basis' track and also for any track that is in the same
@@ -395,7 +395,7 @@ Editor::mapover_tracks (sigc::slot<void, RouteTimeAxisView&, uint32_t> sl, TimeA
 
        /* call the slots */
        uint32_t const sz = tracks.size ();
-       
+
        for (set<RouteTimeAxisView*>::iterator i = tracks.begin(); i != tracks.end(); ++i) {
                sl (**i, sz);
        }
@@ -451,8 +451,7 @@ Editor::get_equivalent_regions (RegionSelection & basis, PBD::PropertyID prop) c
 
                mapover_tracks (
                        sigc::bind (sigc::mem_fun (*this, &Editor::mapped_get_equivalent_regions), *i, &eq),
-                       &(*i)->get_time_axis_view(), prop
-                       );
+                       &(*i)->get_time_axis_view(), prop);
 
                for (vector<RegionView*>::iterator j = eq.begin(); j != eq.end(); ++j) {
                        equivalent.add (*j);
@@ -522,7 +521,6 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op,
 
                switch (op) {
                case Selection::Toggle:
-
                        if (selection->selected (clicked_regionview)) {
                                if (press) {
 
@@ -533,7 +531,6 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op,
                                        button_release_can_deselect = true;
 
                                } else {
-
                                        if (button_release_can_deselect) {
 
                                                /* just remove this one region, but only on a permitted button release */
@@ -687,7 +684,7 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op,
                                relevant_tracks.insert (r);
                        }
                }
-               
+
                set<RouteTimeAxisView*> already_in_selection;
 
                if (relevant_tracks.empty()) {
@@ -767,8 +764,8 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op,
                                                                        */
 
                                                                        if (find (already_in_selection.begin(),
-                                                                                 already_in_selection.end(),
-                                                                                 artv) == already_in_selection.end()) {
+                                                                                 already_in_selection.end(),
+                                                                                 artv) == already_in_selection.end()) {
 
                                                                                relevant_tracks.insert (artv);
                                                                        }
@@ -781,7 +778,7 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op,
                }
 
                /* 3. find all selectable objects (regionviews in this case) between that one and the end of the
-                          one that was clicked.
+                  one that was clicked.
                */
 
                for (set<RouteTimeAxisView*>::iterator t = relevant_tracks.begin(); t != relevant_tracks.end(); ++t) {
@@ -806,7 +803,7 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op,
                }
        }
 
-  out:
+out:
        return commit;
 }
 
@@ -887,23 +884,23 @@ Editor::track_selection_changed ()
 
        for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
 
-                bool yn = (find (selection->tracks.begin(), selection->tracks.end(), *i) != selection->tracks.end());
-                
-                (*i)->set_selected (yn);
-                
-                TimeAxisView::Children c = (*i)->get_child_list ();
-                for (TimeAxisView::Children::iterator j = c.begin(); j != c.end(); ++j) {
-                        (*j)->set_selected (find (selection->tracks.begin(), selection->tracks.end(), j->get()) != selection->tracks.end());
-                }
-
-                if (yn && 
-                    ((mouse_mode == MouseRange) || 
-                     ((mouse_mode == MouseObject) && (_join_object_range_state == JOIN_OBJECT_RANGE_OBJECT)))) {
-                        (*i)->reshow_selection (selection->time);
-                } else {
-                        (*i)->hide_selection ();
-                }
-        }
+               bool yn = (find (selection->tracks.begin(), selection->tracks.end(), *i) != selection->tracks.end());
+
+               (*i)->set_selected (yn);
+
+               TimeAxisView::Children c = (*i)->get_child_list ();
+               for (TimeAxisView::Children::iterator j = c.begin(); j != c.end(); ++j) {
+                       (*j)->set_selected (find (selection->tracks.begin(), selection->tracks.end(), j->get()) != selection->tracks.end());
+               }
+
+               if (yn &&
+                   ((mouse_mode == MouseRange) ||
+                    ((mouse_mode == MouseObject) && (_join_object_range_state == JOIN_OBJECT_RANGE_OBJECT)))) {
+                       (*i)->reshow_selection (selection->time);
+               } else {
+                       (*i)->hide_selection ();
+               }
+       }
 
        ActionManager::set_sensitive (ActionManager::track_selection_sensitive_actions, !selection->tracks.empty());
 }
@@ -959,7 +956,6 @@ Editor::sensitize_the_right_region_actions ()
                if (!selection->time.empty()) {
                        _region_actions->get_action("split-region")->set_sensitive (true);
                }
-               
                return;
 
        } else if (mouse_mode != MouseObject) {
@@ -968,14 +964,14 @@ Editor::sensitize_the_right_region_actions ()
        }
 
        /* We get here if we are in Object mode */
-                       
+
        RegionSelection rs = get_regions_from_selection_and_entered ();
        sensitize_all_region_actions (!rs.empty ());
 
        _ignore_region_action = true;
-       
+
        /* Look through the regions that are selected and make notes about what we have got */
-       
+
        bool have_audio = false;
        bool have_midi = false;
        bool have_locked = false;
@@ -992,20 +988,25 @@ Editor::sensitize_the_right_region_actions ()
        bool have_envelope_active = false;
        bool have_envelope_inactive = false;
        bool have_non_unity_scale_amplitude = false;
+       bool have_compound_regions = false;
 
        for (list<RegionView*>::const_iterator i = rs.begin(); i != rs.end(); ++i) {
 
                boost::shared_ptr<Region> r = (*i)->region ();
                boost::shared_ptr<AudioRegion> ar = boost::dynamic_pointer_cast<AudioRegion> (r);
-               
+
                if (ar) {
                        have_audio = true;
                }
-               
+
                if (boost::dynamic_pointer_cast<MidiRegion> (r)) {
                        have_midi = true;
                }
 
+               if (r->is_compound()) {
+                       have_compound_regions = true;
+               }
+
                if (r->locked()) {
                        have_locked = true;
                } else {
@@ -1035,18 +1036,18 @@ Editor::sensitize_the_right_region_actions ()
                }
 
                if (ar) {
-                        /* its a bit unfortunate that "envelope visible" is a view-only
-                           property. we have to find the regionview to able to check
-                           its current setting.
-                        */
-
-                        have_envelope_invisible = true;
-
-                        if (*i) {
-                                AudioRegionView* arv = dynamic_cast<AudioRegionView*> (*i);
-                                if (arv && arv->envelope_visible()) {
-                                        have_envelope_visible = true;
-                                }
+                       /* its a bit unfortunate that "envelope visible" is a view-only
+                          property. we have to find the regionview to able to check
+                          its current setting.
+                       */
+
+                       have_envelope_invisible = true;
+
+                       if (*i) {
+                               AudioRegionView* arv = dynamic_cast<AudioRegionView*> (*i);
+                               if (arv && arv->envelope_visible()) {
+                                       have_envelope_visible = true;
+                               }
                        }
 
                        if (ar->envelope_active()) {
@@ -1065,71 +1066,87 @@ Editor::sensitize_the_right_region_actions ()
                _region_actions->get_action("show-region-list-editor")->set_sensitive (false);
                _region_actions->get_action("show-region-properties")->set_sensitive (false);
                _region_actions->get_action("rename-region")->set_sensitive (false);
+               if (have_audio) {
+                       _region_actions->get_action("combine-regions")->set_sensitive (true);
+               } else {
+                       _region_actions->get_action("combine-regions")->set_sensitive (false);
+               }
        } else if (rs.size() == 1) {
                _region_actions->get_action("add-range-markers-from-region")->set_sensitive (false);
                _region_actions->get_action("close-region-gaps")->set_sensitive (false);
-       } 
+               _region_actions->get_action("combine-regions")->set_sensitive (false);
+       }
 
        if (!have_midi) {
                _region_actions->get_action("show-region-list-editor")->set_sensitive (false);
                _region_actions->get_action("quantize-region")->set_sensitive (false);
                _region_actions->get_action("fork-region")->set_sensitive (false);
+               _region_actions->get_action("transpose-region")->set_sensitive (false);
        }
 
        if (_edit_point == EditAtMouse) {
+#if 0
                _region_actions->get_action("set-region-sync-position")->set_sensitive (false);
                _region_actions->get_action("trim-front")->set_sensitive (false);
                _region_actions->get_action("trim-back")->set_sensitive (false);
                _region_actions->get_action("split-region")->set_sensitive (false);
+#endif
                _region_actions->get_action("place-transient")->set_sensitive (false);
        }
 
+       if (have_compound_regions) {
+               _region_actions->get_action("uncombine-regions")->set_sensitive (true);
+       } else {
+               _region_actions->get_action("uncombine-regions")->set_sensitive (false);
+       }
+
        if (have_audio) {
-               
+
                if (have_envelope_visible && !have_envelope_invisible) {
                        Glib::RefPtr<ToggleAction>::cast_dynamic (_region_actions->get_action("toggle-region-gain-envelope-visible"))->set_active ();
                } else if (have_envelope_visible && have_envelope_invisible) {
-//                     _region_actions->get_action("toggle-region-gain-envelope-visible")->set_inconsistent ();
+                       // _region_actions->get_action("toggle-region-gain-envelope-visible")->set_inconsistent ();
                }
-               
+
                if (have_envelope_active && !have_envelope_inactive) {
                        Glib::RefPtr<ToggleAction>::cast_dynamic (_region_actions->get_action("toggle-region-gain-envelope-active"))->set_active ();
                } else if (have_envelope_active && have_envelope_inactive) {
-//                     _region_actions->get_action("toggle-region-gain-envelope-active")->set_inconsistent ();
+                       // _region_actions->get_action("toggle-region-gain-envelope-active")->set_inconsistent ();
                }
-       
+
        } else {
-               
+
                _region_actions->get_action("analyze-region")->set_sensitive (false);
                _region_actions->get_action("reset-region-gain-envelopes")->set_sensitive (false);
                _region_actions->get_action("toggle-region-gain-envelope-visible")->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);
+
        }
 
        if (!have_non_unity_scale_amplitude || !have_audio) {
                _region_actions->get_action("reset-region-scale-amplitude")->set_sensitive (false);
        }
-               
+
        Glib::RefPtr<ToggleAction>::cast_dynamic (_region_actions->get_action("toggle-region-lock"))->set_active (have_locked && !have_unlocked);
        if (have_locked && have_unlocked) {
-//             _region_actions->get_action("toggle-region-lock")->set_inconsistent ();
+               // _region_actions->get_action("toggle-region-lock")->set_inconsistent ();
        }
 
        Glib::RefPtr<ToggleAction>::cast_dynamic (_region_actions->get_action("toggle-region-lock-style"))->set_active (have_position_lock_style_music && !have_position_lock_style_audio);
-               
+
        if (have_position_lock_style_music && have_position_lock_style_audio) {
-//             _region_actions->get_action("toggle-region-lock-style")->set_inconsistent ();
+               // _region_actions->get_action("toggle-region-lock-style")->set_inconsistent ();
        }
 
        Glib::RefPtr<ToggleAction>::cast_dynamic (_region_actions->get_action("toggle-region-mute"))->set_active (have_muted && !have_unmuted);
        if (have_muted && have_unmuted) {
-//             _region_actions->get_action("toggle-region-mute")->set_inconsistent ();
+               // _region_actions->get_action("toggle-region-mute")->set_inconsistent ();
        }
-        
+
        Glib::RefPtr<ToggleAction>::cast_dynamic (_region_actions->get_action("toggle-opaque-region"))->set_active (have_opaque && !have_non_opaque);
        if (have_opaque && have_non_opaque) {
-//                     _region_actions->get_action("toggle-opaque-region")->set_inconsistent ();
+               // _region_actions->get_action("toggle-opaque-region")->set_inconsistent ();
        }
 
        if (!have_not_at_natural_position) {
@@ -1144,7 +1161,7 @@ Editor::sensitize_the_right_region_actions ()
        }
 
        _ignore_region_action = false;
-       
+
        _all_region_actions_sensitized = false;
 }
 
@@ -1163,19 +1180,14 @@ Editor::region_selection_changed ()
                (*i)->set_selected_regionviews (selection->regions);
        }
 
-        if (_region_selection_change_updates_region_list) {
-                _regions->set_selected (selection->regions);
-        }
+       if (_region_selection_change_updates_region_list) {
+               _regions->set_selected (selection->regions);
+       }
 
        _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);
-       }
+       sensitize_the_right_region_actions ();
 }
 
 void
@@ -1214,15 +1226,13 @@ Editor::select_all_in_track (Selection::Operation op)
 }
 
 void
-Editor::select_all_internal_edit (Selection::Operation op)
+Editor::select_all_internal_edit (Selection::Operation)
 {
-        /* currently limited to MIDI only */
-
        for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) {
                MidiRegionView* mrv = dynamic_cast<MidiRegionView*>(*i);
-                if (mrv) {
-                        mrv->select_all_notes ();
-                }
+               if (mrv) {
+                       mrv->select_all_notes ();
+               }
        }
 }
 
@@ -1231,10 +1241,10 @@ Editor::select_all (Selection::Operation op)
 {
        list<Selectable *> touched;
 
-        if (_internal_editing) {
-                select_all_internal_edit (op);
-                return;
-        }
+       if (_internal_editing) {
+               select_all_internal_edit (op);
+               return;
+       }
 
        for (TrackViewList::iterator iter = track_views.begin(); iter != track_views.end(); ++iter) {
                if ((*iter)->hidden()) {
@@ -1259,6 +1269,7 @@ Editor::select_all (Selection::Operation op)
        }
        commit_reversible_command ();
 }
+
 void
 Editor::invert_selection_in_track ()
 {
@@ -1277,6 +1288,16 @@ Editor::invert_selection ()
 {
        list<Selectable *> touched;
 
+       if (_internal_editing) {
+               for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) {
+                       MidiRegionView* mrv = dynamic_cast<MidiRegionView*>(*i);
+                       if (mrv) {
+                               mrv->invert_selection ();
+                       }
+               }
+               return;
+       }
+
        for (TrackViewList::iterator iter = track_views.begin(); iter != track_views.end(); ++iter) {
                if ((*iter)->hidden()) {
                        continue;
@@ -1295,14 +1316,12 @@ Editor::invert_selection ()
  *  within the region are already selected.
  */
 void
-Editor::select_all_within (
-       framepos_t start, framepos_t end, double top, double bot, const TrackViewList& tracklist, Selection::Operation op, bool preserve_if_selected
-       )
+Editor::select_all_within (framepos_t start, framepos_t end, double top, double bot, const TrackViewList& tracklist, Selection::Operation op, bool preserve_if_selected)
 {
        list<Selectable*> found;
 
        for (TrackViewList::const_iterator iter = tracklist.begin(); iter != tracklist.end(); ++iter) {
-               
+
                if ((*iter)->hidden()) {
                        continue;
                }
@@ -1494,17 +1513,15 @@ Editor::select_all_selectables_using_loop()
 void
 Editor::select_all_selectables_using_cursor (EditorCursor *cursor, bool after)
 {
-        framepos_t start;
+       framepos_t start;
        framepos_t end;
        list<Selectable *> touched;
 
        if (after) {
-               begin_reversible_command (_("select all after cursor"));
                start = cursor->current_frame;
                end = _session->current_end_frame();
        } else {
                if (cursor->current_frame > 0) {
-                       begin_reversible_command (_("select all before cursor"));
                        start = 0;
                        end = cursor->current_frame - 1;
                } else {
@@ -1512,6 +1529,21 @@ Editor::select_all_selectables_using_cursor (EditorCursor *cursor, bool after)
                }
        }
 
+       if (_internal_editing) {
+               for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) {
+                       MidiRegionView* mrv = dynamic_cast<MidiRegionView*>(*i);
+                       if (mrv) {
+                               mrv->select_range (start, end);
+                       }
+               }
+               return;
+       }
+
+       if (after) {
+               begin_reversible_command (_("select all after cursor"));
+       } else {
+               begin_reversible_command (_("select all before cursor"));
+       }
 
        TrackViewList* ts;
 
@@ -1534,17 +1566,15 @@ Editor::select_all_selectables_using_cursor (EditorCursor *cursor, bool after)
 void
 Editor::select_all_selectables_using_edit (bool after)
 {
-        framepos_t start;
+       framepos_t start;
        framepos_t end;
        list<Selectable *> touched;
 
        if (after) {
-               begin_reversible_command (_("select all after edit"));
                start = get_preferred_edit_position();
                end = _session->current_end_frame();
        } else {
                if ((end = get_preferred_edit_position()) > 1) {
-                       begin_reversible_command (_("select all before edit"));
                        start = 0;
                        end -= 1;
                } else {
@@ -1552,6 +1582,19 @@ Editor::select_all_selectables_using_edit (bool after)
                }
        }
 
+       if (_internal_editing) {
+               for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) {
+                       MidiRegionView* mrv = dynamic_cast<MidiRegionView*>(*i);
+                       mrv->select_range (start, end);
+               }
+               return;
+       }
+
+       if (after) {
+               begin_reversible_command (_("select all after edit"));
+       } else {
+               begin_reversible_command (_("select all before edit"));
+       }
 
        TrackViewList* ts;
 
@@ -1574,7 +1617,7 @@ Editor::select_all_selectables_using_edit (bool after)
 void
 Editor::select_all_selectables_between (bool /*within*/)
 {
-        framepos_t start;
+       framepos_t start;
        framepos_t end;
        list<Selectable *> touched;
 
@@ -1582,6 +1625,14 @@ Editor::select_all_selectables_between (bool /*within*/)
                return;
        }
 
+       if (_internal_editing) {
+               for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) {
+                       MidiRegionView* mrv = dynamic_cast<MidiRegionView*>(*i);
+                       mrv->select_range (start, end);
+               }
+               return;
+       }
+
        TrackViewList* ts;
 
        if (selection->tracks.empty()) {
@@ -1603,12 +1654,12 @@ Editor::select_all_selectables_between (bool /*within*/)
 void
 Editor::select_range_between ()
 {
-        framepos_t start;
+       framepos_t start;
        framepos_t end;
 
-        if (mouse_mode == MouseRange && !selection->time.empty()) {
-                selection->clear_time ();
-        }
+       if (mouse_mode == MouseRange && !selection->time.empty()) {
+               selection->clear_time ();
+       }
 
        if (!get_edit_op_range (start, end)) {
                return;
@@ -1636,7 +1687,7 @@ Editor::get_edit_op_range (framepos_t& start, framepos_t& end) const
        if (!mouse_frame (m, ignored)) {
                /* mouse is not in a canvas, try playhead+selected marker.
                   this is probably most true when using menus.
-                */
+               */
 
                if (selection->markers.empty()) {
                        return false;
@@ -1676,9 +1727,9 @@ Editor::get_edit_op_range (framepos_t& start, framepos_t& end) const
                        if (selection->markers.empty()) {
 
                                MessageDialog win (_("No edit range defined"),
-                                                  false,
-                                                  MESSAGE_INFO,
-                                                  BUTTONS_OK);
+                                                  false,
+                                                  MESSAGE_INFO,
+                                                  BUTTONS_OK);
 
                                win.set_secondary_text (
                                        _("the edit point is Selected Marker\nbut there is no selected marker."));
@@ -1725,9 +1776,9 @@ long
 Editor::select_range_around_region (RegionView* rv)
 {
        assert (rv);
-       
+
        selection->set (&rv->get_time_axis_view());
-       
+
        selection->time.clear ();
        boost::shared_ptr<Region> r = rv->region ();
        return selection->set (r->position(), r->position() + r->length());