#include "ardour/session.h"
#include "ardour/types.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
using namespace std;
using namespace ARDOUR;
_removed_notes.push_back (*i);
}
}
-
+
if (!side_effect_removals.empty()) {
cerr << "SER: \n";
for (set<NotePtr>::iterator i = side_effect_removals.begin(); i != side_effect_removals.end(); ++i) {
assert (i->note);
}
}
-
+
for (ChangeList::iterator i = _changes.begin(); i != _changes.end(); ++i) {
Property prop = i->property;
_model->add_note_unlocked (*i);
}
}
-
+
_model->ContentsChanged(); /* EMIT SIGNAL */
}
MidiModel::NoteDiffCommand::unmarshal_note (XMLNode *xml_note)
{
unsigned int note;
- XMLProperty* prop;
+ XMLProperty const * prop;
unsigned int channel;
MidiModel::TimeType time;
MidiModel::TimeType length;
MidiModel::NoteDiffCommand::NoteChange
MidiModel::NoteDiffCommand::unmarshal_change (XMLNode *xml_change)
{
- XMLProperty* prop;
+ XMLProperty const * prop;
NoteChange change;
change.note_id = 0;
MidiModel::SysExDiffCommand::Change
MidiModel::SysExDiffCommand::unmarshal_change (XMLNode *xml_change)
{
- XMLProperty* prop;
+ XMLProperty const * prop;
Change change;
if ((prop = xml_change->property ("property")) != 0) {
MidiModel::PatchChangePtr
MidiModel::PatchChangeDiffCommand::unmarshal_patch_change (XMLNode* n)
{
- XMLProperty* prop;
- XMLProperty* prop_id;
+ XMLProperty const * prop;
+ XMLProperty const * prop_id;
Evoral::event_id_t id = 0;
Evoral::Beats time = Evoral::Beats();
int channel = 0;
int program = 0;
int bank = 0;
-
+
if ((prop_id = n->property ("id")) != 0) {
istringstream s (prop_id->value());
s >> id;
MidiModel::PatchChangeDiffCommand::Change
MidiModel::PatchChangeDiffCommand::unmarshal_change (XMLNode* n)
{
- XMLProperty* prop;
+ XMLProperty const * prop;
Change c;
int an_int;
bool
MidiModel::write_section_to (boost::shared_ptr<MidiSource> source,
const Glib::Threads::Mutex::Lock& source_lock,
- Evoral::Beats begin_time,
- Evoral::Beats end_time)
+ TimeType begin_time,
+ TimeType end_time,
+ bool offset_events)
{
ReadLock lock(read_lock());
MidiStateTracker mst;
source->mark_streaming_midi_write_started (source_lock, note_mode());
for (Evoral::Sequence<TimeType>::const_iterator i = begin(TimeType(), true); i != end(); ++i) {
- const Evoral::Event<Evoral::Beats>& ev (*i);
-
- if (ev.time() >= begin_time && ev.time() < end_time) {
+ if (i->time() >= begin_time && i->time() < end_time) {
- const Evoral::MIDIEvent<Evoral::Beats>* mev =
- static_cast<const Evoral::MIDIEvent<Evoral::Beats>* > (&ev);
+ Evoral::MIDIEvent<TimeType> mev (*i, true); /* copy the event */
- if (!mev) {
- continue;
+ if (offset_events) {
+ mev.set_time(mev.time() - begin_time);
}
+ if (mev.is_note_off()) {
- if (mev->is_note_off()) {
-
- if (!mst.active (mev->note(), mev->channel())) {
+ if (!mst.active (mev.note(), mev.channel())) {
/* the matching note-on was outside the
time range we were given, so just
ignore this note-off.
continue;
}
- source->append_event_beats (source_lock, *i);
- mst.remove (mev->note(), mev->channel());
+ source->append_event_beats (source_lock, mev);
+ mst.remove (mev.note(), mev.channel());
- } else if (mev->is_note_on()) {
- mst.add (mev->note(), mev->channel());
- source->append_event_beats(source_lock, *i);
+ } else if (mev.is_note_on()) {
+ mst.add (mev.note(), mev.channel());
+ source->append_event_beats(source_lock, mev);
} else {
- source->append_event_beats(source_lock, *i);
+ source->append_event_beats(source_lock, mev);
}
}
}
+ if (offset_events) {
+ end_time -= begin_time;
+ }
mst.resolve_notes (*source, source_lock, end_time);
set_percussive(old_percussive);
if ((sb > sa) && (eb <= ea)) {
overlap = OverlapInternal;
- } else if ((eb >= sa) && (eb <= ea)) {
+ } else if ((eb > sa) && (eb <= ea)) {
overlap = OverlapStart;
- } else if ((sb > sa) && (sb <= ea)) {
+ } else if ((sb > sa) && (sb < ea)) {
overlap = OverlapEnd;
} else if ((sa >= sb) && (sa <= eb) && (ea <= eb)) {
overlap = OverlapExternal;
}
}
-/** Transpose notes in a time range by a given number of semitones. Notes
- * will be clamped at 0 and 127 if the transposition would make them exceed
- * that range.
- *
- * @param from Start time.
- * @param end End time.
- * @param semitones Number of semitones to transpose by (+ve is higher, -ve is lower).
- */
void
-MidiModel::transpose (TimeType from, TimeType to, int semitones)
+MidiModel::transpose (NoteDiffCommand* c, const NotePtr note_ptr, int semitones)
{
- boost::shared_ptr<const MidiSource> s = midi_source ();
-
- NoteDiffCommand* c = new_note_diff_command (_("transpose"));
-
- for (Notes::iterator i = notes().begin(); i != notes().end(); ++i) {
+ int new_note = note_ptr->note() + semitones;
- if ((*i)->time() >= to) {
-
- /* finished */
- break;
-
- } else if ((*i)->time() >= from) {
-
- int new_note = (*i)->note() + semitones;
-
- if (new_note < 0) {
- new_note = 0;
- } else if (new_note > 127) {
- new_note = 127;
- }
-
- c->change (*i, NoteDiffCommand::NoteNumber, (uint8_t) new_note);
-
- }
+ if (new_note < 0) {
+ new_note = 0;
+ } else if (new_note > 127) {
+ new_note = 127;
}
- apply_command (s->session (), c);
+ c->change (note_ptr, NoteDiffCommand::NoteNumber, (uint8_t) new_note);
}
void
MidiModel::control_list_marked_dirty ()
{
AutomatableSequence<Evoral::Beats>::control_list_marked_dirty ();
-
+
ContentsChanged (); /* EMIT SIGNAL */
}