Update recorded MIDI regions as notes arrive. Fixes one cause of infinite note-lengths during record. Fix various problems with multiple captures of MIDI during one pass.

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

11 files changed, 67 insertions, 38 deletions

diff --git a/libs/ardour/ardour/diskstream.h b/libs/ardour/ardour/diskstream.h
index 4baf2668a6..4eabe29d85 100644
--- a/libs/ardour/ardour/diskstream.h
+++ b/libs/ardour/ardour/diskstream.h
@@ -110,11 +110,11 @@ class Diskstream : public SessionObject, public PublicDiskstream
 	virtual int use_new_playlist () = 0;
 	virtual int use_copy_playlist () = 0;
 
-	/** @return Capture start position in session frames */
+	/** @return Start position of currently-running capture (in session frames) */
 	framepos_t current_capture_start() const { return capture_start_frame; }
 	framepos_t current_capture_end()   const { return capture_start_frame + capture_captured; }
-	framepos_t get_capture_start_frame (uint32_t n=0);
-	framecnt_t get_captured_frames (uint32_t n=0);
+	framepos_t get_capture_start_frame (uint32_t n = 0) const;
+	framecnt_t get_captured_frames (uint32_t n = 0) const;
 
 	ChanCount n_channels() { return _n_channels; }
 
@@ -242,8 +242,8 @@ class Diskstream : public SessionObject, public PublicDiskstream
 			nframes_t& rec_nframes, nframes_t& rec_offset);
 
 	static nframes_t disk_io_chunk_frames;
-	std::vector<CaptureInfo*>  capture_info;
-	Glib::Mutex           capture_info_lock;
+	std::vector<CaptureInfo*> capture_info;
+	mutable Glib::Mutex capture_info_lock;
 
 	uint32_t i_am_the_modifier;
 
@@ -261,7 +261,8 @@ class Diskstream : public SessionObject, public PublicDiskstream
 	bool         _seek_required;
 
 	bool          force_refill;
-	framepos_t    capture_start_frame; ///< session frames
+	/** Start of currently running capture in session frames */
+	framepos_t    capture_start_frame;
 	framecnt_t    capture_captured;
 	bool          was_recording;
 	nframes_t     adjust_capture_position;
diff --git a/libs/ardour/ardour/midi_diskstream.h b/libs/ardour/ardour/midi_diskstream.h
index 49a7525dc7..126857a858 100644
--- a/libs/ardour/ardour/midi_diskstream.h
+++ b/libs/ardour/ardour/midi_diskstream.h
@@ -107,6 +107,12 @@ class MidiDiskstream : public Diskstream
 		return playback_mode;
 	}
 
+	/** Emitted when some MIDI data has been received for recording.
+	 *  First parameter is the data.
+	 *  Second parameter is the source that it is destined for.
+	 */
+	PBD::Signal2<void, boost::shared_ptr<MidiBuffer>, boost::weak_ptr<MidiSource> > DataRecorded;
+
   protected:
 	friend class Session;
 	friend class Butler;
diff --git a/libs/ardour/ardour/midi_source.h b/libs/ardour/ardour/midi_source.h
index 221bfd13f0..0c2759b96d 100644
--- a/libs/ardour/ardour/midi_source.h
+++ b/libs/ardour/ardour/midi_source.h
@@ -91,12 +91,6 @@ class MidiSource : virtual public Source
 
 	static PBD::Signal1<void,MidiSource*> MidiSourceCreated;
 
-	/** Emitted when a range of recorded data is available for reading from model().
-	 *  First parameter is the start of the range in session frames.
-	 *  Second parameter is the number of frames.
-	 */
-	mutable PBD::Signal2<void,framepos_t,nframes_t> ViewDataRangeReady;
-
 	XMLNode& get_state ();
 	int set_state (const XMLNode&, int version);
 
