From 8849cb428741d7d60261d1e44ceec665912281f5 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 9 Mar 2011 05:19:44 +0000 Subject: add new concept for managing alignment style (AlignChoice); switch to using worst_playback_latency() just about everywhere we were using worst_output_latency() - the former includes plugin latency. answer appears to break earlier fixes to alignment, but is semantically right, so plan to investigate in another 8 hours or so git-svn-id: svn://localhost/ardour2/branches/3.0@9112 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/ardour/diskstream.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libs/ardour/ardour/diskstream.h') diff --git a/libs/ardour/ardour/diskstream.h b/libs/ardour/ardour/diskstream.h index b0896349b5..c6651473e5 100644 --- a/libs/ardour/ardour/diskstream.h +++ b/libs/ardour/ardour/diskstream.h @@ -75,9 +75,10 @@ class Diskstream : public SessionObject, public PublicDiskstream void set_flag (Flag f) { _flags = Flag (_flags | f); } void unset_flag (Flag f) { _flags = Flag (_flags & ~f); } - AlignStyle alignment_style() const { return _alignment_style; } + AlignStyle alignment_style() const { return _alignment_style; } + AlignChoice alignment_choice() const { return _alignment_choice; } void set_align_style (AlignStyle); - void set_persistent_align_style (AlignStyle a) { _persistent_alignment_style = a; } + void set_align_choice (AlignChoice a); framecnt_t roll_delay() const { return _roll_delay; } void set_roll_delay (framecnt_t); @@ -272,6 +273,7 @@ class Diskstream : public SessionObject, public PublicDiskstream framepos_t last_recordable_frame; int last_possibly_recording; AlignStyle _alignment_style; + AlignChoice _alignment_choice; bool _scrubbing; bool _slaved; Location* loop_location; @@ -294,8 +296,6 @@ class Diskstream : public SessionObject, public PublicDiskstream uint32_t _write_data_count; bool in_set_state; - AlignStyle _persistent_alignment_style; - bool first_input_change; Glib::Mutex state_lock; -- cgit v1.2.3