13
0

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
This commit is contained in:
Paul Davis 2011-04-09 15:00:44 +00:00
parent 5d9c6089a4
commit a9a05441ae
2 changed files with 6 additions and 6 deletions

View File

@ -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 ();

View File

@ -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