projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix typo in c212c16eb
[ardour.git]
/
libs
/
ardour
/
beats_frames_converter.cc
diff --git
a/libs/ardour/beats_frames_converter.cc
b/libs/ardour/beats_frames_converter.cc
index 584732ff03e87029e8dfd8eb2fefa44d770da718..94042b1b03c0ae84ccece34fa4eaefc6f2464223 100644
(file)
--- a/
libs/ardour/beats_frames_converter.cc
+++ b/
libs/ardour/beats_frames_converter.cc
@@
-19,6
+19,8
@@
$Id: midiregion.h 733 2006-08-01 17:19:38Z drobilla $
*/
$Id: midiregion.h 733 2006-08-01 17:19:38Z drobilla $
*/
+#include "pbd/stacktrace.h"
+
#include "ardour/beats_frames_converter.h"
#include "ardour/tempo.h"
#include "ardour/beats_frames_converter.h"
#include "ardour/tempo.h"
@@
-28,9
+30,13
@@
namespace ARDOUR {
* supplied to the constructor. Returns the equivalent number of frames,
* taking tempo changes into account.
*/
* supplied to the constructor. Returns the equivalent number of frames,
* taking tempo changes into account.
*/
-frame
cnt
_t
+frame
pos
_t
BeatsFramesConverter::to (double beats) const
{
BeatsFramesConverter::to (double beats) const
{
+ if (beats < 0) {
+ std::cerr << "negative beats passed to BFC: " << beats << std::endl;
+ PBD::stacktrace (std::cerr, 30);
+ }
assert (beats >= 0);
framecnt_t r = _tempo_map.framepos_plus_beats (_origin_b, beats) - _origin_b;
return r;
assert (beats >= 0);
framecnt_t r = _tempo_map.framepos_plus_beats (_origin_b, beats) - _origin_b;
return r;
@@
-41,7
+47,7
@@
BeatsFramesConverter::to (double beats) const
* taking tempo changes into account.
*/
double
* taking tempo changes into account.
*/
double
-BeatsFramesConverter::from (frame
cnt
_t frames) const
+BeatsFramesConverter::from (frame
pos
_t frames) const
{
double b = _tempo_map.framewalk_to_beats (_origin_b, frames);
return b;
{
double b = _tempo_map.framewalk_to_beats (_origin_b, frames);
return b;