diff --git a/libs/ardour/ardour/midi_track.h b/libs/ardour/ardour/midi_track.h
index 0475f3f5ea..91ccc4b1fe 100644
--- a/libs/ardour/ardour/midi_track.h
+++ b/libs/ardour/ardour/midi_track.h
@@ -102,6 +102,8 @@ public:
 	uint16_t get_channel_mask ();
 	boost::shared_ptr<MidiPlaylist> midi_playlist ();
 
+	PBD::Signal2<void, boost::shared_ptr<MidiBuffer>, boost::weak_ptr<MidiSource> > DataRecorded;
+
 protected:
 	XMLNode& state (bool full);
 	
@@ -125,6 +127,9 @@ private:
 	int no_roll (nframes_t nframes, framepos_t start_frame, framepos_t end_frame,
 			bool state_changing, bool can_record, bool rec_monitors_input);
 	void push_midi_input_to_step_edit_ringbuffer (nframes_t nframes);
+
+	void diskstream_data_recorded (boost::shared_ptr<MidiBuffer>, boost::weak_ptr<MidiSource>);
+	PBD::ScopedConnection _diskstream_data_recorded_connection;
 };
 
 } /* namespace ARDOUR*/
diff --git a/libs/ardour/ardour/public_diskstream.h b/libs/ardour/ardour/public_diskstream.h
index de6b3dcb55..41aaeb44ee 100755
--- a/libs/ardour/ardour/public_diskstream.h
+++ b/libs/ardour/ardour/public_diskstream.h
@@ -54,7 +54,7 @@ public:
 	virtual void non_realtime_locate (framepos_t) = 0;
 	virtual void non_realtime_set_speed () = 0;
 	virtual int overwrite_existing_buffers () = 0;
-	virtual framecnt_t get_captured_frames (uint32_t n = 0) = 0;
+	virtual framecnt_t get_captured_frames (uint32_t n = 0) const = 0;
 	virtual int set_loop (Location *) = 0;
 	virtual void transport_looped (framepos_t) = 0;
 	virtual bool realtime_set_speed (double, bool) = 0;
@@ -64,7 +64,7 @@ public:
         virtual void prepare_to_stop (framepos_t) = 0;
 	virtual void set_slaved (bool) = 0;
 	virtual ChanCount n_channels () = 0;
-	virtual framepos_t get_capture_start_frame (uint32_t n = 0) = 0;
+	virtual framepos_t get_capture_start_frame (uint32_t n = 0) const = 0;
 	virtual AlignStyle alignment_style () const = 0;
 	virtual framepos_t current_capture_start () const = 0;
 	virtual framepos_t current_capture_end () const = 0;
diff --git a/libs/ardour/ardour/track.h b/libs/ardour/ardour/track.h
index 38d36ea5d0..ff1b57950a 100644
--- a/libs/ardour/ardour/track.h
+++ b/libs/ardour/ardour/track.h
@@ -122,7 +122,7 @@ class Track : public Route, public PublicDiskstream
 	void non_realtime_locate (framepos_t);
 	void non_realtime_set_speed ();
 	int overwrite_existing_buffers ();
-	framecnt_t get_captured_frames (uint32_t n = 0);
+	framecnt_t get_captured_frames (uint32_t n = 0) const;
 	int set_loop (Location *);
 	void transport_looped (framepos_t);
 	bool realtime_set_speed (double, bool);
@@ -132,7 +132,7 @@ class Track : public Route, public PublicDiskstream
         void prepare_to_stop (framepos_t);
 	void set_slaved (bool);
 	ChanCount n_channels ();
-	framepos_t get_capture_start_frame (uint32_t n = 0);
+	framepos_t get_capture_start_frame (uint32_t n = 0) const;
 	AlignStyle alignment_style () const;
 	framepos_t current_capture_start () const;
 	framepos_t current_capture_end () const;
diff --git a/libs/ardour/diskstream.cc b/libs/ardour/diskstream.cc
index 2c1877b7b5..908e1db5c8 100644
--- a/libs/ardour/diskstream.cc
+++ b/libs/ardour/diskstream.cc
@@ -293,32 +293,35 @@ Diskstream::set_loop (Location *location)
 
 	loop_location = location;
 
