summaryrefslogtreecommitdiff
path: root/libs/ardour/ardour
diff options
context:
space:
mode:
Diffstat (limited to 'libs/ardour/ardour')
-rw-r--r--libs/ardour/ardour/beats_frames_converter.h8
-rw-r--r--libs/ardour/ardour/legatize.h4
-rw-r--r--libs/ardour/ardour/midi_model.h8
-rw-r--r--libs/ardour/ardour/midi_operator.h4
-rw-r--r--libs/ardour/ardour/midi_playlist_source.h2
-rw-r--r--libs/ardour/ardour/midi_region.h8
-rw-r--r--libs/ardour/ardour/midi_source.h24
-rw-r--r--libs/ardour/ardour/midi_state_tracker.h2
-rw-r--r--libs/ardour/ardour/quantize.h4
-rw-r--r--libs/ardour/ardour/smf_source.h8
-rw-r--r--libs/ardour/ardour/tempo.h6
-rw-r--r--libs/ardour/ardour/transform.h8
-rw-r--r--libs/ardour/ardour/variant.h16
13 files changed, 51 insertions, 51 deletions
diff --git a/libs/ardour/ardour/beats_frames_converter.h b/libs/ardour/ardour/beats_frames_converter.h
index ada09b1179..908dd1909e 100644
--- a/libs/ardour/ardour/beats_frames_converter.h
+++ b/libs/ardour/ardour/beats_frames_converter.h
@@ -37,15 +37,15 @@ class TempoMap;
* them to the opposite unit, taking tempo changes into account.
*/
class LIBARDOUR_API BeatsFramesConverter
- : public Evoral::TimeConverter<Evoral::MusicalTime,framepos_t> {
+ : public Evoral::TimeConverter<Evoral::Beats,framepos_t> {
public:
BeatsFramesConverter (TempoMap& tempo_map, framepos_t origin)
- : Evoral::TimeConverter<Evoral::MusicalTime, framepos_t> (origin)
+ : Evoral::TimeConverter<Evoral::Beats, framepos_t> (origin)
, _tempo_map(tempo_map)
{}
- framepos_t to (Evoral::MusicalTime beats) const;
- Evoral::MusicalTime from (framepos_t frames) const;
+ framepos_t to (Evoral::Beats beats) const;
+ Evoral::Beats from (framepos_t frames) const;
private:
TempoMap& _tempo_map;
diff --git a/libs/ardour/ardour/legatize.h b/libs/ardour/ardour/legatize.h
index 4a170e1a1c..78b384e1c7 100644
--- a/libs/ardour/ardour/legatize.h
+++ b/libs/ardour/ardour/legatize.h
@@ -39,10 +39,10 @@ public:
Legatize(bool shrink_only);
~Legatize();
- typedef Evoral::Sequence<Evoral::MusicalTime>::Notes Notes;
+ typedef Evoral::Sequence<Evoral::Beats>::Notes Notes;
Command* operator()(boost::shared_ptr<ARDOUR::MidiModel> model,
- Evoral::MusicalTime position,
+ Evoral::Beats position,
std::vector<Notes>& seqs);
std::string name() const { return std::string ("legatize"); }
diff --git a/libs/ardour/ardour/midi_model.h b/libs/ardour/ardour/midi_model.h
index b86a7436bb..4214431280 100644
--- a/libs/ardour/ardour/midi_model.h
+++ b/libs/ardour/ardour/midi_model.h
@@ -52,9 +52,9 @@ class MidiSource;
* Because of this MIDI controllers and automatable controllers/widgets/etc
* are easily interchangeable.
*/
-class LIBARDOUR_API MidiModel : public AutomatableSequence<Evoral::MusicalTime> {
+class LIBARDOUR_API MidiModel : public AutomatableSequence<Evoral::Beats> {
public:
- typedef Evoral::MusicalTime TimeType;
+ typedef Evoral::Beats TimeType;
MidiModel (boost::shared_ptr<MidiSource>);
@@ -259,8 +259,8 @@ public:
bool write_section_to(boost::shared_ptr<MidiSource> source,
const Glib::Threads::Mutex::Lock& source_lock,
- Evoral::MusicalTime begin = Evoral::MinMusicalTime,
- Evoral::MusicalTime end = Evoral::MaxMusicalTime);
+ Evoral::Beats begin = Evoral::MinBeats,
+ Evoral::Beats end = Evoral::MaxBeats);
// MidiModel doesn't use the normal AutomationList serialisation code
// since controller data is stored in the .mid
diff --git a/libs/ardour/ardour/midi_operator.h b/libs/ardour/ardour/midi_operator.h
index 36e87b714b..b79544ed61 100644
--- a/libs/ardour/ardour/midi_operator.h
+++ b/libs/ardour/ardour/midi_operator.h
@@ -38,8 +38,8 @@ class LIBARDOUR_API MidiOperator {
virtual ~MidiOperator() {}
virtual Command* operator() (boost::shared_ptr<ARDOUR::MidiModel>,
- Evoral::MusicalTime,
- std::vector<Evoral::Sequence<Evoral::MusicalTime>::Notes>&) = 0;
+ Evoral::Beats,
+ std::vector<Evoral::Sequence<Evoral::Beats>::Notes>&) = 0;
virtual std::string name() const = 0;
};
diff --git a/libs/ardour/ardour/midi_playlist_source.h b/libs/ardour/ardour/midi_playlist_source.h
index f064553342..6633be3c9e 100644
--- a/libs/ardour/ardour/midi_playlist_source.h
+++ b/libs/ardour/ardour/midi_playlist_source.h
@@ -45,7 +45,7 @@ public:
XMLNode& get_state ();
int set_state (const XMLNode&, int version);
- void append_event_beats(const Glib::Threads::Mutex::Lock& lock, const Evoral::Event<Evoral::MusicalTime>& ev);
+ void append_event_beats(const Glib::Threads::Mutex::Lock& lock, const Evoral::Event<Evoral::Beats>& ev);
void append_event_frames(const Glib::Threads::Mutex::Lock& lock, const Evoral::Event<framepos_t>& ev, framepos_t source_start);
void load_model(const Glib::Threads::Mutex::Lock& lock, bool force_reload=false);
void destroy_model(const Glib::Threads::Mutex::Lock& lock);
diff --git a/libs/ardour/ardour/midi_region.h b/libs/ardour/ardour/midi_region.h
index 2a4e3a6190..ece23b65f0 100644
--- a/libs/ardour/ardour/midi_region.h
+++ b/libs/ardour/ardour/midi_region.h
@@ -37,8 +37,8 @@ namespace ARDOUR {
MidiModel used by the MidiRegion
*/
LIBARDOUR_API extern PBD::PropertyDescriptor<void*> midi_data;
- LIBARDOUR_API extern PBD::PropertyDescriptor<Evoral::MusicalTime> start_beats;
- LIBARDOUR_API extern PBD::PropertyDescriptor<Evoral::MusicalTime> length_beats;
+ LIBARDOUR_API extern PBD::PropertyDescriptor<Evoral::Beats> start_beats;
+ LIBARDOUR_API extern PBD::PropertyDescriptor<Evoral::Beats> length_beats;
}
}
@@ -114,8 +114,8 @@ class LIBARDOUR_API MidiRegion : public Region
private:
friend class RegionFactory;
- PBD::Property<Evoral::MusicalTime> _start_beats;
- PBD::Property<Evoral::MusicalTime> _length_beats;
+ PBD::Property<Evoral::Beats> _start_beats;
+ PBD::Property<Evoral::Beats> _length_beats;
MidiRegion (const SourceList&);
MidiRegion (boost::shared_ptr<const MidiRegion>);
diff --git a/libs/ardour/ardour/midi_source.h b/libs/ardour/ardour/midi_source.h
index 2b78230a00..8a0c13681d 100644
--- a/libs/ardour/ardour/midi_source.h
+++ b/libs/ardour/ardour/midi_source.h
@@ -43,7 +43,7 @@ template<typename T> class MidiRingBuffer;
class LIBARDOUR_API MidiSource : virtual public Source, public boost::enable_shared_from_this<MidiSource>
{
public:
- typedef Evoral::MusicalTime TimeType;
+ typedef Evoral::Beats TimeType;
MidiSource (Session& session, std::string name, Source::Flag flags = Source::Flag(0));
MidiSource (Session& session, const XMLNode&);
@@ -59,8 +59,8 @@ class LIBARDOUR_API MidiSource : virtual public Source, public boost::enable_sha
*/
int write_to (const Lock& lock,
boost::shared_ptr<MidiSource> newsrc,
- Evoral::MusicalTime begin = Evoral::MinMusicalTime,
- Evoral::MusicalTime end = Evoral::MaxMusicalTime);
+ Evoral::Beats begin = Evoral::MinBeats,
+ Evoral::Beats end = Evoral::MaxBeats);
/** Read the data in a given time range from the MIDI source.
* All time stamps in parameters are in audio frames (even if the source has tempo time).
@@ -93,8 +93,8 @@ class LIBARDOUR_API MidiSource : virtual public Source, public boost::enable_sha
*
* Caller must ensure that the event is later than the last written event.
*/
- virtual void append_event_beats(const Lock& lock,
- const Evoral::Event<Evoral::MusicalTime>& ev) = 0;
+ virtual void append_event_beats(const Lock& lock,
+ const Evoral::Event<Evoral::Beats>& ev) = 0;
/** Append a single event with a timestamp in frames.
*
@@ -132,9 +132,9 @@ class LIBARDOUR_API MidiSource : virtual public Source, public boost::enable_sha
* etc.
*/
virtual void mark_midi_streaming_write_completed (
- const Lock& lock,
- Evoral::Sequence<Evoral::MusicalTime>::StuckNoteOption stuck_option,
- Evoral::MusicalTime when = Evoral::MusicalTime());
+ const Lock& lock,
+ Evoral::Sequence<Evoral::Beats>::StuckNoteOption stuck_option,
+ Evoral::Beats when = Evoral::Beats());
virtual void session_saved();
@@ -205,11 +205,11 @@ class LIBARDOUR_API MidiSource : virtual public Source, public boost::enable_sha
boost::shared_ptr<MidiModel> _model;
bool _writing;
- mutable Evoral::Sequence<Evoral::MusicalTime>::const_iterator _model_iter;
- mutable bool _model_iter_valid;
+ mutable Evoral::Sequence<Evoral::Beats>::const_iterator _model_iter;
+ mutable bool _model_iter_valid;
- mutable Evoral::MusicalTime _length_beats;
- mutable framepos_t _last_read_end;
+ mutable Evoral::Beats _length_beats;
+ mutable framepos_t _last_read_end;
/** The total duration of the current capture. */
framepos_t _capture_length;
diff --git a/libs/ardour/ardour/midi_state_tracker.h b/libs/ardour/ardour/midi_state_tracker.h
index 98611bc722..6690931422 100644
--- a/libs/ardour/ardour/midi_state_tracker.h
+++ b/libs/ardour/ardour/midi_state_tracker.h
@@ -46,7 +46,7 @@ public:
void remove (uint8_t note, uint8_t chn);
void resolve_notes (MidiBuffer& buffer, framepos_t time);
void resolve_notes (Evoral::EventSink<framepos_t>& buffer, framepos_t time);
- void resolve_notes (MidiSource& src, const Glib::Threads::Mutex::Lock& lock, Evoral::MusicalTime time);
+ void resolve_notes (MidiSource& src, const Glib::Threads::Mutex::Lock& lock, Evoral::Beats time);
void dump (std::ostream&);
void reset ();
bool empty() const { return _on == 0; }
diff --git a/libs/ardour/ardour/quantize.h b/libs/ardour/ardour/quantize.h
index 09ba5f2aa2..639736b174 100644
--- a/libs/ardour/ardour/quantize.h
+++ b/libs/ardour/ardour/quantize.h
@@ -35,8 +35,8 @@ public:
~Quantize ();
Command* operator() (boost::shared_ptr<ARDOUR::MidiModel>,
- Evoral::MusicalTime position,
- std::vector<Evoral::Sequence<Evoral::MusicalTime>::Notes>&);
+ Evoral::Beats position,
+ std::vector<Evoral::Sequence<Evoral::Beats>::Notes>&);
std::string name() const { return std::string ("quantize"); }
private:
diff --git a/libs/ardour/ardour/smf_source.h b/libs/ardour/ardour/smf_source.h
index d93fdb8506..29c6403694 100644
--- a/libs/ardour/ardour/smf_source.h
+++ b/libs/ardour/ardour/smf_source.h
@@ -51,14 +51,14 @@ public:
return safe_midi_file_extension(path);
}
- void append_event_beats (const Lock& lock, const Evoral::Event<Evoral::MusicalTime>& ev);
+ void append_event_beats (const Lock& lock, const Evoral::Event<Evoral::Beats>& ev);
void append_event_frames (const Lock& lock, const Evoral::Event<framepos_t>& ev, framepos_t source_start);
void mark_streaming_midi_write_started (const Lock& lock, NoteMode mode);
void mark_streaming_write_completed (const Lock& lock);
void mark_midi_streaming_write_completed (const Lock& lock,
- Evoral::Sequence<Evoral::MusicalTime>::StuckNoteOption,
- Evoral::MusicalTime when = Evoral::MusicalTime());
+ Evoral::Sequence<Evoral::Beats>::StuckNoteOption,
+ Evoral::Beats when = Evoral::Beats());
XMLNode& get_state ();
int set_state (const XMLNode&, int version);
@@ -77,7 +77,7 @@ public:
private:
bool _open;
- Evoral::MusicalTime _last_ev_time_beats;
+ Evoral::Beats _last_ev_time_beats;
framepos_t _last_ev_time_frames;
/** end time (start + duration) of last call to read_unlocked */
mutable framepos_t _smf_last_read_end;
diff --git a/libs/ardour/ardour/tempo.h b/libs/ardour/ardour/tempo.h
index 19fe5b0b12..f2d314651d 100644
--- a/libs/ardour/ardour/tempo.h
+++ b/libs/ardour/ardour/tempo.h
@@ -276,9 +276,9 @@ class LIBARDOUR_API TempoMap : public PBD::StatefulDestructible
*/
framepos_t framepos_plus_bbt (framepos_t pos, Timecode::BBT_Time b) const;
- framepos_t framepos_plus_beats (framepos_t, Evoral::MusicalTime) const;
- framepos_t framepos_minus_beats (framepos_t, Evoral::MusicalTime) const;
- Evoral::MusicalTime framewalk_to_beats (framepos_t pos, framecnt_t distance) const;
+ framepos_t framepos_plus_beats (framepos_t, Evoral::Beats) const;
+ framepos_t framepos_minus_beats (framepos_t, Evoral::Beats) const;
+ Evoral::Beats framewalk_to_beats (framepos_t pos, framecnt_t distance) const;
static const Tempo& default_tempo() { return _default_tempo; }
static const Meter& default_meter() { return _default_meter; }
diff --git a/libs/ardour/ardour/transform.h b/libs/ardour/ardour/transform.h
index 08e4a43521..df77244a17 100644
--- a/libs/ardour/ardour/transform.h
+++ b/libs/ardour/ardour/transform.h
@@ -50,9 +50,9 @@ namespace ARDOUR {
*/
class LIBARDOUR_API Transform : public MidiOperator {
public:
- typedef Evoral::Sequence<Evoral::MusicalTime>::NotePtr NotePtr;
- typedef Evoral::Sequence<Evoral::MusicalTime>::Notes Notes;
- typedef ARDOUR::MidiModel::NoteDiffCommand::Property Property;
+ typedef Evoral::Sequence<Evoral::Beats>::NotePtr NotePtr;
+ typedef Evoral::Sequence<Evoral::Beats>::Notes Notes;
+ typedef ARDOUR::MidiModel::NoteDiffCommand::Property Property;
/** Context while iterating over notes during transformation. */
struct Context {
@@ -132,7 +132,7 @@ public:
Transform(const Program& prog);
Command* operator()(boost::shared_ptr<ARDOUR::MidiModel> model,
- Evoral::MusicalTime position,
+ Evoral::Beats position,
std::vector<Notes>& seqs);
std::string name() const { return std::string ("transform"); }
diff --git a/libs/ardour/ardour/variant.h b/libs/ardour/ardour/variant.h
index 0402ffaa0b..9ecadbfe6a 100644
--- a/libs/ardour/ardour/variant.h
+++ b/libs/ardour/ardour/variant.h
@@ -57,7 +57,7 @@ public:
explicit Variant(int32_t value) : _type(INT) { _int = value; }
explicit Variant(int64_t value) : _type(LONG) { _long = value; }
- explicit Variant(const Evoral::MusicalTime& beats)
+ explicit Variant(const Evoral::Beats& beats)
: _type(BEATS)
, _beats(beats)
{}
@@ -94,7 +94,7 @@ public:
std::min(value, (double)INT64_MAX)));
break;
case BEATS:
- _beats = Evoral::MusicalTime(value);
+ _beats = Evoral::Beats(value);
break;
default:
_type = NOTHING;
@@ -158,19 +158,19 @@ public:
return false;
}
- bool operator==(const Evoral::MusicalTime& v) const {
+ bool operator==(const Evoral::Beats& v) const {
return _type == BEATS && _beats == v;
}
bool operator!() const { return _type == NOTHING; }
- Variant& operator=(Evoral::MusicalTime v) {
+ Variant& operator=(Evoral::Beats v) {
_type = BEATS;
_beats = v;
return *this;
}
- const Evoral::MusicalTime& get_beats() const {
+ const Evoral::Beats& get_beats() const {
ensure_type(BEATS); return _beats;
}
@@ -202,9 +202,9 @@ private:
}
}
- Type _type; ///< Type tag
- std::string _string; ///< PATH, STRING, URI
- Evoral::MusicalTime _beats; ///< BEATS
+ Type _type; ///< Type tag
+ std::string _string; ///< PATH, STRING, URI
+ Evoral::Beats _beats; ///< BEATS
// Union of all primitive numeric types
union {
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-23 15:37:52 +0000