ardour/livetrax
13
0
Fork 0
Code

NO-OP: whitespace

Browse Source
This commit is contained in:
Robin Gareus 2017-09-22 01:52:48 +02:00
parent 7a51d8f768
commit 431b2f15c6
2 changed files with 34 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libs/ardour/disk_writer.cc
View File

@ -48,14 +48,14 @@ DiskWriter::DiskWriter (Session& s, string const & str, DiskIOProcessor::Flag f)
, _record_enabled (0) , _record_enabled (0)
, _record_safe (0) , _record_safe (0)
, capture_start_sample (0) , capture_start_sample (0)
, capture_captured (0) , capture_captured (0)
, was_recording (false) , was_recording (false)
, adjust_capture_position (0) , adjust_capture_position (0)
, _capture_offset (0) , _capture_offset (0)
, first_recordable_sample (max_samplepos) , first_recordable_sample (max_samplepos)
, last_recordable_sample (max_samplepos) , last_recordable_sample (max_samplepos)
, last_possibly_recording (0) , last_possibly_recording (0)
, _alignment_style (ExistingMaterial) , _alignment_style (ExistingMaterial)
, _num_captured_loops (0) , _num_captured_loops (0)
, _accumulated_capture_offset (0) , _accumulated_capture_offset (0)
, _gui_feed_buffer(AudioEngine::instance()->raw_buffer_size (DataType::MIDI)) , _gui_feed_buffer(AudioEngine::instance()->raw_buffer_size (DataType::MIDI))

51
libs/ardour/track.cc
View File

@ -54,12 +54,12 @@ using namespace PBD;
Track::Track (Session& sess, string name, PresentationInfo::Flag flag, TrackMode mode, DataType default_type) Track::Track (Session& sess, string name, PresentationInfo::Flag flag, TrackMode mode, DataType default_type)
: Route (sess, name, flag, default_type) : Route (sess, name, flag, default_type)
, _saved_meter_point (_meter_point) , _saved_meter_point (_meter_point)
, _mode (mode) , _mode (mode)
, _alignment_choice (Automatic) , _alignment_choice (Automatic)
{ {
_freeze_record.state = NoFreeze; _freeze_record.state = NoFreeze;
_declickable = true; _declickable = true;
} }
@ -81,30 +81,31 @@ Track::~Track ()
int int
Track::init () Track::init ()
{ {
if (Route::init ()) { if (Route::init ()) {
return -1; return -1;
} }
DiskIOProcessor::Flag dflags = DiskIOProcessor::Recordable; DiskIOProcessor::Flag dflags = DiskIOProcessor::Recordable;
if (_mode == Destructive && !Profile->get_trx()) { if (_mode == Destructive && !Profile->get_trx()) {
dflags = DiskIOProcessor::Flag (dflags | DiskIOProcessor::Destructive); dflags = DiskIOProcessor::Flag (dflags | DiskIOProcessor::Destructive);
} else if (_mode == NonLayered){ } else if (_mode == NonLayered){
dflags = DiskIOProcessor::Flag(dflags | DiskIOProcessor::NonLayered); dflags = DiskIOProcessor::Flag(dflags | DiskIOProcessor::NonLayered);
} }
_disk_reader.reset (new DiskReader (_session, name(), dflags)); _disk_reader.reset (new DiskReader (_session, name(), dflags));
_disk_reader->set_block_size (_session.get_block_size ()); _disk_reader->set_block_size (_session.get_block_size ());
_disk_reader->set_route (boost::dynamic_pointer_cast<Route> (shared_from_this())); _disk_reader->set_route (boost::dynamic_pointer_cast<Route> (shared_from_this()));
_disk_writer.reset (new DiskWriter (_session, name(), dflags));
_disk_writer->set_block_size (_session.get_block_size ());
_disk_writer->set_route (boost::dynamic_pointer_cast<Route> (shared_from_this()));
set_align_choice_from_io (); set_align_choice_from_io ();
_disk_writer.reset (new DiskWriter (_session, name(), dflags));
_disk_writer->set_block_size (_session.get_block_size ());
_disk_writer->set_route (boost::dynamic_pointer_cast<Route> (shared_from_this()));
use_new_playlist (data_type()); use_new_playlist (data_type());
boost::shared_ptr<Route> rp (boost::dynamic_pointer_cast<Route> (shared_from_this())); boost::shared_ptr<Route> rp (boost::dynamic_pointer_cast<Route> (shared_from_this()));
boost::shared_ptr<Track> rt = boost::dynamic_pointer_cast<Track> (rp); boost::shared_ptr<Track> rt = boost::dynamic_pointer_cast<Track> (rp);
_record_enable_control.reset (new RecordEnableControl (_session, EventTypeMap::instance().to_symbol (RecEnableAutomation), *this)); _record_enable_control.reset (new RecordEnableControl (_session, EventTypeMap::instance().to_symbol (RecEnableAutomation), *this));
@ -118,13 +119,13 @@ Track::init ()
_session.config.ParameterChanged.connect_same_thread (*this, boost::bind (&Track::parameter_changed, this, _1)); _session.config.ParameterChanged.connect_same_thread (*this, boost::bind (&Track::parameter_changed, this, _1));
_monitoring_control->Changed.connect_same_thread (*this, boost::bind (&Track::monitoring_changed, this, _1, _2)); _monitoring_control->Changed.connect_same_thread (*this, boost::bind (&Track::monitoring_changed, this, _1, _2));
_record_safe_control->Changed.connect_same_thread (*this, boost::bind (&Track::record_safe_changed, this, _1, _2)); _record_safe_control->Changed.connect_same_thread (*this, boost::bind (&Track::record_safe_changed, this, _1, _2));
_record_enable_control->Changed.connect_same_thread (*this, boost::bind (&Track::record_enable_changed, this, _1, _2)); _record_enable_control->Changed.connect_same_thread (*this, boost::bind (&Track::record_enable_changed, this, _1, _2));
_input->changed.connect_same_thread (*this, boost::bind (&Track::input_changed, this)); _input->changed.connect_same_thread (*this, boost::bind (&Track::input_changed, this));
return 0; return 0;
} }
void void