From 6a4fb5838463b4b2803b999b0df0ec5b0d9e399f Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Mon, 8 Aug 2016 17:20:59 -0400 Subject: [PATCH] fix thinko that causes near duplicate menu items in group context menu when not in group tabs --- gtk2_ardour/editor_ops.cc | 52 +++++++++++++++++++++++---------- gtk2_ardour/group_tabs.cc | 3 -- gtk2_ardour/midi_region_view.cc | 7 ++++- 3 files changed, 43 insertions(+), 19 deletions(-) diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index 5419ce9374..c208e55165 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/gtk2_ardour/editor_ops.cc @@ -4178,6 +4178,7 @@ Editor::cut_copy (CutCopyOp op) } } + struct AutomationRecord { AutomationRecord () : state (0) , line(NULL) {} AutomationRecord (XMLNode* s, const AutomationLine* l) : state (s) , line (l) {} @@ -4186,7 +4187,11 @@ struct AutomationRecord { const AutomationLine* line; ///< line this came from boost::shared_ptr copy; ///< copied events for the cut buffer }; - +struct PointsSelectionPositionSorter { + bool operator() (ControlPoint* a, ControlPoint* b) { + return (*(a->model()))->when < (*(b->model()))->when; + } +}; /** Cut, copy or clear selected automation points. * @param op Operation (Cut, Copy or Clear) */ @@ -4204,9 +4209,12 @@ Editor::cut_copy_points (Editing::CutCopyOp op, Evoral::Beats earliest, bool mid typedef std::map, AutomationRecord> Lists; Lists lists; + /* user could select points in any order */ + selection->points.sort(PointsSelectionPositionSorter ()); + /* Go through all selected points, making an AutomationRecord for each distinct AutomationList */ - for (PointSelection::iterator i = selection->points.begin(); i != selection->points.end(); ++i) { - const AutomationLine& line = (*i)->line(); + for (PointSelection::iterator sel_point = selection->points.begin(); sel_point != selection->points.end(); ++sel_point) { + const AutomationLine& line = (*sel_point)->line(); const boost::shared_ptr al = line.the_list(); if (lists.find (al) == lists.end ()) { /* We haven't seen this list yet, so make a record for it. This includes @@ -4226,17 +4234,17 @@ Editor::cut_copy_points (Editing::CutCopyOp op, Evoral::Beats earliest, bool mid /* Add all selected points to the relevant copy ControlLists */ framepos_t start = std::numeric_limits::max(); - for (PointSelection::iterator i = selection->points.begin(); i != selection->points.end(); ++i) { - boost::shared_ptr al = (*i)->line().the_list(); - AutomationList::const_iterator j = (*i)->model(); + for (PointSelection::iterator sel_point = selection->points.begin(); sel_point != selection->points.end(); ++sel_point) { + boost::shared_ptr al = (*sel_point)->line().the_list(); + AutomationList::const_iterator ctrl_evt = (*sel_point)->model (); - lists[al].copy->fast_simple_add ((*j)->when, (*j)->value); + lists[al].copy->fast_simple_add ((*ctrl_evt)->when, (*ctrl_evt)->value); if (midi) { /* Update earliest MIDI start time in beats */ - earliest = std::min(earliest, Evoral::Beats((*j)->when)); + earliest = std::min(earliest, Evoral::Beats((*ctrl_evt)->when)); } else { /* Update earliest session start time in frames */ - start = std::min(start, (*i)->line().session_position(j)); + start = std::min(start, (*sel_point)->line().session_position(ctrl_evt)); } } @@ -4259,12 +4267,13 @@ Editor::cut_copy_points (Editing::CutCopyOp op, Evoral::Beats earliest, bool mid start time, so relative ordering between points is preserved when copying from several lists and the paste starts at the earliest copied piece of data. */ - for (AutomationList::iterator j = i->second.copy->begin(); j != i->second.copy->end(); ++j) { - (*j)->when -= line_offset; + boost::shared_ptr &al_cpy = i->second.copy; + for (AutomationList::iterator ctrl_evt = al_cpy->begin(); ctrl_evt != al_cpy->end(); ++ctrl_evt) { + (*ctrl_evt)->when -= line_offset; } /* And add it to the cut buffer */ - cut_buffer->add (i->second.copy); + cut_buffer->add (al_cpy); } } @@ -4276,9 +4285,22 @@ Editor::cut_copy_points (Editing::CutCopyOp op, Evoral::Beats earliest, bool mid } /* Remove each selected point from its AutomationList */ - for (PointSelection::iterator i = selection->points.begin(); i != selection->points.end(); ++i) { - boost::shared_ptr al = (*i)->line().the_list(); - al->erase ((*i)->model ()); + for (PointSelection::iterator sel_point = selection->points.begin(); sel_point != selection->points.end(); ++sel_point) { + AutomationLine& line = (*sel_point)->line (); + boost::shared_ptr al = line.the_list(); + + bool erase = true; + + if (dynamic_cast (&line)) { + /* removing of first and last gain point in region gain lines is prohibited*/ + if (line.is_last_point (*(*sel_point)) || line.is_first_point (*(*sel_point))) { + erase = false; + } + } + + if(erase) { + al->erase ((*sel_point)->model ()); + } } /* Thaw the lists and add undo records for them */ diff --git a/gtk2_ardour/group_tabs.cc b/gtk2_ardour/group_tabs.cc index f81cc585f8..5b5d5d1809 100644 --- a/gtk2_ardour/group_tabs.cc +++ b/gtk2_ardour/group_tabs.cc @@ -341,9 +341,6 @@ GroupTabs::get_menu (RouteGroup* g, bool in_tab_area) const VCAList vcas = _session->vca_manager().vcas (); if (!in_tab_area) { - items.push_back (MenuElem (_("Create New Group ..."), sigc::bind (sigc::mem_fun(*this, &GroupTabs::run_new_group_dialog), (RouteList const *) 0, false))); - items.push_back (MenuElem (_("Create New Group with Control Master ..."), sigc::bind (sigc::mem_fun(*this, &GroupTabs::run_new_group_dialog), (RouteList const *) 0, true))); - /* context menu is not for a group tab, show the "create new from" items here */ diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc index 3d67fef187..6a4f08a332 100644 --- a/gtk2_ardour/midi_region_view.cc +++ b/gtk2_ardour/midi_region_view.cc @@ -3529,7 +3529,9 @@ MidiRegionView::paste (framepos_t pos, const ::Selection& selection, PasteContex MidiNoteSelection::const_iterator m = selection.midi_notes.get_nth(ctx.counts.n_notes()); if (m != selection.midi_notes.end()) { ctx.counts.increase_n_notes(); - if (!(*m)->empty()) { commit = true; } + if (!(*m)->empty()) { + commit = true; + } paste_internal(pos, ctx.count, ctx.times, **m); } @@ -3538,6 +3540,9 @@ MidiRegionView::paste (framepos_t pos, const ::Selection& selection, PasteContex const ATracks& atracks = midi_view()->automation_tracks(); for (ATracks::const_iterator a = atracks.begin(); a != atracks.end(); ++a) { if (a->second->paste(pos, selection, ctx, sub_num)) { + if(!commit) { + trackview.editor().begin_reversible_command (Operations::paste); + } commit = true; } }