From a9a05441ae6096f35fd425d395a9c1b475c2de81 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Sat, 9 Apr 2011 15:00:44 +0000
Subject: [PATCH] part two of: correctly reset capture alignment at session
 load

git-svn-id: svn://localhost/ardour2/branches/3.0@9336 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 libs/ardour/ardour/track.h | 4 ++--
 libs/ardour/track.cc       | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libs/ardour/ardour/track.h b/libs/ardour/ardour/track.h
index f92d11ab4c..5e77b4c6e9 100644
--- a/libs/ardour/ardour/track.h
+++ b/libs/ardour/ardour/track.h
@@ -143,8 +143,8 @@ class Track : public Route, public PublicDiskstream
 	framepos_t current_capture_end () const;
 	void playlist_modified ();
 	int use_playlist (boost::shared_ptr<Playlist>);
-	void set_align_style (AlignStyle);
-	void set_align_choice (AlignChoice);
+	void set_align_style (AlignStyle, bool force=false);
+	void set_align_choice (AlignChoice, bool force=false);
 	int use_copy_playlist ();
 	int use_new_playlist ();
         void adjust_playback_buffering ();
diff --git a/libs/ardour/track.cc b/libs/ardour/track.cc
index 0d7bf9ea98..3316f1fc34 100644
--- a/libs/ardour/track.cc
+++ b/libs/ardour/track.cc
@@ -586,15 +586,15 @@ Track::read_data_count () const
 }
 
 void
-Track::set_align_style (AlignStyle s)
+Track::set_align_style (AlignStyle s, bool force)
 {
-	_diskstream->set_align_style (s);
+	_diskstream->set_align_style (s, force);
 }
 
 void
-Track::set_align_choice (AlignChoice s)
+Track::set_align_choice (AlignChoice s, bool force)
 {
-	_diskstream->set_align_choice (s);
+	_diskstream->set_align_choice (s, force);
 }
 
 uint32_t