Remove internal edit mode and add "content" tool.
[ardour.git] / gtk2_ardour / editor_selection.cc
index 59425b289c362f71cf423eb747b9059427186860..93dd7c15fbc35bbcd7f168a3a13d65334532d70e 100644 (file)
@@ -185,12 +185,12 @@ Editor::set_selected_track_as_side_effect (Selection::Operation op)
                return;
        }
 
-       if (!clicked_routeview) {
-               return;
+       RouteGroup* group = NULL;
+       if (clicked_routeview) {
+               group = clicked_routeview->route()->route_group();
        }
 
        bool had_tracks = !selection->tracks.empty();
-       RouteGroup* group = clicked_routeview->route()->route_group();
        RouteGroup& arg (_session->all_route_group());
 
        switch (op) {
@@ -640,8 +640,14 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op)
                                selection->set (all_equivalent_regions);
                                commit = true;
                        } else {
-                               /* no commit necessary: clicked on an already selected region */
-                               goto out;
+                               /* clicked on an already selected region */
+                               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;
+                               }
                        }
                        break;
 
@@ -991,6 +997,15 @@ Editor::time_selection_changed ()
                return;
        }
 
+       /* XXX this is superficially inefficient. Hide the selection in all
+        * tracks, then show it in all selected tracks.
+        *
+        * However, if you investigate what this actually does, it isn't
+        * anywhere nearly as bad as it may appear. Remember: nothing is
+        * redrawn or even recomputed during these two loops - that only
+        * happens when we next render ...
+        */
+
        for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
                (*i)->hide_selection ();
        }
@@ -1004,10 +1019,6 @@ Editor::time_selection_changed ()
        } else {
                ActionManager::set_sensitive (ActionManager::time_selection_sensitive_actions, true);
        }
-
-       if (_session && Config->get_always_play_range() && !_session->transport_rolling() && !selection->time.empty()) {
-               _session->request_locate (selection->time.start());
-       }
 }
 
 /** Set all region actions to have a given sensitivity */
@@ -1170,6 +1181,8 @@ Editor::sensitize_the_right_region_actions ()
                editor_menu_actions->get_action("RegionMenuMIDI")->set_sensitive (false);
                _region_actions->get_action("show-region-list-editor")->set_sensitive (false);
                _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("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);
@@ -1365,23 +1378,13 @@ Editor::select_all_internal_edit (Selection::Operation)
 }
 
 void
