#include <ctime>
#include <list>
-#include "pbd/convert.h"
+#include "pbd/types_convert.h"
#include "pbd/stl_delete.h"
#include "pbd/xml++.h"
#include "pbd/enumwriter.h"
#include "ardour/session.h"
#include "ardour/audiofilesource.h"
#include "ardour/tempo.h"
+#include "ardour/types_convert.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
+
+namespace PBD {
+ DEFINE_ENUM_CONVERT(ARDOUR::Location::Flags);
+}
using namespace std;
using namespace ARDOUR;
Location::Location (Session& s)
: SessionHandleRef (s)
, _start (0)
+ , _start_beat (0.0)
, _end (0)
+ , _end_beat (0.0)
, _flags (Flags (0))
, _locked (false)
, _position_lock_style (AudioTime)
}
/** 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)
+Location::Location (Session& s, samplepos_t sample_start, samplepos_t sample_end, const std::string &name, Flags bits, const uint32_t sub_num)
: SessionHandleRef (s)
, _name (name)
, _start (sample_start)
, _flags (bits)
, _locked (false)
, _position_lock_style (s.config.get_glue_new_markers_to_bars_and_beats() ? MusicTime : AudioTime)
+
{
- recompute_bbt_from_frames ();
+ recompute_beat_from_samples (sub_num);
assert (_start >= 0);
assert (_end >= 0);
, StatefulDestructible()
, _name (other._name)
, _start (other._start)
- , _bbt_start (other._bbt_start)
+ , _start_beat (other._start_beat)
, _end (other._end)
- , _bbt_end (other._bbt_end)
+ , _end_beat (other._end_beat)
, _flags (other._flags)
, _position_lock_style (other._position_lock_style)
+
{
/* copy is not locked even if original was */
Location::Location (Session& s, const XMLNode& node)
: SessionHandleRef (s)
+ , _flags (Flags (0))
, _position_lock_style (AudioTime)
{
/* Note: _position_lock_style is initialised above in case set_state doesn't set it
if (_name != other._name ||
_start != other._start ||
_end != other._end ||
- _bbt_start != other._bbt_start ||
- _bbt_end != other._bbt_end ||
+ _start_beat != other._start_beat ||
+ _end_beat != other._end_beat ||
_flags != other._flags ||
_position_lock_style != other._position_lock_style) {
return false;
_name = other._name;
_start = other._start;
- _bbt_start = other._bbt_start;
+ _start_beat = other._start_beat;
_end = other._end;
- _bbt_end = other._bbt_end;
+ _end_beat = other._end_beat;
_flags = other._flags;
_position_lock_style = other._position_lock_style;
-
+
/* XXX need to copy scene change */
/* copy is not locked even if original was */
void
Location::set_name (const std::string& str)
-{
- _name = str;
+{
+ _name = str;
- name_changed (this); /* EMIT SIGNAL */
- NameChanged (); /* EMIT SIGNAL */
+ name_changed (this); /* EMIT SIGNAL */
+ NameChanged (); /* EMIT SIGNAL */
}
/** Set start position.
* @param s New start.
* @param force true to force setting, even if the given new start is after the current end.
- * @param allow_bbt_recompute True to recompute BBT start time from the new given start time.
+ * @param allow_beat_recompute True to recompute BEAT start time from the new given start time.
*/
int
-Location::set_start (framepos_t s, bool force, bool allow_bbt_recompute)
+Location::set_start (samplepos_t s, bool force, bool allow_beat_recompute, const uint32_t sub_num)
{
if (s < 0) {
return -1;
if (_start != s) {
_start = s;
_end = s;
- if (allow_bbt_recompute) {
- recompute_bbt_from_frames ();
+ if (allow_beat_recompute) {
+ recompute_beat_from_samples (sub_num);
}
start_changed (this); /* EMIT SIGNAL */
StartChanged (); /* EMIT SIGNAL */
- end_changed (this); /* EMIT SIGNAL */
- EndChanged (); /* EMIT SIGNAL */
+ //end_changed (this); /* EMIT SIGNAL */
+ //EndChanged (); /* EMIT SIGNAL */
}
/* moving the start (position) of a marker with a scene change
return 0;
} else if (!force) {
- /* range locations must exceed a minimum duration */
- if (_end - s < Config->get_range_location_minimum()) {
- return -1;
- }
- }
+ /* range locations must exceed a minimum duration */
+ if (_end - s < Config->get_range_location_minimum()) {
+ return -1;
+ }
+ }
if (s != _start) {
- framepos_t const old = _start;
+ samplepos_t const old = _start;
_start = s;
- if (allow_bbt_recompute) {
- recompute_bbt_from_frames ();
+ if (allow_beat_recompute) {
+ recompute_beat_from_samples (sub_num);
}
start_changed (this); /* EMIT SIGNAL */
StartChanged (); /* EMIT SIGNAL */
-
+
if (is_session_range ()) {
Session::StartTimeChanged (old); /* EMIT SIGNAL */
AudioFileSource::set_header_position_offset (s);
/** Set end position.
* @param s New end.
* @param force true to force setting, even if the given new end is before the current start.
- * @param allow_bbt_recompute True to recompute BBT end time from the new given end time.
+ * @param allow_beat_recompute True to recompute BEAT end time from the new given end time.
*/
int
-Location::set_end (framepos_t e, bool force, bool allow_bbt_recompute)
+Location::set_end (samplepos_t e, bool force, bool allow_beat_recompute, const uint32_t sub_num)
{
if (e < 0) {
return -1;
if (_start != e) {
_start = e;
_end = e;
- if (allow_bbt_recompute) {
- recompute_bbt_from_frames ();
+ if (allow_beat_recompute) {
+ recompute_beat_from_samples (sub_num);
}
- start_changed (this); /* EMIT SIGNAL */
- StartChanged (); /* EMIT SIGNAL */
+ //start_changed (this); /* EMIT SIGNAL */
+ //StartChanged (); /* EMIT SIGNAL */
end_changed (this); /* EMIT SIGNAL */
EndChanged (); /* EMIT SIGNAL */
}
assert (_end >= 0);
return 0;
- } else if (!force) {
- /* range locations must exceed a minimum duration */
- if (e - _start < Config->get_range_location_minimum()) {
- return -1;
- }
+ } else if (!force) {
+ /* range locations must exceed a minimum duration */
+ if (e - _start < Config->get_range_location_minimum()) {
+ return -1;
+ }
}
if (e != _end) {
- framepos_t const old = _end;
+ samplepos_t const old = _end;
_end = e;
- if (allow_bbt_recompute) {
- recompute_bbt_from_frames ();
+ if (allow_beat_recompute) {
+ recompute_beat_from_samples (sub_num);
}
end_changed(this); /* EMIT SIGNAL */
}
int
-Location::set (framepos_t s, framepos_t e, bool allow_bbt_recompute)
+Location::set (samplepos_t s, samplepos_t e, bool allow_beat_recompute, const uint32_t sub_num)
{
if (s < 0 || e < 0) {
return -1;
return -1;
}
- bool start_change = false;
- bool end_change = false;
+ bool start_change = false;
+ bool end_change = false;
if (is_mark()) {
_start = s;
_end = s;
- if (allow_bbt_recompute) {
- recompute_bbt_from_frames ();
+ if (allow_beat_recompute) {
+ recompute_beat_from_samples (sub_num);
}
- start_change = true;
- end_change = true;
+ start_change = true;
+ end_change = true;
}
assert (_start >= 0);
} else {
- /* range locations must exceed a minimum duration */
- if (e - s < Config->get_range_location_minimum()) {
- return -1;
- }
-
- if (s != _start) {
-
- framepos_t const old = _start;
- _start = s;
-
- if (allow_bbt_recompute) {
- recompute_bbt_from_frames ();
- }
-
- start_change = true;
-
- if (is_session_range ()) {
- Session::StartTimeChanged (old); /* EMIT SIGNAL */
- AudioFileSource::set_header_position_offset (s);
- }
- }
-
-
- if (e != _end) {
-
- framepos_t const old = _end;
- _end = e;
-
- if (allow_bbt_recompute) {
- recompute_bbt_from_frames ();
- }
-
- end_change = true;
-
- if (is_session_range()) {
- Session::EndTimeChanged (old); /* EMIT SIGNAL */
- }
- }
-
- assert (_end >= 0);
- }
+ /* range locations must exceed a minimum duration */
+ if (e - s < Config->get_range_location_minimum()) {
+ return -1;
+ }
- if (start_change) {
- start_changed(this); /* EMIT SIGNAL */
- StartChanged(); /* EMIT SIGNAL */
- }
+ if (s != _start) {
- if (end_change) {
- end_changed(this); /* EMIT SIGNAL */
- EndChanged(); /* EMIT SIGNAL */
- }
+ samplepos_t const old = _start;
+ _start = s;
- if (start_change && end_change) {
- changed (this);
- Changed ();
- }
+ if (allow_beat_recompute) {
+ recompute_beat_from_samples (sub_num);
+ }
+
+ start_change = true;
+
+ if (is_session_range ()) {
+ Session::StartTimeChanged (old); /* EMIT SIGNAL */
+ AudioFileSource::set_header_position_offset (s);
+ }
+ }
+
+
+ if (e != _end) {
+
+ samplepos_t const old = _end;
+ _end = e;
+
+ if (allow_beat_recompute) {
+ recompute_beat_from_samples (sub_num);
+ }
+
+ end_change = true;
- return 0;
+ if (is_session_range()) {
+ Session::EndTimeChanged (old); /* EMIT SIGNAL */
+ }
+ }
+
+ assert (_end >= 0);
+ }
+
+ if (start_change && end_change) {
+ changed (this);
+ Changed ();
+ } else if (start_change) {
+ start_changed(this); /* EMIT SIGNAL */
+ StartChanged(); /* EMIT SIGNAL */
+ } else if (end_change) {
+ end_changed(this); /* EMIT SIGNAL */
+ EndChanged(); /* EMIT SIGNAL */
+ }
+
+ return 0;
}
int
-Location::move_to (framepos_t pos)
+Location::move_to (samplepos_t pos, const uint32_t sub_num)
{
if (pos < 0) {
return -1;
if (_start != pos) {
_start = pos;
_end = _start + length();
- recompute_bbt_from_frames ();
+ recompute_beat_from_samples (sub_num);
changed (this); /* EMIT SIGNAL */
Changed (); /* EMIT SIGNAL */
Location::set_hidden (bool yn, void*)
{
if (set_flag_internal (yn, IsHidden)) {
- flags_changed (this); /* EMIT SIGNAL */
- FlagsChanged ();
+ flags_changed (this); /* EMIT SIGNAL */
+ FlagsChanged ();
}
}
}
if (set_flag_internal (yn, IsCDMarker)) {
- flags_changed (this); /* EMIT SIGNAL */
- FlagsChanged ();
+ flags_changed (this); /* EMIT SIGNAL */
+ FlagsChanged ();
}
}
void
Location::set_is_range_marker (bool yn, void*)
{
- if (set_flag_internal (yn, IsRangeMarker)) {
- flags_changed (this);
- FlagsChanged (); /* EMIT SIGNAL */
- }
+ if (set_flag_internal (yn, IsRangeMarker)) {
+ flags_changed (this);
+ FlagsChanged (); /* EMIT SIGNAL */
+ }
+}
+
+void
+Location::set_is_clock_origin (bool yn, void*)
+{
+ if (set_flag_internal (yn, IsClockOrigin)) {
+ flags_changed (this);
+ FlagsChanged (); /* EMIT SIGNAL */
+ }
}
void
Location::set_skip (bool yn)
{
- if (is_range_marker() && length() > 0) {
- if (set_flag_internal (yn, IsSkip)) {
- flags_changed (this);
- FlagsChanged ();
- }
- }
+ if (is_range_marker() && length() > 0) {
+ if (set_flag_internal (yn, IsSkip)) {
+ flags_changed (this);
+ FlagsChanged ();
+ }
+ }
}
void
Location::set_skipping (bool yn)
{
- if (is_range_marker() && is_skip() && length() > 0) {
- if (set_flag_internal (yn, IsSkipping)) {
- flags_changed (this);
- FlagsChanged ();
- }
- }
+ if (is_range_marker() && is_skip() && length() > 0) {
+ if (set_flag_internal (yn, IsSkipping)) {
+ flags_changed (this);
+ FlagsChanged ();
+ }
+ }
}
void
}
if (set_flag_internal (yn, IsAutoPunch)) {
- flags_changed (this); /* EMIT SIGNAL */
- FlagsChanged (); /* EMIT SIGNAL */
+ flags_changed (this); /* EMIT SIGNAL */
+ FlagsChanged (); /* EMIT SIGNAL */
}
}
}
if (set_flag_internal (yn, IsAutoLoop)) {
- flags_changed (this); /* EMIT SIGNAL */
- FlagsChanged (); /* EMIT SIGNAL */
+ flags_changed (this); /* EMIT SIGNAL */
+ FlagsChanged (); /* EMIT SIGNAL */
}
}
{
XMLNode* root = new XMLNode("CD-Info");
- root->add_property("name", name);
- root->add_property("value", value);
+ root->set_property("name", name);
+ root->set_property("value", value);
return *root;
}
Location::get_state ()
{
XMLNode *node = new XMLNode ("Location");
- char buf[64];
typedef map<string, string>::const_iterator CI;
node->add_child_nocopy(cd_info_node(m->first, m->second));
}
- id().print (buf, sizeof (buf));
- node->add_property("id", buf);
- node->add_property ("name", name());
- snprintf (buf, sizeof (buf), "%" PRId64, start());
- node->add_property ("start", buf);
- snprintf (buf, sizeof (buf), "%" PRId64, end());
- node->add_property ("end", buf);
- node->add_property ("flags", enum_2_string (_flags));
- node->add_property ("locked", (_locked ? "yes" : "no"));
- node->add_property ("position-lock-style", enum_2_string (_position_lock_style));
+ node->set_property ("id", id ());
+ node->set_property ("name", name());
+ node->set_property ("start", start());
+ node->set_property ("end", end());
+ if (position_lock_style() == MusicTime) {
+ node->set_property ("start-beat", _start_beat);
+ node->set_property ("end-beat", _end_beat);
+ }
+ node->set_property ("flags", _flags);
+ node->set_property ("locked", _locked);
+ node->set_property ("position-lock-style", _position_lock_style);
if (_scene_change) {
node->add_child_nocopy (_scene_change->get_state());
int
Location::set_state (const XMLNode& node, int version)
{
- const XMLProperty *prop;
-
XMLNodeList cd_list = node.children();
XMLNodeConstIterator cd_iter;
XMLNode *cd_node;
warning << _("XML node for Location has no ID information") << endmsg;
}
- if ((prop = node.property ("name")) == 0) {
+ std::string str;
+ if (!node.get_property ("name", str)) {
error << _("XML node for Location has no name information") << endmsg;
return -1;
}
- set_name (prop->value());
+ set_name (str);
+
+ /* can't use set_start() here, because _end
+ may make the value of _start illegal.
+ */
- if ((prop = node.property ("start")) == 0) {
+ if (!node.get_property ("start", _start)) {
error << _("XML node for Location has no start information") << endmsg;
return -1;
}
- /* can't use set_start() here, because _end
- may make the value of _start illegal.
- */
-
- sscanf (prop->value().c_str(), "%" PRId64, &_start);
-
- if ((prop = node.property ("end")) == 0) {
- error << _("XML node for Location has no end information") << endmsg;
- return -1;
+ if (!node.get_property ("end", _end)) {
+ error << _("XML node for Location has no end information") << endmsg;
+ return -1;
}
- sscanf (prop->value().c_str(), "%" PRId64, &_end);
+ Flags old_flags (_flags);
- if ((prop = node.property ("flags")) == 0) {
- error << _("XML node for Location has no flags information") << endmsg;
- return -1;
+ if (!node.get_property ("flags", _flags)) {
+ error << _("XML node for Location has no flags information") << endmsg;
+ return -1;
}
- _flags = Flags (string_2_enum (prop->value(), _flags));
+ if (old_flags != _flags) {
+ FlagsChanged ();
+ }
- if ((prop = node.property ("locked")) != 0) {
- _locked = string_is_affirmative (prop->value());
- } else {
+ if (!node.get_property ("locked", _locked)) {
_locked = false;
}
for (cd_iter = cd_list.begin(); cd_iter != cd_list.end(); ++cd_iter) {
- cd_node = *cd_iter;
+ cd_node = *cd_iter;
- if (cd_node->name() != "CD-Info") {
- continue;
- }
-
- if ((prop = cd_node->property ("name")) != 0) {
- cd_name = prop->value();
- } else {
- throw failed_constructor ();
- }
+ if (cd_node->name() != "CD-Info") {
+ continue;
+ }
- if ((prop = cd_node->property ("value")) != 0) {
- cd_value = prop->value();
- } else {
- throw failed_constructor ();
- }
+ if (!cd_node->get_property ("name", cd_name)) {
+ throw failed_constructor ();
+ }
+ if (!cd_node->get_property ("value", cd_value)) {
+ throw failed_constructor ();
+ }
- cd_info[cd_name] = cd_value;
+ cd_info[cd_name] = cd_value;
}
- if ((prop = node.property ("position-lock-style")) != 0) {
- _position_lock_style = PositionLockStyle (string_2_enum (prop->value(), _position_lock_style));
- }
+ node.get_property ("position-lock-style", _position_lock_style);
XMLNode* scene_child = find_named_node (node, SceneChange::xml_node_name);
-
+
if (scene_child) {
_scene_change = SceneChange::factory (*scene_child, version);
}
- recompute_bbt_from_frames ();
+ if (position_lock_style() == AudioTime) {
+ recompute_beat_from_samples (0);
+ } else{
+ /* music */
+ if (!node.get_property ("start-beat", _start_beat) ||
+ !node.get_property ("end-beat", _end_beat)) {
+ recompute_beat_from_samples (0);
+ }
+ }
+
changed (this); /* EMIT SIGNAL */
Changed (); /* EMIT SIGNAL */
_position_lock_style = ps;
- recompute_bbt_from_frames ();
+ if (ps == MusicTime) {
+ recompute_beat_from_samples (0);
+ }
position_lock_style_changed (this); /* EMIT SIGNAL */
PositionLockStyleChanged (); /* EMIT SIGNAL */
}
void
-Location::recompute_bbt_from_frames ()
+Location::recompute_beat_from_samples (const uint32_t sub_num)
{
- if (_position_lock_style != MusicTime) {
- return;
- }
-
- _session.bbt_time (_start, _bbt_start);
- _session.bbt_time (_end, _bbt_end);
+ _start_beat = _session.tempo_map().exact_beat_at_sample (_start, sub_num);
+ _end_beat = _session.tempo_map().exact_beat_at_sample (_end, sub_num);
}
void
-Location::recompute_frames_from_bbt ()
+Location::recompute_samples_from_beat ()
{
if (_position_lock_style != MusicTime) {
return;
}
TempoMap& map (_session.tempo_map());
- set (map.frame_time (_bbt_start), map.frame_time (_bbt_end), false);
+ set (map.sample_at_beat (_start_beat), map.sample_at_beat (_end_beat), false);
}
void
void
Location::set_scene_change (boost::shared_ptr<SceneChange> sc)
{
- _scene_change = sc;
+ if (_scene_change != sc) {
+ _scene_change = sc;
+ _session.set_dirty ();
- scene_changed (); /* EMIT SIGNAL */
+ scene_changed (); /* EMIT SIGNAL */
+ SceneChangeChanged (); /* EMIT SIGNAL */
+ }
}
/*---------------------------------------------------------------------- */
}
if (ret == 0) {
- current_changed (current_location); /* EMIT SIGNAL */
+ current_changed (current_location); /* EMIT SIGNAL */
}
return ret;
}
+void
+Locations::set_clock_origin (Location* loc, void *src)
+{
+ LocationList::iterator i;
+ for (i = locations.begin(); i != locations.end(); ++i) {
+ if ((*i)->is_clock_origin ()) {
+ (*i)->set_is_clock_origin (false, src);
+ }
+ if (*i == loc) {
+ (*i)->set_is_clock_origin (true, src);
+ }
+ }
+}
+
int
Locations::next_available_name(string& result,string base)
{
string::size_type l;
int suffix;
char buf[32];
- std::map<uint32_t,bool> taken;
- uint32_t n;
+ std::map<uint32_t,bool> taken;
+ uint32_t n;
result = base;
- l = base.length();
+ l = base.length();
- if (!base.empty()) {
-
- /* find all existing names that match "base", and store
- the numeric part of them (if any) in the map "taken"
- */
+ if (!base.empty()) {
- for (i = locations.begin(); i != locations.end(); ++i) {
+ /* find all existing names that match "base", and store
+ the numeric part of them (if any) in the map "taken"
+ */
- const string& temp ((*i)->name());
-
- if (!temp.find (base,0)) {
+ for (i = locations.begin(); i != locations.end(); ++i) {
- if ((suffix = atoi (temp.substr(l,3))) != 0) {
- taken.insert (make_pair (suffix,true));
- }
- }
- }
- }
+ const string& temp ((*i)->name());
+
+ if (!temp.find (base,0)) {
+ /* grab what comes after the "base" as if it was
+ a number, and assuming that works OK,
+ store it in "taken" so that we know it
+ has been used.
+ */
+ if ((suffix = atoi (temp.substr(l))) != 0) {
+ taken.insert (make_pair (suffix,true));
+ }
+ }
+ }
+ }
+
+ /* Now search for an un-used suffix to add to "base". This
+ will find "holes" in the numbering sequence when a location
+ was deleted.
+
+ This must start at 1, both for human-numbering reasons
+ and also because the call to atoi() above would return
+ zero if there is no recognizable numeric suffix, causing
+ "base 0" not to be inserted into the "taken" map.
+ */
+
+ n = 1;
+
+ while (n < UINT32_MAX) {
+ if (taken.find (n) == taken.end()) {
+ snprintf (buf, sizeof(buf), "%d", n);
+ result += buf;
+ return 1;
+ }
+ ++n;
+ }
- /* Now search for an un-used suffix to add to "base". This
- will find "holes" in the numbering sequence when a location
- was deleted.
-
- This must start at 1, both for human-numbering reasons
- and also because the call to atoi() above would return
- zero if there is no recognizable numeric suffix, causing
- "base 0" not to be inserted into the "taken" map.
- */
-
- n = 1;
-
- while (n < UINT32_MAX) {
- if (taken.find (n) == taken.end()) {
- snprintf (buf, sizeof(buf), "%d", n);
- result += buf;
- return 1;
- }
- ++n;
- }
-
return 0;
}
i = tmp;
}
}
-
+
changed (); /* EMIT SIGNAL */
}
current_location = 0;
}
- changed ();
+ changed ();
current_changed (0); /* EMIT SIGNAL */
}
added (loc); /* EMIT SIGNAL */
if (make_current) {
- current_changed (current_location); /* EMIT SIGNAL */
+ current_changed (current_location); /* EMIT SIGNAL */
}
if (loc->is_session_range()) {
bool was_current = false;
LocationList::iterator i;
+ if (!loc) {
+ return;
+ }
+
if (loc->is_session_range()) {
return;
}
for (i = locations.begin(); i != locations.end(); ++i) {
if ((*i) == loc) {
+ bool was_loop = (*i)->is_auto_loop();
delete *i;
locations.erase (i);
was_removed = true;
current_location = 0;
was_current = true;
}
+ if (was_loop) {
+ if (_session.get_play_loop()) {
+ _session.request_play_loop (false, false);
+ }
+ _session.auto_loop_location_changed (0);
+ }
break;
}
}
if (was_removed) {
removed (loc); /* EMIT SIGNAL */
-
+
if (was_current) {
- current_changed (0); /* EMIT SIGNAL */
+ current_changed (0); /* EMIT SIGNAL */
}
}
}
Location* session_range_location = 0;
if (version < 3000) {
- session_range_location = new Location (_session, 0, 0, _("session"), Location::IsSessionRange);
+ session_range_location = new Location (_session, 0, 0, _("session"), Location::IsSessionRange, 0);
new_locations.push_back (session_range_location);
}
if (i != locations.end()) {
/* we can re-use an old Location object */
loc = *i;
+
+ // changed locations will be updated by Locations::changed signal
loc->set_state (**niter, version);
} else {
loc = new Location (_session, **niter);
}
}
+ /* We may have some unused locations in the old list. */
+ for (LocationList::iterator i = locations.begin(); i != locations.end(); ) {
+ LocationList::iterator tmp = i;
+ ++tmp;
+
+ LocationList::iterator n = new_locations.begin();
+ bool found = false;
+
+ while (n != new_locations.end ()) {
+ if ((*i)->id() == (*n)->id()) {
+ found = true;
+ break;
+ }
+ ++n;
+ }
+
+ if (!found) {
+ delete *i;
+ locations.erase (i);
+ }
+
+ i = tmp;
+ }
+
locations = new_locations;
if (locations.size()) {
}
-typedef std::pair<framepos_t,Location*> LocationPair;
+typedef std::pair<samplepos_t,Location*> LocationPair;
struct LocationStartEarlierComparison
{
- bool operator() (LocationPair a, LocationPair b) {
- return a.first < b.first;
- }
+ bool operator() (LocationPair a, LocationPair b) {
+ return a.first < b.first;
+ }
};
struct LocationStartLaterComparison
{
- bool operator() (LocationPair a, LocationPair b) {
- return a.first > b.first;
- }
+ bool operator() (LocationPair a, LocationPair b) {
+ return a.first > b.first;
+ }
};
-framepos_t
-Locations::first_mark_before (framepos_t frame, bool include_special_ranges)
+samplepos_t
+Locations::first_mark_before (samplepos_t sample, bool include_special_ranges)
{
Glib::Threads::Mutex::Lock lm (lock);
vector<LocationPair> locs;
-
+
for (LocationList::iterator i = locations.begin(); i != locations.end(); ++i) {
locs.push_back (make_pair ((*i)->start(), (*i)));
if (!(*i)->is_mark()) {
if (!include_special_ranges && ((*i).second->is_auto_loop() || (*i).second->is_auto_punch())) {
continue;
}
- if ((*i).first < frame) {
+ if ((*i).first < sample) {
return (*i).first;
}
}
}
Location*
-Locations::mark_at (framepos_t pos, framecnt_t slop) const
+Locations::mark_at (samplepos_t pos, samplecnt_t slop) const
{
Glib::Threads::Mutex::Lock lm (lock);
Location* closest = 0;
- frameoffset_t mindelta = max_framepos;
- frameoffset_t delta;
+ sampleoffset_t mindelta = max_samplepos;
+ sampleoffset_t delta;
/* locations are not necessarily stored in linear time order so we have
* to iterate across all of them to find the one closest to a give point.
for (LocationList::const_iterator i = locations.begin(); i != locations.end(); ++i) {
if ((*i)->is_mark()) {
- if (pos > (*i)->start()) {
+ if (pos > (*i)->start()) {
delta = pos - (*i)->start();
} else {
delta = (*i)->start() - pos;
}
-
+
if (slop == 0 && delta == 0) {
/* special case: no slop, and direct hit for position */
return *i;
return closest;
}
-framepos_t
-Locations::first_mark_after (framepos_t frame, bool include_special_ranges)
+samplepos_t
+Locations::first_mark_after (samplepos_t sample, bool include_special_ranges)
{
Glib::Threads::Mutex::Lock lm (lock);
vector<LocationPair> locs;
LocationStartEarlierComparison cmp;
sort (locs.begin(), locs.end(), cmp);
-
+
/* locs is sorted in reverse order */
for (vector<LocationPair>::iterator i = locs.begin(); i != locs.end(); ++i) {
if (!include_special_ranges && ((*i).second->is_auto_loop() || (*i).second->is_auto_punch())) {
continue;
}
- if ((*i).first > frame) {
+ if ((*i).first > sample) {
return (*i).first;
}
}
}
/** Look for the `marks' (either locations which are marks, or start/end points of range markers) either
- * side of a frame. Note that if frame is exactly on a `mark', that mark will not be considered for returning
+ * side of a sample. Note that if sample 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_framepos if none exists)
- * @param after Filled in with the position of the next `mark' after `frame' (or max_framepos if none exists)
+ * @param sample Frame to look for.
+ * @param before Filled in with the position of the last `mark' before `sample' (or max_samplepos if none exists)
+ * @param after Filled in with the position of the next `mark' after `sample' (or max_samplepos if none exists)
*/
void
-Locations::marks_either_side (framepos_t const frame, framepos_t& before, framepos_t& after) const
+Locations::marks_either_side (samplepos_t const sample, samplepos_t& before, samplepos_t& after) const
{
- before = after = max_framepos;
+ before = after = max_samplepos;
LocationList locs;
/* Get a list of positions; don't store any that are exactly on our requested position */
- std::list<framepos_t> positions;
+ std::list<samplepos_t> positions;
for (LocationList::const_iterator i = locs.begin(); i != locs.end(); ++i) {
if (((*i)->is_auto_loop() || (*i)->is_auto_punch())) {
if (!(*i)->is_hidden()) {
if ((*i)->is_mark ()) {
- if ((*i)->start() != frame) {
+ if ((*i)->start() != sample) {
positions.push_back ((*i)->start ());
}
} else {
- if ((*i)->start() != frame) {
+ if ((*i)->start() != sample) {
positions.push_back ((*i)->start ());
}
- if ((*i)->end() != frame) {
+ if ((*i)->end() != sample) {
positions.push_back ((*i)->end ());
}
}
positions.sort ();
- std::list<framepos_t>::iterator i = positions.begin ();
- while (i != positions.end () && *i < frame) {
+ std::list<samplepos_t>::iterator i = positions.begin ();
+ while (i != positions.end () && *i < sample) {
++i;
}
return const_cast<Location*> (*i);
}
}
- return 0;
+ return 0;
+}
+
+Location*
+Locations::clock_origin_location () const
+{
+ for (LocationList::const_iterator i = locations.begin(); i != locations.end(); ++i) {
+ if ((*i)->is_clock_origin()) {
+ return const_cast<Location*> (*i);
+ }
+ }
+ return session_range_location ();
}
uint32_t
Location *
Locations::get_location_by_id(PBD::ID id)
{
- LocationList::iterator it;
- for (it = locations.begin(); it != locations.end(); ++it)
- if (id == (*it)->id())
- return *it;
+ LocationList::iterator it;
+ for (it = locations.begin(); it != locations.end(); ++it)
+ if (id == (*it)->id())
+ return *it;
- return 0;
+ return 0;
}
void
-Locations::find_all_between (framepos_t start, framepos_t end, LocationList& ll, Location::Flags flags)
+Locations::find_all_between (samplepos_t start, samplepos_t end, LocationList& ll, Location::Flags flags)
{
Glib::Threads::Mutex::Lock lm (lock);
}
}
}
-
projects / ardour.git / blobdiff