#include "ardour/amp.h"
#include "ardour/audioengine.h"
#include "ardour/audiofilesource.h"
+#include "ardour/audioplaylist.h"
#include "ardour/audioregion.h"
#include "ardour/debug.h"
#include "ardour/delivery.h"
#include "ardour/event_type_map.h"
#include "ardour/io_processor.h"
#include "ardour/meter.h"
+#include "ardour/midi_playlist.h"
#include "ardour/midi_region.h"
#include "ardour/monitor_control.h"
#include "ardour/playlist.h"
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)
- , _disk_io_point (DiskIOPreFader)
- , _mode (mode)
+ , _saved_meter_point (_meter_point)
+ , _mode (mode)
, _alignment_choice (Automatic)
{
_freeze_record.state = NoFreeze;
- _declickable = true;
}
Track::~Track ()
int
Track::init ()
{
- if (Route::init ()) {
- return -1;
- }
+ if (Route::init ()) {
+ return -1;
+ }
- use_new_playlist ();
+ DiskIOProcessor::Flag dflags = DiskIOProcessor::Recordable;
+
+ if (_mode == Destructive && !Profile->get_trx()) {
+ dflags = DiskIOProcessor::Flag (dflags | DiskIOProcessor::Destructive);
+ }
- /* disk writer and reader processors will be added when Route calls
- * add_processors_oh_children_of_mine ().
- */
+ _disk_reader.reset (new DiskReader (_session, name(), dflags));
+ _disk_reader->set_block_size (_session.get_block_size ());
+ _disk_reader->set_route (boost::dynamic_pointer_cast<Route> (shared_from_this()));
+ _disk_reader->set_owner (this);
- boost::shared_ptr<Route> rp (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()));
+ _disk_writer->set_owner (this);
+
+ set_align_choice_from_io ();
+
+ use_new_playlist (data_type());
+
+ boost::shared_ptr<Route> rp (boost::dynamic_pointer_cast<Route> (shared_from_this()));
boost::shared_ptr<Track> rt = boost::dynamic_pointer_cast<Track> (rp);
_record_enable_control.reset (new RecordEnableControl (_session, EventTypeMap::instance().to_symbol (RecEnableAutomation), *this));
_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));
- _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));
-
- _input->changed.connect_same_thread (*this, boost::bind (&Track::input_changed, this));
-
- return 0;
-}
-
-void
-Track::add_processors_oh_children_of_mine ()
-{
- cerr << name() << " ::apocom(), create DW + DR\n";
-
- DiskIOProcessor::Flag dflags = DiskIOProcessor::Recordable;
-
- if (_mode == Destructive && !Profile->get_trx()) {
- dflags = DiskIOProcessor::Flag (dflags | DiskIOProcessor::Destructive);
- } else if (_mode == NonLayered){
- dflags = DiskIOProcessor::Flag(dflags | DiskIOProcessor::NonLayered);
- }
+ _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));
- _disk_reader.reset (new DiskReader (_session, name(), dflags));
- _disk_reader->set_block_size (_session.get_block_size ());
- _disk_reader->set_route (boost::dynamic_pointer_cast<Route> (shared_from_this()));
+ _input->changed.connect_same_thread (*this, boost::bind (&Track::input_changed, 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()));
+ return 0;
}
void
}
XMLNode&
-Track::get_state ()
-{
- return state (true);
-}
-
-XMLNode&
-Track::state (bool full)
+Track::state (bool save_template)
{
- XMLNode& root (Route::state (full));
+ XMLNode& root (Route::state (save_template));
if (_playlists[DataType::AUDIO]) {
root.set_property (X_("audio-playlist"), _playlists[DataType::AUDIO]->id().to_s());
root.add_child_nocopy (_record_enable_control->get_state ());
root.set_property (X_("saved-meter-point"), _saved_meter_point);
- root.set_property (X_("disk-io-point"), _disk_io_point);
root.set_property (X_("alignment-choice"), _alignment_choice);
return root;
return -1;
}
- XMLNode* child;
+ if (version >= 3000 && version < 6000) {
+ if (XMLNode* ds_node = find_named_node (node, "Diskstream")) {
+ std::string name;
+ if (ds_node->get_property ("name", name)) {
+
+ ds_node->set_property ("active", true);
- if (version >= 3000 && version < 4000) {
- if ((child = find_named_node (node, X_("Diskstream"))) != 0) {
- /* XXX if we remember anything from stored DiskStream
- state (older Ardour versions) that is needed by a
- DiskReader or DiskWriter, we should cook up a new
- XMLNode here, populate it with that information
- (child nodes, properties, etc.) and then call
- ::set_state() on the writer/reader.
-
- But at present (June 2017), there's no such state.
- */
+ _disk_writer->set_state (*ds_node, version);
+ _disk_reader->set_state (*ds_node, version);
+
+ AlignChoice ac;
+ if (ds_node->get_property (X_("capture-alignment"), ac)) {
+ set_align_choice (ac, true);
+ }
+
+ if (boost::shared_ptr<AudioPlaylist> pl = boost::dynamic_pointer_cast<AudioPlaylist> (_session.playlists->by_name (name))) {
+ use_playlist (DataType::AUDIO, pl);
+ }
+
+ if (boost::shared_ptr<MidiPlaylist> pl = boost::dynamic_pointer_cast<MidiPlaylist> (_session.playlists->by_name (name))) {
+ use_playlist (DataType::MIDI, pl);
+ }
+ }
}
}
+ XMLNode* child;
std::string playlist_id;
if (node.get_property (X_("audio-playlist"), playlist_id)) {
_saved_meter_point = _meter_point;
}
- if (!node.get_property (X_("saved-meter-point"), _disk_io_point)) {
- _disk_io_point = DiskIOPreFader;
- }
AlignChoice ac;
return 0;
}
-XMLNode&
-Track::get_template ()
-{
- return state (false);
-}
-
Track::FreezeRecord::~FreezeRecord ()
{
for (vector<FreezeRecordProcessorInfo*>::iterator i = processor_info.begin(); i != processor_info.end(); ++i) {
return _freeze_record.state;
}
+bool
+Track::declick_in_progress () const
+{
+ return _disk_reader->declick_in_progress ();
+}
+
bool
Track::can_record()
{
return ret;
}
-void
-Track::set_latency_compensation (framecnt_t longest_session_latency)
-{
- Route::set_latency_compensation (longest_session_latency);
- _disk_reader->set_roll_delay (_roll_delay);
-}
-
-int
-Track::no_roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame, bool session_state_changing)
-{
- Glib::Threads::RWLock::ReaderLock lm (_processor_lock, Glib::Threads::TRY_LOCK);
-
- if (!lm.locked()) {
- return 0;
- }
-
- bool can_record = _session.actively_recording ();
-
- /* no outputs? nothing to do ... what happens if we have sends etc. ? */
-
- 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;
- }
-
- /* not active ... do the minimum possible by just outputting silence */
-
- if (!_active) {
- silence (nframes);
- if (_meter_point == MeterInput && ((_monitoring_control->monitoring_choice() & MonitorInput) || _disk_writer->record_enabled())) {
- _meter->reset();
- }
- return 0;
- }
-
- if (session_state_changing) {
- if (_session.transport_speed() != 0.0f) {
- /* we're rolling but some state is changing (e.g. our
- disk reader contents) so we cannot use them. Be
- silent till this is over. Don't declick.
-
- XXX note the absurdity of ::no_roll() being called when we ARE rolling!
- */
- passthru_silence (start_frame, end_frame, nframes, 0);
- return 0;
- }
- /* we're really not rolling, so we're either delivery silence or actually
- monitoring, both of which are safe to do while session_state_changing is true.
- */
- }
-
- _disk_writer->check_record_status (start_frame, can_record);
-
- bool be_silent;
-
- MonitorState const s = monitoring_state ();
- /* we are not rolling, so be silent even if we are monitoring disk, as there
- will be no disk data coming in.
- */
- switch (s) {
- case MonitoringSilence:
- be_silent = true;
- break;
- case MonitoringDisk:
- be_silent = true;
- break;
- case MonitoringInput:
- be_silent = false;
- break;
- default:
- 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 .. */
-
- if (be_silent) {
-
- if (_meter_point == MeterInput) {
- /* still need input monitoring and metering */
-
- bool const track_rec = _disk_writer->record_enabled ();
- 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 no_meter = false;
-
- /* this needs a proper K-map
- * and should be separated into a function similar to monitoring_state()
- * that also handles roll() states in audio_track.cc, midi_track.cc and route.cc
- *
- * see http://www.oofus.co.uk/ardour/Ardour3MonitorModesV3.pdf
- */
- if (!auto_input && !track_rec) {
- no_meter=true;
- }
- else if (tape_machine_mode && !track_rec && auto_input) {
- no_meter=true;
- }
- else if (!software_monitor && tape_machine_mode && !track_rec) {
- no_meter=true;
- }
- else if (!software_monitor && !tape_machine_mode && !track_rec && !auto_input) {
- no_meter=true;
- }
-
- if (no_meter) {
- BufferSet& bufs (_session.get_silent_buffers (n_process_buffers()));
- _meter->run (bufs, start_frame, end_frame, 1.0, nframes, true);
- _input->process_input (boost::shared_ptr<Processor>(), start_frame, end_frame, _session.transport_speed(), nframes);
- } else {
- _input->process_input (_meter, start_frame, end_frame, _session.transport_speed(), nframes);
- }
- }
-
- passthru_silence (start_frame, end_frame, nframes, 0);
-
- } 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, _session.transport_speed(), nframes, true);
- }
-
- passthru (bufs, start_frame, end_frame, nframes, false);
- }
-
- flush_processor_buffers_locked (nframes);
-
- return 0;
-}
-
-int
-Track::silent_roll (pframes_t nframes, framepos_t /*start_frame*/, framepos_t /*end_frame*/, bool& need_butler)
-{
- Glib::Threads::RWLock::ReaderLock lm (_processor_lock, Glib::Threads::TRY_LOCK);
- if (!lm.locked()) {
- // XXX DISK reader needs to seek ahead the correct distance ?? OR DOES IT ?
- //framecnt_t playback_distance = _disk_reader->calculate_playback_distance(nframes);
- //if (can_internal_playback_seek(playback_distance)) {
- // internal_playback_seek(playback_distance);
- //}
- return 0;
- }
-
- if (n_outputs().n_total() == 0 && _processors.empty()) {
- return 0;
- }
-
- if (!_active) {
- silence (nframes);
- return 0;
- }
-
- _silent = true;
- _amp->apply_gain_automation(false);
-
- silence (nframes);
- flush_processor_buffers_locked (nframes);
-
- //BufferSet& bufs (_session.get_route_buffers (n_process_buffers(), true));
- // XXXX DISKWRITER/READER ADVANCE, SET need_butler
- return 0;
-}
-
boost::shared_ptr<Playlist>
Track::playlist ()
{
return _disk_writer->last_capture_sources ();
}
-void
-Track::update_latency_information ()
-{
- Glib::Threads::RWLock::ReaderLock lr (_processor_lock);
- framecnt_t chain_latency = _input->latency ();
-
- for (ProcessorList::iterator p = _processors.begin(); p != _processors.end(); ++p) {
- (*p)->set_input_latency (chain_latency);
- chain_latency += (*p)->signal_latency ();
- }
-}
-
std::string
Track::steal_write_source_name()
{
}
int
-Track::seek (framepos_t p, bool complete_refill)
+Track::seek (samplepos_t p, bool complete_refill)
{
if (_disk_reader->seek (p, complete_refill)) {
return -1;
return _disk_writer->seek (p, complete_refill);
}
-bool
-Track::hidden () const
-{
- return _disk_writer->hidden () || _disk_reader->hidden();
-}
-
int
-Track::can_internal_playback_seek (framecnt_t p)
+Track::can_internal_playback_seek (samplecnt_t p)
{
return _disk_reader->can_internal_playback_seek (p);
}
int
-Track::internal_playback_seek (framecnt_t p)
+Track::internal_playback_seek (samplecnt_t p)
{
return _disk_reader->internal_playback_seek (p);
}
void
-Track::non_realtime_locate (framepos_t p)
+Track::non_realtime_locate (samplepos_t p)
{
Route::non_realtime_locate (p);
-
- if (!hidden()) {
- /* don't waste i/o cycles and butler calls
- for hidden (secret) tracks
- */
- _disk_reader->non_realtime_locate (p);
- _disk_writer->non_realtime_locate (p);
- }
-}
-
-void
-Track::non_realtime_speed_change ()
-{
- _disk_reader->non_realtime_speed_change ();
}
int
return _disk_reader->overwrite_existing_buffers ();
}
-framecnt_t
-Track::get_captured_frames (uint32_t n) const
-{
- return _disk_writer->get_captured_frames (n);
-}
-
-int
-Track::set_loop (Location* l)
+samplecnt_t
+Track::get_captured_samples (uint32_t n) const
{
- if (_disk_reader->set_loop (l)) {
- return -1;
- }
- return _disk_writer->set_loop (l);
+ return _disk_writer->get_captured_samples (n);
}
void
-Track::transport_looped (framepos_t p)
+Track::transport_looped (samplepos_t p)
{
return _disk_writer->transport_looped (p);
}
-bool
-Track::realtime_speed_change ()
-{
- if (_disk_reader->realtime_speed_change ()) {
- return -1;
- }
- return _disk_writer->realtime_speed_change ();
-}
-
-void
-Track::realtime_handle_transport_stopped ()
-{
- Glib::Threads::RWLock::ReaderLock lm (_processor_lock, Glib::Threads::TRY_LOCK);
-
- if (!lm.locked ()) {
- return;
- }
-
- for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) {
- (*i)->realtime_handle_transport_stopped ();
- }
-}
-
void
Track::transport_stopped_wallclock (struct tm & n, time_t t, bool g)
{
return _disk_reader->pending_overwrite ();
}
-void
-Track::prepare_to_stop (framepos_t t, framepos_t a)
-{
- _disk_writer->prepare_to_stop (t, a);
-}
-
void
Track::set_slaved (bool s)
{
return _disk_reader->output_streams();
}
-framepos_t
-Track::get_capture_start_frame (uint32_t n) const
+samplepos_t
+Track::get_capture_start_sample (uint32_t n) const
{
- return _disk_writer->get_capture_start_frame (n);
+ return _disk_writer->get_capture_start_sample (n);
}
AlignStyle
AlignChoice
Track::alignment_choice () const
{
- return _disk_writer->alignment_choice ();
+ return _alignment_choice;
}
-framepos_t
+samplepos_t
Track::current_capture_start () const
{
return _disk_writer->current_capture_start ();
}
-framepos_t
+samplepos_t
Track::current_capture_end () const
{
return _disk_writer->current_capture_end ();
_playlists[dt] = p;
}
+ _session.set_dirty ();
+ PlaylistChanged (); /* EMIT SIGNAL */
+
return ret;
}
}
int
-Track::use_new_playlist ()
+Track::use_new_playlist (DataType dt)
{
string newname;
- boost::shared_ptr<Playlist> playlist = _playlists[data_type()];
+ boost::shared_ptr<Playlist> playlist = _playlists[dt];
if (playlist) {
newname = Playlist::bump_name (playlist->name(), _session);
newname = Playlist::bump_name (_name, _session);
}
- playlist = PlaylistFactory::create (data_type(), _session, newname, hidden());
+ playlist = PlaylistFactory::create (dt, _session, newname, is_private_route());
if (!playlist) {
return -1;
}
- return use_playlist (data_type(), playlist);
+ return use_playlist (dt, playlist);
}
void
Track::set_align_choice (AlignChoice ac, bool force)
{
+ _alignment_choice = ac;
switch (ac) {
- case Automatic:
- _alignment_choice = Automatic;
- set_align_choice_from_io ();
- return;
- default:
- break;
+ case Automatic:
+ set_align_choice_from_io ();
+ break;
+ case UseCaptureTime:
+ _disk_writer->set_align_style (CaptureTime, force);
+ break;
+ case UseExistingMaterial:
+ _disk_writer->set_align_style (ExistingMaterial, force);
+ break;
}
-
- _disk_writer->set_align_choice (ac, force);
- _alignment_choice = ac;
}
void
}
}
-#ifdef USE_TRACKS_CODE_FEATURES
-
-/* This is the Tracks version of Track::monitoring_state().
- *
- * Ardour developers: try to flag or fix issues if parts of the libardour API
- * change in ways that invalidate this
- */
-
-MonitorState
-Track::monitoring_state () const
-{
- /* Explicit requests */
-
- if (_monitoring != MonitorInput) {
- return MonitoringInput;
- }
-
- if (_monitoring & MonitorDisk) {
- return MonitoringDisk;
- }
-
- /* 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) {
- return MonitoringDisk;
- } else {
- return MonitoringInput;
- }
-
- } else {
-
- if (roll) {
- return MonitoringDisk;
- }
- }
-
- return MonitoringSilence;
-}
-
-#else
-
-/* This is the Ardour/Mixbus version of Track::monitoring_state().
- *
- * Tracks developers: do NOT modify this method under any circumstances.
- */
-
-MonitorState
-Track::monitoring_state () const
-{
- /* Explicit requests */
- MonitorChoice m (_monitoring_control->monitoring_choice());
-
- if (m != MonitorAuto) {
-
- MonitorState ms ((MonitorState) 0);
-
- if (m & MonitorInput) {
- ms = MonitoringInput;
- }
-
- if (m & MonitorDisk) {
- ms = MonitorState (ms | MonitoringDisk);
- }
-
- return ms;
- }
-
- 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.
- */
-
- bool const roll = _session.transport_rolling ();
- bool const track_rec = _disk_writer->record_enabled ();
- 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 session_rec;
-
- /* I suspect that just use actively_recording() is good enough all the
- * 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() || _session.preroll_record_punch_enabled ()) {
- session_rec = _session.actively_recording ();
- } else {
- session_rec = _session.get_record_enabled();
- }
-
- if (track_rec) {
-
- if (!session_rec && roll && auto_input) {
- return MonitoringDisk;
- } else {
- return software_monitor ? MonitoringInput : MonitoringSilence;
- }
-
- } else {
-
- if (tape_machine_mode) {
-
- return MonitoringDisk;
-
- } else {
-
- if (!roll && auto_input) {
- return software_monitor ? MonitoringInput : MonitoringSilence;
- } else {
- return MonitoringDisk;
- }
-
- }
- }
-
- abort(); /* NOTREACHED */
- return MonitoringSilence;
-}
-
-#endif
-
-void
-Track::maybe_declick (BufferSet& bufs, framecnt_t nframes, int declick)
-{
- /* never declick if there is an internal generator - we just want it to
- keep generating sound without interruption.
-
- ditto if we are monitoring inputs.
- */
-
- if (_have_internal_generator || (_monitoring_control->monitoring_choice() == MonitorInput)) {
- return;
- }
-
- if (!declick) {
- declick = _pending_declick;
- }
-
- if (declick != 0) {
- Amp::declick (bufs, nframes, declick);
- }
-}
-
-framecnt_t
-Track::check_initial_delay (framecnt_t nframes, framepos_t& transport_frame)
-{
- if (_roll_delay > nframes) {
-
- _roll_delay -= nframes;
- silence_unlocked (nframes);
- /* transport frame is not legal for caller to use */
- return 0;
-
- } else if (_roll_delay > 0) {
-
- nframes -= _roll_delay;
- silence_unlocked (_roll_delay);
- transport_frame += _roll_delay;
-
- /* shuffle all the port buffers for things that lead "out" of this Route
- to reflect that we just wrote _roll_delay frames of silence.
- */
-
- Glib::Threads::RWLock::ReaderLock lm (_processor_lock);
- for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) {
- boost::shared_ptr<IOProcessor> iop = boost::dynamic_pointer_cast<IOProcessor> (*i);
- if (iop) {
- iop->increment_port_buffer_offset (_roll_delay);
- }
- }
- _output->increment_port_buffer_offset (_roll_delay);
-
- _roll_delay = 0;
-
- }
-
- return nframes;
-}
-
void
Track::monitoring_changed (bool, Controllable::GroupControlDisposition)
{
return true;
}
+ cerr << name() << " looking for state for track procs, DR = " << _disk_reader << endl;
+
if (prop->value() == "diskreader") {
if (_disk_reader) {
_disk_reader->set_state (node, Stateful::current_state_version);
return;
}
- framecnt_t total_capture = 0;
+ samplecnt_t total_capture = 0;
for (total_capture = 0, ci = capture_info.begin(); ci != capture_info.end(); ++ci) {
- total_capture += (*ci)->frames;
+ total_capture += (*ci)->samples;
}
/* we will want to be able to keep (over)writing the source
pl->clear_changes ();
pl->freeze ();
- /* Session frame time of the initial capture in this pass, which is where the source starts */
- framepos_t initial_capture = 0;
+ /* Session sample time of the initial capture in this pass, which is where the source starts */
+ samplepos_t initial_capture = 0;
if (!capture_info.empty()) {
initial_capture = capture_info.front()->start;
}
- BeatsFramesConverter converter (_session.tempo_map(), capture_info.front()->start);
- const framepos_t preroll_off = _session.preroll_record_trim_len ();
+ BeatsSamplesConverter converter (_session.tempo_map(), capture_info.front()->start);
+ const samplepos_t preroll_off = _session.preroll_record_trim_len ();
for (ci = capture_info.begin(); ci != capture_info.end(); ++ci) {
RegionFactory::region_name (region_name, mfs->name(), false);
DEBUG_TRACE (DEBUG::CaptureAlignment, string_compose ("%1 capture start @ %2 length %3 add new region %4\n",
- _name, (*ci)->start, (*ci)->frames, region_name));
+ _name, (*ci)->start, (*ci)->samples, region_name));
- // cerr << _name << ": based on ci of " << (*ci)->start << " for " << (*ci)->frames << " add a region\n";
+ // cerr << _name << ": based on ci of " << (*ci)->start << " for " << (*ci)->samples << " add a region\n";
try {
PropertyList plist;
/* start of this region is the offset between the start of its capture and the start of the whole pass */
plist.add (Properties::start, (*ci)->start - initial_capture);
- plist.add (Properties::length, (*ci)->frames);
- plist.add (Properties::length_beats, converter.from((*ci)->frames).to_double());
+ plist.add (Properties::length, (*ci)->samples);
+ plist.add (Properties::length_beats, converter.from((*ci)->samples).to_double());
plist.add (Properties::name, region_name);
boost::shared_ptr<Region> rx (RegionFactory::create (srcs, plist));
continue; /* XXX is this OK? */
}
- // cerr << "add new region, buffer position = " << buffer_position << " @ " << (*ci)->start << endl;
+ cerr << "add new region, len = " << (*ci)->samples << " @ " << (*ci)->start << endl;
- pl->add_region (midi_region, (*ci)->start + preroll_off);
+ pl->add_region (midi_region, (*ci)->start + preroll_off, 1, _session.config.get_layered_record_mode ());
}
pl->thaw ();
try {
PropertyList plist;
- plist.add (Properties::start, afs->last_capture_start_frame());
+ plist.add (Properties::start, afs->last_capture_start_sample());
plist.add (Properties::length, afs->length(0));
plist.add (Properties::name, whole_file_region_name);
boost::shared_ptr<Region> rx (RegionFactory::create (srcs, plist));
pl->set_capture_insertion_in_progress (true);
pl->freeze ();
- const framepos_t preroll_off = _session.preroll_record_trim_len ();
- framecnt_t buffer_position = afs->last_capture_start_frame ();
+ const samplepos_t preroll_off = _session.preroll_record_trim_len ();
+ samplecnt_t buffer_position = afs->last_capture_start_sample ();
CaptureInfos::const_iterator ci;
for (ci = capture_info.begin(); ci != capture_info.end(); ++ci) {
RegionFactory::region_name (region_name, whole_file_region_name, false);
DEBUG_TRACE (DEBUG::CaptureAlignment, string_compose ("%1 capture bufpos %5 start @ %2 length %3 add new region %4\n",
- _name, (*ci)->start, (*ci)->frames, region_name, buffer_position));
+ _name, (*ci)->start, (*ci)->samples, region_name, buffer_position));
try {
PropertyList plist;
plist.add (Properties::start, buffer_position);
- plist.add (Properties::length, (*ci)->frames);
+ plist.add (Properties::length, (*ci)->samples);
plist.add (Properties::name, region_name);
boost::shared_ptr<Region> rx (RegionFactory::create (srcs, plist));
continue; /* XXX is this OK? */
}
- pl->add_region (region, (*ci)->start + preroll_off, 1, _disk_writer->non_layered());
+ pl->add_region (region, (*ci)->start + preroll_off, 1, _session.config.get_layered_record_mode());
pl->set_layer (region, DBL_MAX);
- buffer_position += (*ci)->frames;
+ buffer_position += (*ci)->samples;
}
pl->thaw ();
_session.add_command (new StatefulDiffCommand (pl));
}
-#ifdef __clang__
-__attribute__((annotate("realtime")))
-#endif
-void
-Track::setup_invisible_processors_oh_children_of_mine (ProcessorList& processors)
-{
- ProcessorList::iterator insert_pos;
-
- switch (_disk_io_point) {
- case DiskIOPreFader:
- insert_pos = find (processors.begin(), processors.end(), _trim);
- if (insert_pos != processors.end()) {
- insert_pos = processors.insert (insert_pos, _disk_writer);
- processors.insert (insert_pos, _disk_reader);
- }
- break;
- case DiskIOPostFader:
- insert_pos = find (processors.begin(), processors.end(), _main_outs);
- if (insert_pos != processors.end()) {
- insert_pos = processors.insert (insert_pos, _disk_writer);
- processors.insert (insert_pos, _disk_reader);
- }
- case DiskIOCustom:
- break;
- }
-}
-
-void
-Track::set_disk_io_position (DiskIOPoint diop)
-{
- bool display = false;
- switch (diop) {
- case DiskIOCustom:
- display = true;
- break;
- default:
- display = false;
- }
-
- _disk_writer->set_display_to_user (display);
- _disk_reader->set_display_to_user (display);
-
- const bool changed = (diop != _disk_io_point);
-
- _disk_io_point = diop;
-
- if (changed) {
- Glib::Threads::Mutex::Lock lx (AudioEngine::instance()->process_lock ());
- configure_processors (0);
- }
-
- processors_changed (RouteProcessorChange ()); /* EMIT SIGNAL */
-}
projects / ardour.git / blobdiff