revert to single buffer for disk playback, and 5.x-style overwrite

Also address issues with MIDI and also atomicity of _pending_overwrite

1 files changed, 4 insertions, 7 deletions

diff --git a/libs/ardour/disk_io.cc b/libs/ardour/disk_io.cc
index 7d153661b9..a55e2c559b 100644
--- a/libs/ardour/disk_io.cc
+++ b/libs/ardour/disk_io.cc
@@ -324,22 +324,19 @@ DiskIOProcessor::use_playlist (DataType dt, boost::shared_ptr<Playlist> playlist
 }
 
 DiskIOProcessor::ChannelInfo::ChannelInfo (samplecnt_t bufsize)
-	: wbuf (0)
+	: rbuf (0)
+	, wbuf (0)
 	, capture_transition_buf (0)
 	, curr_capture_cnt (0)
 {
-	rbuf[0] = 0;
-	rbuf[1] = 0;
 }
 
 DiskIOProcessor::ChannelInfo::~ChannelInfo ()
 {
-	delete rbuf[0];
-	delete rbuf[1];
+	delete rbuf;
 	delete wbuf;
 	delete capture_transition_buf;
-	rbuf[0] = 0;
-	rbuf[1] = 0;
+	rbuf = 0;
 	wbuf = 0;
 	capture_transition_buf = 0;
 }