use dedicated counter for sidechain port numbering

[ardour.git] / gtk2_ardour / editor_ops.cc

diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index ec6ee82c1c33bc025a145373706c257deae9111a..d5386523352fdb3f1da87a22f4f8324d8d95ae44 100644 (file)
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -1921,7 +1921,7 @@ Editor::temporal_zoom_region (bool both_axes)
 
 
 bool
-Editor::get_selection_extents ( framepos_t &start, framepos_t &end )
+Editor::get_selection_extents (framepos_t &start, framepos_t &end) const
 {
        start = max_framepos;
        end = 0;
@@ -2782,7 +2782,7 @@ Editor::rename_region ()
                return;
        }
 
-       ArdourDialog d (*this, _("Rename Region"), true, false);
+       ArdourDialog d (_("Rename Region"), true, false);
        Entry entry;
        Label label (_("New name:"));
        HBox hbox;
@@ -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) {
@@ -5160,12 +5160,13 @@ Editor::strip_region_silence ()
        StripSilenceDialog d (_session, audio_only);
        int const r = d.run ();
 
-        d.drop_rects ();
+       d.drop_rects ();
 
-        if (r == Gtk::RESPONSE_OK) {
-                ARDOUR::AudioIntervalMap silences;
-                d.silences (silences);
+       if (r == Gtk::RESPONSE_OK) {
+               ARDOUR::AudioIntervalMap silences;
+               d.silences (silences);
                StripSilence s (*_session, silences, d.fade_length());
+
                apply_filter (s, _("strip silence"), &d);
        }
 }
@@ -5440,6 +5441,11 @@ Editor::apply_filter (Filter& filter, string command, ProgressReporter* progress
                                playlist->clear_changes ();
                                playlist->clear_owned_changes ();
 
+                               if (!in_command) {
+                                       begin_reversible_command (command);
+                                       in_command = true;
+                               }
+
                                if (filter.results.empty ()) {
 
                                        /* no regions returned; remove the old one */
@@ -5460,14 +5466,10 @@ Editor::apply_filter (Filter& filter, string command, ProgressReporter* progress
                                        }
 
                                }
+
                                /* We might have removed regions, which alters other regions' layering_index,
                                   so we need to do a recursive diff here.
                                */
-
-                               if (!in_command) {
-                                       begin_reversible_command (command);
-                                       in_command = true;
-                               }
                                vector<Command*> cmds;
                                playlist->rdiff (cmds);
                                _session->add_commands (cmds);
@@ -7225,7 +7227,7 @@ Editor::do_insert_time ()
        }
 
        insert_time (
-               get_preferred_edit_position(),
+               get_preferred_edit_position (EDIT_IGNORE_MOUSE),
                d.distance(),
                d.intersected_region_action (),
                d.all_playlists(),
@@ -7597,7 +7599,7 @@ Editor::fit_tracks (TrackViewList & tracks)
        double first_y_pos = DBL_MAX;
 
        if (h < TimeAxisView::preset_height (HeightSmall)) {
-               MessageDialog msg (*this, _("There are too many tracks to fit in the current window"));
+               MessageDialog msg (_("There are too many tracks to fit in the current window"));
                /* too small to be displayed */
                return;
        }