/*
Copyright (C) 2009 Paul Davis
- Author: Dave Robillard
+ Author: David Robillard
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
namespace ARDOUR {
framecnt_t
-BeatsFramesConverter::to(double beats) const
+BeatsFramesConverter::to (double beats) const
{
- return _tempo_map.framepos_plus_bbt (_origin_b, Timecode::BBT_Time(beats));
+ assert (beats >= 0);
+
+ return _tempo_map.framepos_plus_bbt (_origin_b, Timecode::BBT_Time(beats)) - _origin_b;
}
double
BeatsFramesConverter::from (framecnt_t frames) const
{
- return _tempo_map.framewalk_to_beats (_origin_b, frames);
+ return _tempo_map.framewalk_to_beats (_origin_b, frames);
}
} /* namespace ARDOUR */