X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fmidi_source.h;h=0c2759b96d667222f1d4526faa9ff015dfa67bae;hb=90172686b92b53cc5ab1d60c0e6daecb65d17d3d;hp=36c8548e2044c49c1da09373fe2ab611aae284f2;hpb=de24d4f8b11b959a5155051a9f4a7b456b4ab465;p=ardour.git

diff --git a/libs/ardour/ardour/midi_source.h b/libs/ardour/ardour/midi_source.h
index 36c8548e20..0c2759b96d 100644
--- a/libs/ardour/ardour/midi_source.h
+++ b/libs/ardour/ardour/midi_source.h
@@ -56,29 +56,28 @@ class MidiSource : virtual public Source
 	 * \param source_start Start position of the SOURCE in this read context
 	 * \param start Start of range to be read
 	 * \param cnt Length of range to be read (in audio frames)
-	 * \param stamp_offset Offset to add to event times written to dst
-	 * \param negative_stamp_offset Offset to subtract from event times written to dst
 	 * \param tracker an optional pointer to MidiStateTracker object, for note on/off tracking
 	 */
 	virtual nframes_t midi_read (Evoral::EventSink<nframes_t>& dst,
-				     sframes_t source_start,
-				     sframes_t start, nframes_t cnt,
-				     sframes_t stamp_offset, sframes_t negative_stamp_offset, MidiStateTracker*) const;
+				     framepos_t source_start,
+				     framepos_t start, nframes_t cnt,
+				     MidiStateTracker*,
+				     std::set<Evoral::Parameter> const &) const;
 
 	virtual nframes_t midi_write (MidiRingBuffer<nframes_t>& src,
-	                              sframes_t source_start,
+	                              framepos_t source_start,
 	                              nframes_t cnt);
 
 	virtual void append_event_unlocked_beats(const Evoral::Event<Evoral::MusicalTime>& ev) = 0;
 
 	virtual void append_event_unlocked_frames(const Evoral::Event<nframes_t>& ev,
-			sframes_t source_start) = 0;
+			framepos_t source_start) = 0;
 
 	virtual bool       empty () const;
 	virtual framecnt_t length (framepos_t pos) const;
 	virtual void       update_length (framepos_t pos, framecnt_t cnt);
 
-	virtual void mark_streaming_midi_write_started (NoteMode mode, sframes_t start_time);
+	virtual void mark_streaming_midi_write_started (NoteMode mode, framepos_t start_time);
 	virtual void mark_streaming_write_started ();
 	virtual void mark_streaming_write_completed ();
 
@@ -92,9 +91,6 @@ class MidiSource : virtual public Source
 
 	static PBD::Signal1<void,MidiSource*> MidiSourceCreated;
 
-	// Signal a range of recorded data is available for reading from model()
-	mutable PBD::Signal2<void,sframes_t,nframes_t> ViewDataRangeReady;
-
 	XMLNode& get_state ();
 	int set_state (const XMLNode&, int version);
 
@@ -111,20 +107,36 @@ class MidiSource : virtual public Source
 	void set_note_mode(NoteMode mode);
 
 	boost::shared_ptr<MidiModel> model() { return _model; }
-	void set_model(boost::shared_ptr<MidiModel> m) { _model = m; }
+	void set_model (boost::shared_ptr<MidiModel>);
 	void drop_model();
 
+	Evoral::ControlList::InterpolationStyle interpolation_of (Evoral::Parameter) const;
+	void set_interpolation_of (Evoral::Parameter, Evoral::ControlList::InterpolationStyle);
+	void copy_interpolation_from (boost::shared_ptr<MidiSource>);
+	void copy_interpolation_from (MidiSource *);
+
+	AutoState automation_state_of (Evoral::Parameter) const;
+	void set_automation_state_of (Evoral::Parameter, AutoState);
+	void copy_automation_state_from (boost::shared_ptr<MidiSource>);
+	void copy_automation_state_from (MidiSource *);
+
+	/** Emitted when a different MidiModel is set */
+	PBD::Signal0<void> ModelChanged;
+	/** Emitted when a parameter's interpolation style is changed */
+	PBD::Signal2<void, Evoral::Parameter, Evoral::ControlList::InterpolationStyle> InterpolationChanged;
+	/** Emitted when a parameter's automation state is changed */
+	PBD::Signal2<void, Evoral::Parameter, AutoState> AutomationStateChanged;
+
   protected:
 	virtual void flush_midi() = 0;
 
 	virtual nframes_t read_unlocked (Evoral::EventSink<nframes_t>& dst,
-					 sframes_t position,
-					 sframes_t start, nframes_t cnt,
-					 sframes_t stamp_offset, sframes_t negative_stamp_offset,
+					 framepos_t position,
+					 framepos_t start, nframes_t cnt,
 					 MidiStateTracker* tracker) const = 0;
 
 	virtual nframes_t write_unlocked (MidiRingBuffer<nframes_t>& dst,
-			sframes_t position,
+			framepos_t position,
 			nframes_t cnt) = 0;
 
 	std::string      _captured_for;
@@ -138,8 +150,20 @@ class MidiSource : virtual public Source
 	mutable bool                                                  _model_iter_valid;
 
 	mutable double    _length_beats;
-	mutable sframes_t _last_read_end;
-	sframes_t         _last_write_end;
+	mutable framepos_t _last_read_end;
+	framepos_t         _last_write_end;
+
+	/** Map of interpolation styles to use for Parameters; if they are not in this map,
+	 *  the correct interpolation style can be obtained from EventTypeMap::interpolation_of ()
+	 */
+	typedef std::map<Evoral::Parameter, Evoral::ControlList::InterpolationStyle> InterpolationStyleMap;
+	InterpolationStyleMap _interpolation_style;
+
+	/** Map of automation states to use for Parameters; if they are not in this map,
+	 *  the correct automation state is Off.
+	 */
+	typedef std::map<Evoral::Parameter, AutoState> AutomationStateMap;
+	AutomationStateMap  _automation_state;
 };
 
 }