X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fdiskstream.cc;h=a359f228e8d68c7818d46141578cfb696e2bd8a9;hb=b9054a1f723f6107f42a04ae9838820bbbd1f0ce;hp=affda7b56af41aad06e21ccbcb25a6ef04562ede;hpb=c4c40340855dff6191a670d3130d65b1e79dc8a0;p=ardour.git diff --git a/libs/ardour/diskstream.cc b/libs/ardour/diskstream.cc index affda7b56a..a359f228e8 100644 --- a/libs/ardour/diskstream.cc +++ b/libs/ardour/diskstream.cc @@ -31,30 +31,20 @@ #include #include - -#include +#include #include "pbd/error.h" #include "pbd/basename.h" #include "pbd/memento_command.h" #include "pbd/xml++.h" +#include "pbd/stacktrace.h" -#include "ardour/ardour.h" -#include "ardour/audioengine.h" #include "ardour/debug.h" #include "ardour/diskstream.h" -#include "ardour/utils.h" -#include "ardour/configuration.h" -#include "ardour/audiofilesource.h" -#include "ardour/send.h" +#include "ardour/io.h" #include "ardour/pannable.h" -#include "ardour/panner_shell.h" #include "ardour/playlist.h" -#include "ardour/cycle_timer.h" -#include "ardour/region.h" -#include "ardour/panner.h" #include "ardour/session.h" -#include "ardour/io.h" #include "ardour/track.h" #include "i18n.h" @@ -69,7 +59,7 @@ using namespace PBD; * default from configuration_vars.h). 0 is not a good value for * allocating buffer sizes.. */ -ARDOUR::framecnt_t Diskstream::disk_io_chunk_frames = 1024 * 256; +ARDOUR::framecnt_t Diskstream::disk_io_chunk_frames = 1024 * 256 / sizeof (Sample); PBD::Signal0 Diskstream::DiskOverrun; PBD::Signal0 Diskstream::DiskUnderrun; @@ -83,7 +73,6 @@ Diskstream::Diskstream (Session &sess, const string &name, Flag flag) , _actual_speed (1.0f) , _buffer_reallocation_required (false) , _seek_required (false) - , force_refill (false) , capture_start_frame (0) , capture_captured (0) , was_recording (false) @@ -95,7 +84,6 @@ Diskstream::Diskstream (Session &sess, const string &name, Flag flag) , last_possibly_recording (0) , _alignment_style (ExistingMaterial) , _alignment_choice (Automatic) - , _scrubbing (false) , _slaved (false) , loop_location (0) , overwrite_frame (0) @@ -108,9 +96,6 @@ Diskstream::Diskstream (Session &sess, const string &name, Flag flag) , _target_speed (_speed) , file_frame (0) , playback_sample (0) - , playback_distance (0) - , _read_data_count (0) - , _write_data_count (0) , in_set_state (false) , _flags (flag) , deprecated_io_node (0) @@ -126,7 +111,6 @@ Diskstream::Diskstream (Session& sess, const XMLNode& /*node*/) , _actual_speed (1.0f) , _buffer_reallocation_required (false) , _seek_required (false) - , force_refill (false) , capture_start_frame (0) , capture_captured (0) , was_recording (false) @@ -138,7 +122,6 @@ Diskstream::Diskstream (Session& sess, const XMLNode& /*node*/) , last_possibly_recording (0) , _alignment_style (ExistingMaterial) , _alignment_choice (Automatic) - , _scrubbing (false) , _slaved (false) , loop_location (0) , overwrite_frame (0) @@ -151,9 +134,6 @@ Diskstream::Diskstream (Session& sess, const XMLNode& /*node*/) , _target_speed (_speed) , file_frame (0) , playback_sample (0) - , playback_distance (0) - , _read_data_count (0) - , _write_data_count (0) , in_set_state (false) , _flags (Recordable) , deprecated_io_node (0) @@ -180,8 +160,10 @@ Diskstream::set_track (Track* t) ic_connection.disconnect(); _io->changed.connect_same_thread (ic_connection, boost::bind (&Diskstream::handle_input_change, this, _1, _2)); - input_change_pending.type = IOChange::Type (IOChange::ConfigurationChanged|IOChange::ConnectionsChanged); - non_realtime_input_change (); + if (_io->n_ports() != ChanCount::ZERO) { + input_change_pending.type = IOChange::Type (IOChange::ConfigurationChanged|IOChange::ConnectionsChanged); + non_realtime_input_change (); + } _track->Destroyed.connect_same_thread (*this, boost::bind (&Diskstream::route_going_away, this)); } @@ -189,7 +171,7 @@ Diskstream::set_track (Track* t) void Diskstream::handle_input_change (IOChange change, void * /*src*/) { - Glib::Mutex::Lock lm (state_lock); + Glib::Threads::Mutex::Lock lm (state_lock); if (change.type & (IOChange::ConfigurationChanged|IOChange::ConnectionsChanged)) { @@ -211,7 +193,7 @@ Diskstream::non_realtime_set_speed () { if (_buffer_reallocation_required) { - Glib::Mutex::Lock lm (state_lock); + Glib::Threads::Mutex::Lock lm (state_lock); allocate_temporary_buffers (); _buffer_reallocation_required = false; @@ -242,8 +224,8 @@ Diskstream::realtime_set_speed (double sp, bool global) if (new_speed != _actual_speed) { - framecnt_t required_wrap_size = (framecnt_t) floor (_session.get_block_size() * - fabs (new_speed)) + 1; + framecnt_t required_wrap_size = (framecnt_t) ceil (_session.get_block_size() * + fabs (new_speed)) + 2; if (required_wrap_size > wrap_buffer_size) { _buffer_reallocation_required = true; @@ -277,26 +259,26 @@ Diskstream::set_capture_offset () void -Diskstream::set_align_style (AlignStyle a) +Diskstream::set_align_style (AlignStyle a, bool force) { if (record_enabled() && _session.actively_recording()) { return; } - if (a != _alignment_style) { + if ((a != _alignment_style) || force) { _alignment_style = a; AlignmentStyleChanged (); } } void -Diskstream::set_align_choice (AlignChoice a) +Diskstream::set_align_choice (AlignChoice a, bool force) { if (record_enabled() && _session.actively_recording()) { return; } - if (a != _alignment_choice) { + if ((a != _alignment_choice) || force) { _alignment_choice = a; switch (_alignment_choice) { @@ -333,7 +315,7 @@ Diskstream::set_loop (Location *location) ARDOUR::framepos_t Diskstream::get_capture_start_frame (uint32_t n) const { - Glib::Mutex::Lock lm (capture_info_lock); + Glib::Threads::Mutex::Lock lm (capture_info_lock); if (capture_info.size() > n) { /* this is a completed capture */ @@ -347,12 +329,12 @@ Diskstream::get_capture_start_frame (uint32_t n) const ARDOUR::framecnt_t Diskstream::get_captured_frames (uint32_t n) const { - Glib::Mutex::Lock lm (capture_info_lock); + Glib::Threads::Mutex::Lock lm (capture_info_lock); if (capture_info.size() > n) { /* this is a completed capture */ return capture_info[n]->frames; - } else { + } else { /* this is the currently in-progress capture */ return capture_captured; } @@ -374,7 +356,7 @@ Diskstream::use_playlist (boost::shared_ptr playlist) bool prior_playlist = false; { - Glib::Mutex::Lock lm (state_lock); + Glib::Threads::Mutex::Lock lm (state_lock); if (playlist == _playlist) { return 0; @@ -454,18 +436,9 @@ Diskstream::set_name (const string& str) if (_name != str) { assert(playlist()); playlist()->set_name (str); - SessionObject::set_name(str); - - if (!in_set_state && recordable()) { - /* rename existing capture files so that they have the correct name */ - return rename_write_sources (); - } else { - return false; - } } - - return true; + return true; } XMLNode& @@ -487,7 +460,7 @@ Diskstream::get_state () if (_extra_xml) { node->add_child_copy (*_extra_xml); } - + return *node; } @@ -501,13 +474,9 @@ Diskstream::set_state (const XMLNode& node, int /*version*/) } if (deprecated_io_node) { - if ((prop = deprecated_io_node->property ("id")) != 0) { - _id = prop->value (); - } + set_id (*deprecated_io_node); } else { - if ((prop = node.property ("id")) != 0) { - _id = prop->value (); - } + set_id (node); } if ((prop = node.property ("flags")) != 0) { @@ -515,25 +484,17 @@ Diskstream::set_state (const XMLNode& node, int /*version*/) } if ((prop = node.property (X_("capture-alignment"))) != 0) { - _alignment_choice = AlignChoice (string_2_enum (prop->value(), _alignment_choice)); + set_align_choice (AlignChoice (string_2_enum (prop->value(), _alignment_choice)), true); } else { - _alignment_choice = Automatic; + set_align_choice (Automatic, true); } if ((prop = node.property ("playlist")) == 0) { return -1; } - { - bool had_playlist = (_playlist != 0); - - if (find_and_use_playlist (prop->value())) { - return -1; - } - - if (!had_playlist) { - _playlist->set_orig_diskstream_id (id()); - } + if (find_and_use_playlist (prop->value())) { + return -1; } if ((prop = node.property ("speed")) != 0) { @@ -554,11 +515,11 @@ Diskstream::playlist_ranges_moved (list< Evoral::RangeMove > const & automation undo (it must, since automation-follows-regions can lose automation data). Hence we can do nothing here. */ - + if (from_undo) { return; } - + if (!_track || Config->get_automation_follows_regions () == false) { return; } @@ -575,14 +536,14 @@ Diskstream::playlist_ranges_moved (list< Evoral::RangeMove > const & /* move panner automation */ boost::shared_ptr pannable = _track->pannable(); Evoral::ControlSet::Controls& c (pannable->controls()); - + for (Evoral::ControlSet::Controls::iterator ci = c.begin(); ci != c.end(); ++ci) { boost::shared_ptr ac = boost::dynamic_pointer_cast(ci->second); if (!ac) { continue; } boost::shared_ptr alist = ac->alist(); - + XMLNode & before = alist->get_state (); bool const things_moved = alist->move_ranges (movements); if (things_moved) { @@ -655,36 +616,27 @@ Diskstream::check_record_status (framepos_t transport_frame, bool can_record) return; } - /* we transitioned to recording. lets see if its transport based or a punch */ - - first_recordable_frame = transport_frame + _capture_offset; - last_recordable_frame = max_framepos; capture_start_frame = _session.transport_frame(); + first_recordable_frame = capture_start_frame + _capture_offset; + last_recordable_frame = max_framepos; - /* in theory, we should be offsetting by _session.worst_playback_latency() when we adjust - for ExistingMaterial alignment. But that number includes the worst processor latency - across all routes, and each track will already be roll-delay adjusted to handle that. - so don't use worst_playback_latency(), just worst_output_latency() which covers - only downstream latency from IO ports. - */ - - DEBUG_TRACE (DEBUG::CaptureAlignment, string_compose ("%1: @ %7 basic FRF = %2 CSF = %4 CO = %5, EMO = %6 RD = %8\n", + DEBUG_TRACE (DEBUG::CaptureAlignment, string_compose ("%1: @ %7 (%9) FRF = %2 CSF = %4 CO = %5, EMO = %6 RD = %8 WOL %10 WTL %11\n", name(), first_recordable_frame, last_recordable_frame, capture_start_frame, _capture_offset, existing_material_offset, - transport_frame, - _roll_delay)); + transport_frame, + _roll_delay, + _session.transport_frame(), + _session.worst_output_latency(), + _session.worst_track_latency())); + if (_alignment_style == ExistingMaterial) { first_recordable_frame += existing_material_offset; DEBUG_TRACE (DEBUG::CaptureAlignment, string_compose ("\tshift FRF by EMO %1\n", first_recordable_frame)); - } else { - capture_start_frame += _roll_delay; - DEBUG_TRACE (DEBUG::CaptureAlignment, string_compose ("\tshift CFS by roll delay of %1 to %2\n", - _roll_delay, capture_start_frame)); } - + prepare_record_status (capture_start_frame); } else { @@ -692,23 +644,21 @@ Diskstream::check_record_status (framepos_t transport_frame, bool can_record) if (last_possibly_recording == fully_rec_enabled) { /* we were recording last time */ - + if (change & transport_rolling) { /* transport-change (stopped rolling): last_recordable_frame was set in ::prepare_to_stop(). We had to set it there because we likely rolled past the stopping point to declick out, and then backed up. */ - + } else { /* punch out */ - - last_recordable_frame = transport_frame + _capture_offset; - + + last_recordable_frame = _session.transport_frame() + _capture_offset; + if (_alignment_style == ExistingMaterial) { last_recordable_frame += existing_material_offset; - } else { - last_recordable_frame += _roll_delay; } } } @@ -724,15 +674,15 @@ Diskstream::route_going_away () } void -Diskstream::calculate_record_range(OverlapType ot, framepos_t transport_frame, framecnt_t nframes, - framecnt_t & rec_nframes, framecnt_t & rec_offset) +Diskstream::calculate_record_range (Evoral::OverlapType ot, framepos_t transport_frame, framecnt_t nframes, + framecnt_t & rec_nframes, framecnt_t & rec_offset) { switch (ot) { - case OverlapNone: + case Evoral::OverlapNone: rec_nframes = 0; break; - case OverlapInternal: + case Evoral::OverlapInternal: /* ---------- recrange |---| transrange */ @@ -740,7 +690,7 @@ Diskstream::calculate_record_range(OverlapType ot, framepos_t transport_frame, f rec_offset = 0; break; - case OverlapStart: + case Evoral::OverlapStart: /* |--------| recrange -----| transrange */ @@ -750,7 +700,7 @@ Diskstream::calculate_record_range(OverlapType ot, framepos_t transport_frame, f } break; - case OverlapEnd: + case Evoral::OverlapEnd: /* |--------| recrange |-------- transrange */ @@ -758,7 +708,7 @@ Diskstream::calculate_record_range(OverlapType ot, framepos_t transport_frame, f rec_offset = 0; break; - case OverlapExternal: + case Evoral::OverlapExternal: /* |--------| recrange -------------- transrange */ @@ -766,6 +716,10 @@ Diskstream::calculate_record_range(OverlapType ot, framepos_t transport_frame, f rec_offset = first_recordable_frame - transport_frame; break; } + + DEBUG_TRACE (DEBUG::CaptureAlignment, string_compose ("%1 rec? %2 @ %3 (for %4) FRF %5 LRF %6 : rf %7 @ %8\n", + _name, enum_2_string (ot), transport_frame, nframes, + first_recordable_frame, last_recordable_frame, rec_nframes, rec_offset)); } void @@ -773,3 +727,16 @@ Diskstream::prepare_to_stop (framepos_t pos) { last_recordable_frame = pos + _capture_offset; } + +void +Diskstream::engage_record_enable () +{ + g_atomic_int_set (&_record_enabled, 1); +} + +void +Diskstream::disengage_record_enable () +{ + g_atomic_int_set (&_record_enabled, 0); +} +