correct name of Midi-UI thread memory-pool and request-queue

[ardour.git] / gtk2_ardour / editor_ops.cc

diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index 7402d231471d555bda48647b2bd2e5ff1dd1b607..cb67f1fc20b696ec085ed0d82eeb9d695dadc40b 100644 (file)
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -3353,67 +3353,6 @@ Editor::region_fill_track ()
        commit_reversible_command ();
 }
 
-void
-Editor::region_fill_selection ()
-{
-       if (clicked_routeview == 0 || !clicked_routeview->is_audio_track()) {
-               return;
-       }
-
-       if (selection->time.empty()) {
-               return;
-       }
-
-       boost::shared_ptr<Region> region = _regions->get_single_selection ();
-       if (region == 0) {
-               return;
-       }
-
-       framepos_t start = selection->time[clicked_selection].start;
-       framepos_t end = selection->time[clicked_selection].end;
-
-       boost::shared_ptr<Playlist> playlist;
-
-       if (selection->tracks.empty()) {
-               return;
-       }
-
-       framepos_t selection_length = end - start;
-       float times = (float)selection_length / region->length();
-       bool in_command = false;
-
-       TrackViewList ts = selection->tracks.filter_to_unique_playlists ();
-       RegionSelection foo;
-
-       for (TrackViewList::iterator i = ts.begin(); i != ts.end(); ++i) {
-
-               if ((playlist = (*i)->playlist()) == 0) {
-                       continue;
-               }
-
-               if (!in_command) {
-                       begin_reversible_command (Operations::fill_selection);
-                       in_command = true;
-               }
-               RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (*i);
-               latest_regionviews.clear ();
-               sigc::connection c = rtv->view()->RegionViewAdded.connect (sigc::mem_fun(*this, &Editor::collect_new_region_view));
-
-               playlist->clear_changes ();
-               playlist->add_region (RegionFactory::create (region, true), start, times);
-               _session->add_command (new StatefulDiffCommand (playlist));
-               c.disconnect ();
-               foo.insert (foo.end(), latest_regionviews.begin(), latest_regionviews.end());
-       }
-
-       if (in_command) {
-               if (!foo.empty()) {
-                       selection->set (foo);
-               }
-               commit_reversible_command ();
-       }
-}
-
 void
 Editor::set_region_sync_position ()
 {
@@ -4101,6 +4040,7 @@ Editor::cut_copy (CutCopyOp op)
                Location* loc = find_location_from_marker (entered_marker, ignored);
 
                if (_session && loc) {
+                       entered_marker = NULL;
                        Glib::signal_idle().connect (sigc::bind (sigc::mem_fun(*this, &Editor::really_remove_marker), loc));
                }