Spelling correction patch from Debian

[ardour.git] / gtk2_ardour / editor_ops.cc

diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index 55d38f3a884e9da23d7f2346a77a30eee84cbc22..91f2031efa1890dfaaf6472e6dad90796aec5ab7 100644 (file)
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -4567,7 +4567,7 @@ Editor::cut_copy_regions (CutCopyOp op, RegionSelection& rs)
 
                list<boost::shared_ptr<Playlist> > foo;
 
-               /* the pmap is in the same order as the tracks in which selected regions occured */
+               /* the pmap is in the same order as the tracks in which selected regions occurred */
 
                for (vector<PlaylistMapping>::iterator i = pmap.begin(); i != pmap.end(); ++i) {
                        if ((*i).pl) {
@@ -4811,18 +4811,9 @@ Editor::duplicate_selection (float times)
        }
 
        boost::shared_ptr<Playlist> playlist;
-       vector<boost::shared_ptr<Region> > new_regions;
-       vector<boost::shared_ptr<Region> >::iterator ri;
-
-       create_region_from_selection (new_regions);
-
-       if (new_regions.empty()) {
-               return;
-       }
-
-       ri = new_regions.begin();
 
        TrackViewList ts = selection->tracks.filter_to_unique_playlists ();
+
        bool in_command = false;
 
        for (TrackViewList::iterator i = ts.begin(); i != ts.end(); ++i) {
@@ -4830,27 +4821,34 @@ Editor::duplicate_selection (float times)
                        continue;
                }
                playlist->clear_changes ();
-               framepos_t end;
+
                if (clicked_selection) {
-                       end = selection->time[clicked_selection].end;
+                       playlist->duplicate_range (selection->time[clicked_selection], times);
                } else {
-                       end = selection->time.end_frame();
+                       playlist->duplicate_ranges (selection->time, times);
                }
-               playlist->duplicate (*ri, end + 1, times);
 
                if (!in_command) {
-                       begin_reversible_command (_("duplicate selection"));
+                       begin_reversible_command (_("duplicate range selection"));
                        in_command = true;
                }
                _session->add_command (new StatefulDiffCommand (playlist));
 
-               ++ri;
-               if (ri == new_regions.end()) {
-                       --ri;
-               }
        }
 
        if (in_command) {
+               // now "move" range selection to after the current range selection
+               framecnt_t distance = 0;
+
+               if (clicked_selection) {
+                       distance = selection->time[clicked_selection].end -
+                                  selection->time[clicked_selection].start;
+               } else {
+                       distance = selection->time.end_frame() - selection->time.start();
+               }
+
+               selection->move_time (distance);
+
                commit_reversible_command ();
        }
 }
@@ -7226,12 +7224,10 @@ Editor::do_insert_time ()
                return;
        }
 
-       InsertTimeOption opt = d.intersected_region_action ();
-
        insert_time (
-               get_preferred_edit_position(),
+               get_preferred_edit_position (EDIT_IGNORE_MOUSE),
                d.distance(),
-               opt,
+               d.intersected_region_action (),
                d.all_playlists(),
                d.move_glued(),
                d.move_markers(),
@@ -7429,7 +7425,7 @@ Editor::remove_time (framepos_t pos, framecnt_t frames, InsertTimeOption opt,
                        pl->shift (pos, -frames, true, ignore_music_glue);
 
                        if (!in_command) {
-                               begin_reversible_command (_("cut time"));
+                               begin_reversible_command (_("remove time"));
                                in_command = true;
                        }
                        XMLNode &after = pl->get_state();
@@ -7441,7 +7437,7 @@ Editor::remove_time (framepos_t pos, framecnt_t frames, InsertTimeOption opt,
                RouteTimeAxisView* rtav = dynamic_cast<RouteTimeAxisView*> (*x);
                if (rtav) {
                        if (!in_command) {
-                               begin_reversible_command (_("cut time"));
+                               begin_reversible_command (_("remove time"));
                                in_command = true;
                        }
                        rtav->route ()->shift (pos, -frames);
@@ -7514,7 +7510,7 @@ Editor::remove_time (framepos_t pos, framecnt_t frames, InsertTimeOption opt,
 
                if (moved) {
                        if (!in_command) {
-                               begin_reversible_command (_("cut time"));
+                               begin_reversible_command (_("remove time"));
                                in_command = true;
                        }
                        XMLNode& after (_session->locations()->get_state());