summaryrefslogtreecommitdiff
path: root/libs/ardour/ardour/diskstream.h
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2011-04-09 14:59:22 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2011-04-09 14:59:22 +0000
commit64022eebcbb7b7720fa1920dd6bfbf3976c70b44 (patch)
treec77a3b8629a32f8df2706cf0459a66ae19c8fdd1 /libs/ardour/ardour/diskstream.h
parentce35e913d0e7f059dc15e9677ff6b3c5287ff487 (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/ardour/diskstream.h')
-rw-r--r--libs/ardour/ardour/diskstream.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/libs/ardour/ardour/diskstream.h b/libs/ardour/ardour/diskstream.h
index aae7c276f3..42ee154fd4 100644
--- a/libs/ardour/ardour/diskstream.h
+++ b/libs/ardour/ardour/diskstream.h
@@ -77,15 +77,14 @@ class Diskstream : public SessionObject, public PublicDiskstream
AlignStyle alignment_style() const { return _alignment_style; }
AlignChoice alignment_choice() const { return _alignment_choice; }
- void set_align_style (AlignStyle);
- void set_align_choice (AlignChoice a);
+ void set_align_style (AlignStyle, bool force=false);
+ void set_align_choice (AlignChoice a, bool force=false);
framecnt_t roll_delay() const { return _roll_delay; }
void set_roll_delay (framecnt_t);
bool record_enabled() const { return g_atomic_int_get (&_record_enabled); }
virtual void set_record_enabled (bool yn) = 0;
- virtual void get_input_sources () = 0;
bool destructive() const { return _flags & Destructive; }
virtual int set_destructive (bool /*yn*/) { return -1; }