projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
win32_pthread is relevant for both: MSVC & MINGW
[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 03a581e276d9f85163ce97c676c8c31f559de552..94042b1b03c0ae84ccece34fa4eaefc6f2464223 100644
(file)
--- a/
libs/ardour/beats_frames_converter.cc
+++ b/
libs/ardour/beats_frames_converter.cc
@@
-19,21
+19,27
@@
$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"
namespace ARDOUR {
#include "ardour/beats_frames_converter.h"
#include "ardour/tempo.h"
namespace ARDOUR {
-/** Takes a duration in beats and considers it as a distance from the origin
+/** Takes a
positive
duration in beats and considers it as a distance from the origin
* 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);
assert (beats >= 0);
-
- return
_tempo_map.framepos_plus_beats (_origin_b, beats) - _origin_b
;
+ framecnt_t r = _tempo_map.framepos_plus_beats (_origin_b, beats) - _origin_b;
+ return
r
;
}
/** Takes a duration in frames and considers it as a distance from the origin
}
/** Takes a duration in frames and considers it as a distance from the origin
@@
-41,9
+47,10
@@
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
{
{
- return _tempo_map.framewalk_to_beats (_origin_b, frames);
+ double b = _tempo_map.framewalk_to_beats (_origin_b, frames);
+ return b;
}
} /* namespace ARDOUR */
}
} /* namespace ARDOUR */