-	 LoopSet (location); /* EMIT SIGNAL */
+	LoopSet (location); /* EMIT SIGNAL */
 	return 0;
 }
 
+/** Get the start position (in session frames) of the nth capture in the current pass */
 ARDOUR::framepos_t
-Diskstream::get_capture_start_frame (uint32_t n)
+Diskstream::get_capture_start_frame (uint32_t n) const
 {
 	Glib::Mutex::Lock lm (capture_info_lock);
 
 	if (capture_info.size() > n) {
+		/* this is a completed capture */
 		return capture_info[n]->start;
-	}
-	else {
+	} else {
+		/* this is the currently in-progress capture */
 		return capture_start_frame;
 	}
 }
 
 ARDOUR::framecnt_t
-Diskstream::get_captured_frames (uint32_t n)
+Diskstream::get_captured_frames (uint32_t n) const
 {
 	Glib::Mutex::Lock lm (capture_info_lock);
 
 	if (capture_info.size() > n) {
+		/* this is a completed capture */
 		return capture_info[n]->frames;
-	}
-	else {  
+	} else {  
+		/* this is the currently in-progress capture */
 		return capture_captured;
 	}
 }
diff --git a/libs/ardour/midi_diskstream.cc b/libs/ardour/midi_diskstream.cc
index 0ac67fae82..f5b9cb5345 100644
--- a/libs/ardour/midi_diskstream.cc
+++ b/libs/ardour/midi_diskstream.cc
@@ -540,6 +540,16 @@ MidiDiskstream::process (framepos_t transport_frame, nframes_t nframes, bool can
 			_capture_buf->write(ev.time() + transport_frame, ev.type(), ev.size(), ev.buffer());
 		}
 
