#include "ardour/audiofilesource.h"
#include "ardour/tempo.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
using namespace std;
using namespace ARDOUR;
, _flags (bits)
, _locked (false)
, _position_lock_style (s.config.get_glue_new_markers_to_bars_and_beats() ? MusicTime : AudioTime)
+
{
recompute_bbt_from_frames ();
, _bbt_end (other._bbt_end)
, _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
_bbt_end = other._bbt_end;
_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.
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) {
}
start_changed (this); /* EMIT SIGNAL */
StartChanged (); /* EMIT SIGNAL */
-
+
if (is_session_range ()) {
Session::StartTimeChanged (old); /* EMIT SIGNAL */
AudioFileSource::set_header_position_offset (s);
if (allow_bbt_recompute) {
recompute_bbt_from_frames ();
}
- 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) {
return -1;
}
- bool start_change = false;
- bool end_change = false;
+ bool start_change = false;
+ bool end_change = false;
if (is_mark()) {
recompute_bbt_from_frames ();
}
- 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 */
- }
+ framepos_t const old = _start;
+ _start = s;
- if (start_change && end_change) {
- changed (this);
- Changed ();
- }
+ 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);
+ }
+
+ 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;
+ return 0;
}
int
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_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 */
}
}
int
Location::set_state (const XMLNode& node, int version)
{
- const XMLProperty *prop;
+ XMLProperty const * prop;
XMLNodeList cd_list = node.children();
XMLNodeConstIterator cd_iter;
return -1;
}
- /* can't use set_start() here, because _end
- may make the value of _start illegal.
- */
+ /* 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;
+ error << _("XML node for Location has no end information") << endmsg;
+ return -1;
}
sscanf (prop->value().c_str(), "%" PRId64, &_end);
if ((prop = node.property ("flags")) == 0) {
- error << _("XML node for Location has no flags information") << endmsg;
- return -1;
+ error << _("XML node for Location has no flags information") << endmsg;
+ return -1;
}
+ Flags old_flags (_flags);
_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 {
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 (cd_node->name() != "CD-Info") {
+ continue;
+ }
- if ((prop = cd_node->property ("name")) != 0) {
- cd_name = prop->value();
- } else {
- throw failed_constructor ();
- }
+ if ((prop = cd_node->property ("name")) != 0) {
+ cd_name = prop->value();
+ } else {
+ throw failed_constructor ();
+ }
- if ((prop = cd_node->property ("value")) != 0) {
- cd_value = prop->value();
- } else {
- throw failed_constructor ();
- }
+ if ((prop = cd_node->property ("value")) != 0) {
+ cd_value = prop->value();
+ } else {
+ throw failed_constructor ();
+ }
- cd_info[cd_name] = cd_value;
+ cd_info[cd_name] = cd_value;
}
if ((prop = node.property ("position-lock-style")) != 0) {
}
XMLNode* scene_child = find_named_node (node, SceneChange::xml_node_name);
-
+
if (scene_child) {
_scene_change = SceneChange::factory (*scene_child, version);
}
return;
}
- _session.bbt_time (_start, _bbt_start);
- _session.bbt_time (_end, _bbt_end);
+ _bbt_start = _session.tempo_map().beat_at_frame (_start);
+ _bbt_end = _session.tempo_map().beat_at_frame (_end);
}
void
}
TempoMap& map (_session.tempo_map());
- set (map.frame_time (_bbt_start), map.frame_time (_bbt_end), false);
+ set (map.frame_at_beat (_bbt_start), map.frame_at_beat (_bbt_end), 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;
}
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()) {
if (was_removed) {
removed (loc); /* EMIT SIGNAL */
-
+
if (was_current) {
- current_changed (0); /* EMIT SIGNAL */
+ current_changed (0); /* EMIT SIGNAL */
}
}
}
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);
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
{
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()) {
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;
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) {
return const_cast<Location*> (*i);
}
}
- return 0;
+ return 0;
}
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
projects / ardour.git / blobdiff