projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow markers to be glued to bar/beat time. Fixes #1815.
[ardour.git]
/
gtk2_ardour
/
time_selection.cc
diff --git
a/gtk2_ardour/time_selection.cc
b/gtk2_ardour/time_selection.cc
index 518e04cccb3056647415cb72c85a90ad8af8ac1b..185c7e1eeadf06112e8009df0814b16c48f18dcd 100644
(file)
--- a/
gtk2_ardour/time_selection.cc
+++ b/
gtk2_ardour/time_selection.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2003-2004 Paul Davis
+ Copyright (C) 2003-2004 Paul Davis
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-15,13
+15,12
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id$
*/
#include <algorithm>
*/
#include <algorithm>
-#include
<pbd/error.h>
-#include
<ardour/ardour.h>
+#include
"pbd/error.h"
+#include
"ardour/ardour.h"
#include "time_selection.h"
#include "time_selection.h"
@@
-67,16
+66,16
@@
TimeSelection::consolidate ()
}
return changed;
}
return changed;
-}
+}
-jack_nframes_t
+nframes_t
TimeSelection::start ()
{
if (empty()) {
return 0;
}
TimeSelection::start ()
{
if (empty()) {
return 0;
}
-
jack_
nframes_t first = max_frames;
+ nframes_t first = max_frames;
for (std::list<AudioRange>::iterator i = begin(); i != end(); ++i) {
if ((*i).start < first) {
for (std::list<AudioRange>::iterator i = begin(); i != end(); ++i) {
if ((*i).start < first) {
@@
-86,10
+85,10
@@
TimeSelection::start ()
return first;
}
return first;
}
-jack_nframes_t
+nframes_t
TimeSelection::end_frame ()
{
TimeSelection::end_frame ()
{
-
jack_
nframes_t last = 0;
+ nframes_t last = 0;
/* XXX make this work like RegionSelection: no linear search needed */
/* XXX make this work like RegionSelection: no linear search needed */
@@
-101,9
+100,8
@@
TimeSelection::end_frame ()
return last;
}
return last;
}
-
jack_
nframes_t
+nframes_t
TimeSelection::length()
{
return end_frame() - start() + 1;
}
TimeSelection::length()
{
return end_frame() - start() + 1;
}
-