using namespace ARDOUR;
using namespace PBD;
-/* XXX This goes uninitialized when there is no ~/.ardour3 directory.
+/* XXX This goes uninitialized when there is no ~/.config/ardour3 directory.
* I can't figure out why, so this will do for now (just stole the
* default from configuration_vars.h). 0 is not a good value for
* allocating buffer sizes..
Diskstream::Diskstream (Session &sess, const string &name, Flag flag)
: SessionObject(sess, name)
+ , i_am_the_modifier (0)
+ , _route (0)
+ , _record_enabled (0)
+ , _visible_speed (1.0f)
+ , _actual_speed (1.0f)
+ , _buffer_reallocation_required (false)
+ , _seek_required (false)
+ , force_refill (false)
+ , capture_start_frame (0)
+ , capture_captured (0)
+ , was_recording (false)
+ , adjust_capture_position (0)
+ , _capture_offset (0)
+ , _roll_delay (0)
+ , first_recordable_frame (max_frames)
+ , last_recordable_frame (max_frames)
+ , last_possibly_recording (0)
+ , _alignment_style (ExistingMaterial)
+ , _scrubbing (false)
+ , _slaved (false)
+ , loop_location (0)
+ , overwrite_frame (0)
+ , overwrite_offset (0)
+ , pending_overwrite (false)
+ , overwrite_queued (false)
+ , input_change_pending (NoChange)
+ , wrap_buffer_size (0)
+ , speed_buffer_size (0)
+ , _speed (1.0)
+ , _target_speed (_speed)
+ , file_frame (0)
+ , playback_sample (0)
+ , playback_distance (0)
+ , _read_data_count (0)
+ , _write_data_count (0)
+ , in_set_state (false)
+ , _persistent_alignment_style (ExistingMaterial)
+ , first_input_change (true)
+ , scrub_start (0)
+ , scrub_buffer_size (0)
+ , scrub_offset (0)
+ , _flags (flag)
+
{
- init (flag);
}
Diskstream::Diskstream (Session& sess, const XMLNode& /*node*/)
: SessionObject(sess, "unnamed diskstream")
+ , i_am_the_modifier (0)
+ , _route (0)
+ , _record_enabled (0)
+ , _visible_speed (1.0f)
+ , _actual_speed (1.0f)
+ , _buffer_reallocation_required (false)
+ , _seek_required (false)
+ , force_refill (false)
+ , capture_start_frame (0)
+ , capture_captured (0)
+ , was_recording (false)
+ , adjust_capture_position (0)
+ , _capture_offset (0)
+ , _roll_delay (0)
+ , first_recordable_frame (max_frames)
+ , last_recordable_frame (max_frames)
+ , last_possibly_recording (0)
+ , _alignment_style (ExistingMaterial)
+ , _scrubbing (false)
+ , _slaved (false)
+ , loop_location (0)
+ , overwrite_frame (0)
+ , overwrite_offset (0)
+ , pending_overwrite (false)
+ , overwrite_queued (false)
+ , input_change_pending (NoChange)
+ , wrap_buffer_size (0)
+ , speed_buffer_size (0)
+ , _speed (1.0)
+ , _target_speed (_speed)
+ , file_frame (0)
+ , playback_sample (0)
+ , playback_distance (0)
+ , _read_data_count (0)
+ , _write_data_count (0)
+ , in_set_state (false)
+ , _persistent_alignment_style (ExistingMaterial)
+ , first_input_change (true)
+ , scrub_start (0)
+ , scrub_buffer_size (0)
+ , scrub_offset (0)
+ , _flags (Recordable)
{
- init (Recordable);
-}
-
-void
-Diskstream::init (Flag f)
-{
- _flags = f;
- _route = 0;
- _alignment_style = ExistingMaterial;
- _persistent_alignment_style = ExistingMaterial;
- first_input_change = true;
- i_am_the_modifier = 0;
- g_atomic_int_set (&_record_enabled, 0);
- was_recording = false;
- capture_start_frame = 0;
- capture_captured = 0;
- _visible_speed = 1.0f;
- _actual_speed = 1.0f;
- _buffer_reallocation_required = false;
- _seek_required = false;
- first_recordable_frame = max_frames;
- last_recordable_frame = max_frames;
- _roll_delay = 0;
- _capture_offset = 0;
- _processed = false;
- _slaved = false;
- adjust_capture_position = 0;
- last_possibly_recording = 0;
- loop_location = 0;
- wrap_buffer_size = 0;
- speed_buffer_size = 0;
- _speed = 1.0;
- _target_speed = _speed;
- file_frame = 0;
- playback_sample = 0;
- playback_distance = 0;
- _read_data_count = 0;
- _write_data_count = 0;
- commit_should_unlock = false;
-
- pending_overwrite = false;
- overwrite_frame = 0;
- overwrite_queued = false;
- input_change_pending = NoChange;
}
Diskstream::~Diskstream ()
return _buffer_reallocation_required || _seek_required;
}
-void
-Diskstream::prepare ()
-{
- _processed = false;
- playback_distance = 0;
-}
-
-void
-Diskstream::recover ()
-{
- if (commit_should_unlock) {
- state_lock.unlock();
- }
- _processed = false;
-}
-
void
Diskstream::set_capture_offset ()
{
if (capture_info.size() > n) {
return capture_info[n]->frames;
}
- else {
+ else {
return capture_captured;
}
}
int
Diskstream::use_playlist (boost::shared_ptr<Playlist> playlist)
{
+ if (!playlist) {
+ return 0;
+ }
+
+ bool no_prior_playlist = true;
+
{
Glib::Mutex::Lock lm (state_lock);
if (_playlist) {
_playlist->release();
+ no_prior_playlist = false;
}
_playlist = playlist;
reset_write_sources (false);
}
- _playlist->Modified.connect_same_thread (playlist_connections, boost::bind (&Diskstream::playlist_modified, this));
+ _playlist->ContentsChanged.connect_same_thread (playlist_connections, boost::bind (&Diskstream::playlist_modified, this));
_playlist->DropReferences.connect_same_thread (playlist_connections, boost::bind (&Diskstream::playlist_deleted, this, boost::weak_ptr<Playlist>(_playlist)));
_playlist->RangesMoved.connect_same_thread (playlist_connections, boost::bind (&Diskstream::playlist_ranges_moved, this, _1));
}
take care of the buffer refill.
*/
- if (!overwrite_queued && !(_session.state_of_the_state() & Session::CannotSave)) {
+ if (!overwrite_queued && no_prior_playlist) {
_session.request_overwrite_buffer (this);
overwrite_queued = true;
}
}
void
-Diskstream::playlist_changed (Change)
+Diskstream::playlist_changed (const PropertyChange&)
{
playlist_modified ();
}
bool
Diskstream::set_name (const string& str)
{
- if (str != _name) {
+ if (_name != str) {
assert(playlist());
playlist()->set_name (str);
}
void
-Diskstream::playlist_ranges_moved (list< Evoral::RangeMove<nframes_t> > const & movements_frames)
+Diskstream::playlist_ranges_moved (list< Evoral::RangeMove<framepos_t> > const & movements_frames)
{
if (!_route || Config->get_automation_follows_regions () == false) {
return;
list< Evoral::RangeMove<double> > movements;
- for (list< Evoral::RangeMove<nframes_t> >::const_iterator i = movements_frames.begin();
+ for (list< Evoral::RangeMove<framepos_t> >::const_iterator i = movements_frames.begin();
i != movements_frames.end();
++i) {
}
void
-Diskstream::move_processor_automation (boost::weak_ptr<Processor> p, list< Evoral::RangeMove<nframes_t> > const & movements_frames)
+Diskstream::move_processor_automation (boost::weak_ptr<Processor> p, list< Evoral::RangeMove<framepos_t> > const & movements_frames)
{
boost::shared_ptr<Processor> processor (p.lock ());
if (!processor) {
}
list< Evoral::RangeMove<double> > movements;
- for (list< Evoral::RangeMove<nframes_t> >::const_iterator i = movements_frames.begin();
+ for (list< Evoral::RangeMove<framepos_t> >::const_iterator i = movements_frames.begin();
i != movements_frames.end(); ++i) {
movements.push_back(Evoral::RangeMove<double>(i->from, i->length, i->to));
}
/* was stopped, now rolling (and recording) */
if (_alignment_style == ExistingMaterial) {
+
first_recordable_frame += _session.worst_output_latency();
+
+ DEBUG_TRACE (DEBUG::Latency, string_compose ("Offset rec from stop. Capture offset: %1 Worst O/P Latency: %2 Roll Delay: %3 First Recordable Frame: %4 Transport Frame: %5\n",
+ _capture_offset, _session.worst_output_latency(), _roll_delay, first_recordable_frame, transport_frame));
} else {
first_recordable_frame += _roll_delay;
}
if (_alignment_style == ExistingMaterial) {
-
- if (!_session.config.get_punch_in()) {
-
- /* manual punch in happens at the correct transport frame
- because the user hit a button. but to get alignment correct
- we have to back up the position of the new region to the
- appropriate spot given the roll delay.
- */
-
- capture_start_frame -= _roll_delay;
-
- /* XXX paul notes (august 2005): i don't know why
- this is needed.
- */
-
- first_recordable_frame += _capture_offset;
-
- } else {
-
- /* autopunch toggles recording at the precise
- transport frame, and then the DS waits
- to start recording for a time that depends
- on the output latency.
- */
-
- first_recordable_frame += _session.worst_output_latency();
- }
-
+ /* manual punch in happens at the correct transport frame
+ because the user hit a button. but to get alignment correct
+ we have to back up the position of the new region to the
+ appropriate spot given the roll delay.
+ */
+
+
+ /* autopunch toggles recording at the precise
+ transport frame, and then the DS waits
+ to start recording for a time that depends
+ on the output latency.
+ */
+
+ first_recordable_frame += _session.worst_output_latency();
+
+ DEBUG_TRACE (DEBUG::Latency, string_compose ("Punch in manual/auto. Capture offset: %1 Worst O/P Latency: %2 Roll Delay: %3 First Recordable Frame: %4 Transport Frame: %5\n",
+ _capture_offset, _session.worst_output_latency(), _roll_delay, first_recordable_frame, transport_frame));
} else {
if (_session.config.get_punch_in()) {
last_recordable_frame += _roll_delay;
}
- first_recordable_frame = max_frames;
+ //first_recordable_frame = max_frames;
+
+ DEBUG_TRACE (DEBUG::Latency, string_compose ("Stop record - %6 | %7. Capture offset: %1 Worst O/P Latency: %2 Roll Delay: %3 First Recordable Frame: %4 Transport Frame: %5\n",
+ _capture_offset, _session.worst_output_latency(), _roll_delay, first_recordable_frame, transport_frame,
+ can_record, record_enabled()));
}
last_possibly_recording = possibly_recording;
projects / ardour.git / blobdiff