Fix broken whitespace. I'd apologize for the compile times if it was my fault :D

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

diff --git a/libs/ardour/audio_track.cc b/libs/ardour/audio_track.cc
index 41a8d4c7f0cea160bc908175b9a9f8f29763d10e..aa7768a22872a839433f09ef4acd7db2310885a7 100644 (file)
--- a/libs/ardour/audio_track.cc
+++ b/libs/ardour/audio_track.cc
@@ -92,7 +92,7 @@ AudioTrack::set_diskstream (boost::shared_ptr<Diskstream> ds)
 {
        Track::set_diskstream (ds);
 
-        _diskstream->set_track (this);
+       _diskstream->set_track (this);
        _diskstream->set_destructive (_mode == Destructive);
        _diskstream->set_non_layered (_mode == NonLayered);
 
@@ -231,9 +231,9 @@ AudioTrack::_set_state (const XMLNode& node, int version, bool call_base)
                }
        }
 
-        /* set rec-enable control *AFTER* setting up diskstream, because it may want to operate
-           on the diskstream as it sets its own state
-        */
+       /* set rec-enable control *AFTER* setting up diskstream, because it may want to operate
+          on the diskstream as it sets its own state
+       */
 
        XMLNodeList nlist;
        XMLNodeConstIterator niter;
@@ -242,14 +242,13 @@ AudioTrack::_set_state (const XMLNode& node, int version, bool call_base)
        for (niter = nlist.begin(); niter != nlist.end(); ++niter){
                child = *niter;
 
-                if (child->name() == Controllable::xml_node_name && (prop = child->property ("name")) != 0) {
-                        if (prop->value() == X_("recenable")) {
-                                _rec_enable_control->set_state (*child, version);
-                        }
-                }
+               if (child->name() == Controllable::xml_node_name && (prop = child->property ("name")) != 0) {
+                       if (prop->value() == X_("recenable")) {
+                               _rec_enable_control->set_state (*child, version);
+                       }
+               }
        }
 
-
        pending_state = const_cast<XMLNode*> (&node);
 
        if (_session.state_of_the_state() & Session::Loading) {
@@ -367,7 +366,7 @@ AudioTrack::roll (pframes_t nframes, framepos_t start_frame, framepos_t end_fram
        Sample* tmpb;
        framepos_t transport_frame;
        boost::shared_ptr<AudioDiskstream> diskstream = audio_diskstream();
-        
+
        automation_snapshot (start_frame, false);
 
        if (n_outputs().n_total() == 0 && _processors.empty()) {
@@ -375,7 +374,7 @@ AudioTrack::roll (pframes_t nframes, framepos_t start_frame, framepos_t end_fram
        }
 
        if (!_active) {
-                silence (nframes);
+               silence (nframes);
                return 0;
        }
 
@@ -505,9 +504,11 @@ AudioTrack::roll (pframes_t nframes, framepos_t start_frame, framepos_t end_fram
 
                /* final argument: don't waste time with automation if we're recording or we've just stopped (yes it can happen) */
 
-               process_output_buffers (bufs, start_frame, end_frame, nframes, (!_session.get_record_enabled() || !Config->get_do_not_record_plugins()), declick,
-                                        (!diskstream->record_enabled() && _session.transport_rolling()));
-
+               process_output_buffers (
+                       bufs, start_frame, end_frame, nframes,
+                       (!_session.get_record_enabled() || !Config->get_do_not_record_plugins()),
+                       declick,
+                       (!diskstream->record_enabled() && _session.transport_rolling()));
 
        } else {
                /* problem with the diskstream; just be quiet for a bit */
@@ -527,15 +528,15 @@ AudioTrack::export_stuff (BufferSet& buffers, framepos_t start, framecnt_t nfram
        Glib::RWLock::ReaderLock rlock (_processor_lock);
 
        boost::shared_ptr<AudioPlaylist> apl = boost::dynamic_pointer_cast<AudioPlaylist>(diskstream->playlist());
-       assert(apl);
 
+       assert(apl);
+       assert(buffers.count().n_audio() >= 1);
        assert ((framecnt_t) buffers.get_audio(0).capacity() >= nframes);
 
        if (apl->read (buffers.get_audio(0).data(), mix_buffer.get(), gain_buffer.get(), start, nframes) != nframes) {
                return -1;
        }
 
-       assert(buffers.count().n_audio() >= 1);
        uint32_t n=1;
        Sample* b = buffers.get_audio(0).data();
        BufferSet::audio_iterator bi = buffers.audio_begin();
@@ -546,8 +547,7 @@ AudioTrack::export_stuff (BufferSet& buffers, framepos_t start, framecnt_t nfram
                                return -1;
                        }
                        b = bi->data();
-               }
-               else {
+               } else {
                        /* duplicate last across remaining buffers */
                        memcpy (bi->data(), b, sizeof (Sample) * nframes);
                }
@@ -568,7 +568,7 @@ AudioTrack::export_stuff (BufferSet& buffers, framepos_t start, framecnt_t nfram
                boost::shared_ptr<Processor> processor = boost::dynamic_pointer_cast<Processor> (*i);
                boost::shared_ptr<Delivery> delivery = boost::dynamic_pointer_cast<Delivery> (*i);
                boost::shared_ptr<PeakMeter> meter = boost::dynamic_pointer_cast<PeakMeter> (*i);
-               
+
                if (processor && (!delivery || !Delivery::role_requires_output_ports (delivery->role())) && !meter) {
                        processor->run (buffers, start, start+nframes, nframes, true);
                }
@@ -669,7 +669,7 @@ AudioTrack::freeze_me (InterThreadInfo& itt)
        /* create a new region from all filesources, keep it private */
 
        PropertyList plist;
-       
+
        plist.add (Properties::start, 0);
        plist.add (Properties::length, srcs[0]->length(srcs[0]->timeline_position()));
        plist.add (Properties::name, region_name);