X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Ftrack.cc;h=d7d9a0a9d14686b04ba78f8aba3521367b4d36e1;hb=1399ef391de5b05888ea2e13e6ff80f14b6e84d9;hp=2c9e71ca466091ca7e92a12c6cd91d947b93d1e4;hpb=4dc63966f0872efe768dad61eb9b8785d06b92d1;p=ardour.git diff --git a/libs/ardour/track.cc b/libs/ardour/track.cc index 2c9e71ca46..d7d9a0a9d1 100644 --- a/libs/ardour/track.cc +++ b/libs/ardour/track.cc @@ -21,28 +21,33 @@ #include "ardour/debug.h" #include "ardour/delivery.h" #include "ardour/diskstream.h" +#include "ardour/event_type_map.h" #include "ardour/io_processor.h" #include "ardour/meter.h" +#include "ardour/monitor_control.h" #include "ardour/playlist.h" #include "ardour/port.h" #include "ardour/processor.h" +#include "ardour/profile.h" +#include "ardour/record_enable_control.h" +#include "ardour/record_safe_control.h" #include "ardour/route_group_specialized.h" #include "ardour/session.h" #include "ardour/session_playlists.h" #include "ardour/track.h" +#include "ardour/types_convert.h" #include "ardour/utils.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace ARDOUR; using namespace PBD; -Track::Track (Session& sess, string name, Route::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) , _saved_meter_point (_meter_point) , _mode (mode) - , _monitoring (MonitorAuto) { _freeze_record.state = NoFreeze; _declickable = true; @@ -60,18 +65,25 @@ Track::init () return -1; } - boost::shared_ptr rp (shared_from_this()); + boost::shared_ptr rp (boost::dynamic_pointer_cast (shared_from_this())); boost::shared_ptr rt = boost::dynamic_pointer_cast (rp); - _rec_enable_control = boost::shared_ptr (new RecEnableControl(rt)); - _rec_enable_control->set_flags (Controllable::Toggle); - /* don't add rec_enable_control to controls because we don't want it to - * appear as an automatable parameter - */ - track_number_changed.connect_same_thread (*this, boost::bind (&Track::resync_track_name, this)); + _record_enable_control.reset (new RecordEnableControl (_session, EventTypeMap::instance().to_symbol (RecEnableAutomation), *this)); + add_control (_record_enable_control); + + _record_safe_control.reset (new RecordSafeControl (_session, EventTypeMap::instance().to_symbol (RecSafeAutomation), *this)); + add_control (_record_safe_control); + + _monitoring_control.reset (new MonitorControl (_session, EventTypeMap::instance().to_symbol (MonitoringAutomation), *this)); + add_control (_monitoring_control); + _session.config.ParameterChanged.connect_same_thread (*this, boost::bind (&Track::parameter_changed, this, _1)); - return 0; + _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_enable_control->Changed.connect_same_thread (*this, boost::bind (&Track::record_enable_changed, this, _1, _2)); + + return 0; } void @@ -96,13 +108,16 @@ XMLNode& Track::state (bool full) { XMLNode& root (Route::state (full)); - root.add_property (X_("monitoring"), enum_2_string (_monitoring)); - root.add_property (X_("saved-meter-point"), enum_2_string (_saved_meter_point)); - root.add_child_nocopy (_rec_enable_control->get_state()); + + root.add_child_nocopy (_monitoring_control->get_state ()); + root.add_child_nocopy (_record_safe_control->get_state ()); + root.add_child_nocopy (_record_enable_control->get_state ()); + + root.set_property (X_("saved-meter-point"), _saved_meter_point); root.add_child_nocopy (_diskstream->get_state ()); - + return root; -} +} int Track::set_state (const XMLNode& node, int version) @@ -133,25 +148,32 @@ Track::set_state (const XMLNode& node, int version) for (XMLNodeConstIterator niter = nlist.begin(); niter != nlist.end(); ++niter) { child = *niter; - XMLProperty* prop; - 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) { + std::string name; + if (!child->get_property ("name", name)) { + continue; + } + + if (name == _record_enable_control->name()) { + _record_enable_control->set_state (*child, version); + } else if (name == _record_safe_control->name()) { + _record_safe_control->set_state (*child, version); + } else if (name == _monitoring_control->name()) { + _monitoring_control->set_state (*child, version); } } } - - const XMLProperty* prop; - if ((prop = node.property (X_("monitoring"))) != 0) { - _monitoring = MonitorChoice (string_2_enum (prop->value(), _monitoring)); - } else { - _monitoring = MonitorAuto; + /* convert old 3001 state */ + MonitorChoice monitoring; + if (node.get_property (X_("monitoring"), monitoring)) { + XMLNode mon_node ("backwardscompat"); + mon_node.set_property (X_("monitoring"), monitoring); + mon_node.set_property (X_("value"), (int) monitoring); + _monitoring_control->set_state (mon_node, version); } - if ((prop = node.property (X_("saved-meter-point"))) != 0) { - _saved_meter_point = MeterPoint (string_2_enum (prop->value(), _saved_meter_point)); - } else { + if (!node.get_property (X_("saved-meter-point"), _saved_meter_point)) { _saved_meter_point = _meter_point; } @@ -177,46 +199,6 @@ Track::freeze_state() const return _freeze_record.state; } -Track::RecEnableControl::RecEnableControl (boost::shared_ptr t) - : AutomationControl (t->session(), - RecEnableAutomation, - ParameterDescriptor(Evoral::Parameter(RecEnableAutomation)), - boost::shared_ptr(), - X_("recenable")) - , track (t) -{ - boost::shared_ptr gl(new AutomationList(Evoral::Parameter(RecEnableAutomation))); - set_list (gl); -} - -void -Track::RecEnableControl::set_value (double val) -{ - boost::shared_ptr t = track.lock (); - if (!t) { - return; - } - - t->set_record_enabled (val >= 0.5 ? true : false, this); -} - -double -Track::RecEnableControl::get_value () const -{ - boost::shared_ptr t = track.lock (); - if (!t) { - return 0; - } - - return (t->record_enabled() ? 1.0 : 0.0); -} - -bool -Track::record_enabled () const -{ - return _diskstream && _diskstream->record_enabled (); -} - bool Track::can_record() { @@ -229,24 +211,15 @@ Track::can_record() return will_record; } -void -Track::prep_record_enabled (bool yn, void *src) +int +Track::prep_record_enabled (bool yn) { - if (yn && record_safe ()) { - return; - } - - if (!_session.writable()) { - return; - } - - if (_freeze_record.state == Frozen) { - return; + if (yn && _record_safe_control->get_value()) { + return -1; } - if (_route_group && src != _route_group && _route_group->is_active() && _route_group->is_recenable()) { - _route_group->apply (&Track::prep_record_enabled, yn, _route_group); - return; + if (!can_be_record_enabled()) { + return -1; } /* keep track of the meter point as it was before we rec-enabled */ @@ -255,7 +228,7 @@ Track::prep_record_enabled (bool yn, void *src) } bool will_follow; - + if (yn) { will_follow = _diskstream->prep_record_enable (); } else { @@ -271,56 +244,32 @@ Track::prep_record_enabled (bool yn, void *src) set_meter_point (_saved_meter_point); } } + + return 0; } void -Track::set_record_enabled (bool yn, void *src) +Track::record_enable_changed (bool, Controllable::GroupControlDisposition) { - if (_diskstream->record_safe ()) { - return; - } - - if (!_session.writable()) { - return; - } - - if (_freeze_record.state == Frozen) { - return; - } - - if (_route_group && src != _route_group && _route_group->is_active() && _route_group->is_recenable()) { - _route_group->apply (&Track::set_record_enabled, yn, _route_group); - return; - } - - _diskstream->set_record_enabled (yn); + _diskstream->set_record_enabled (_record_enable_control->get_value()); +} - _rec_enable_control->Changed (); +void +Track::record_safe_changed (bool, Controllable::GroupControlDisposition) +{ + _diskstream->set_record_safe (_record_safe_control->get_value()); } bool -Track::record_safe () const +Track::can_be_record_safe () { - return _diskstream && _diskstream->record_safe (); + return !_record_enable_control->get_value() && _diskstream && _session.writable() && (_freeze_record.state != Frozen); } -void -Track::set_record_safe (bool yn, void *src) +bool +Track::can_be_record_enabled () { - if (!_session.writable()) { /* REQUIRES REVIEW */ - return; - } - - if (_freeze_record.state == Frozen) { /* REQUIRES REVIEW */ - return; - } - - if (_route_group && src != _route_group && _route_group->is_active() && _route_group->is_recenable()) { - _route_group->apply (&Track::set_record_safe, yn, _route_group); - return; - } - - _diskstream->set_record_safe (yn); + return !_record_safe_control->get_value() && _diskstream && !_diskstream->record_safe() && _session.writable() && (_freeze_record.state != Frozen); } void @@ -350,8 +299,12 @@ Track::set_name (const string& str) { bool ret; - if (record_enabled() && _session.actively_recording()) { - /* this messes things up if done while recording */ + if (str.empty ()) { + return false; + } + + if (_record_enable_control->get_value()) { + /* when re-arm'ed the file (named after the track) is already ready to rolll */ return false; } @@ -423,7 +376,8 @@ Track::no_roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame, /* no outputs? nothing to do ... what happens if we have sends etc. ? */ - if (n_outputs().n_total() == 0) { + if (n_outputs().n_total() == 0 && !ARDOUR::Profile->get_mixbus()) { + //Note: Mixbus has its own output mechanism, so we should operate even if no explicit outputs are assigned return 0; } @@ -431,7 +385,7 @@ Track::no_roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame, if (!_active) { silence (nframes); - if (_meter_point == MeterInput && (_monitoring & MonitorInput || _diskstream->record_enabled())) { + if (_meter_point == MeterInput && ((_monitoring_control->monitoring_choice() & MonitorInput) || _diskstream->record_enabled())) { _meter->reset(); } return 0; @@ -474,12 +428,12 @@ Track::no_roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame, be_silent = false; break; } - + //if we have an internal generator, let it play regardless of monitoring state if (_have_internal_generator) { be_silent = false; } - + _amp->apply_gain_automation (false); /* if have_internal_generator, or .. */ @@ -516,10 +470,10 @@ Track::no_roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame, if (no_meter) { BufferSet& bufs (_session.get_silent_buffers (n_process_buffers())); - _meter->run (bufs, 0, 0, nframes, true); - _input->process_input (boost::shared_ptr(), start_frame, end_frame, nframes); + _meter->run (bufs, start_frame, end_frame, 1.0, nframes, true); + _input->process_input (boost::shared_ptr(), start_frame, end_frame, speed(), nframes); } else { - _input->process_input (_meter, start_frame, end_frame, nframes); + _input->process_input (_meter, start_frame, end_frame, speed(), nframes); } } @@ -528,22 +482,17 @@ Track::no_roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame, } else { BufferSet& bufs = _session.get_route_buffers (n_process_buffers()); - + fill_buffers_with_input (bufs, _input, nframes); if (_meter_point == MeterInput) { - _meter->run (bufs, start_frame, end_frame, nframes, true); + _meter->run (bufs, start_frame, end_frame, 1.0 /*speed()*/, nframes, true); } passthru (bufs, start_frame, end_frame, nframes, false); } - for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) { - boost::shared_ptr d = boost::dynamic_pointer_cast (*i); - if (d) { - d->flush_buffers (nframes); - } - } + flush_processor_buffers_locked (nframes); return 0; } @@ -573,6 +522,7 @@ Track::silent_roll (pframes_t nframes, framepos_t /*start_frame*/, framepos_t /* _amp->apply_gain_automation(false); silence (nframes); + flush_processor_buffers_locked (nframes); framecnt_t playback_distance; @@ -590,8 +540,6 @@ Track::set_diskstream (boost::shared_ptr ds) ds->PlaylistChanged.connect_same_thread (*this, boost::bind (&Track::diskstream_playlist_changed, this)); diskstream_playlist_changed (); - ds->RecordEnableChanged.connect_same_thread (*this, boost::bind (&Track::diskstream_record_enable_changed, this)); - ds->RecordSafeChanged.connect_same_thread (*this, boost::bind (&Track::diskstream_record_safe_changed, this)); ds->SpeedChanged.connect_same_thread (*this, boost::bind (&Track::diskstream_speed_changed, this)); ds->AlignmentStyleChanged.connect_same_thread (*this, boost::bind (&Track::diskstream_alignment_style_changed, this)); } @@ -602,18 +550,6 @@ Track::diskstream_playlist_changed () PlaylistChanged (); /* EMIT SIGNAL */ } -void -Track::diskstream_record_enable_changed () -{ - RecordEnableChanged (); /* EMIT SIGNAL */ -} - -void -Track::diskstream_record_safe_changed () -{ - RecordSafeChanged (); /* EMIT SIGNAL */ -} - void Track::diskstream_speed_changed () { @@ -942,11 +878,11 @@ MonitorState Track::monitoring_state () const { /* Explicit requests */ - + if (_monitoring & MonitorInput) { return MonitoringInput; } - + if (_monitoring & MonitorDisk) { return MonitoringDisk; } @@ -954,16 +890,16 @@ Track::monitoring_state () const /* This is an implementation of the truth table in doc/monitor_modes.pdf; I don't think it's ever going to be too pretty too look at. */ - + // GZ: NOT USED IN TRACKS //bool const auto_input = _session.config.get_auto_input (); //bool const software_monitor = Config->get_monitoring_model() == SoftwareMonitoring; //bool const tape_machine_mode = Config->get_tape_machine_mode (); - + bool const roll = _session.transport_rolling (); bool const track_rec = _diskstream->record_enabled (); bool session_rec = _session.actively_recording (); - + if (track_rec) { if (!session_rec && roll) { @@ -993,15 +929,27 @@ MonitorState Track::monitoring_state () const { /* Explicit requests */ - - if (_monitoring & MonitorInput) { + MonitorChoice m (_monitoring_control->monitoring_choice()); + + if (m & MonitorInput) { return MonitoringInput; } - - if (_monitoring & MonitorDisk) { + + if (m & MonitorDisk) { return MonitoringDisk; } + switch (_session.config.get_session_monitoring ()) { + case MonitorDisk: + return MonitoringDisk; + break; + case MonitorInput: + return MonitoringInput; + break; + default: + break; + } + /* This is an implementation of the truth table in doc/monitor_modes.pdf; I don't think it's ever going to be too pretty too look at. */ @@ -1017,9 +965,11 @@ Track::monitoring_state () const * time, but just to keep the semantics the same as they were before * sept 26th 2012, we differentiate between the cases where punch is * enabled and those where it is not. + * + * rg: I suspect this is not the case: monitoring may differ */ - if (_session.config.get_punch_in() || _session.config.get_punch_out()) { + if (_session.config.get_punch_in() || _session.config.get_punch_out() || _session.preroll_record_punch_enabled ()) { session_rec = _session.actively_recording (); } else { session_rec = _session.get_record_enabled(); @@ -1046,7 +996,7 @@ Track::monitoring_state () const } else { return MonitoringDisk; } - + } } @@ -1065,7 +1015,7 @@ Track::maybe_declick (BufferSet& bufs, framecnt_t nframes, int declick) ditto if we are monitoring inputs. */ - if (_have_internal_generator || monitoring_choice() == MonitorInput) { + if (_have_internal_generator || (_monitoring_control->monitoring_choice() == MonitorInput)) { return; } @@ -1115,16 +1065,10 @@ Track::check_initial_delay (framecnt_t nframes, framepos_t& transport_frame) } void -Track::set_monitoring (MonitorChoice mc) +Track::monitoring_changed (bool, Controllable::GroupControlDisposition) { - if (mc != _monitoring) { - _monitoring = mc; - - for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) { - (*i)->monitoring_changed (); - } - - MonitoringChanged (); /* EMIT SIGNAL */ + for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) { + (*i)->monitoring_changed (); } } @@ -1134,11 +1078,10 @@ Track::metering_state () const bool rv; if (_session.transport_rolling ()) { // audio_track.cc || midi_track.cc roll() runs meter IFF: - rv = _meter_point == MeterInput && (_monitoring & MonitorInput || _diskstream->record_enabled()); + rv = _meter_point == MeterInput && ((_monitoring_control->monitoring_choice() & MonitorInput) || _diskstream->record_enabled()); } else { // track no_roll() always metering if rv = _meter_point == MeterInput; } return rv ? MeteringInput : MeteringRoute; } -