remove tests for locate_pending() before deciding whether to increment transport...

[ardour.git] / libs / ardour / disk_writer.cc

diff --git a/libs/ardour/disk_writer.cc b/libs/ardour/disk_writer.cc
index 1e248dcdc0fe5e1756287731f4bd93d725b24f68..a3dc3335d09faf70ef3133283638d70bba871126 100644 (file)
--- a/libs/ardour/disk_writer.cc
+++ b/libs/ardour/disk_writer.cc
@@ -67,6 +67,12 @@ DiskWriter::DiskWriter (Session& s, string const & str, DiskIOProcessor::Flag f)
 DiskWriter::~DiskWriter ()
 {
        DEBUG_TRACE (DEBUG::Destruction, string_compose ("DiskWriter %1 @ %2 deleted\n", _name, this));
+
+       boost::shared_ptr<ChannelList> c = channels.reader();
+
+       for (ChannelList::iterator chan = c->begin(); chan != c->end(); ++chan) {
+               (*chan)->write_source.reset ();
+       }
 }
 
 framecnt_t
@@ -863,7 +869,6 @@ DiskWriter::seek (framepos_t frame, bool complete_refill)
        }
 
        playback_sample = frame;
-       file_frame = frame;
 
        return 0;
 }