From a21ab2d9260bd4cb1af1de0b8cd4cad9e9687861 Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Mon, 8 Oct 2018 20:50:52 +0200 Subject: Move event.h and audiotypes.h into src and get rid of the obsolete include folder. --- test/dgreftest/Makefile.am | 2 +- test/dgreftest/midiinputengine.cc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'test/dgreftest') diff --git a/test/dgreftest/Makefile.am b/test/dgreftest/Makefile.am index 3884250..51b7825 100644 --- a/test/dgreftest/Makefile.am +++ b/test/dgreftest/Makefile.am @@ -9,7 +9,7 @@ dgreftest_LDADD = $(PTHREAD_LIBS) $(JACK_LIBS) \ dgreftest_LDFLAGS = dgreftest_CXXFLAGS = $(SNDFILE_CXXFLAGS) $(PTHREAD_CFLAGS) \ - -I$(top_srcdir)/include -I$(top_srcdir)/src \ + -I$(top_srcdir)/src \ -I$(top_srcdir)/hugin -DWITH_HUG_MUTEX -DWITH_HUG_FILTER \ $(JACK_CFLAGS) $(SSEFLAGS) $(SMF_CFLAGS) $(FLOAT_STORE) diff --git a/test/dgreftest/midiinputengine.cc b/test/dgreftest/midiinputengine.cc index e984d58..ca223da 100644 --- a/test/dgreftest/midiinputengine.cc +++ b/test/dgreftest/midiinputengine.cc @@ -157,7 +157,7 @@ void MidifileInputEngine::run(size_t pos, size_t len, std::vector& even events.emplace_back(); auto& event = events.back(); - event.type = TYPE_ONSET; + event.type = EventType::OnSet; size_t evpos = current_event->time_seconds * (samplerate / speed); event.offset = evpos - pos; @@ -183,7 +183,7 @@ void MidifileInputEngine::run(size_t pos, size_t len, std::vector& even else { assert(len >= 1); - events.push_back({TYPE_STOP, 0, len-1, 0.f}); + events.push_back({EventType::Stop, 0, len-1, 0.f}); } } } -- cgit v1.2.3