summaryrefslogtreecommitdiff
path: root/libs/ardour/location.cc
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2011-06-01 16:50:12 +0000
committerDavid Robillard <d@drobilla.net>2011-06-01 16:50:12 +0000
commita473d630eb165272992e90f8d854b1d66ec0be63 (patch)
treed0d027d4e53cb3883f4098c4736651d0ae89c19a /libs/ardour/location.cc
parenta46cea06e29bfdb18e0199a665caf5a34d388968 (diff)
Fix broken whitespace. I'd apologize for the compile times if it was my fault :D
git-svn-id: svn://localhost/ardour2/branches/3.0@9654 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/location.cc')
-rw-r--r--libs/ardour/location.cc28
1 files changed, 14 insertions, 14 deletions
diff --git a/libs/ardour/location.cc b/libs/ardour/location.cc
index 086b6ed0c8..7095596101 100644
--- a/libs/ardour/location.cc
+++ b/libs/ardour/location.cc
@@ -95,7 +95,7 @@ Location::Location (Session& s, const XMLNode& node)
/* 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 ();
}
@@ -163,14 +163,14 @@ Location::set_start (framepos_t s, bool force, bool allow_bbt_recompute)
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 ();
@@ -183,7 +183,7 @@ Location::set_start (framepos_t s, bool force, bool allow_bbt_recompute)
}
assert (_start >= 0);
-
+
return 0;
}
@@ -204,7 +204,7 @@ Location::set_end (framepos_t e, bool force, bool allow_bbt_recompute)
return -1;
}
}
-
+
if (is_mark()) {
if (_start != e) {
_start = e;
@@ -218,13 +218,13 @@ Location::set_end (framepos_t e, bool force, bool allow_bbt_recompute)
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 ();
@@ -520,7 +520,7 @@ Location::recompute_bbt_from_frames ()
if (_position_lock_style != MusicTime) {
return;
}
-
+
_session.tempo_map().bbt_time (_start, _bbt_start);
_session.tempo_map().bbt_time (_end, _bbt_end);
}
@@ -710,7 +710,7 @@ void
Locations::add (Location *loc, bool make_current)
{
assert (loc);
-
+
{
Glib::Mutex::Lock lm (lock);
locations.push_back (loc);
@@ -823,7 +823,7 @@ Locations::set_state (const XMLNode& node, int version)
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;
@@ -970,7 +970,7 @@ void
Locations::marks_either_side (framepos_t const frame, framepos_t& before, framepos_t& after) const
{
before = after = max_framepos;
-
+
LocationList locs;
{
@@ -979,7 +979,7 @@ Locations::marks_either_side (framepos_t const frame, framepos_t& before, framep
}
/* Get a list of positions; don't store any that are exactly on our requested position */
-
+
std::list<framepos_t> positions;
for (LocationList::const_iterator i = locs.begin(); i != locs.end(); ++i) {
@@ -1026,7 +1026,7 @@ Locations::marks_either_side (framepos_t const frame, framepos_t& before, framep
/* none before */
return;
}
-
+
--i;
before = *i;
}