Remove dead code.

[ardour.git] / gtk2_ardour / editor_ops.cc

diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index ed1cc7b25699a0a682fc45022338cc2924583b3c..f0de126c6735046a66bfa37be53d424fe17dd106 100644 (file)
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -1533,7 +1533,7 @@ Editor::temporal_zoom (framecnt_t fpp)
        // would be 4147200000 samples, so 2592000 samples per pixel.
 
        nfpp = min (fpp, (framecnt_t) 2592000);
-       nfpp = max ((framecnt_t) 1, fpp);
+       nfpp = max ((framecnt_t) 1, nfpp);
 
        new_page_size = (framepos_t) floor (_visible_canvas_width * nfpp);
        half_page_size = new_page_size / 2;
@@ -4009,6 +4009,13 @@ Editor::cut_copy_midi (CutCopyOp op)
                        _last_cut_copy_source_track = &mrv->get_time_axis_view();
                }
        }
+
+       if (!selection->points.empty()) {
+               cut_copy_points (op);
+               if (op == Cut || op == Delete) {
+                       selection->clear_points ();
+               }
+       }
 }
 
 struct lt_playlist {
@@ -4379,7 +4386,7 @@ Editor::paste_internal (framepos_t position, float times)
                sort_track_selection (ts);
        } else {
                /* Figure out which track to base the paste at. */
-               TimeAxisView* base_track;
+               TimeAxisView* base_track = NULL;
                if (_edit_point == Editing::EditAtMouse && entered_track) {
                        /* With the mouse edit point, paste onto the track under the mouse. */
                        base_track = entered_track;
@@ -4389,6 +4396,9 @@ Editor::paste_internal (framepos_t position, float times)
                } else if (_last_cut_copy_source_track) {
                        /* Paste to the track that the cut/copy came from (see mantis #333). */
                        base_track = _last_cut_copy_source_track;
+               } else {
+                       /* This is "impossible" since we've copied... well, do nothing. */
+                       return;
                }
 
                /* Walk up to parent if necessary, so base track is a route. */
@@ -4433,17 +4443,13 @@ Editor::paste_internal (framepos_t position, float times)
                /* undo/redo is handled by individual tracks/regions */
 
                RegionSelection rs;
-               RegionSelection::iterator r;
-               MidiNoteSelection::iterator cb;
-
                get_regions_at (rs, position, ts);
 
-               for (cb = cut_buffer->midi_notes.begin(), r = rs.begin();
-                    cb != cut_buffer->midi_notes.end() && r != rs.end(); ++r) {
+               ItemCounts counts;
+               for (RegionSelection::iterator r = rs.begin(); r != rs.end(); ++r) {
                        MidiRegionView* mrv = dynamic_cast<MidiRegionView*> (*r);
                        if (mrv) {
-                               mrv->paste (position, paste_count, times, **cb);
-                               ++cb;
+                               mrv->paste (position, paste_count, times, *cut_buffer, counts);
                        }
                }
 
@@ -4843,8 +4849,8 @@ Editor::apply_midi_note_edit_op_to_region (MidiOperator& op, MidiRegionView& mrv
        vector<Evoral::Sequence<Evoral::MusicalTime>::Notes> v;
        v.push_back (selected);
 
-       framepos_t pos_frames = mrv.midi_region()->position() - mrv.midi_region()->start();
-       double     pos_beats  = _session->tempo_map().framewalk_to_beats(0, pos_frames);
+       framepos_t          pos_frames = mrv.midi_region()->position() - mrv.midi_region()->start();
+       Evoral::MusicalTime pos_beats  = _session->tempo_map().framewalk_to_beats(0, pos_frames);
 
        return op (mrv.midi_region()->model(), pos_beats, v);
 }
@@ -4957,7 +4963,7 @@ Editor::quantize_region ()
        qd->hide ();
 
        if (r == Gtk::RESPONSE_OK) {
-               Quantize quant (*_session, qd->snap_start(), qd->snap_end(),
+               Quantize quant (qd->snap_start(), qd->snap_end(),
                                qd->start_grid_size(), qd->end_grid_size(),
                                qd->strength(), qd->swing(), qd->threshold());
 
@@ -4982,7 +4988,7 @@ Editor::insert_patch_change (bool from_context)
        */
        MidiRegionView* first = dynamic_cast<MidiRegionView*> (rs.front ());
 
-       Evoral::PatchChange<Evoral::MusicalTime> empty (0, 0, 0, 0);
+       Evoral::PatchChange<Evoral::MusicalTime> empty (Evoral::MusicalTime(), 0, 0, 0);
         PatchChangeDialog d (0, _session, empty, first->instrument_info(), Gtk::Stock::ADD);
 
        if (d.run() == RESPONSE_CANCEL) {