Add legatize and remove overlap MIDI operations.
We're going to need the ability to apply MIDI edit operations to a note/control selection soon...
This commit is contained in:
parent
f4a30e1f60
commit
bfbb0f6178
|
@ -252,6 +252,8 @@
|
|||
<menuitem action='transpose-region'/>
|
||||
<menuitem action='insert-patch-change'/>
|
||||
<menuitem action='quantize-region'/>
|
||||
<menuitem action='legatize-region'/>
|
||||
<menuitem action='remove-overlap'/>
|
||||
<menuitem action='fork-region'/>
|
||||
<menuitem action='show-region-list-editor'/>
|
||||
</menu>
|
||||
|
@ -632,6 +634,8 @@
|
|||
<menuitem action='transpose-region'/>
|
||||
<menuitem action='insert-patch-change-context'/>
|
||||
<menuitem action='quantize-region'/>
|
||||
<menuitem action='legatize-region'/>
|
||||
<menuitem action='remove-overlap'/>
|
||||
<menuitem action='fork-region'/>
|
||||
<menuitem action='show-region-list-editor'/>
|
||||
</menu>
|
||||
|
|
|
@ -33,6 +33,8 @@
|
|||
<Binding action="Region/cut-region-gain" key="ampersand"/>
|
||||
<Binding action="Common/Quit" key="Primary-q"/>
|
||||
<Binding action="Region/quantize-region" key="q"/>
|
||||
<Binding action="Region/legatize-region" key="Primary-apostrophe"/>
|
||||
<Binding action="Region/remove-overlap" key="Secondary-apostrophe"/>
|
||||
<Binding action="MouseMode/toggle-internal-edit" key="e"/>
|
||||
<Binding action="Editor/select-all-before-edit-cursor" key="Primary-e"/>
|
||||
<Binding action="Region/export-region" key="Primary-Level4-e"/>
|
||||
|
|
|
@ -1190,6 +1190,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
|
|||
void reset_region_scale_amplitude ();
|
||||
void adjust_region_gain (bool up);
|
||||
void quantize_region ();
|
||||
void legatize_region (bool shrink_only);
|
||||
void insert_patch_change (bool from_context);
|
||||
void fork_region ();
|
||||
|
||||
|
|
|
@ -1953,6 +1953,8 @@ Editor::register_region_actions ()
|
|||
);
|
||||
|
||||
reg_sens (_region_actions, "quantize-region", _("Quantize..."), sigc::mem_fun (*this, &Editor::quantize_region));
|
||||
reg_sens (_region_actions, "legatize-region", _("Legatize"), sigc::bind(sigc::mem_fun (*this, &Editor::legatize_region), false));
|
||||
reg_sens (_region_actions, "remove-overlap", _("Remove Overlap"), sigc::bind(sigc::mem_fun (*this, &Editor::legatize_region), true));
|
||||
reg_sens (_region_actions, "insert-patch-change", _("Insert Patch Change..."), sigc::bind (sigc::mem_fun (*this, &Editor::insert_patch_change), false));
|
||||
reg_sens (_region_actions, "insert-patch-change-context", _("Insert Patch Change..."), sigc::bind (sigc::mem_fun (*this, &Editor::insert_patch_change), true));
|
||||
reg_sens (_region_actions, "fork-region", _("Unlink from other copies"), sigc::mem_fun (*this, &Editor::fork_region));
|
||||
|
|
|
@ -50,6 +50,7 @@
|
|||
#include "ardour/playlist_factory.h"
|
||||
#include "ardour/profile.h"
|
||||
#include "ardour/quantize.h"
|
||||
#include "ardour/legatize.h"
|
||||
#include "ardour/region_factory.h"
|
||||
#include "ardour/reverse.h"
|
||||
#include "ardour/session.h"
|
||||
|
@ -4987,6 +4988,36 @@ Editor::quantize_region ()
|
|||
}
|
||||
}
|
||||
|
||||
void
|
||||
Editor::legatize_region (bool shrink_only)
|
||||
{
|
||||
int selected_midi_region_cnt = 0;
|
||||
|
||||
if (!_session) {
|
||||
return;
|
||||
}
|
||||
|
||||
RegionSelection rs = get_regions_from_selection_and_entered ();
|
||||
|
||||
if (rs.empty()) {
|
||||
return;
|
||||
}
|
||||
|
||||
for (RegionSelection::iterator r = rs.begin(); r != rs.end(); ++r) {
|
||||
MidiRegionView* const mrv = dynamic_cast<MidiRegionView*> (*r);
|
||||
if (mrv) {
|
||||
selected_midi_region_cnt++;
|
||||
}
|
||||
}
|
||||
|
||||
if (selected_midi_region_cnt == 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
Legatize legatize(shrink_only);
|
||||
apply_midi_note_edit_op (legatize);
|
||||
}
|
||||
|
||||
void
|
||||
Editor::insert_patch_change (bool from_context)
|
||||
{
|
||||
|
|
|
@ -1181,6 +1181,8 @@ Editor::sensitize_the_right_region_actions ()
|
|||
editor_menu_actions->get_action("RegionMenuMIDI")->set_sensitive (false);
|
||||
_region_actions->get_action("show-region-list-editor")->set_sensitive (false);
|
||||
_region_actions->get_action("quantize-region")->set_sensitive (false);
|
||||
_region_actions->get_action("legatize-region")->set_sensitive (false);
|
||||
_region_actions->get_action("remove-overlap")->set_sensitive (false);
|
||||
_region_actions->get_action("fork-region")->set_sensitive (false);
|
||||
_region_actions->get_action("insert-patch-change-context")->set_sensitive (false);
|
||||
_region_actions->get_action("insert-patch-change")->set_sensitive (false);
|
||||
|
|
|
@ -253,6 +253,8 @@
|
|||
<menuitem action='transpose-region'/>
|
||||
<menuitem action='insert-patch-change-context'/>
|
||||
<menuitem action='quantize-region'/>
|
||||
<menuitem action='legatize-region'/>
|
||||
<menuitem action='remove-overlap'/>
|
||||
<menuitem action='fork-region'/>
|
||||
<menuitem action='show-region-list-editor'/>
|
||||
</menu>
|
||||
|
|
|
@ -0,0 +1,56 @@
|
|||
/*
|
||||
Copyright (C) 2014 Paul Davis
|
||||
Author: David Robillard
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*/
|
||||
|
||||
#ifndef __ardour_legatize_h__
|
||||
#define __ardour_legatize_h__
|
||||
|
||||
#include <string>
|
||||
|
||||
#include "ardour/libardour_visibility.h"
|
||||
#include "ardour/types.h"
|
||||
#include "ardour/midi_operator.h"
|
||||
|
||||
namespace ARDOUR {
|
||||
|
||||
/** "Legatize" nodes (extend note ends to force legato).
|
||||
*
|
||||
* This can also do "remove overlap" by setting shrink_only to true, in which
|
||||
* case note lengths will only be changed if they are long enough to overlap
|
||||
* the following note.
|
||||
*/
|
||||
class LIBARDOUR_API Legatize : public MidiOperator {
|
||||
public:
|
||||
Legatize(bool shrink_only);
|
||||
~Legatize();
|
||||
|
||||
typedef Evoral::Sequence<Evoral::MusicalTime>::Notes Notes;
|
||||
|
||||
Command* operator()(boost::shared_ptr<ARDOUR::MidiModel> model,
|
||||
Evoral::MusicalTime position,
|
||||
std::vector<Notes>& seqs);
|
||||
|
||||
std::string name() const { return std::string ("legatize"); }
|
||||
|
||||
private:
|
||||
bool _shrink_only;
|
||||
};
|
||||
|
||||
} /* namespace */
|
||||
|
||||
#endif /* __ardour_legatize_h__ */
|
|
@ -0,0 +1,60 @@
|
|||
/*
|
||||
Copyright (C) 20014 Paul Davis
|
||||
Author: David Robillard
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*/
|
||||
|
||||
#include "ardour/legatize.h"
|
||||
#include "ardour/midi_model.h"
|
||||
|
||||
namespace ARDOUR {
|
||||
|
||||
Legatize::Legatize(bool shrink_only)
|
||||
: _shrink_only(shrink_only)
|
||||
{}
|
||||
|
||||
Legatize::~Legatize ()
|
||||
{}
|
||||
|
||||
Command*
|
||||
Legatize::operator()(boost::shared_ptr<ARDOUR::MidiModel> model,
|
||||
Evoral::MusicalTime position,
|
||||
std::vector<Legatize::Notes>& seqs)
|
||||
{
|
||||
MidiModel::NoteDiffCommand* cmd = new MidiModel::NoteDiffCommand(model, "legatize");
|
||||
|
||||
for (std::vector<Legatize::Notes>::iterator s = seqs.begin(); s != seqs.end(); ++s) {
|
||||
for (Legatize::Notes::iterator i = (*s).begin(); i != (*s).end();) {
|
||||
Legatize::Notes::iterator next = i;
|
||||
if (++next == (*s).end()) {
|
||||
break;
|
||||
}
|
||||
|
||||
const Evoral::MusicalTime new_end = (*next)->time() - Evoral::MusicalTime::tick();
|
||||
if ((*i)->end_time() > new_end ||
|
||||
(!_shrink_only && (*i)->end_time() < new_end)) {
|
||||
const Evoral::MusicalTime new_length(new_end - (*i)->time());
|
||||
cmd->change((*i), MidiModel::NoteDiffCommand::Length, new_length);
|
||||
}
|
||||
|
||||
i = next;
|
||||
}
|
||||
}
|
||||
|
||||
return cmd;
|
||||
}
|
||||
|
||||
} // namespace ARDOUR
|
|
@ -105,6 +105,7 @@ libardour_sources = [
|
|||
'io_processor.cc',
|
||||
'kmeterdsp.cc',
|
||||
'ladspa_plugin.cc',
|
||||
'legatize.cc',
|
||||
'location.cc',
|
||||
'location_importer.cc',
|
||||
'ltc_slave.cc',
|
||||
|
|
Loading…
Reference in New Issue