a more reliable/robust/less complex version of previous commit

[ardour.git] / gtk2_ardour / editor_ops.cc

diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index ccb77558b82344cff4310d9c5f8f6e5385960177..c83e96d67f15a269d77d3d561e7227c30e31d830 100644 (file)
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -102,7 +102,7 @@
 #include "transform_dialog.h"
 #include "ui_config.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -151,7 +151,7 @@ Editor::redo (uint32_t n)
 }
 
 void
-Editor::split_regions_at (framepos_t where, RegionSelection& regions)
+Editor::split_regions_at (framepos_t where, RegionSelection& regions, const int32_t sub_num)
 {
        bool frozen = false;
 
@@ -226,7 +226,7 @@ Editor::split_regions_at (framepos_t where, RegionSelection& regions)
 
                if (pl) {
                        pl->clear_changes ();
-                       pl->split_region ((*a)->region(), where);
+                       pl->split_region ((*a)->region(), where, sub_num);
                        _session->add_command (new StatefulDiffCommand (pl));
                }
 
@@ -433,6 +433,9 @@ Editor::nudge_forward (bool next, bool force_playhead)
                                        } else {
                                                loc->set_end (max_framepos);
                                        }
+                                       if (loc->is_session_range()) {
+                                               _session->set_end_is_free (false);
+                                       }
                                }
                                if (!in_command) {
                                        begin_reversible_command (_("nudge location forward"));
@@ -524,6 +527,9 @@ Editor::nudge_backward (bool next, bool force_playhead)
                                        } else {
                                                loc->set_end (loc->length());
                                        }
+                                       if (loc->is_session_range()) {
+                                               _session->set_end_is_free (false);
+                                       }
                                }
                                if (!in_command) {
                                        begin_reversible_command (_("nudge location forward"));
@@ -2233,6 +2239,8 @@ Editor::set_session_end_from_playhead ()
 
                commit_reversible_command ();
        }
+
+       _session->set_end_is_free (false);
 }
 
 void
@@ -4635,7 +4643,7 @@ Editor::paste (float times, bool from_context)
 {
         DEBUG_TRACE (DEBUG::CutNPaste, "paste to preferred edit pos\n");
 
-       paste_internal (get_preferred_edit_position (EDIT_IGNORE_NONE, from_context), times);
+       paste_internal (get_preferred_edit_position (EDIT_IGNORE_NONE, from_context), times, get_grid_music_divisions (0));
 }
 
 void
@@ -4649,11 +4657,11 @@ Editor::mouse_paste ()
        }
 
        snap_to (where);
-       paste_internal (where, 1);
+       paste_internal (where, 1, get_grid_music_divisions (0));
 }
 
 void
-Editor::paste_internal (framepos_t position, float times)
+Editor::paste_internal (framepos_t position, float times, const int32_t sub_num)
 {
         DEBUG_TRACE (DEBUG::CutNPaste, string_compose ("apparent paste position is %1\n", position));
 
@@ -4746,7 +4754,7 @@ Editor::paste_internal (framepos_t position, float times)
               "greedy" paste from one automation type to another. */
 
            PasteContext ctx(paste_count, times, ItemCounts(), true);
-           ts.front()->paste (position, *cut_buffer, ctx);
+           ts.front()->paste (position, *cut_buffer, ctx, sub_num);
 
        } else {
 
@@ -4754,7 +4762,7 @@ Editor::paste_internal (framepos_t position, float times)
 
                PasteContext ctx(paste_count, times, ItemCounts(), false);
                for (TrackViewList::iterator i = ts.begin(); i != ts.end(); ++i) {
-                       (*i)->paste (position, *cut_buffer, ctx);
+                       (*i)->paste (position, *cut_buffer, ctx, sub_num);
                }
        }
 
@@ -6151,7 +6159,11 @@ Editor::split_region ()
                        return;
                }
 
-               split_regions_at (where, rs);
+               if (snap_musical()) {
+                       split_regions_at (where, rs, get_grid_music_divisions (0));
+               } else {
+                       split_regions_at (where, rs, 0);
+               }
        }
 }
 
@@ -6168,6 +6180,7 @@ Editor::select_next_route()
        RouteUI *rui;
        do {
                for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
+
                        if (*i == current) {
                                ++i;
                                if (i != track_views.end()) {
@@ -6179,10 +6192,12 @@ Editor::select_next_route()
                                break;
                        }
                }
+
                rui = dynamic_cast<RouteUI *>(current);
-       } while ( current->hidden() || (rui != NULL && !rui->route()->active()));
 
-       selection->set(current);
+       } while (current->hidden() || (rui == NULL) || !rui->route()->active());
+
+       selection->set (current);
 
        ensure_time_axis_view_is_visible (*current, false);
 }
@@ -6200,6 +6215,7 @@ Editor::select_prev_route()
        RouteUI *rui;
        do {
                for (TrackViewList::reverse_iterator i = track_views.rbegin(); i != track_views.rend(); ++i) {
+
                        if (*i == current) {
                                ++i;
                                if (i != track_views.rend()) {
@@ -6211,7 +6227,8 @@ Editor::select_prev_route()
                        }
                }
                rui = dynamic_cast<RouteUI *>(current);
-       } while ( current->hidden() || (rui != NULL && !rui->route()->active()));
+
+       } while (current->hidden() || (rui == NULL) || !rui->route()->active());
 
        selection->set (current);
 
@@ -6278,11 +6295,11 @@ Editor::set_session_extents_from_selection ()
 
        Location* loc;
        if ((loc = _session->locations()->session_range_location()) == 0) {
-               _session->set_session_extents ( start, end );  // this will create a new session range;  no need for UNDO
+               _session->set_session_extents (start, end);  // this will create a new session range;  no need for UNDO
        } else {
                XMLNode &before = loc->get_state();
 
-               _session->set_session_extents ( start, end );
+               _session->set_session_extents (start, end);
 
                XMLNode &after = loc->get_state();
 
@@ -6292,6 +6309,8 @@ Editor::set_session_extents_from_selection ()
 
                commit_reversible_command ();
        }
+
+       _session->set_end_is_free (false);
 }
 
 void
@@ -6548,7 +6567,8 @@ Editor::define_one_bar (framepos_t start, framepos_t end)
        } else if (t.frame() == start) {
                _session->tempo_map().change_existing_tempo_at (start, beats_per_minute, t.note_type());
        } else {
-               _session->tempo_map().add_tempo (Tempo (beats_per_minute, t.note_type()), 0.0, start, TempoSection::Constant, AudioTime);
+               const Tempo tempo (beats_per_minute, t.note_type());
+               _session->tempo_map().add_tempo (tempo, 0.0, start, TempoSection::Constant, AudioTime);
        }
 
        XMLNode& after (_session->tempo_map().get_state());
@@ -7289,7 +7309,8 @@ Editor::insert_time (
                        (*i)->clear_owned_changes ();
 
                        if (opt == SplitIntersected) {
-                               (*i)->split (pos);
+                               /* non musical split */
+                               (*i)->split (pos, 0);
                        }
 
                        (*i)->shift (pos, frames, (opt == MoveIntersected), ignore_music_glue);