NO-OP/Optimize Bounce: Lookup data-type only once

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

diff --git a/libs/ardour/disk_reader.cc b/libs/ardour/disk_reader.cc
index bb41945af5dd503aad4acd73acfb92c87d671549..cef82639fe1db27f64897fd842841e7743d4ed8b 100644 (file)
--- a/libs/ardour/disk_reader.cc
+++ b/libs/ardour/disk_reader.cc
@@ -68,12 +68,6 @@ DiskReader::DiskReader (Session& s, string const & str, DiskIOProcessor::Flag f)
 DiskReader::~DiskReader ()
 {
        DEBUG_TRACE (DEBUG::Destruction, string_compose ("DiskReader %1 @ %2 deleted\n", _name, this));
-
-       for (uint32_t n = 0; n < DataType::num_types; ++n) {
-               if (_playlists[n]) {
-                       _playlists[n]->release ();
-               }
-       }
 }
 
 void
@@ -603,7 +597,7 @@ DiskReader::seek (samplepos_t sample, bool complete_refill)
                /* this should not happen. new transport should postponse seeking
                 * until de-click is complete */
                printf ("LOCATE WITHOUT DECLICK (gain=%f) at %ld seek-to %ld\n", _declick_amp.gain (), playback_sample, sample);
-               return -1;
+               //return -1;
        }
        if (sample == playback_sample && !complete_refill) {
                return 0; // XXX double-check this
@@ -614,7 +608,7 @@ DiskReader::seek (samplepos_t sample, bool complete_refill)
 
        //sample = std::max ((samplecnt_t)0, sample -_session.worst_output_latency ());
 
-       printf ("DiskReader::seek %s %ld -> %ld refill=%d\n", owner()->name().c_str(), playback_sample, sample, complete_refill);
+       //printf ("DiskReader::seek %s %ld -> %ld refill=%d\n", owner()->name().c_str(), playback_sample, sample, complete_refill);
        // TODO: check if we can micro-locate
 
        for (n = 0, chan = c->begin(); chan != c->end(); ++chan, ++n) {