projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move ever close to working master/slave logic, this time with audio testing
[ardour.git]
/
libs
/
ardour
/
location.cc
diff --git
a/libs/ardour/location.cc
b/libs/ardour/location.cc
index 0758642336bdb441bb7202c6e7493f2158d531b1..d827d0f2b606dfccd064c90c8771861795c84fb6 100644
(file)
--- a/
libs/ardour/location.cc
+++ b/
libs/ardour/location.cc
@@
-58,7
+58,6
@@
Location::Location (Session& s)
, _flags (Flags (0))
, _locked (false)
, _position_lock_style (AudioTime)
, _flags (Flags (0))
, _locked (false)
, _position_lock_style (AudioTime)
- , _block_change_notifications (false)
{
assert (_start >= 0);
assert (_end >= 0);
{
assert (_start >= 0);
assert (_end >= 0);
@@
-73,7
+72,6
@@
Location::Location (Session& s, framepos_t sample_start, framepos_t sample_end,
, _flags (bits)
, _locked (false)
, _position_lock_style (s.config.get_glue_new_markers_to_bars_and_beats() ? MusicTime : AudioTime)
, _flags (bits)
, _locked (false)
, _position_lock_style (s.config.get_glue_new_markers_to_bars_and_beats() ? MusicTime : AudioTime)
- , _block_change_notifications (false)
{
recompute_bbt_from_frames ();
{
recompute_bbt_from_frames ();
@@
-92,7
+90,6
@@
Location::Location (const Location& other)
, _bbt_end (other._bbt_end)
, _flags (other._flags)
, _position_lock_style (other._position_lock_style)
, _bbt_end (other._bbt_end)
, _flags (other._flags)
, _position_lock_style (other._position_lock_style)
- , _block_change_notifications (false)
{
/* copy is not locked even if original was */
{
/* copy is not locked even if original was */
@@
-107,6
+104,7
@@
Location::Location (const Location& other)
Location::Location (Session& s, const XMLNode& node)
: SessionHandleRef (s)
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
, _position_lock_style (AudioTime)
{
/* Note: _position_lock_style is initialised above in case set_state doesn't set it
@@
-150,7
+148,7
@@
Location::operator= (const Location& other)
_bbt_end = other._bbt_end;
_flags = other._flags;
_position_lock_style = other._position_lock_style;
_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 */
/* XXX need to copy scene change */
/* copy is not locked even if original was */
@@
-170,8
+168,8
@@
Location::operator= (const Location& other)
void
Location::set_name (const std::string& str)
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 */
@@
-209,8
+207,8
@@
Location::set_start (framepos_t s, bool force, bool allow_bbt_recompute)
start_changed (this); /* EMIT SIGNAL */
StartChanged (); /* EMIT SIGNAL */
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
}
/* moving the start (position) of a marker with a scene change
@@
-242,7
+240,7
@@
Location::set_start (framepos_t s, bool force, bool allow_bbt_recompute)
}
start_changed (this); /* EMIT SIGNAL */
StartChanged (); /* EMIT SIGNAL */
}
start_changed (this); /* EMIT SIGNAL */
StartChanged (); /* EMIT SIGNAL */
-
+
if (is_session_range ()) {
Session::StartTimeChanged (old); /* EMIT SIGNAL */
AudioFileSource::set_header_position_offset (s);
if (is_session_range ()) {
Session::StartTimeChanged (old); /* EMIT SIGNAL */
AudioFileSource::set_header_position_offset (s);
@@
-283,8
+281,8
@@
Location::set_end (framepos_t e, bool force, bool allow_bbt_recompute)
if (allow_bbt_recompute) {
recompute_bbt_from_frames ();
}
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 */
}
end_changed (this); /* EMIT SIGNAL */
EndChanged (); /* EMIT SIGNAL */
}
@@
-360,7
+358,7
@@
Location::set (framepos_t s, framepos_t e, bool allow_bbt_recompute)
if (e - s < Config->get_range_location_minimum()) {
return -1;
}
if (e - s < Config->get_range_location_minimum()) {
return -1;
}
-
+
if (s != _start) {
framepos_t const old = _start;
if (s != _start) {
framepos_t const old = _start;
@@
-371,23
+369,23
@@
Location::set (framepos_t s, framepos_t e, bool allow_bbt_recompute)
}
start_change = true;
}
start_change = true;
-
+
if (is_session_range ()) {
Session::StartTimeChanged (old); /* EMIT SIGNAL */
AudioFileSource::set_header_position_offset (s);
}
}
if (is_session_range ()) {
Session::StartTimeChanged (old); /* EMIT SIGNAL */
AudioFileSource::set_header_position_offset (s);
}
}
-
-
+
+
if (e != _end) {
if (e != _end) {
-
+
framepos_t const old = _end;
_end = e;
if (allow_bbt_recompute) {
recompute_bbt_from_frames ();
}
framepos_t const old = _end;
_end = e;
if (allow_bbt_recompute) {
recompute_bbt_from_frames ();
}
-
+
end_change = true;
if (is_session_range()) {
end_change = true;
if (is_session_range()) {
@@
-398,24
+396,17
@@
Location::set (framepos_t s, framepos_t e, bool allow_bbt_recompute)
assert (_end >= 0);
}
assert (_end >= 0);
}
- if (start_change) {
+ if (start_change && end_change) {
+ changed (this);
+ Changed ();
+ } else if (start_change) {
start_changed(this); /* EMIT SIGNAL */
StartChanged(); /* EMIT SIGNAL */
start_changed(this); /* EMIT SIGNAL */
StartChanged(); /* EMIT SIGNAL */
- }
-
- if (end_change) {
+ } else if (end_change) {
end_changed(this); /* EMIT SIGNAL */
EndChanged(); /* EMIT SIGNAL */
}
end_changed(this); /* EMIT SIGNAL */
EndChanged(); /* EMIT SIGNAL */
}
- if (start_change && end_change) {
- changed (this);
-
- if (!_block_change_notifications) {
- Changed ();
- }
- }
-
return 0;
}
return 0;
}
@@
-436,10
+427,7
@@
Location::move_to (framepos_t pos)
recompute_bbt_from_frames ();
changed (this); /* EMIT SIGNAL */
recompute_bbt_from_frames ();
changed (this); /* EMIT SIGNAL */
-
- if (!_block_change_notifications) {
- Changed (); /* EMIT SIGNAL */
- }
+ Changed (); /* EMIT SIGNAL */
}
assert (_start >= 0);
}
assert (_start >= 0);
@@
-606,7
+594,7
@@
Location::get_state ()
int
Location::set_state (const XMLNode& node, int version)
{
int
Location::set_state (const XMLNode& node, int version)
{
-
const XMLProperty *
prop;
+
XMLProperty const *
prop;
XMLNodeList cd_list = node.children();
XMLNodeConstIterator cd_iter;
XMLNodeList cd_list = node.children();
XMLNodeConstIterator cd_iter;
@@
-654,8
+642,13
@@
Location::set_state (const XMLNode& node, int version)
return -1;
}
return -1;
}
+ Flags old_flags (_flags);
_flags = Flags (string_2_enum (prop->value(), _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 {
if ((prop = node.property ("locked")) != 0) {
_locked = string_is_affirmative (prop->value());
} else {
@@
-691,7
+684,7
@@
Location::set_state (const XMLNode& node, int version)
}
XMLNode* scene_child = find_named_node (node, SceneChange::xml_node_name);
}
XMLNode* scene_child = find_named_node (node, SceneChange::xml_node_name);
-
+
if (scene_child) {
_scene_change = SceneChange::factory (*scene_child, version);
}
if (scene_child) {
_scene_change = SceneChange::factory (*scene_child, version);
}
@@
-699,10
+692,7
@@
Location::set_state (const XMLNode& node, int version)
recompute_bbt_from_frames ();
changed (this); /* EMIT SIGNAL */
recompute_bbt_from_frames ();
changed (this); /* EMIT SIGNAL */
-
- if (!_block_change_notifications) {
- Changed (); /* EMIT SIGNAL */
- }
+ Changed (); /* EMIT SIGNAL */
assert (_start >= 0);
assert (_end >= 0);
assert (_start >= 0);
assert (_end >= 0);
@@
-732,8
+722,8
@@
Location::recompute_bbt_from_frames ()
return;
}
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
}
void
@@
-744,7
+734,7
@@
Location::recompute_frames_from_bbt ()
}
TempoMap& map (_session.tempo_map());
}
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
@@
-766,9
+756,13
@@
Location::unlock ()
void
Location::set_scene_change (boost::shared_ptr<SceneChange> sc)
{
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 */
+ }
}
/*---------------------------------------------------------------------- */
}
/*---------------------------------------------------------------------- */
@@
-821,7
+815,7
@@
Locations::next_available_name(string& result,string base)
l = base.length();
if (!base.empty()) {
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"
*/
/* find all existing names that match "base", and store
the numeric part of them (if any) in the map "taken"
*/
@@
-829,10
+823,14
@@
Locations::next_available_name(string& result,string base)
for (i = locations.begin(); i != locations.end(); ++i) {
const string& temp ((*i)->name());
for (i = locations.begin(); i != locations.end(); ++i) {
const string& temp ((*i)->name());
-
- if (!temp.find (base,0)) {
- if ((suffix = atoi (temp.substr(l,3))) != 0) {
+ 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));
}
}
taken.insert (make_pair (suffix,true));
}
}
@@
-844,12
+842,12
@@
Locations::next_available_name(string& result,string base)
was deleted.
This must start at 1, both for human-numbering reasons
was deleted.
This must start at 1, both for human-numbering reasons
- and also because the call to atoi() above would return
+ 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.
*/
zero if there is no recognizable numeric suffix, causing
"base 0" not to be inserted into the "taken" map.
*/
- n = 1;
+ n = 1;
while (n < UINT32_MAX) {
if (taken.find (n) == taken.end()) {
while (n < UINT32_MAX) {
if (taken.find (n) == taken.end()) {
@@
-859,7
+857,7
@@
Locations::next_available_name(string& result,string base)
}
++n;
}
}
++n;
}
-
+
return 0;
}
return 0;
}
@@
-920,7
+918,7
@@
Locations::clear_markers ()
i = tmp;
}
}
i = tmp;
}
}
-
+
changed (); /* EMIT SIGNAL */
}
changed (); /* EMIT SIGNAL */
}
@@
-1020,7
+1018,7
@@
Locations::remove (Location *loc)
if (was_removed) {
removed (loc); /* EMIT SIGNAL */
if (was_removed) {
removed (loc); /* EMIT SIGNAL */
-
+
if (was_current) {
current_changed (0); /* EMIT SIGNAL */
}
if (was_current) {
current_changed (0); /* EMIT SIGNAL */
}
@@
-1083,11
+1081,9
@@
Locations::set_state (const XMLNode& node, int version)
if (i != locations.end()) {
/* we can re-use an old Location object */
loc = *i;
if (i != locations.end()) {
/* we can re-use an old Location object */
loc = *i;
-
+
// changed locations will be updated by Locations::changed signal
// changed locations will be updated by Locations::changed signal
- loc->set_block_change_notifications (true);
loc->set_state (**niter, version);
loc->set_state (**niter, version);
- loc->set_block_change_notifications (false);
} else {
loc = new Location (_session, **niter);
}
} else {
loc = new Location (_session, **niter);
}
@@
-1191,7
+1187,7
@@
Locations::first_mark_before (framepos_t frame, bool include_special_ranges)
{
Glib::Threads::Mutex::Lock lm (lock);
vector<LocationPair> locs;
{
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::iterator i = locations.begin(); i != locations.end(); ++i) {
locs.push_back (make_pair ((*i)->start(), (*i)));
if (!(*i)->is_mark()) {
@@
-1234,12
+1230,12
@@
Locations::mark_at (framepos_t pos, framecnt_t slop) const
for (LocationList::const_iterator i = locations.begin(); i != locations.end(); ++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;
}
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;
if (slop == 0 && delta == 0) {
/* special case: no slop, and direct hit for position */
return *i;
@@
-1272,7
+1268,7
@@
Locations::first_mark_after (framepos_t frame, bool include_special_ranges)
LocationStartEarlierComparison cmp;
sort (locs.begin(), locs.end(), cmp);
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) {
/* locs is sorted in reverse order */
for (vector<LocationPair>::iterator i = locs.begin(); i != locs.end(); ++i) {