From 2a251b457069ffb4b744fbd0dd7aca7acb31f381 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Wed, 7 Jan 2015 00:12:07 -0500
Subject: MusicalTime => Beats.

---
 libs/ardour/ardour/midi_source.h | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'libs/ardour/ardour/midi_source.h')

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;
-- 
cgit v1.2.3