MusicalTime => Beats.

4 files changed, 8 insertions, 8 deletions

diff --git a/libs/evoral/test/SMFTest.cpp b/libs/evoral/test/SMFTest.cpp
index 9bbe021947..d42ee26dff 100644
--- a/libs/evoral/test/SMFTest.cpp
+++ b/libs/evoral/test/SMFTest.cpp
@@ -45,25 +45,25 @@ SMFTest::takeFiveTest ()
 	smf.seek_to_start();
 
 	uint64_t time = 0; /* in SMF ticks */
-	Evoral::Event<Evoral::MusicalTime> ev;
+	Evoral::Event<Evoral::Beats> ev;
 
 	uint32_t delta_t = 0;
 	uint32_t size    = 0;
 	uint8_t* buf     = NULL;
 	int ret;
 	while ((ret = smf.read_event(&delta_t, &size, &buf)) >= 0) {
-		ev.set(buf, size, Evoral::MusicalTime());
+		ev.set(buf, size, Evoral::Beats());
 		time += delta_t;
 
 		if (ret > 0) { // didn't skip (meta) event
 			//cerr << "read smf event type " << hex << int(buf[0]) << endl;
-			ev.set_time(Evoral::MusicalTime::ticks_at_rate(time, smf.ppqn()));
+			ev.set_time(Evoral::Beats::ticks_at_rate(time, smf.ppqn()));
 			ev.set_event_type(type_map->midi_event_type(buf[0]));
 			seq->append(ev, next_event_id ());
 		}
 	}
 
 	seq->end_write (Sequence<Time>::Relax,
-	                Evoral::MusicalTime::ticks_at_rate(time, smf.ppqn()));
+	                Evoral::Beats::ticks_at_rate(time, smf.ppqn()));
 	CPPUNIT_ASSERT(!seq->empty());
 }
diff --git a/libs/evoral/test/SMFTest.hpp b/libs/evoral/test/SMFTest.hpp
index 6e42b6f7b3..94172c62c8 100644
--- a/libs/evoral/test/SMFTest.hpp
+++ b/libs/evoral/test/SMFTest.hpp
@@ -57,7 +57,7 @@ class SMFTest : public CppUnit::TestFixture
 	CPPUNIT_TEST_SUITE_END();
 
 public:
-	typedef Evoral::MusicalTime Time;
+	typedef Evoral::Beats Time;
 
 	void setUp() {
 		type_map = new DummyTypeMap();
diff --git a/libs/evoral/test/SequenceTest.cpp b/libs/evoral/test/SequenceTest.cpp
index f6a8363f4d..39afcd3095 100644
--- a/libs/evoral/test/SequenceTest.cpp
+++ b/libs/evoral/test/SequenceTest.cpp
@@ -75,7 +75,7 @@ SequenceTest::iteratorSeekTest ()
 	}
 
 	bool on = true;
-	for (Sequence<Time>::const_iterator i = seq->begin(Evoral::MusicalTime(600)); i != seq->end(); ++i) {
+	for (Sequence<Time>::const_iterator i = seq->begin(Evoral::Beats(600)); i != seq->end(); ++i) {
 		if (on) {
 			CPPUNIT_ASSERT(((const MIDIEvent<Time>&)*i).is_note_on());
 			CPPUNIT_ASSERT_EQUAL(i->time(), Time((num_notes + 6) * 100));
diff --git a/libs/evoral/test/SequenceTest.hpp b/libs/evoral/test/SequenceTest.hpp
index d8e0406100..da1991efc8 100644
--- a/libs/evoral/test/SequenceTest.hpp
+++ b/libs/evoral/test/SequenceTest.hpp
@@ -113,7 +113,7 @@ class SequenceTest : public CppUnit::TestFixture
 	CPPUNIT_TEST_SUITE_END ();
 
 public:
-	typedef MusicalTime Time;
+	typedef Beats Time;
 	typedef std::vector< boost::shared_ptr< Note<Time> > > Notes;
 
 	void setUp () {
@@ -125,7 +125,7 @@ public:
 		for (int i = 0; i < 12; i++) {
 			test_notes.push_back(
 				boost::shared_ptr<Note<Time> >(
-					new Note<Time>(0, MusicalTime(i * 100), MusicalTime(100), 64 + i, 64)));
+					new Note<Time>(0, Beats(i * 100), Beats(100), 64 + i, 64)));
 		}
 	}