diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-04-09 14:59:22 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-04-09 14:59:22 +0000 |
| commit | 64022eebcbb7b7720fa1920dd6bfbf3976c70b44 (patch) | |
| tree | c77a3b8629a32f8df2706cf0459a66ae19c8fdd1 /libs/ardour/diskstream.cc | |
| parent | ce35e913d0e7f059dc15e9677ff6b3c5287ff487 (diff) | |
correctly reset capture alignment at session load; for MIDI diskstreams, don't try to set capture alignment based on connectivity, always set _source_port ASAP and check _source_port when recording
git-svn-id: svn://localhost/ardour2/branches/3.0@9334 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/diskstream.cc')
| -rw-r--r-- | libs/ardour/diskstream.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libs/ardour/diskstream.cc b/libs/ardour/diskstream.cc index 69c83e30a1..4bc20c14ae 100644 --- a/libs/ardour/diskstream.cc +++ b/libs/ardour/diskstream.cc @@ -280,26 +280,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) { @@ -509,9 +509,9 @@ 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) { |