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/ardour | |
| 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/ardour')
| -rw-r--r-- | libs/ardour/ardour/diskstream.h | 5 | ||||
| -rwxr-xr-x | libs/ardour/ardour/public_diskstream.h | 3 |
2 files changed, 4 insertions, 4 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; } diff --git a/libs/ardour/ardour/public_diskstream.h b/libs/ardour/ardour/public_diskstream.h index 37bac7b71e..4fc9a4a55e 100755 --- a/libs/ardour/ardour/public_diskstream.h +++ b/libs/ardour/ardour/public_diskstream.h @@ -70,7 +70,8 @@ public: virtual framepos_t current_capture_end () const = 0; virtual void playlist_modified () = 0; virtual int use_playlist (boost::shared_ptr<Playlist>) = 0; - virtual void set_align_style (AlignStyle) = 0; + virtual void set_align_style (AlignStyle, bool force=false) = 0; + virtual void set_align_choice (AlignChoice, bool force=false) = 0; virtual int use_copy_playlist () = 0; virtual int use_new_playlist () = 0; virtual void adjust_playback_buffering () = 0; |