summaryrefslogtreecommitdiff
path: root/libs/ardour/location.cc
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2011-09-14 20:39:03 +0000
committerCarl Hetherington <carl@carlh.net>2011-09-14 20:39:03 +0000
commit315f41f82f1e5e5cf941e83895848a6372670935 (patch)
tree7d8f919229b4b523640f5a19b245d2817f54428e /libs/ardour/location.cc
parent8f39701908660bbf2c7d2f2867ea83638daf33f0 (diff)
Option to glue new markers to bars and beats (part of
#4202). git-svn-id: svn://localhost/ardour2/branches/3.0@10087 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/location.cc')
-rw-r--r--libs/ardour/location.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/ardour/location.cc b/libs/ardour/location.cc
index 7095596101..b6a09d863a 100644
--- a/libs/ardour/location.cc
+++ b/libs/ardour/location.cc
@@ -54,6 +54,7 @@ Location::Location (Session& s)
assert (_end >= 0);
}
+/** Construct a new Location, giving it the position lock style determined by glue-new-markers-to-bars-and-beats */
Location::Location (Session& s, framepos_t sample_start, framepos_t sample_end, const std::string &name, Flags bits)
: SessionHandleRef (s)
, _name (name)
@@ -61,7 +62,7 @@ Location::Location (Session& s, framepos_t sample_start, framepos_t sample_end,
, _end (sample_end)
, _flags (bits)
, _locked (false)
- , _position_lock_style (AudioTime)
+ , _position_lock_style (s.config.get_glue_new_markers_to_bars_and_beats() ? MusicTime : AudioTime)
{
recompute_bbt_from_frames ();