projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
laying the groundwork for adding/removing transport masters
[ardour.git]
/
libs
/
ardour
/
ardour
/
beats_samples_converter.h
diff --git
a/libs/ardour/ardour/beats_samples_converter.h
b/libs/ardour/ardour/beats_samples_converter.h
index f9ca27f2099b889d593a0d6785baf44170fb3f45..3323ee67c8984e9713ad4d74d8820e09dbb07c13 100644
(file)
--- a/
libs/ardour/ardour/beats_samples_converter.h
+++ b/
libs/ardour/ardour/beats_samples_converter.h
@@
-19,7
+19,7
@@
$Id: midiregion.h 733 2006-08-01 17:19:38Z drobilla $
*/
$Id: midiregion.h 733 2006-08-01 17:19:38Z drobilla $
*/
-#include "
evoral/Beats.hpp
"
+#include "
temporal/beats.h
"
#include "evoral/TimeConverter.hpp"
#include "ardour/libardour_visibility.h"
#include "evoral/TimeConverter.hpp"
#include "ardour/libardour_visibility.h"
@@
-37,15
+37,15
@@
class TempoMap;
* them to the opposite unit, taking tempo changes into account.
*/
class LIBARDOUR_API BeatsSamplesConverter
* them to the opposite unit, taking tempo changes into account.
*/
class LIBARDOUR_API BeatsSamplesConverter
- : public Evoral::TimeConverter<
Ev
oral::Beats,samplepos_t> {
+ : public Evoral::TimeConverter<
Temp
oral::Beats,samplepos_t> {
public:
BeatsSamplesConverter (const TempoMap& tempo_map, samplepos_t origin)
public:
BeatsSamplesConverter (const TempoMap& tempo_map, samplepos_t origin)
- : Evoral::TimeConverter<
Ev
oral::Beats, samplepos_t> (origin)
+ : Evoral::TimeConverter<
Temp
oral::Beats, samplepos_t> (origin)
, _tempo_map(tempo_map)
{}
, _tempo_map(tempo_map)
{}
- samplepos_t to (
Ev
oral::Beats beats) const;
-
Ev
oral::Beats from (samplepos_t samples) const;
+ samplepos_t to (
Temp
oral::Beats beats) const;
+
Temp
oral::Beats from (samplepos_t samples) const;
private:
const TempoMap& _tempo_map;
private:
const TempoMap& _tempo_map;