-Editor::select_all (Selection::Operation op)
+Editor::select_all_objects (Selection::Operation op)
 {
        list<Selectable *> touched;
 
-       TrackViewList ts;
-
-       if (selection->tracks.empty()) {
-               if (entered_track) {
-                       ts.push_back (entered_track);
-               } else {
-                       ts = track_views;
-               }
-       } else {
-               ts = selection->tracks;
-       }
+       TrackViewList ts  = track_views;
 
-       if (_internal_editing) {
+       if (internal_editing()) {
 
                bool midi_selected = false;
 
@@ -1409,8 +1412,10 @@ Editor::select_all (Selection::Operation op)
                        continue;
                }
                (*iter)->get_selectables (0, max_framepos, 0, DBL_MAX, touched);
+               selection->add (*iter);
        }
 
+
        begin_reversible_command (_("select all"));
        switch (op) {
        case Selection::Add:
@@ -1447,7 +1452,7 @@ Editor::invert_selection ()
 {
        list<Selectable *> touched;
 
-       if (_internal_editing) {
+       if (internal_editing()) {
                for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) {
                        MidiRegionView* mrv = dynamic_cast<MidiRegionView*>(*i);
                        if (mrv) {
@@ -1489,6 +1494,8 @@ Editor::select_all_within (framepos_t start, framepos_t end, double top, double
        }
 
        if (found.empty()) {
+               selection->clear_objects();
+               selection->clear_time ();
                return;
        }
 
@@ -1688,7 +1695,7 @@ Editor::select_all_selectables_using_cursor (EditorCursor *cursor, bool after)
                }
        }
 
-       if (_internal_editing) {
+       if (internal_editing()) {
                for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) {
                        MidiRegionView* mrv = dynamic_cast<MidiRegionView*>(*i);
                        if (mrv) {
@@ -1741,7 +1748,7 @@ Editor::select_all_selectables_using_edit (bool after)
                }
        }
 
-       if (_internal_editing) {
+       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);
@@ -1784,7 +1791,7 @@ Editor::select_all_selectables_between (bool /*within*/)
                return;
        }
 
-       if (_internal_editing) {
+       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);
@@ -1831,98 +1838,102 @@ Editor::select_range_between ()
 bool
 Editor::get_edit_op_range (framepos_t& start, framepos_t& end) const
 {
-       framepos_t m;
-       bool ignored;
+//     framepos_t m;
+//     bool ignored;
 
        /* if an explicit range exists, use it */
 
-       if (!selection->time.empty()) {
+       if ( (mouse_mode == MouseRange || get_smart_mode() ) &&  !selection->time.empty()) {
                /* we know that these are ordered */
                start = selection->time.start();
                end = selection->time.end_frame();
                return true;
-       }
-
-       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;
-               }
-
-               start = selection->markers.front()->position();
-               end = _session->audible_frame();
-
        } else {
-
-               switch (_edit_point) {
-               case EditAtPlayhead:
-                       if (selection->markers.empty()) {
-                               /* use mouse + playhead */
-                               start = m;
-                               end = _session->audible_frame();
-                       } else {
-                               /* use playhead + selected marker */
-                               start = _session->audible_frame();
-                               end = selection->markers.front()->position();
-                       }
-                       break;
-
-               case EditAtMouse:
-                       /* use mouse + selected marker */
-                       if (selection->markers.empty()) {
-                               start = m;
-                               end = _session->audible_frame();
-                       } else {
-                               start = selection->markers.front()->position();
-                               end = m;
-                       }
-                       break;
-
-               case EditAtSelectedMarker:
-                       /* use mouse + selected marker */
-                       if (selection->markers.empty()) {
-
-                               MessageDialog win (_("No edit range defined"),
-                                                  false,
-                                                  MESSAGE_INFO,
-                                                  BUTTONS_OK);
-
-                               win.set_secondary_text (
-                                       _("the edit point is Selected Marker\nbut there is no selected marker."));
-
-
-                               win.set_default_response (RESPONSE_CLOSE);
-                               win.set_position (Gtk::WIN_POS_MOUSE);
-                               win.show_all();
-
-                               win.run ();
-
-                               return false; // NO RANGE
-                       }
-                       start = selection->markers.front()->position();
-                       end = m;
-                       break;
-               }
-       }
-
-       if (start == end) {
+               start = 0;
+               end = 0;
                return false;
        }
-
-       if (start > end) {
-               swap (start, end);
-       }
+       
+//     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;
+//             }
+
+//             start = selection->markers.front()->position();
+//             end = _session->audible_frame();
+
+//     } else {
+
+//             switch (_edit_point) {
+//             case EditAtPlayhead:
+//                     if (selection->markers.empty()) {
+//                             /* use mouse + playhead */
+//                             start = m;
+//                             end = _session->audible_frame();
+//                     } else {
+//                             /* use playhead + selected marker */
+//                             start = _session->audible_frame();
+//                             end = selection->markers.front()->position();
+//                     }
+//                     break;
+
+//             case EditAtMouse:
+//                     /* use mouse + selected marker */
+//                     if (selection->markers.empty()) {
+//                             start = m;
+//                             end = _session->audible_frame();
+//                     } else {
+//                             start = selection->markers.front()->position();
+//                             end = m;
+//                     }
+//                     break;
+
+//             case EditAtSelectedMarker:
+//                     /* use mouse + selected marker */
+//                     if (selection->markers.empty()) {
+
+//                             MessageDialog win (_("No edit range defined"),
+//                                                false,
+//                                                MESSAGE_INFO,
+//                                                BUTTONS_OK);
+
+//                             win.set_secondary_text (
+//                                     _("the edit point is Selected Marker\nbut there is no selected marker."));
+
+
+//                             win.set_default_response (RESPONSE_CLOSE);
+//                             win.set_position (Gtk::WIN_POS_MOUSE);
+//                             win.show_all();
+
+//                             win.run ();
+
+//                             return false; // NO RANGE
+//                     }
+//                     start = selection->markers.front()->position();
+//                     end = m;
+//                     break;
+//             }
+//     }
+
+//     if (start == end) {
+//             return false;
+//     }
+
+//     if (start > end) {
+//             swap (start, end);
+//     }
 
        /* turn range into one delimited by start...end,
           not start...end-1
        */
 
-       end++;
+//     end++;
 
-       return true;
+//     return true;
 }
 
 void