First stage of options rework.
[ardour.git] / libs / ardour / audio_diskstream.cc
index fbe12e6bf5c8936ee7ea8c91128b1ee1e9196aef..910239f6305e1ca59fa64cb61c8258b871281af8 100644 (file)
 #include <sys/stat.h>
 #include <sys/mman.h>
 
-#include <pbd/error.h>
+#include "pbd/error.h"
 #include <glibmm/thread.h>
-#include <pbd/xml++.h>
-#include <pbd/memento_command.h>
-#include <pbd/enumwriter.h>
-#include <pbd/stacktrace.h>
-
-#include <ardour/ardour.h>
-#include <ardour/audioengine.h>
-#include <ardour/audio_diskstream.h>
-#include <ardour/utils.h>
-#include <ardour/configuration.h>
-#include <ardour/audiofilesource.h>
-#include <ardour/send.h>
-#include <ardour/region_factory.h>
-#include <ardour/audioplaylist.h>
-#include <ardour/playlist_factory.h>
-#include <ardour/cycle_timer.h>
-#include <ardour/audioregion.h>
-#include <ardour/audio_port.h>
-#include <ardour/source_factory.h>
+#include "pbd/xml++.h"
+#include "pbd/memento_command.h"
+#include "pbd/enumwriter.h"
+#include "pbd/stacktrace.h"
+
+#include "ardour/ardour.h"
+#include "ardour/audioengine.h"
+#include "ardour/analyser.h"
+#include "ardour/audio_diskstream.h"
+#include "ardour/utils.h"
+#include "ardour/configuration.h"
+#include "ardour/audiofilesource.h"
+#include "ardour/send.h"
+#include "ardour/region_factory.h"
+#include "ardour/audioplaylist.h"
+#include "ardour/playlist_factory.h"
+#include "ardour/cycle_timer.h"
+#include "ardour/audioregion.h"
+#include "ardour/audio_port.h"
+#include "ardour/source_factory.h"
+#include "ardour/audio_buffer.h"
+#include "ardour/session.h"
+#include "ardour/io.h"
 
 #include "i18n.h"
 #include <locale.h>
@@ -204,6 +208,18 @@ AudioDiskstream::non_realtime_input_change ()
        }
 }
 
