ardour/livetrax
13
0
Fork 0
Code

Clean up some location handling bits; should fix update of editor summary when session start/end is moved.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@6948 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2010-04-22 00:20:57 +00:00
parent b32efee4b3
commit bc8a459dbe
2 changed files with 29 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libs/ardour/ardour/location.h
View File

@ -93,7 +93,6 @@ class Location : public PBD::StatefulDestructible
void set_auto_loop (bool yn, void *src); void set_auto_loop (bool yn, void *src);
void set_hidden (bool yn, void *src); void set_hidden (bool yn, void *src);
void set_cd (bool yn, void *src); void set_cd (bool yn, void *src);
void set_is_session_range (bool yn, void* src);
void set_is_range_marker (bool yn, void* src); void set_is_range_marker (bool yn, void* src);
bool is_auto_punch () const { return _flags & IsAutoPunch; } bool is_auto_punch () const { return _flags & IsAutoPunch; }

90
libs/ardour/location.cc
View File

@ -89,32 +89,27 @@ Location::set_start (nframes64_t s)
return -1; return -1;
} }
if (is_mark()) {
if (_start != s) {
_start = s;
_end = s;
start_changed(this); /* EMIT SIGNAL */
end_changed(this); /* EMIT SIGNAL */
}
return 0;
}
if (is_session_range()) {
start_changed (this); /* EMIT SIGNAL */
Session::StartTimeChanged (); /* EMIT SIGNAL */
AudioFileSource::set_header_position_offset (s);
}
if (((is_auto_punch() || is_auto_loop()) && s >= _end) || s > _end) { if (((is_auto_punch() || is_auto_loop()) && s >= _end) || s > _end) {
return -1; return -1;
} }
if (is_mark()) {
if (_start != s) {
_start = s;
_end = s;
start_changed (this); /* EMIT SIGNAL */
end_changed (this); /* EMIT SIGNAL */
}
return 0;
}
if (s != _start) { if (s != _start) {
_start = s; _start = s;
start_changed(this); /* EMIT SIGNAL */ start_changed (this); /* EMIT SIGNAL */
if (is_session_range ()) {
Session::StartTimeChanged (); /* EMIT SIGNAL */
AudioFileSource::set_header_position_offset (s);
}
} }
return 0; return 0;
@ -127,56 +122,37 @@ Location::set_end (nframes64_t e)
return -1; return -1;
} }
if (((is_auto_punch() || is_auto_loop()) && e <= _start) || e < _start) {
return -1;
}
if (is_mark()) { if (is_mark()) {
if (_start != e) { if (_start != e) {
_start = e; _start = e;
_end = e; _end = e;
start_changed(this); /* EMIT SIGNAL */ start_changed (this); /* EMIT SIGNAL */
end_changed(this); /* EMIT SIGNAL */ end_changed (this); /* EMIT SIGNAL */
} }
return 0; return 0;
} }
if (is_session_range()) {
_end = e;
end_changed (this); /* EMIT SIGNAL */
Session::EndTimeChanged (); /* EMIT SIGNAL */
}
if (((is_auto_punch() || is_auto_loop()) && e <= _start) || e < _start) {
return -1;
}
if (e != _end) { if (e != _end) {
_end = e; _end = e;
end_changed(this); /* EMIT SIGNAL */ end_changed(this); /* EMIT SIGNAL */
if (is_session_range()) {
Session::EndTimeChanged (); /* EMIT SIGNAL */
}
} }
return 0; return 0;
} }
int int
Location::set (nframes64_t start, nframes64_t end) Location::set (nframes64_t start, nframes64_t end)
{ {
if (_locked) { set_start (start);
return -1; set_end (end);
}
if (is_mark() && start != end) {
return -1;
} else if (((is_auto_punch() || is_auto_loop()) && start >= end) || (start > end)) {
return -1;
}
if (_start != start) {
_start = start;
start_changed(this); /* EMIT SIGNAL */
}
if (_end != end) {
_end = end;
end_changed(this); /* EMIT SIGNAL */
}
return 0;
} }
int int
@ -220,14 +196,6 @@ Location::set_cd (bool yn, void *src)
} }
} }
void
Location::set_is_session_range (bool yn, void *src)
{
if (set_flag_internal (yn, IsSessionRange)) {
FlagsChanged (this, src); /* EMIT SIGNAL */
}
}
void void
Location::set_is_range_marker (bool yn, void *src) Location::set_is_range_marker (bool yn, void *src)
{ {