X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=libs%2Fardour%2Fardour%2Fbeats_samples_converter.h;h=3323ee67c8984e9713ad4d74d8820e09dbb07c13;hb=67ba0bd992920032cc645cb2954084f54fa59b2f;hp=f9ca27f2099b889d593a0d6785baf44170fb3f45;hpb=30b087ab3d28f1585987fa3f6ae006562ae192e3;p=ardour.git diff --git a/libs/ardour/ardour/beats_samples_converter.h b/libs/ardour/ardour/beats_samples_converter.h index f9ca27f209..3323ee67c8 100644 --- 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 $ */ -#include "evoral/Beats.hpp" +#include "temporal/beats.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 - : public Evoral::TimeConverter { + : public Evoral::TimeConverter { public: BeatsSamplesConverter (const TempoMap& tempo_map, samplepos_t origin) - : Evoral::TimeConverter (origin) + : Evoral::TimeConverter (origin) , _tempo_map(tempo_map) {} - samplepos_t to (Evoral::Beats beats) const; - Evoral::Beats from (samplepos_t samples) const; + samplepos_t to (Temporal::Beats beats) const; + Temporal::Beats from (samplepos_t samples) const; private: const TempoMap& _tempo_map;