+		if (buf.size() != 0) {
+			/* Make a copy of this data and emit it for the GUI to see */
+			boost::shared_ptr<MidiBuffer> copy (new MidiBuffer (buf.capacity ()));
+			for (MidiBuffer::iterator i = buf.begin(); i != buf.end(); ++i) {
+				copy->push_back ((*i).time() + transport_frame, (*i).size(), (*i).buffer());
+			}
+				
+			DataRecorded (copy, _write_source); /* EMIT SIGNAL */
+		}
+
 	} else {
 
 		if (was_recording) {
@@ -837,8 +847,7 @@ MidiDiskstream::do_flush (RunContext /*context*/, bool force_flush)
 
 	total = _session.transport_frame() - _last_flush_frame;
 
-	if (_last_flush_frame > _session.transport_frame()
-			|| _last_flush_frame < capture_start_frame) {
+	if (_last_flush_frame > _session.transport_frame() || _last_flush_frame < capture_start_frame) {
 		_last_flush_frame = _session.transport_frame();
 	}
 
@@ -869,7 +878,7 @@ MidiDiskstream::do_flush (RunContext /*context*/, bool force_flush)
 	if (record_enabled() && 
             ((_session.transport_frame() - _last_flush_frame > disk_io_chunk_frames) || 
              force_flush)) {
-		if ((!_write_source) || _write_source->midi_write (*_capture_buf, capture_start_frame, to_write) != to_write) {
+		if ((!_write_source) || _write_source->midi_write (*_capture_buf, get_capture_start_frame (0), to_write) != to_write) {
 			error << string_compose(_("MidiDiskstream %1: cannot write to disk"), _id) << endmsg;
 			return -1;
 		} else {
@@ -1002,8 +1011,13 @@ MidiDiskstream::transport_stopped_wallclock (struct tm& /*when*/, time_t /*twhen
                         _playlist->clear_changes ();
                         _playlist->freeze ();
 
-                        uint32_t buffer_position = 0;
-                        for (buffer_position = 0, ci = capture_info.begin(); ci != capture_info.end(); ++ci) {
+			/* Session frame time of the initial capture in this pass, which is where the source starts */
+			framepos_t initial_capture = 0;
+			if (!capture_info.empty()) {
+				initial_capture = capture_info.front()->start;
+			}
+			
+                        for (ci = capture_info.begin(); ci != capture_info.end(); ++ci) {
 
                                 string region_name;
 
@@ -1013,8 +1027,9 @@ MidiDiskstream::transport_stopped_wallclock (struct tm& /*when*/, time_t /*twhen
 
                                 try {
                                         PropertyList plist;
-				
-                                        plist.add (Properties::start, buffer_position);
+
+					/* start of this region is the offset between the start of its capture and the start of the whole pass */
+                                        plist.add (Properties::start, (*ci)->start - initial_capture);
                                         plist.add (Properties::length, (*ci)->frames);
                                         plist.add (Properties::name, region_name);
 				
@@ -1032,8 +1047,6 @@ MidiDiskstream::transport_stopped_wallclock (struct tm& /*when*/, time_t /*twhen
                                 i_am_the_modifier++;
                                 _playlist->add_region (region, (*ci)->start);
                                 i_am_the_modifier--;
-
-                                buffer_position += (*ci)->frames;
                         }
 
                         _playlist->thaw ();
@@ -1151,8 +1164,6 @@ MidiDiskstream::engage_record_enable ()
 		_source_port->request_monitor_input (!(_session.config.get_auto_input() && rolling));
 	}
 
-	_write_source->mark_streaming_midi_write_started (_note_mode, _session.transport_frame());
-
 	RecordEnableChanged (); /* EMIT SIGNAL */
 }
 
diff --git a/libs/ardour/midi_track.cc b/libs/ardour/midi_track.cc
index 595fccf360..452e3038bd 100644
--- a/libs/ardour/midi_track.cc
+++ b/libs/ardour/midi_track.cc
@@ -105,6 +105,10 @@ MidiTrack::set_diskstream (boost::shared_ptr<Diskstream> ds)
 	_diskstream->set_record_enabled (false);
 	//_diskstream->monitor_input (false);
 
+	_diskstream_data_recorded_connection.disconnect ();
+	boost::shared_ptr<MidiDiskstream> mds = boost::dynamic_pointer_cast<MidiDiskstream> (ds);
+	mds->DataRecorded.connect_same_thread (_diskstream_data_recorded_connection, boost::bind (&MidiTrack::diskstream_data_recorded, this, _1, _2));
+
 	DiskstreamChanged (); /* EMIT SIGNAL */
 }
 
@@ -633,3 +637,10 @@ MidiTrack::midi_playlist ()
 {
 	return midi_diskstream()->midi_playlist ();
 }
+
+void
+MidiTrack::diskstream_data_recorded (boost::shared_ptr<MidiBuffer> buf, boost::weak_ptr<MidiSource> src)
+{
+	DataRecorded (buf, src); /* EMIT SIGNAL */
+}
+			       
diff --git a/libs/ardour/smf_source.cc b/libs/ardour/smf_source.cc
index 322c4dff97..1b9be5ddaa 100644
--- a/libs/ardour/smf_source.cc
+++ b/libs/ardour/smf_source.cc
@@ -266,8 +266,6 @@ SMFSource::write_unlocked (MidiRingBuffer<nframes_t>& source, framepos_t positio
 	Evoral::SMF::flush();
 	free(buf);
 
-	ViewDataRangeReady (_last_write_end, duration); /* EMIT SIGNAL */
-
 	return duration;
 }
 
diff --git a/libs/ardour/track.cc b/libs/ardour/track.cc
index 46517e1752..72fcac8c46 100644
--- a/libs/ardour/track.cc
+++ b/libs/ardour/track.cc
@@ -528,7 +528,7 @@ Track::overwrite_existing_buffers ()
 }
 
 framecnt_t
-Track::get_captured_frames (uint32_t n)
+Track::get_captured_frames (uint32_t n) const
 {
 	return _diskstream->get_captured_frames (n);
 }
@@ -588,7 +588,7 @@ Track::n_channels ()
 }
 
 framepos_t
-Track::get_capture_start_frame (uint32_t n)
+Track::get_capture_start_frame (uint32_t n) const
 {
 	return _diskstream->get_capture_start_frame (n);
 }