using namespace ARDOUR;
using namespace PBD;
-/* 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..
- */
-ARDOUR::framecnt_t Diskstream::disk_io_chunk_frames = 1024 * 256 / sizeof (Sample);
+ARDOUR::framecnt_t Diskstream::disk_read_chunk_frames = default_disk_read_chunk_frames ();
+ARDOUR::framecnt_t Diskstream::disk_write_chunk_frames = default_disk_write_chunk_frames ();
PBD::Signal0<void> Diskstream::DiskOverrun;
PBD::Signal0<void> Diskstream::DiskUnderrun;
return;
}
- _capture_offset = _io->latency();
- DEBUG_TRACE (DEBUG::CaptureAlignment, string_compose ("%1: using IO latency, capture offset set to %2\n", name(), _capture_offset));
+ switch (_alignment_style) {
+ case ExistingMaterial:
+ _capture_offset = _io->latency();
+ break;
+
+ case CaptureTime:
+ default:
+ _capture_offset = 0;
+ break;
+ }
+
+ DEBUG_TRACE (DEBUG::CaptureAlignment, string_compose ("%1: using IO latency, capture offset set to %2 with style = %3\n", name(), _capture_offset, enum_2_string (_alignment_style)));
}
if ((a != _alignment_style) || force) {
_alignment_style = a;
+ set_capture_offset ();
AlignmentStyleChanged ();
}
}
if ((a != _alignment_choice) || force) {
_alignment_choice = a;
- switch (_alignment_choice) {
- case Automatic:
- set_align_style_from_io ();
- break;
- case UseExistingMaterial:
- set_align_style (ExistingMaterial);
- break;
- case UseCaptureTime:
- set_align_style (CaptureTime);
- break;
- }
+ switch (_alignment_choice) {
+ case Automatic:
+ set_align_style_from_io ();
+ break;
+ case UseExistingMaterial:
+ set_align_style (ExistingMaterial);
+ break;
+ case UseCaptureTime:
+ set_align_style (CaptureTime);
+ break;
+ }
}
}
playlist()->set_name (str);
SessionObject::set_name(str);
}
- return true;
+ return true;
+}
+
+bool
+Diskstream::set_write_source_name (const std::string& str) {
+ _write_source_name = str;
+ return true;
}
XMLNode&
{
XMLNode* node = new XMLNode ("Diskstream");
char buf[64];
- LocaleGuard lg (X_("POSIX"));
+ LocaleGuard lg (X_("C"));
node->add_property ("flags", enum_2_string (_flags));
node->add_property ("playlist", _playlist->name());
const int transport_rolling = 0x4;
const int track_rec_enabled = 0x2;
const int global_rec_enabled = 0x1;
- const int fully_rec_enabled = (transport_rolling|track_rec_enabled|global_rec_enabled);
+ const int fully_rec_enabled = (transport_rolling|track_rec_enabled|global_rec_enabled);
/* merge together the 3 factors that affect record status, and compute
- what has changed.
- */
+ * what has changed.
+ */
rolling = _session.transport_speed() != 0.0f;
possibly_recording = (rolling << 2) | ((int)record_enabled() << 1) | (int)can_record;
return;
}
- framecnt_t existing_material_offset = _session.worst_playback_latency();
+ const framecnt_t existing_material_offset = _session.worst_playback_latency();
- if (possibly_recording == fully_rec_enabled) {
+ if (possibly_recording == fully_rec_enabled) {
- if (last_possibly_recording == fully_rec_enabled) {
- return;
- }
+ if (last_possibly_recording == fully_rec_enabled) {
+ return;
+ }
capture_start_frame = _session.transport_frame();
first_recordable_frame = capture_start_frame + _capture_offset;
first_recordable_frame));
}
- prepare_record_status (capture_start_frame);
+ prepare_record_status (capture_start_frame);
- } else {
+ } else {
- if (last_possibly_recording == fully_rec_enabled) {
+ if (last_possibly_recording == fully_rec_enabled) {
- /* we were recording last time */
+ /* we were recording last time */
- if (change & transport_rolling) {
+ 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.
- */
+ /* 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 */
+ } else {
+ /* punch out */
- last_recordable_frame = _session.transport_frame() + _capture_offset;
+ last_recordable_frame = _session.transport_frame() + _capture_offset;
- if (_alignment_style == ExistingMaterial) {
- last_recordable_frame += existing_material_offset;
- }
- }
- }
- }
+ if (_alignment_style == ExistingMaterial) {
+ last_recordable_frame += existing_material_offset;
+ }
+ }
+ }
+ }
last_possibly_recording = possibly_recording;
}
case Evoral::OverlapInternal:
/* ---------- recrange
- |---| transrange
- */
+ * |---| transrange
+ */
rec_nframes = nframes;
rec_offset = 0;
break;
case Evoral::OverlapStart:
/* |--------| recrange
- -----| transrange
- */
+ * -----| transrange
+ */
rec_nframes = transport_frame + nframes - first_recordable_frame;
if (rec_nframes) {
rec_offset = first_recordable_frame - transport_frame;
case Evoral::OverlapEnd:
/* |--------| recrange
- |-------- transrange
- */
+ * |-------- transrange
+ */
rec_nframes = last_recordable_frame - transport_frame;
rec_offset = 0;
break;
case Evoral::OverlapExternal:
/* |--------| recrange
- -------------- transrange
- */
+ * -------------- transrange
+ */
rec_nframes = last_recordable_frame - first_recordable_frame;
rec_offset = first_recordable_frame - transport_frame;
break;
}
void
-Diskstream::prepare_to_stop (framepos_t pos)
+Diskstream::prepare_to_stop (framepos_t transport_frame, framepos_t audible_frame)
{
- last_recordable_frame = pos + _capture_offset;
+ switch (_alignment_style) {
+ case ExistingMaterial:
+ last_recordable_frame = transport_frame + _capture_offset;
+ DEBUG_TRACE (DEBUG::CaptureAlignment, string_compose("%1: prepare to stop sets last recordable frame to %2 + %3 = %4\n", _name, transport_frame, _capture_offset, last_recordable_frame));
+ break;
+
+ case CaptureTime:
+ last_recordable_frame = audible_frame; // note that capture_offset is zero
+ /* we may already have captured audio before the last_recordable_frame (audible frame),
+ so deal with this.
+ */
+ if (last_recordable_frame > capture_start_frame) {
+ capture_captured = min (capture_captured, last_recordable_frame - capture_start_frame);
+ }
+ DEBUG_TRACE (DEBUG::CaptureAlignment, string_compose("%1: prepare to stop sets last recordable frame to audible frame @ %2\n", _name, audible_frame));
+ break;
+ }
+
}
void
g_atomic_int_set (&_record_enabled, 0);
}
+framecnt_t
+Diskstream::default_disk_read_chunk_frames()
+{
+ return 65536;
+}
+
+framecnt_t
+Diskstream::default_disk_write_chunk_frames ()
+{
+ return 65536;
+}