X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fmidi_model.cc;h=7f2b7fb863f31a6b55aa2f02f314b4667dd8d358;hb=cf52d6e4b40111eb04b244ec054055a4ec15dbe0;hp=de5000669c46f84e287f83cdd8f6e165a40354af;hpb=91fac4c96dc6210dcc056da70dc608700d7eb570;p=ardour.git

diff --git a/libs/ardour/midi_model.cc b/libs/ardour/midi_model.cc
index de5000669c..7f2b7fb863 100644
--- a/libs/ardour/midi_model.cc
+++ b/libs/ardour/midi_model.cc
@@ -40,7 +40,7 @@
 #include "ardour/session.h"
 #include "ardour/types.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -321,7 +321,7 @@ MidiModel::NoteDiffCommand::operator() ()
 				_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) {
@@ -364,7 +364,7 @@ MidiModel::NoteDiffCommand::undo ()
 				assert (i->note);
 			}
 		}
-				
+
 		for (ChangeList::iterator i = _changes.begin(); i != _changes.end(); ++i) {
 			Property prop = i->property;
 
@@ -439,7 +439,7 @@ MidiModel::NoteDiffCommand::undo ()
 			_model->add_note_unlocked (*i);
 		}
 	}
-	
+
 	_model->ContentsChanged(); /* EMIT SIGNAL */
 }
 
@@ -491,7 +491,7 @@ Evoral::Sequence<MidiModel::TimeType>::NotePtr
 MidiModel::NoteDiffCommand::unmarshal_note (XMLNode *xml_note)
 {
 	unsigned int note;
-	XMLProperty* prop;
+	XMLProperty const * prop;
 	unsigned int channel;
 	MidiModel::TimeType time;
 	MidiModel::TimeType length;
@@ -599,7 +599,7 @@ MidiModel::NoteDiffCommand::marshal_change (const NoteChange& change)
 MidiModel::NoteDiffCommand::NoteChange
 MidiModel::NoteDiffCommand::unmarshal_change (XMLNode *xml_change)
 {
-	XMLProperty* prop;
+	XMLProperty const * prop;
 	NoteChange change;
 	change.note_id = 0;
 
@@ -876,7 +876,7 @@ MidiModel::SysExDiffCommand::marshal_change (const Change& change)
 MidiModel::SysExDiffCommand::Change
 MidiModel::SysExDiffCommand::unmarshal_change (XMLNode *xml_change)
 {
-	XMLProperty* prop;
+	XMLProperty const * prop;
 	Change change;
 
 	if ((prop = xml_change->property ("property")) != 0) {
@@ -1235,14 +1235,14 @@ MidiModel::PatchChangeDiffCommand::marshal_change (const Change& c)
 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;
@@ -1277,7 +1277,7 @@ MidiModel::PatchChangeDiffCommand::unmarshal_patch_change (XMLNode* n)
 MidiModel::PatchChangeDiffCommand::Change
 MidiModel::PatchChangeDiffCommand::unmarshal_change (XMLNode* n)
 {
-	XMLProperty* prop;
+	XMLProperty const * prop;
 	Change c;
 	int an_int;
 
@@ -1289,7 +1289,7 @@ MidiModel::PatchChangeDiffCommand::unmarshal_change (XMLNode* n)
 	assert (prop);
 	Evoral::event_id_t const id = atoi (prop->value().c_str());
 
-	/* we need to load via an int intermediate for all properties that are 
+	/* we need to load via an int intermediate for all properties that are
 	   actually uint8_t (char/byte).
 	*/
 
@@ -1453,6 +1453,11 @@ MidiModel::sync_to_source (const Glib::Threads::Mutex::Lock& source_lock)
 		return false;
 	}
 
+	/* Invalidate and store active notes, which will be picked up by the iterator
+	   on the next roll if time progresses linearly. */
+	ms->invalidate(source_lock,
+	               ms->session().transport_rolling() ? &_active_notes : NULL);
+
 	ms->mark_streaming_midi_write_started (source_lock, note_mode());
 
 	for (Evoral::Sequence<TimeType>::const_iterator i = begin(TimeType(), true); i != end(); ++i) {
@@ -1660,9 +1665,9 @@ MidiModel::resolve_overlaps_unlocked (const NotePtr note, void* arg)
 
 		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;
@@ -1978,50 +1983,24 @@ MidiModel::insert_silence_at_start (TimeType t)
 	}
 }
 
-/** 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) {
-
-		if ((*i)->time() >= to) {
+	int new_note = note_ptr->note() + semitones;
 
-			/* 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 */
 }