MIDI region forking, plus Playlist::regions_to_read() fix forward ported from 2.X. region forking requires a few cleanups

git-svn-id: svn://localhost/ardour2/branches/3.0@7118 d708f5d6-7413-0410-9779-e7cbd77b26cf

9 files changed, 24 insertions, 6 deletions

diff --git a/libs/ardour/ardour/audioregion.h b/libs/ardour/ardour/audioregion.h
index f9c13b2bbe..0a3e53039e 100644
--- a/libs/ardour/ardour/audioregion.h
+++ b/libs/ardour/ardour/audioregion.h
@@ -107,7 +107,6 @@ class AudioRegion : public Region
 	};
 
 	virtual framecnt_t read (Sample*, framepos_t pos, framecnt_t cnt, int channel) const;
-	virtual framecnt_t read_with_ops (Sample*, framepos_t pos, framecnt_t cnt, int channel, ReadOps rops) const;
 	virtual framecnt_t readable_length() const { return length(); }
 
 	virtual framecnt_t read_at (Sample *buf, Sample *mixdown_buf, float *gain_buf,
diff --git a/libs/ardour/ardour/automatable.h b/libs/ardour/ardour/automatable.h
index 3236d816c3..9b83705b0a 100644
--- a/libs/ardour/ardour/automatable.h
+++ b/libs/ardour/ardour/automatable.h
@@ -42,6 +42,7 @@ class Automatable : virtual public Evoral::ControlSet
 {
 public:
 	Automatable(Session&);
+        Automatable (const Automatable& other);
 	Automatable();
 
 	virtual ~Automatable() {}
diff --git a/libs/ardour/ardour/automatable_sequence.h b/libs/ardour/ardour/automatable_sequence.h
index 88e1733c1b..730ea33a7c 100644
--- a/libs/ardour/ardour/automatable_sequence.h
+++ b/libs/ardour/ardour/automatable_sequence.h
@@ -29,11 +29,18 @@ namespace ARDOUR {
 template<typename T>
 class AutomatableSequence : public Automatable, public Evoral::Sequence<T> {
 public:
-	AutomatableSequence(Session& s, size_t /*size*/)
+	AutomatableSequence(Session& s)
 		: Evoral::ControlSet()
 		, Automatable(s)
 		, Evoral::Sequence<T>(EventTypeMap::instance())
 	{}
+
+	AutomatableSequence(const AutomatableSequence<T>& other)
+		: Evoral::ControlSet(other)
+		, Automatable(other._a_session)
+		, Evoral::Sequence<T>(other)
+	{}
+
 };
 
 } // namespace ARDOUR
diff --git a/libs/ardour/ardour/debug.h b/libs/ardour/ardour/debug.h
index 57b66a8793..1cd8854fea 100644
--- a/libs/ardour/ardour/debug.h
+++ b/libs/ardour/ardour/debug.h
@@ -46,6 +46,7 @@ namespace PBD {
                 extern uint64_t MidiClock;
                 extern uint64_t Monitor;
                 extern uint64_t Solo;
+                extern uint64_t AudioPlayback;
 	}
 }
 
diff --git a/libs/ardour/ardour/midi_model.h b/libs/ardour/ardour/midi_model.h
index fcd285f98c..8d949cadbb 100644
--- a/libs/ardour/ardour/midi_model.h
+++ b/libs/ardour/ardour/midi_model.h
@@ -51,7 +51,7 @@ class MidiModel : public AutomatableSequence<Evoral::MusicalTime> {
 public:
 	typedef double TimeType;
 
-	MidiModel(MidiSource* s, size_t size=0);
+	MidiModel(MidiSource* s);
 
 	NoteMode note_mode() const { return (percussive() ? Percussive : Sustained); }
 	void set_note_mode(NoteMode mode) { set_percussive(mode == Percussive); };
@@ -151,7 +151,8 @@ public:
 	void                     apply_command(Session& session, Command* cmd);
 	void                     apply_command_as_subcommand(Session& session, Command* cmd);
 
-	bool write_to(boost::shared_ptr<MidiSource> source);
+	bool write_to(boost::shared_ptr<MidiSource> source, Evoral::MusicalTime begin = Evoral::MinMusicalTime,
+                      Evoral::MusicalTime end = Evoral::MaxMusicalTime);
 
 	// MidiModel doesn't use the normal AutomationList serialisation code
 	// since controller data is stored in the .mid
diff --git a/libs/ardour/ardour/midi_region.h b/libs/ardour/ardour/midi_region.h
index 671e4fca43..568638ed21 100644
--- a/libs/ardour/ardour/midi_region.h
+++ b/libs/ardour/ardour/midi_region.h
@@ -50,6 +50,8 @@ class MidiRegion : public Region
   public:
 	~MidiRegion();
 
+        boost::shared_ptr<MidiRegion> clone ();
+        
 	boost::shared_ptr<MidiSource> midi_source (uint32_t n=0) const;
 
 	/* Stub Readable interface */
diff --git a/libs/ardour/ardour/midi_source.h b/libs/ardour/ardour/midi_source.h
index 7b867c70fd..2484d3575a 100644
--- a/libs/ardour/ardour/midi_source.h
+++ b/libs/ardour/ardour/midi_source.h
@@ -47,6 +47,9 @@ class MidiSource : virtual public Source
 	MidiSource (Session& session, const XMLNode&);
 	virtual ~MidiSource ();
 
+        boost::shared_ptr<MidiSource> clone (Evoral::MusicalTime begin = Evoral::MinMusicalTime, 
+                                             Evoral::MusicalTime end = Evoral::MaxMusicalTime);
+
 	/** Read the data in a given time range from the MIDI source.
 	 * All time stamps in parameters are in audio frames (even if the source has tempo time).
 	 * \param dst Ring buffer where read events are written
diff --git a/libs/ardour/ardour/midi_state_tracker.h b/libs/ardour/ardour/midi_state_tracker.h
index 76a669838a..5c65c1f018 100644
--- a/libs/ardour/ardour/midi_state_tracker.h
+++ b/libs/ardour/ardour/midi_state_tracker.h
@@ -28,7 +28,7 @@ template <typename T> class EventSink;
 }
 
 namespace ARDOUR {
-
+class MidiSource;
 
 /** Tracks played notes, so they can be resolved in potential stuck note
  * situations (e.g. looping, transport stop, etc).
@@ -43,10 +43,14 @@ public:
 	void remove (uint8_t note, uint8_t chn);
 	void resolve_notes (MidiBuffer& buffer, nframes64_t time);
 	void resolve_notes (Evoral::EventSink<nframes_t>& buffer, nframes64_t time);
+	void resolve_notes (MidiSource& src, Evoral::MusicalTime time);
 	void dump (std::ostream&);
 	void reset ();
 	bool empty() const { return _on == 0; }
 	uint16_t on() const { return _on; }
+        bool active (uint8_t note, uint8_t channel) { 
+                return _active_notes[(channel*128)+note] > 0;
+        }
 
 private:
 	void track_note_onoffs(const Evoral::MIDIEvent<MidiBuffer::TimeType>& event);
diff --git a/libs/ardour/ardour/utils.h b/libs/ardour/ardour/utils.h
index e68f7a01df..e7e8f2b820 100644
--- a/libs/ardour/ardour/utils.h
+++ b/libs/ardour/ardour/utils.h
@@ -50,7 +50,7 @@ static inline float f_max(float x, float a) {
 	return (x);
 }
 
-std::string bump_name_once(std::string s);
+std::string bump_name_once(const std::string& s, char delimiter);
 
 int cmp_nocase (const std::string& s, const std::string& s2);