diff options
author | David Robillard <d@drobilla.net> | 2011-04-04 22:46:48 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2011-04-04 22:46:48 +0000 |
commit | 62e730b57ab30bb8642c5682b53b7c534d923a24 (patch) | |
tree | 92741da0e56bc6e5579b08a9ab7230e5054a92c9 /libs/ardour/audio_track.cc | |
parent | 847e8f06107293254606d499aeb3e8a2006b9b78 (diff) |
Fix broken whitespace (no functional changes).
git-svn-id: svn://localhost/ardour2/branches/3.0@9288 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/audio_track.cc')
-rw-r--r-- | libs/ardour/audio_track.cc | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/libs/ardour/audio_track.cc b/libs/ardour/audio_track.cc index 026e11c225..efd6e8ba86 100644 --- 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) { @@ -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; } @@ -387,7 +386,7 @@ AudioTrack::roll (pframes_t nframes, framepos_t start_frame, framepos_t end_fram playback distance to zero, thus causing diskstream::commit to do nothing. */ - cerr << name() << " Can't operate at " << transport_frame << " since roll delay is only " << _roll_delay << endl; + cerr << name() << " Can't operate at " << transport_frame << " since roll delay is only " << _roll_delay << endl; return diskstream->process (transport_frame, 0, can_record, rec_monitors_input, need_butler); } @@ -506,9 +505,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 */ |