, _locked (false)
, _position_lock_style (AudioTime)
{
-
+ assert (_start >= 0);
+ assert (_end >= 0);
}
-Location::Location (Session& s, nframes64_t sample_start, nframes64_t sample_end, const std::string &name, Flags bits)
+Location::Location (Session& s, framepos_t sample_start, framepos_t sample_end, const std::string &name, Flags bits)
: SessionHandleRef (s)
, _name (name)
, _start (sample_start)
, _position_lock_style (AudioTime)
{
recompute_bbt_from_frames ();
+
+ assert (_start >= 0);
+ assert (_end >= 0);
}
Location::Location (const Location& other)
/* copy is not locked even if original was */
_locked = false;
+
+ assert (_start >= 0);
+ assert (_end >= 0);
}
Location::Location (Session& s, const XMLNode& node)
: SessionHandleRef (s)
+ , _position_lock_style (AudioTime)
{
+ /* 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 (_start >= 0);
+ assert (_end >= 0);
}
Location*
/* "changed" not emitted on purpose */
+ assert (_start >= 0);
+ assert (_end >= 0);
+
return this;
}
* @param allow_bbt_recompute True to recompute BBT start time from the new given start time.
*/
int
-Location::set_start (nframes64_t s, bool force, bool allow_bbt_recompute)
+Location::set_start (framepos_t s, bool force, bool allow_bbt_recompute)
{
if (_locked) {
return -1;
if (allow_bbt_recompute) {
recompute_bbt_from_frames ();
}
+
start_changed (this); /* EMIT SIGNAL */
end_changed (this); /* EMIT SIGNAL */
}
+
+ 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 ();
}
start_changed (this); /* EMIT SIGNAL */
if (is_session_range ()) {
- Session::StartTimeChanged (); /* EMIT SIGNAL */
+ Session::StartTimeChanged (old); /* EMIT SIGNAL */
AudioFileSource::set_header_position_offset (s);
}
}
+ assert (_start >= 0);
+
return 0;
}
* @param allow_bbt_recompute True to recompute BBT end time from the new given end time.
*/
int
-Location::set_end (nframes64_t e, bool force, bool allow_bbt_recompute)
+Location::set_end (framepos_t e, bool force, bool allow_bbt_recompute)
{
if (_locked) {
return -1;
start_changed (this); /* EMIT SIGNAL */
end_changed (this); /* EMIT SIGNAL */
}
+
+ 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 ();
end_changed(this); /* EMIT SIGNAL */
if (is_session_range()) {
- Session::EndTimeChanged (); /* EMIT SIGNAL */
+ Session::EndTimeChanged (old); /* EMIT SIGNAL */
}
}
+ assert (_end >= 0);
+
return 0;
}
int
-Location::set (nframes64_t start, nframes64_t end, bool allow_bbt_recompute)
+Location::set (framepos_t start, framepos_t end, bool allow_bbt_recompute)
{
/* check validity */
if (((is_auto_punch() || is_auto_loop()) && start >= end) || (!is_mark() && start > end)) {
}
int
-Location::move_to (nframes64_t pos)
+Location::move_to (framepos_t pos)
{
if (_locked) {
return -1;
changed (this); /* EMIT SIGNAL */
}
+ assert (_start >= 0);
+ assert (_end >= 0);
+
return 0;
}
changed (this); /* EMIT SIGNAL */
+ assert (_start >= 0);
+ assert (_end >= 0);
+
return 0;
}
if (make_current) {
current_changed (current_location); /* EMIT SIGNAL */
}
+
+ if (loc->is_session_range()) {
+ Session::StartTimeChanged (0);
+ Session::EndTimeChanged (1);
+ }
}
void
LocationList::iterator iter;
Glib::Mutex::Lock lm (lock);
- for (iter = locations.begin(); iter != locations.end(); ++iter) {
+ 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);
}
{
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;
string::size_type const c = v.find_first_of (',');
string const s = v.substr (0, c);
if (s == X_("IsStart")) {
- session_range_location->set_start (loc->start());
+ session_range_location->set_start (loc->start(), true);
add = false;
} else if (s == X_("IsEnd")) {
- session_range_location->set_end (loc->start());
+ session_range_location->set_end (loc->start(), true);
add = false;
}
}
if (add) {
- locations.push_back (loc);
+ new_locations.push_back (loc);
}
}
}
}
+ locations = new_locations;
+
if (locations.size()) {
current_location = locations.front();
} else {
};
Location *
-Locations::first_location_before (nframes64_t frame, bool include_special_ranges)
+Locations::first_location_before (framepos_t frame, bool include_special_ranges)
{
LocationList locs;
}
Location *
-Locations::first_location_after (nframes64_t frame, bool include_special_ranges)
+Locations::first_location_after (framepos_t frame, bool include_special_ranges)
{
LocationList locs;
* side of a frame. Note that if frame is exactly on a `mark', that mark will not be considered for returning
* as before/after.
* @param frame Frame to look for.
- * @param before Filled in with the position of the last `mark' before `frame' (or max_frames if none exists)
- * @param after Filled in with the position of the next `mark' after `frame' (or max_frames if none exists)
+ * @param before Filled in with the position of the last `mark' before `frame' (or max_framepos if none exists)
+ * @param after Filled in with the position of the next `mark' after `frame' (or max_framepos if none exists)
*/
void
-Locations::marks_either_side (nframes64_t const frame, nframes64_t& before, nframes64_t& after) const
+Locations::marks_either_side (framepos_t const frame, framepos_t& before, framepos_t& after) const
{
- before = after = max_frames;
+ before = after = max_framepos;
LocationList locs;
/* Get a list of positions; don't store any that are exactly on our requested position */
- std::list<nframes64_t> positions;
+ std::list<framepos_t> positions;
for (LocationList::const_iterator i = locs.begin(); i != locs.end(); ++i) {
if (((*i)->is_auto_loop() || (*i)->is_auto_punch())) {
positions.sort ();
- std::list<nframes64_t>::iterator i = positions.begin ();
+ std::list<framepos_t>::iterator i = positions.begin ();
while (i != positions.end () && *i < frame) {
++i;
}
}
void
-Locations::find_all_between (nframes64_t start, nframes64_t end, LocationList& ll, Location::Flags flags)
+Locations::find_all_between (framepos_t start, framepos_t end, LocationList& ll, Location::Flags flags)
{
Glib::Mutex::Lock lm (lock);
projects / ardour.git / blobdiff