torben's port buffer reworking; torben's panner automation loading patch (allows loading of 2.X sessions)

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

1 files changed, 3 insertions, 3 deletions

diff --git a/libs/ardour/audio_diskstream.cc b/libs/ardour/audio_diskstream.cc
index e9f4b9ea15..4cf834b5c1 100644
--- a/libs/ardour/audio_diskstream.cc
+++ b/libs/ardour/audio_diskstream.cc
@@ -655,8 +655,8 @@ AudioDiskstream::process (nframes_t transport_frame, nframes_t nframes, nframes_
 
 				AudioPort* const ap = _io->audio_input(n);
 				assert(ap);
-				assert(rec_nframes <= ap->get_audio_buffer().capacity());
-				memcpy (chaninfo->current_capture_buffer, ap->get_audio_buffer().data(rec_nframes, offset + rec_offset), sizeof (Sample) * rec_nframes);
+				assert(rec_nframes <= ap->get_audio_buffer( nframes, offset ).capacity());
+				memcpy (chaninfo->current_capture_buffer, ap->get_audio_buffer( nframes, offset ).data(rec_nframes, offset + rec_offset), sizeof (Sample) * rec_nframes);
 
 			} else {
 
@@ -670,7 +670,7 @@ AudioDiskstream::process (nframes_t transport_frame, nframes_t nframes, nframes_
 				AudioPort* const ap = _io->audio_input(n);
 				assert(ap);
 
-				Sample* buf = ap->get_audio_buffer().data(nframes, offset);
+				Sample* buf = ap->get_audio_buffer( nframes, offset ).data(nframes, offset);
 				nframes_t first = chaninfo->capture_vector.len[0];
 
 				memcpy (chaninfo->capture_wrap_buffer, buf, sizeof (Sample) * first);