#include "ardour/panner.h"
#include "ardour/session.h"
#include "ardour/io.h"
-#include "ardour/route.h"
+#include "ardour/track.h"
#include "i18n.h"
#include <locale.h>
Diskstream::Diskstream (Session &sess, const string &name, Flag flag)
: SessionObject(sess, name)
, i_am_the_modifier (0)
- , _route (0)
+ , _track (0)
, _record_enabled (0)
, _visible_speed (1.0f)
, _actual_speed (1.0f)
, loop_location (0)
, overwrite_frame (0)
, overwrite_offset (0)
- , pending_overwrite (false)
+ , _pending_overwrite (false)
, overwrite_queued (false)
, input_change_pending (NoChange)
, wrap_buffer_size (0)
Diskstream::Diskstream (Session& sess, const XMLNode& /*node*/)
: SessionObject(sess, "unnamed diskstream")
, i_am_the_modifier (0)
- , _route (0)
+ , _track (0)
, _record_enabled (0)
, _visible_speed (1.0f)
, _actual_speed (1.0f)
, loop_location (0)
, overwrite_frame (0)
, overwrite_offset (0)
- , pending_overwrite (false)
+ , _pending_overwrite (false)
, overwrite_queued (false)
, input_change_pending (NoChange)
, wrap_buffer_size (0)
}
void
-Diskstream::set_route (Route& r)
+Diskstream::set_track (Track* t)
{
- _route = &r;
- _io = _route->input();
+ _track = t;
+ _io = _track->input();
ic_connection.disconnect();
_io->changed.connect_same_thread (ic_connection, boost::bind (&Diskstream::handle_input_change, this, _1, _2));
non_realtime_input_change ();
set_align_style_from_io ();
- _route->Destroyed.connect_same_thread (*this, boost::bind (&Diskstream::route_going_away, this));
+ _track->Destroyed.connect_same_thread (*this, boost::bind (&Diskstream::route_going_away, this));
}
void
_roll_delay = nframes;
}
-void
-Diskstream::set_speed (double sp)
-{
- _session.request_diskstream_speed (*this, sp);
-
- /* to force a rebuffering at the right place */
- playlist_modified();
-}
-
int
Diskstream::use_playlist (boost::shared_ptr<Playlist> playlist)
{
if (!playlist) {
- return;
+ return 0;
}
- bool no_prior_playlist = true;
+ bool prior_playlist = false;
{
Glib::Mutex::Lock lm (state_lock);
if (_playlist) {
_playlist->release();
- no_prior_playlist = false;
+ prior_playlist = true;
}
_playlist = playlist;
_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));
+ _playlist->RangesMoved.connect_same_thread (playlist_connections, boost::bind (&Diskstream::playlist_ranges_moved, this, _1, _2));
}
/* don't do this if we've already asked for it *or* if we are setting up
take care of the buffer refill.
*/
- if (!overwrite_queued && no_prior_playlist) {
- _session.request_overwrite_buffer (this);
+ if (!overwrite_queued && prior_playlist) {
+ _session.request_overwrite_buffer (_track);
overwrite_queued = true;
}
Diskstream::playlist_modified ()
{
if (!i_am_the_modifier && !overwrite_queued) {
- _session.request_overwrite_buffer (this);
+ _session.request_overwrite_buffer (_track);
overwrite_queued = true;
}
}
}
void
-Diskstream::remove_region_from_last_capture (boost::weak_ptr<Region> wregion)
+Diskstream::playlist_ranges_moved (list< Evoral::RangeMove<framepos_t> > const & movements_frames, bool from_undo)
{
- boost::shared_ptr<Region> region (wregion.lock());
-
- if (!region) {
+ /* If we're coming from an undo, it will have handled
+ automation undo (it must, since automation-follows-regions
+ can lose automation data). Hence we can do nothing here.
+ */
+
+ if (from_undo) {
return;
}
-
- _last_capture_regions.remove (region);
-}
-
-void
-Diskstream::playlist_ranges_moved (list< Evoral::RangeMove<framepos_t> > const & movements_frames)
-{
- if (!_route || Config->get_automation_follows_regions () == false) {
+
+ if (!_track || Config->get_automation_follows_regions () == false) {
return;
}
}
/* move panner automation */
- boost::shared_ptr<Panner> p = _route->main_outs()->panner ();
+ boost::shared_ptr<Panner> p = _track->main_outs()->panner ();
if (p) {
for (uint32_t i = 0; i < p->npanners (); ++i) {
boost::shared_ptr<AutomationList> pan_alist = p->streampanner(i).pan_control()->alist();
}
/* move processor automation */
- _route->foreach_processor (boost::bind (&Diskstream::move_processor_automation, this, _1, movements_frames));
+ _track->foreach_processor (boost::bind (&Diskstream::move_processor_automation, this, _1, movements_frames));
}
void
set<Evoral::Parameter> const a = processor->what_can_be_automated ();
+ cout << "move processor auto for " << processor->name() << "\n";
+
for (set<Evoral::Parameter>::iterator i = a.begin (); i != a.end (); ++i) {
+ cout << "moving " << *i << "\n";
boost::shared_ptr<AutomationList> al = processor->automation_control(*i)->alist();
XMLNode & before = al->get_state ();
al->move_ranges (movements);
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);
/* merge together the 3 factors that affect record status, and compute
what has changed.
if (possibly_recording == last_possibly_recording) {
return;
}
+ if (possibly_recording == fully_rec_enabled) {
- /* change state */
-
- /* if per-track or global rec-enable turned on while the other was already on, we've started recording */
-
- if (((change & track_rec_enabled) && record_enabled() && (!(change & global_rec_enabled) && can_record)) ||
- ((change & global_rec_enabled) && can_record && (!(change & track_rec_enabled) && record_enabled()))) {
-
- /* starting to record: compute first+last frames */
+ if (last_possibly_recording == fully_rec_enabled) {
+ 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_frames;
capture_start_frame = transport_frame;
- if (!(last_possibly_recording & transport_rolling) && (possibly_recording & transport_rolling)) {
-
- /* was stopped, now rolling (and recording) */
+ if (change & transport_rolling) {
+ /* transport-change (started rolling) */
+
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 {
+
+ /* there are two delays happening:
+
+ 1) inbound, represented by _capture_offset
+ 2) outbound, represented by _session.worst_output_latency()
+
+ the first sample to record occurs when the larger of these
+ two has elapsed, since they occur in parallel.
+
+ since we've already added _capture_offset, just add the
+ difference if _session.worst_output_latency() is larger.
+ */
+
+ if (_capture_offset < _session.worst_output_latency()) {
+ first_recordable_frame += (_session.worst_output_latency() - _capture_offset);
+ }
+ } else {
first_recordable_frame += _roll_delay;
- }
-
- } else {
+ }
+
+ } else {
- /* was rolling, but record state changed */
+ /* punch in */
if (_alignment_style == ExistingMaterial) {
- /* 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
+ /* There are two kinds of punch:
+
+ 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()) {
- first_recordable_frame += _roll_delay;
- } else {
- capture_start_frame -= _roll_delay;
- }
- }
-
- }
- prepare_record_status(capture_start_frame);
+ XXX: BUT THIS CODE DOESN'T DIFFERENTIATE !!!
- } else if (!record_enabled() || !can_record) {
-
- /* stop recording */
+ */
- last_recordable_frame = transport_frame + _capture_offset;
+ if (_capture_offset < _session.worst_output_latency()) {
+ /* see comment in ExistingMaterial block above */
+ first_recordable_frame += (_session.worst_output_latency() - _capture_offset);
+ }
- if (_alignment_style == ExistingMaterial) {
- last_recordable_frame += _session.worst_output_latency();
- } else {
- last_recordable_frame += _roll_delay;
- }
-
- //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()));
- }
+ } else {
+ capture_start_frame -= _roll_delay;
+ }
+ }
+
+ prepare_record_status (capture_start_frame);
+
+ } else {
+
+ 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() */
+
+ } else {
+ /* punch out */
+
+ last_recordable_frame = transport_frame + _capture_offset;
+
+ if (_alignment_style == ExistingMaterial) {
+ if (_session.worst_output_latency() > _capture_offset) {
+ last_recordable_frame += (_session.worst_output_latency() - _capture_offset);
+ }
+ } else {
+ last_recordable_frame += _roll_delay;
+ }
+ }
+ }
+ }
last_possibly_recording = possibly_recording;
}
break;
}
}
+
+void
+Diskstream::prepare_to_stop (framepos_t pos)
+{
+ last_recordable_frame = pos + _capture_offset;
+}