+void
+AudioDiskstream::non_realtime_locate (nframes_t location)
+{
+       /* now refill channel buffers */
+
+       if (speed() != 1.0f || speed() != -1.0f) {
+               seek ((nframes_t) (location * (double) speed()));
+       } else {
+               seek (location);
+       }
+}
+
 void
 AudioDiskstream::get_input_sources ()
 {
@@ -212,13 +228,14 @@ AudioDiskstream::get_input_sources ()
        uint32_t n;
        ChannelList::iterator chan;
        uint32_t ni = _io->n_inputs().n_audio();
+       vector<string> connections;
 
        for (n = 0, chan = c->begin(); chan != c->end() && n < ni; ++chan, ++n) {
                
-               const char **connections = _io->input(n)->get_connections ();
+               connections.clear ();
+
+               if (_io->input(n)->get_connections (connections) == 0) {
                
-               if (connections == 0 || connections[0] == 0) {
-                       
                        if ((*chan)->source) {
                                // _source->disable_metering ();
                        }
@@ -226,12 +243,7 @@ AudioDiskstream::get_input_sources ()
                        (*chan)->source = 0;
                        
                } else {
-                       (*chan)->source = dynamic_cast<AudioPort*>(
-                               _session.engine().get_port_by_name (connections[0]) );
-               }
-               
-               if (connections) {
-                       free (connections);
+                       (*chan)->source = dynamic_cast<AudioPort*>(_session.engine().get_port_by_name (connections[0]) );
                }
        }
 }              
@@ -268,7 +280,7 @@ AudioDiskstream::use_new_playlist ()
 {
        string newname;
        boost::shared_ptr<AudioPlaylist> playlist;
-
+       
        if (!in_set_state && destructive()) {
                return 0;
        }
@@ -401,7 +413,7 @@ AudioDiskstream::check_record_status (nframes_t transport_frame, nframes_t nfram
 
        /* if per-track or global rec-enable turned on while the other was already on, we've started recording */
 
-       if ((change & track_rec_enabled) && record_enabled() && (!(change & global_rec_enabled) && can_record) || 
+       if (((change & track_rec_enabled) && record_enabled() && (!(change & global_rec_enabled) && can_record)) || 
            ((change & global_rec_enabled) && can_record && (!(change & track_rec_enabled) && record_enabled()))) {
                
                /* starting to record: compute first+last frames */
@@ -426,7 +438,7 @@ AudioDiskstream::check_record_status (nframes_t transport_frame, nframes_t nfram
 
                        if (_alignment_style == ExistingMaterial) {
 
-                               if (!Config->get_punch_in()) {
+                               if (!_session.config.get_punch_in()) {
 
                                        /* manual punch in happens at the correct transport frame
                                           because the user hit a button. but to get alignment correct 
@@ -455,7 +467,7 @@ AudioDiskstream::check_record_status (nframes_t transport_frame, nframes_t nfram
 
                        } else {
 
-                               if (Config->get_punch_in()) {
+                               if (_session.config.get_punch_in()) {
                                        first_recordable_frame += _roll_delay;
                                } else {
                                        capture_start_frame -= _roll_delay;
@@ -501,7 +513,7 @@ AudioDiskstream::check_record_status (nframes_t transport_frame, nframes_t nfram
 }
 
 int
-AudioDiskstream::process (nframes_t transport_frame, nframes_t nframes, nframes_t offset, bool can_record, bool rec_monitors_input)
+AudioDiskstream::process (nframes_t transport_frame, nframes_t nframes, bool can_record, bool rec_monitors_input)
 {
        uint32_t n;
        boost::shared_ptr<ChannelList> c = channels.reader();
@@ -527,6 +539,11 @@ AudioDiskstream::process (nframes_t transport_frame, nframes_t nframes, nframes_
 
        commit_should_unlock = false;
 
+       if (!_io || !_io->active()) {
+               _processed = true;
+               return 0;
+       }
+
        check_record_status (transport_frame, nframes, can_record);
 
        nominally_recording = (can_record && re);
@@ -553,7 +570,7 @@ AudioDiskstream::process (nframes_t transport_frame, nframes_t nframes, nframes_
                (*chan)->current_playback_buffer = 0;
        }
 
-       if (nominally_recording || (_session.get_record_enabled() && Config->get_punch_in())) {
+       if (nominally_recording || (_session.get_record_enabled() && _session.config.get_punch_in())) {
                OverlapType ot;
                
                // Safeguard against situations where process() goes haywire when autopunching and last_recordable_frame < first_recordable_frame
@@ -635,14 +652,15 @@ AudioDiskstream::process (nframes_t transport_frame, nframes_t nframes, nframes_
                                
                                chaninfo->current_capture_buffer = chaninfo->capture_vector.buf[0];
 
-                               /* note: grab the entire port buffer, but only copy what we were supposed to for recording, and use
-                                  rec_offset
+                               /* note: grab the entire port buffer, but only copy what we were supposed to
+                                  for recording, and use rec_offset
                                */
 
                                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).capacity());
+                               memcpy (chaninfo->current_capture_buffer, ap->get_audio_buffer (rec_nframes).data(rec_offset), sizeof (Sample) * rec_nframes);
+
 
                        } else {
 
@@ -656,7 +674,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).data();
                                nframes_t first = chaninfo->capture_vector.len[0];
 
                                memcpy (chaninfo->capture_wrap_buffer, buf, sizeof (Sample) * first);
@@ -748,15 +766,19 @@ AudioDiskstream::process (nframes_t transport_frame, nframes_t nframes, nframes_
                                nframes_t total = chaninfo->playback_vector.len[0] + chaninfo->playback_vector.len[1];
                                
                                if (necessary_samples > total) {
+                                       cerr << "underrun for " << _name << endl;
                                        DiskUnderrun ();
                                        goto out;
                                        
                                } else {
                                        
-                                       memcpy ((char *) chaninfo->playback_wrap_buffer, chaninfo->playback_vector.buf[0],
-                                               chaninfo->playback_vector.len[0] * sizeof (Sample));
-                                       memcpy (chaninfo->playback_wrap_buffer + chaninfo->playback_vector.len[0], chaninfo->playback_vector.buf[1], 
-                                               (necessary_samples - chaninfo->playback_vector.len[0]) * sizeof (Sample));
+                                       memcpy ((char *) chaninfo->playback_wrap_buffer,
+                                                       chaninfo->playback_vector.buf[0],
+                                                       chaninfo->playback_vector.len[0] * sizeof (Sample));
+                                       memcpy (chaninfo->playback_wrap_buffer + chaninfo->playback_vector.len[0],
+                                                       chaninfo->playback_vector.buf[1], 
+                                                       (necessary_samples - chaninfo->playback_vector.len[0])
+                                                                       * sizeof (Sample));
                                        
                                        chaninfo->current_playback_buffer = chaninfo->playback_wrap_buffer;
                                }
@@ -764,43 +786,7 @@ AudioDiskstream::process (nframes_t transport_frame, nframes_t nframes, nframes_
                } 
 
                if (rec_nframes == 0 && _actual_speed != 1.0f && _actual_speed != -1.0f) {
-                       
-                       uint64_t phase = last_phase;
-                       int64_t phi_delta;
-                       nframes_t i = 0;
-
-                       // Linearly interpolate into the alt buffer
-                       // using 40.24 fixp maths (swh)
-
-                       if (phi != target_phi) {
-                               phi_delta = ((int64_t)(target_phi - phi)) / nframes;
-                       } else {
-                               phi_delta = 0;
-                       }
-
-                       for (chan = c->begin(); chan != c->end(); ++chan) {
-
-                               float fr;
-                               ChannelInfo* chaninfo (*chan);
-
-                               i = 0;
-                               phase = last_phase;
-
-                               for (nframes_t outsample = 0; outsample < nframes; ++outsample) {
-                                       i = phase >> 24;
-                                       fr = (phase & 0xFFFFFF) / 16777216.0f;
-                                       chaninfo->speed_buffer[outsample] = 
-                                               chaninfo->current_playback_buffer[i] * (1.0f - fr) +
-                                               chaninfo->current_playback_buffer[i+1] * fr;
-                                       phase += phi + phi_delta;
-                               }
-                               
-                               chaninfo->current_playback_buffer = chaninfo->speed_buffer;
-                       }
-
-                       playback_distance = i; // + 1;
-                       last_phase = (phase & 0xFFFFFF);
-
+                       process_varispeed_playback(nframes, c);
                } else {
                        playback_distance = nframes;
                }
@@ -827,11 +813,78 @@ AudioDiskstream::process (nframes_t transport_frame, nframes_t nframes, nframes_
        return ret;
 }
 
+void
+AudioDiskstream::process_varispeed_playback(nframes_t nframes, boost::shared_ptr<ChannelList> c)
+{
+       ChannelList::iterator chan;
+       
+       // the idea behind phase is that when the speed is not 1.0, we have to 
+       // interpolate between samples and then we have to store where we thought we were. 
+       // rather than being at sample N or N+1, we were at N+0.8792922
+       // so the "phase" element, if you want to think about this way, 
+       // varies from 0 to 1, representing the "offset" between samples
+       uint64_t    phase = last_phase;
+       
+       // acceleration
+       int64_t     phi_delta;
+       
+       // index in the input buffers
+       nframes_t   i = 0;
+
+       // Linearly interpolate into the speed buffer
+       // using 40.24 fixed point math
+       //
+       // Fixed point is just an integer with an implied scaling factor. 
+       // In 40.24 the scaling factor is 2^24 = 16777216,  
+       // so a value of 10*2^24 (in integer space) is equivalent to 10.0. 
+       //
+       // The advantage is that addition and modulus [like x = (x + y) % 2^40]  
+       // have no rounding errors and no drift, and just require a single integer add.
+       // (swh)
+       
+       const int64_t fractional_part_mask  = 0xFFFFFF;
+       const Sample  binary_scaling_factor = 16777216.0f;
+
+       // phi = fixed point speed
+       if (phi != target_phi) {
+               phi_delta = ((int64_t)(target_phi - phi)) / nframes;
+       } else {
+               phi_delta = 0;
+       }
+
+       for (chan = c->begin(); chan != c->end(); ++chan) {
+
+               Sample fractional_phase_part;
+               ChannelInfo* chaninfo (*chan);
+
+               i = 0;
+               phase = last_phase;
+
+               for (nframes_t outsample = 0; outsample < nframes; ++outsample) {
+                       i = phase >> 24;
+                       fractional_phase_part = (phase & fractional_part_mask) / binary_scaling_factor;
+                       chaninfo->speed_buffer[outsample] = 
+                               chaninfo->current_playback_buffer[i] * (1.0f - fractional_phase_part) +
+                               chaninfo->current_playback_buffer[i+1] * fractional_phase_part;
+                       phase += phi + phi_delta;
+               }
+               
+               chaninfo->current_playback_buffer = chaninfo->speed_buffer;
+       }
+
+       playback_distance = i; // + 1;
+       last_phase = (phase & fractional_part_mask);
+}
+
 bool
 AudioDiskstream::commit (nframes_t nframes)
 {
        bool need_butler = false;
 
+       if (!_io || !_io->active()) {
+               return false;
+       }
+
        if (_actual_speed < 0.0) {
                playback_sample -= playback_distance;
        } else {
@@ -854,10 +907,18 @@ AudioDiskstream::commit (nframes_t nframes)
        }
        
        if (_slaved) {
-               need_butler = c->front()->playback_buf->write_space() >= c->front()->playback_buf->bufsize() / 2;
+               if (_io && _io->active()) {
+                       need_butler = c->front()->playback_buf->write_space() >= c->front()->playback_buf->bufsize() / 2;
+               } else {
+                       need_butler = false;
+               }
        } else {
-               need_butler = c->front()->playback_buf->write_space() >= disk_io_chunk_frames
-                       || c->front()->capture_buf->read_space() >= disk_io_chunk_frames;
+               if (_io && _io->active()) {
+                       need_butler = c->front()->playback_buf->write_space() >= disk_io_chunk_frames
+                               || c->front()->capture_buf->read_space() >= disk_io_chunk_frames;
+               } else {
+                       need_butler = c->front()->capture_buf->read_space() >= disk_io_chunk_frames;
+               }
        }
 
        if (commit_should_unlock) {
@@ -1348,7 +1409,7 @@ AudioDiskstream::_do_refill (Sample* mixdown_buffer, float* gain_buffer)
  * written at all unless @a force_flush is true.
  */
 int
-AudioDiskstream::do_flush (Session::RunContext context, bool force_flush)
+AudioDiskstream::do_flush (RunContext context, bool force_flush)
 {
        uint32_t to_write;
        int32_t ret = 0;
@@ -1500,7 +1561,7 @@ AudioDiskstream::transport_stopped (struct tm& when, time_t twhen, bool abort_ca
        */
 
        while (more_work && !err) {
-               switch (do_flush (Session::TransportContext, true)) {
+               switch (do_flush (TransportContext, true)) {
                case 0:
                        more_work = false;
                        break;
@@ -1555,6 +1616,9 @@ AudioDiskstream::transport_stopped (struct tm& when, time_t twhen, bool abort_ca
                        s->update_header (capture_info.front()->start, when, twhen);
                        s->set_captured_for (_name);
                        s->mark_immutable ();
+                       if (Config->get_auto_analyse_audio()) {
+                               Analyser::queue_source_for_analysis (s, true);
+                       }
                }
        }
 
@@ -1582,9 +1646,10 @@ AudioDiskstream::transport_stopped (struct tm& when, time_t twhen, bool abort_ca
                */
                
                try {
-                       boost::shared_ptr<Region> rx (RegionFactory::create (srcs, c->front()->write_source->last_capture_start_frame(), total_capture, 
-                                                                            whole_file_region_name,
-                                                                            0, AudioRegion::Flag (AudioRegion::DefaultFlags|AudioRegion::Automatic|AudioRegion::WholeFile)));
+                       boost::shared_ptr<Region> rx (RegionFactory::create (srcs,
+                                               c->front()->write_source->last_capture_start_frame(), total_capture, 
+                                               whole_file_region_name, 0,
+                                               Region::Flag (Region::DefaultFlags|Region::Automatic|Region::WholeFile)));
 
                        region = boost::dynamic_pointer_cast<AudioRegion> (rx);
                        region->special_set_position (capture_info.front()->start);
@@ -1626,7 +1691,7 @@ AudioDiskstream::transport_stopped (struct tm& when, time_t twhen, bool abort_ca
                        _last_capture_regions.push_back (region);
                        
                        i_am_the_modifier++;
-                       _playlist->add_region (region, (*ci)->start);
+                       _playlist->add_region (region, (*ci)->start, 1, non_layered());
                        i_am_the_modifier--;
                        
                        buffer_position += (*ci)->frames;
@@ -1749,6 +1814,9 @@ AudioDiskstream::finish_capture (bool rec_monitors_input, boost::shared_ptr<Chan
 
        capture_info.push_back (ci);
        capture_captured = 0;
+
+       /* now we've finished a capture, reset first_recordable_frame for next time */
+       first_recordable_frame = max_frames;
 }
 
 void
@@ -1799,7 +1867,7 @@ AudioDiskstream::engage_record_enable ()
 
                for (ChannelList::iterator chan = c->begin(); chan != c->end(); ++chan) {
                        if ((*chan)->source) {
-                               (*chan)->source->ensure_monitor_input (!(Config->get_auto_input() && rolling));
+                               (*chan)->source->ensure_monitor_input (!(_session.config.get_auto_input() && rolling));
                        }
                        capturing_sources.push_back ((*chan)->write_source);
                        (*chan)->write_source->mark_streaming_write_started ();
@@ -1820,8 +1888,8 @@ AudioDiskstream::disengage_record_enable ()
 {
        g_atomic_int_set (&_record_enabled, 0);
        boost::shared_ptr<ChannelList> c = channels.reader();
-       for (ChannelList::iterator chan = c->begin(); chan != c->end(); ++chan) {
-               if (Config->get_monitoring_model() == HardwareMonitoring) {
+       if (Config->get_monitoring_model() == HardwareMonitoring) {
+               for (ChannelList::iterator chan = c->begin(); chan != c->end(); ++chan) {
                        if ((*chan)->source) {
                                (*chan)->source->ensure_monitor_input (false);
                        }
@@ -1868,7 +1936,7 @@ AudioDiskstream::get_state ()
 
                Location* pi;
 
-               if (Config->get_punch_in() && ((pi = _session.locations()->auto_punch_location()) != 0)) {
+               if (_session.config.get_punch_in() && ((pi = _session.locations()->auto_punch_location()) != 0)) {
                        snprintf (buf, sizeof (buf), "%" PRIu32, pi->start());
                } else {
                        snprintf (buf, sizeof (buf), "%" PRIu32, _session.transport_frame());
@@ -1941,6 +2009,7 @@ AudioDiskstream::set_state (const XMLNode& node)
        if (nchans > _n_channels.n_audio()) {
 
                add_channel (nchans - _n_channels.n_audio());
+               IO::PortCountChanged(_n_channels);
 
        } else if (nchans < _n_channels.n_audio()) {
 
@@ -1990,8 +2059,6 @@ AudioDiskstream::set_state (const XMLNode& node)
           up of the IO that owns this DS (::non_realtime_input_change())
        */
                
-       in_set_state = false;
-
        return 0;
 }
 
@@ -2105,7 +2172,8 @@ AudioDiskstream::set_block_size (nframes_t nframes)
                boost::shared_ptr<ChannelList> c = channels.reader();
 
                for (ChannelList::iterator chan = c->begin(); chan != c->end(); ++chan) {
-                       if ((*chan)->speed_buffer) delete [] (*chan)->speed_buffer;
+                       if ((*chan)->speed_buffer)
+                               delete [] (*chan)->speed_buffer;
                        (*chan)->speed_buffer = new Sample[speed_buffer_size];
                }
        }
@@ -2128,9 +2196,11 @@ AudioDiskstream::allocate_temporary_buffers ()
                boost::shared_ptr<ChannelList> c = channels.reader();
 
                for (ChannelList::iterator chan = c->begin(); chan != c->end(); ++chan) {
-                       if ((*chan)->playback_wrap_buffer) delete [] (*chan)->playback_wrap_buffer;
+                       if ((*chan)->playback_wrap_buffer)
+                               delete [] (*chan)->playback_wrap_buffer;
                        (*chan)->playback_wrap_buffer = new Sample[required_wrap_size]; 
-                       if ((*chan)->capture_wrap_buffer) delete [] (*chan)->capture_wrap_buffer;
+                       if ((*chan)->capture_wrap_buffer)
+                               delete [] (*chan)->capture_wrap_buffer;
                        (*chan)->capture_wrap_buffer = new Sample[required_wrap_size];  
                }
 
@@ -2182,7 +2252,7 @@ int
 AudioDiskstream::add_channel_to (boost::shared_ptr<ChannelList> c, uint32_t how_many)
 {
        while (how_many--) {
-               c->push_back (new ChannelInfo(_session.diskstream_buffer_size(), speed_buffer_size, wrap_buffer_size));
+               c->push_back (new ChannelInfo(_session.audio_diskstream_buffer_size(), speed_buffer_size, wrap_buffer_size));
        }
 
        _n_channels.set(DataType::AUDIO, c->size());
@@ -2202,8 +2272,8 @@ AudioDiskstream::add_channel (uint32_t how_many)
 int
 AudioDiskstream::remove_channel_from (boost::shared_ptr<ChannelList> c, uint32_t how_many)
 {
-       while (--how_many && !c->empty()) {
-               delete c->back();
+       while (how_many-- && !c->empty()) {
+               //delete c->back(); // FIXME: crash (thread safe with RCU?)
                c->pop_back();
        }
 
@@ -2273,7 +2343,9 @@ AudioDiskstream::use_pending_capture_data (XMLNode& node)
 
                        try {
                                fs = boost::dynamic_pointer_cast<AudioFileSource> (
-                                       SourceFactory::createWritable (DataType::AUDIO, _session, prop->value(), false, _session.frame_rate()));
+                                               SourceFactory::createWritable (DataType::AUDIO, _session,
+                                                               prop->value(), true,
+                                                               false, _session.frame_rate()));
                        }
 
                        catch (failed_constructor& err) {
@@ -2307,22 +2379,25 @@ AudioDiskstream::use_pending_capture_data (XMLNode& node)
        boost::shared_ptr<AudioRegion> region;
        
        try {
-               region = boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (pending_sources, 0, first_fs->length(),
-                                                                                         region_name_from_path (first_fs->name(), true), 
-                                                                                         0, AudioRegion::Flag (AudioRegion::DefaultFlags|AudioRegion::Automatic|AudioRegion::WholeFile)));
+               region = boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (
+                               pending_sources, 0, first_fs->length(first_fs->timeline_position()),
+                               region_name_from_path (first_fs->name(), true), 0,
+                               Region::Flag (Region::DefaultFlags|Region::Automatic|Region::WholeFile)));
                region->special_set_position (0);
        }
 
        catch (failed_constructor& err) {
-               error << string_compose (_("%1: cannot create whole-file region from pending capture sources"),
-                                 _name)
-                     << endmsg;
+               error << string_compose (
+                               _("%1: cannot create whole-file region from pending capture sources"),
+                               _name) << endmsg;
                
                return -1;
        }
 
        try {
-               region = boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (pending_sources, 0, first_fs->length(), region_name_from_path (first_fs->name(), true)));
+               region = boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (
+                               pending_sources, 0, first_fs->length(first_fs->timeline_position()),
+                               region_name_from_path (first_fs->name(), true)));
        }
 
        catch (failed_constructor& err) {
@@ -2338,6 +2413,21 @@ AudioDiskstream::use_pending_capture_data (XMLNode& node)
        return 0;
 }
 
+int
+AudioDiskstream::set_non_layered (bool yn)
+{
+       if (yn != non_layered()) {
+               
+               if (yn) {
+                       _flags = Flag (_flags | NonLayered);
+               } else {
+                       _flags = Flag (_flags & ~NonLayered);
+               }
+       }
+
+       return 0;
+}
+
 int
 AudioDiskstream::set_destructive (bool yn)
 {
@@ -2438,33 +2528,21 @@ AudioDiskstream::ChannelInfo::~ChannelInfo ()
                write_source.reset ();
        }
                
-       if (speed_buffer) {
-               delete [] speed_buffer;
-               speed_buffer = 0;
-       }
+       delete [] speed_buffer;
+       speed_buffer = 0;
 
-       if (playback_wrap_buffer) {
-               delete [] playback_wrap_buffer;
-               playback_wrap_buffer = 0;
-       }
+       delete [] playback_wrap_buffer;
+       playback_wrap_buffer = 0;
 
-       if (capture_wrap_buffer) {
-               delete [] capture_wrap_buffer;
-               capture_wrap_buffer = 0;
-       }
+       delete [] capture_wrap_buffer;
+       capture_wrap_buffer = 0;
        
-       if (playback_buf) {
-               delete playback_buf;
-               playback_buf = 0;
-       }
+       delete playback_buf;
+       playback_buf = 0;
 
-       if (capture_buf) {
-               delete capture_buf;
-               capture_buf = 0;
-       }
+       delete capture_buf;
+       capture_buf = 0;
 
-       if (capture_transition_buf) {
-               delete capture_transition_buf;
-               capture_transition_buf = 0;
-       }
+       delete capture_transition_buf;
+       capture_transition_buf = 0;
 }