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)
, _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 ();
/* Note: _position_lock_style is initialised above in case set_state doesn't set it
(for 2.X session file compatibility).
*/
-
+
if (set_state (node, Stateful::loading_state_version)) {
throw failed_constructor ();
}
assert (_end >= 0);
}
+bool
+Location::operator== (const Location& other)
+{
+ if (_name != other._name ||
+ _start != other._start ||
+ _end != other._end ||
+ _bbt_start != other._bbt_start ||
+ _bbt_end != other._bbt_end ||
+ _flags != other._flags ||
+ _position_lock_style != other._position_lock_style) {
+ return false;
+ }
+ return true;
+}
+
Location*
Location::operator= (const Location& other)
{
int
Location::set_start (framepos_t s, bool force, bool allow_bbt_recompute)
{
+ if (s < 0) {
+ return -1;
+ }
+
if (_locked) {
return -1;
}
assert (_start >= 0);
assert (_end >= 0);
-
+
return 0;
}
-
+
if (s != _start) {
framepos_t const old = _start;
-
+
_start = s;
if (allow_bbt_recompute) {
recompute_bbt_from_frames ();
}
assert (_start >= 0);
-
+
return 0;
}
int
Location::set_end (framepos_t e, bool force, bool allow_bbt_recompute)
{
+ if (e < 0) {
+ return -1;
+ }
+
if (_locked) {
return -1;
}
return -1;
}
}
-
+
if (is_mark()) {
if (_start != e) {
_start = e;
assert (_start >= 0);
assert (_end >= 0);
-
+
return 0;
}
if (e != _end) {
+
framepos_t const old = _end;
-
+
_end = e;
if (allow_bbt_recompute) {
recompute_bbt_from_frames ();
int
Location::set (framepos_t start, framepos_t end, bool allow_bbt_recompute)
{
+ if (start < 0 || end < 0) {
+ return -1;
+ }
+
/* check validity */
if (((is_auto_punch() || is_auto_loop()) && start >= end) || (!is_mark() && start > end)) {
return -1;
int
Location::move_to (framepos_t pos)
{
+ if (pos < 0) {
+ return -1;
+ }
+
if (_locked) {
return -1;
}
return -1;
}
- if ((prop = node.property ("id")) == 0) {
+ if (!set_id (node)) {
warning << _("XML node for Location has no ID information") << endmsg;
- } else {
- _id = prop->value ();
}
if ((prop = node.property ("name")) == 0) {
if (_position_lock_style != MusicTime) {
return;
}
-
- _session.tempo_map().bbt_time (_start, _bbt_start);
- _session.tempo_map().bbt_time (_end, _bbt_end);
+
+ _session.bbt_time (_start, _bbt_start);
+ _session.bbt_time (_end, _bbt_end);
}
void
int ret;
if (want_lock) {
- Glib::Mutex::Lock lm (lock);
+ Glib::Threads::Mutex::Lock lm (lock);
ret = set_current_unlocked (loc);
} else {
ret = set_current_unlocked (loc);
Locations::clear ()
{
{
- Glib::Mutex::Lock lm (lock);
+ Glib::Threads::Mutex::Lock lm (lock);
for (LocationList::iterator i = locations.begin(); i != locations.end(); ) {
Locations::clear_markers ()
{
{
- Glib::Mutex::Lock lm (lock);
+ Glib::Threads::Mutex::Lock lm (lock);
LocationList::iterator tmp;
for (LocationList::iterator i = locations.begin(); i != locations.end(); ) {
Locations::clear_ranges ()
{
{
- Glib::Mutex::Lock lm (lock);
+ Glib::Threads::Mutex::Lock lm (lock);
LocationList::iterator tmp;
for (LocationList::iterator i = locations.begin(); i != locations.end(); ) {
Locations::add (Location *loc, bool make_current)
{
assert (loc);
-
+
{
- Glib::Mutex::Lock lm (lock);
+ Glib::Threads::Mutex::Lock lm (lock);
locations.push_back (loc);
if (make_current) {
}
{
- Glib::Mutex::Lock lm (lock);
+ Glib::Threads::Mutex::Lock lm (lock);
for (i = locations.begin(); i != locations.end(); ++i) {
if ((*i) == loc) {
{
XMLNode *node = new XMLNode ("Locations");
LocationList::iterator iter;
- Glib::Mutex::Lock lm (lock);
+ Glib::Threads::Mutex::Lock lm (lock);
for (iter = locations.begin(); iter != locations.end(); ++iter) {
node->add_child_nocopy ((*iter)->get_state ());
XMLNodeList nlist = node.children();
- locations.clear ();
+ /* build up a new locations list in here */
+ LocationList new_locations;
+
current_location = 0;
Location* session_range_location = 0;
if (version < 3000) {
session_range_location = new Location (_session, 0, 0, _("session"), Location::IsSessionRange);
- locations.push_back (session_range_location);
+ new_locations.push_back (session_range_location);
}
{
- Glib::Mutex::Lock lm (lock);
+ Glib::Threads::Mutex::Lock lm (lock);
XMLNodeConstIterator niter;
for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
try {
- Location *loc = new Location (_session, **niter);
+ XMLProperty const * prop_id = (*niter)->property ("id");
+ assert (prop_id);
+ PBD::ID id (prop_id->value ());
+
+ LocationList::const_iterator i = locations.begin();
+ while (i != locations.end () && (*i)->id() != id) {
+ ++i;
+ }
+
+ Location* loc;
+ if (i != locations.end()) {
+ /* we can re-use an old Location object */
+ loc = *i;
+ loc->set_state (**niter, version);
+ } else {
+ loc = new Location (_session, **niter);
+ }
bool add = true;
}
if (add) {
- locations.push_back (loc);
+ new_locations.push_back (loc);
}
}
}
}
+ locations = new_locations;
+
if (locations.size()) {
current_location = locations.front();
} else {
LocationList locs;
{
- Glib::Mutex::Lock lm (lock);
+ Glib::Threads::Mutex::Lock lm (lock);
locs = locations;
}
LocationList locs;
{
- Glib::Mutex::Lock lm (lock);
+ Glib::Threads::Mutex::Lock lm (lock);
locs = locations;
}
Locations::marks_either_side (framepos_t const frame, framepos_t& before, framepos_t& after) const
{
before = after = max_framepos;
-
+
LocationList locs;
{
- Glib::Mutex::Lock lm (lock);
+ Glib::Threads::Mutex::Lock lm (lock);
locs = locations;
}
/* Get a list of positions; don't store any that are exactly on our requested position */
-
+
std::list<framepos_t> positions;
for (LocationList::const_iterator i = locs.begin(); i != locs.end(); ++i) {
/* none before */
return;
}
-
+
--i;
before = *i;
}
Locations::num_range_markers () const
{
uint32_t cnt = 0;
- Glib::Mutex::Lock lm (lock);
+ Glib::Threads::Mutex::Lock lm (lock);
for (LocationList::const_iterator i = locations.begin(); i != locations.end(); ++i) {
if ((*i)->is_range_marker()) {
++cnt;
void
Locations::find_all_between (framepos_t start, framepos_t end, LocationList& ll, Location::Flags flags)
{
- Glib::Mutex::Lock lm (lock);
+ Glib::Threads::Mutex::Lock lm (lock);
for (LocationList::const_iterator i = locations.begin(); i != locations.end(); ++i) {
if ((flags == 0 || (*i)->matches (flags)) &&