X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=libs%2Fardour%2Faudio_diskstream.cc;h=c302e06681ca05f394b14c7451eafafb6e27501b;hb=5e1cfcc7ed557fc28ca8b362deceefa1967ab22b;hp=8378fa210ce009697ff9416603da4880adc588f6;hpb=8ca9061b308238ba80d82b6960e79fa1ea5cda92;p=ardour.git

diff --git a/libs/ardour/audio_diskstream.cc b/libs/ardour/audio_diskstream.cc
index 8378fa210c..c302e06681 100644
--- a/libs/ardour/audio_diskstream.cc
+++ b/libs/ardour/audio_diskstream.cc
@@ -408,7 +408,7 @@ AudioDiskstream::prepare_record_status(framepos_t capture_start_frame)
  *      that someone can read playback_distance worth of data from.
  */
 int
-AudioDiskstream::process (framepos_t transport_frame, pframes_t nframes, framecnt_t& playback_distance)
+AudioDiskstream::process (BufferSet& bufs, framepos_t transport_frame, pframes_t nframes, framecnt_t& playback_distance, bool need_disk_signal)
 {
 	uint32_t n;
 	boost::shared_ptr<ChannelList> c = channels.reader();
@@ -494,9 +494,9 @@ AudioDiskstream::process (framepos_t transport_frame, pframes_t nframes, framecn
 				assert(ap);
 				assert(rec_nframes <= (framecnt_t) ap->get_audio_buffer(nframes).capacity());
 
-				Sample *buf = ap->get_audio_buffer (nframes).data (rec_offset);
+				Sample *buf = bufs.get_audio (n).data(rec_offset);
 				memcpy (chaninfo->current_capture_buffer, buf, sizeof (Sample) * rec_nframes);
-
+				
 			} else {
 
 				framecnt_t total = chaninfo->capture_vector.len[0] + chaninfo->capture_vector.len[1];
@@ -509,7 +509,7 @@ AudioDiskstream::process (framepos_t transport_frame, pframes_t nframes, framecn
 				boost::shared_ptr<AudioPort> const ap = _io->audio (n);
 				assert(ap);
 
-				Sample* buf = ap->get_audio_buffer(nframes).data (rec_offset);
+				Sample *buf = bufs.get_audio (n).data(rec_offset);
 				framecnt_t first = chaninfo->capture_vector.len[0];
 
 				memcpy (chaninfo->capture_wrap_buffer, buf, sizeof (Sample) * first);
@@ -618,6 +618,8 @@ AudioDiskstream::process (framepos_t transport_frame, pframes_t nframes, framecn
 					   as our current_playback_buffer.
 					*/
 
+					assert(wrap_buffer_size >= necessary_samples);
+
 					/* Copy buf[0] from playback_buf */
 					memcpy ((char *) chaninfo->playback_wrap_buffer,
 							chaninfo->playback_vector.buf[0],
@@ -655,6 +657,46 @@ AudioDiskstream::process (framepos_t transport_frame, pframes_t nframes, framecn
 		_speed = _target_speed;
 	}
 
+	if (need_disk_signal) {
+
+		/* copy data over to buffer set */
+		
+		size_t n_buffers = bufs.count().n_audio();
+		size_t n_chans = c->size();
+		gain_t scaling = 1.0f;
+		
+		if (n_chans > n_buffers) {
+			scaling = ((float) n_buffers)/n_chans;
+		}
+
+		for (n = 0, chan = c->begin(); chan != c->end(); ++chan, ++n) {
+			
+			AudioBuffer& buf (bufs.get_audio (n%n_buffers));
+			ChannelInfo* chaninfo (*chan);
+			
+			if (n < n_chans) {
+				if (scaling != 1.0f) {
+					buf.read_from_with_gain (chaninfo->current_playback_buffer, nframes, scaling);
+				} else {
+					buf.read_from (chaninfo->current_playback_buffer, nframes);
+				}
+			} else {
+				if (scaling != 1.0f) {
+					buf.accumulate_with_gain_from (chaninfo->current_playback_buffer, nframes, scaling);
+				} else {
+					buf.accumulate_from (chaninfo->current_playback_buffer, nframes);
+				}
+			}
+		}
+
+		/* leave the MIDI count alone */
+		ChanCount cnt (DataType::AUDIO, n_chans);
+		cnt.set (DataType::MIDI, bufs.count().n_midi());
+		bufs.set_count (cnt);
+	
+		/* extra buffers will already be silent, so leave them alone */
+	}
+
 	return 0;
 }
 
@@ -1661,6 +1703,8 @@ AudioDiskstream::set_record_enabled (bool yn)
 		} else {
 			disengage_record_enable ();
 		}
+
+		RecordEnableChanged (); /* EMIT SIGNAL */
 	}
 }
 
@@ -1697,8 +1741,6 @@ AudioDiskstream::prep_record_enable ()
 		}
 	}
 
-	RecordEnableChanged (); /* EMIT SIGNAL */
-
 	return true;
 }
 
@@ -1712,7 +1754,6 @@ AudioDiskstream::prep_record_disable ()
 		}
 	}
 	capturing_sources.clear ();
-	RecordEnableChanged (); /* EMIT SIGNAL */
 
 	return true;
 }
@@ -1953,7 +1994,7 @@ AudioDiskstream::allocate_temporary_buffers ()
 	*/
 
 	double const sp = max (fabsf (_actual_speed), 1.2f);
-	framecnt_t required_wrap_size = (framecnt_t) floor (_session.get_block_size() * sp) + 1;
+	framecnt_t required_wrap_size = (framecnt_t) ceil (_session.get_block_size() * sp) + 2;
 
 	if (required_wrap_size > wrap_buffer_size) {
 
@@ -2127,7 +2168,7 @@ AudioDiskstream::use_pending_capture_data (XMLNode& node)
 				fs = boost::dynamic_pointer_cast<AudioFileSource> (
 					SourceFactory::createWritable (
 						DataType::AUDIO, _session,
-						prop->value(), string(), false, _session.frame_rate()));
+						prop->value(), false, _session.frame_rate()));
 			}
 
 			catch (failed_constructor& err) {