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. --- Makefile.am | 4 ++-- configure.ac | 1 - drumgizmo/Makefile.am | 2 +- drumgizmo/input/jackmidi.cc | 2 +- drumgizmo/input/midifile.cc | 4 ++-- drumgizmo/input/test.cc | 6 +++--- include/Makefile.am | 3 --- include/audiotypes.h | 38 --------------------------------- include/event.h | 43 ------------------------------------- plugin/Makefile.am | 2 -- plugin/Makefile.mingw32.in | 2 +- plugin/drumgizmo_plugin.cc | 2 +- plugingui/Makefile.am | 2 -- plugingui/Makefile.mingw32 | 2 +- src/Makefile.am | 3 ++- src/audiotypes.h | 35 ++++++++++++++++++++++++++++++ src/drumgizmo.cc | 4 ++-- src/event.h | 45 +++++++++++++++++++++++++++++++++++++++ src/inputprocessor.cc | 4 ++-- src/inputprocessor.h | 2 +- test/Makefile.am | 20 ++++++++--------- test/dgreftest/Makefile.am | 2 +- test/dgreftest/midiinputengine.cc | 4 ++-- 23 files changed, 112 insertions(+), 120 deletions(-) delete mode 100644 include/Makefile.am delete mode 100644 include/audiotypes.h delete mode 100644 include/event.h create mode 100644 src/audiotypes.h create mode 100644 src/event.h diff --git a/Makefile.am b/Makefile.am index f39a2d8..04323c0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ AUTOMAKE_OPTIONS = gnu -SUBDIRS = tools include src plugingui plugin drumgizmo man test -DISTDIRS = tools include src plugingui plugin drumgizmo man test +SUBDIRS = tools src plugingui plugin drumgizmo man test +DISTDIRS = tools src plugingui plugin drumgizmo man test EXTRA_DIST = \ version.h \ diff --git a/configure.ac b/configure.ac index 6b4593c..556d3c0 100644 --- a/configure.ac +++ b/configure.ac @@ -679,7 +679,6 @@ AC_CONFIG_FILES( plugin/Makefile plugin/vst/Makefile plugingui/Makefile - include/Makefile man/Makefile test/Makefile test/dgreftest/Makefile diff --git a/drumgizmo/Makefile.am b/drumgizmo/Makefile.am index f221b5f..5455726 100644 --- a/drumgizmo/Makefile.am +++ b/drumgizmo/Makefile.am @@ -9,7 +9,7 @@ drumgizmo_LDADD = $(JACK_LIBS) $(top_srcdir)/src/libdg.la drumgizmo_LDFLAGS = drumgizmo_CXXFLAGS = \ - -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_srcdir)/getoptpp \ + -I$(top_srcdir)/src -I$(top_srcdir)/getoptpp \ -I$(top_srcdir)/hugin -DWITH_HUG_MUTEX -DWITH_HUG_FILTER \ $(JACK_CFLAGS) $(SSEFLAGS) diff --git a/drumgizmo/input/jackmidi.cc b/drumgizmo/input/jackmidi.cc index 8f8d5cb..8459e67 100644 --- a/drumgizmo/input/jackmidi.cc +++ b/drumgizmo/input/jackmidi.cc @@ -133,7 +133,7 @@ void JackMidiInputEngine::process(jack_nframes_t num_frames) int k = mmap.lookup(key); if(k != -1 && velocity) { - events.push_back({TYPE_ONSET, (size_t)k, event.time, velocity / 127.f}); + events.push_back({EventType::OnSet, (size_t)k, event.time, velocity / 127.f}); } } jack_midi_clear_buffer(buffer); diff --git a/drumgizmo/input/midifile.cc b/drumgizmo/input/midifile.cc index c3bd8ae..562ed37 100644 --- a/drumgizmo/input/midifile.cc +++ b/drumgizmo/input/midifile.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}); } } } diff --git a/drumgizmo/input/test.cc b/drumgizmo/input/test.cc index 3a5ea47..955d218 100644 --- a/drumgizmo/input/test.cc +++ b/drumgizmo/input/test.cc @@ -86,15 +86,15 @@ void TestInputEngine::run(size_t pos, size_t len, std::vector& events) events.emplace_back(); auto& event = events.back(); - event.type = TYPE_ONSET; + event.type = EventType::OnSet; if((length != -1) && (pos > (size_t)(length * sample_rate))) { - event.type = TYPE_STOP; + event.type = EventType::Stop; } else { - event.type = TYPE_ONSET; + event.type = EventType::OnSet; } if(instrument != -1) diff --git a/include/Makefile.am b/include/Makefile.am deleted file mode 100644 index 81a982d..0000000 --- a/include/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -EXTRA_DIST = \ - audiotypes.h \ - event.h \ No newline at end of file diff --git a/include/audiotypes.h b/include/audiotypes.h deleted file mode 100644 index 9efe6c5..0000000 --- a/include/audiotypes.h +++ /dev/null @@ -1,38 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/*************************************************************************** - * sample.h - * - * Fri Jun 3 12:12:17 CEST 2011 - * Copyright 2011 Bent Bisballe Nyeng - * deva@aasimon.org - ****************************************************************************/ - -/* - * This file is part of DrumGizmo. - * - * DrumGizmo is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * DrumGizmo is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with DrumGizmo; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. - */ -#ifndef __DRUMGIZMO_AUDIOTYPES_H__ -#define __DRUMGIZMO_AUDIOTYPES_H__ - -//typedef signed short int sample_t; -typedef float sample_t; - -typedef unsigned int channels_t; -typedef unsigned int channel_t; - -typedef float level_t; - -#endif/*__DRUMGIZMO_AUDIOTYPES_H__*/ diff --git a/include/event.h b/include/event.h deleted file mode 100644 index afb1db4..0000000 --- a/include/event.h +++ /dev/null @@ -1,43 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/*************************************************************************** - * event.h - * - * Fri Jun 3 12:10:50 CEST 2011 - * Copyright 2011 Bent Bisballe Nyeng - * deva@aasimon.org - ****************************************************************************/ - -/* - * This file is part of DrumGizmo. - * - * DrumGizmo is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * DrumGizmo is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with DrumGizmo; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. - */ -#pragma once - -#include - -// TODO: Make enum class -//! Event types -#define TYPE_ONSET 0 -#define TYPE_STOP 1 - -//! POD datatype for input event transport. -struct event_t -{ - std::size_t type; //!< The type of the event. - std::size_t instrument; //!< The instrument number. - std::size_t offset; //!< The offset position in the input buffer - float velocity; //!< The velocity if the type is a note on [0; 1] -}; diff --git a/plugin/Makefile.am b/plugin/Makefile.am index 163fae2..fcb307e 100644 --- a/plugin/Makefile.am +++ b/plugin/Makefile.am @@ -14,7 +14,6 @@ drumgizmo_la_CXXFLAGS = -DLV2 -DLV2_PLUGIN_URI=\"http://drumgizmo.org/lv2\" \ -fvisibility=hidden \ $(LV2_CFLAGS) \ $(SNDFILE_CFLAGS) \ - -I$(top_srcdir)/include \ -I$(top_srcdir)/plugin/plugingizmo \ -I$(top_srcdir)/plugingui \ -I$(top_srcdir)/src \ @@ -48,7 +47,6 @@ endif drumgizmo_vst_la_CXXFLAGS = -DVST \ -fvisibility=hidden \ $(SNDFILE_CFLAGS) \ - -I$(top_srcdir)/include \ -I$(top_srcdir)/plugin/plugingizmo \ -I$(top_srcdir)/plugingui \ -I$(top_srcdir)/src \ diff --git a/plugin/Makefile.mingw32.in b/plugin/Makefile.mingw32.in index 82de017..3619fcb 100644 --- a/plugin/Makefile.mingw32.in +++ b/plugin/Makefile.mingw32.in @@ -39,7 +39,7 @@ DG_SRC = \ @top_srcdir@/src/staminafilter.cc \ @top_srcdir@/src/thread.cc \ @top_srcdir@/src/versionstr.cc -DG_CFLAGS = -I@top_srcdir@ -I@top_srcdir@/include -I@top_srcdir@/src \ +DG_CFLAGS = -I@top_srcdir@ -I@top_srcdir@/src \ -I@top_srcdir@/pugixml/src \ -I@top_srcdir@/plugin/plugingizmo -DVST -DSSE -msse -msse2 # -DDISABLE_HUGIN diff --git a/plugin/drumgizmo_plugin.cc b/plugin/drumgizmo_plugin.cc index af2198c..5614014 100644 --- a/plugin/drumgizmo_plugin.cc +++ b/plugin/drumgizmo_plugin.cc @@ -380,7 +380,7 @@ void DrumGizmoPlugin::Input::run(size_t pos, size_t len, std::vector& e int i = mmap.lookup(event.key); if(event.velocity && (i != -1)) { - events.push_back({TYPE_ONSET, (size_t)i, (size_t)event.getTime(), event.velocity / 127.0f}); + events.push_back({EventType::OnSet, (size_t)i, (size_t)event.getTime(), event.velocity / 127.0f}); } } } diff --git a/plugingui/Makefile.am b/plugingui/Makefile.am index 4da8ce9..8ae991a 100644 --- a/plugingui/Makefile.am +++ b/plugingui/Makefile.am @@ -39,7 +39,6 @@ libdggui_la_CPPFLAGS = \ $(GUI_CPPFLAGS) \ -I$(top_srcdir)/hugin \ -I$(top_srcdir)/src \ - -I$(top_srcdir)/include \ -DWITH_HUG_MUTEX $(PTHREAD_CFLAGS) \ -DLODEPNG_NO_COMPILE_ENCODER \ -DLODEPNG_NO_COMPILE_DISK \ @@ -164,7 +163,6 @@ plugingui_CXXFLAGS = \ $(GUI_CPPFLAGS) \ $(SNDFILE_CXXFLAGS) \ $(PTHREAD_CFLAGS) \ - -I$(top_srcdir)/include \ -I$(top_srcdir)/src \ -I$(top_srcdir)/hugin diff --git a/plugingui/Makefile.mingw32 b/plugingui/Makefile.mingw32 index 597ecd9..afc43b8 100644 --- a/plugingui/Makefile.mingw32 +++ b/plugingui/Makefile.mingw32 @@ -4,7 +4,7 @@ DG_SRC = \ ../src/semaphore.cc \ ../src/mutex.cc -DG_CFLAGS = -I.. -I../include -I../src -DSSE -msse -msse2 +DG_CFLAGS = -I.. -I../src -DSSE -msse -msse2 GUI_SRC = \ testmain.cc \ diff --git a/src/Makefile.am b/src/Makefile.am index 3ecdc76..16a952e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,7 +1,6 @@ noinst_LTLIBRARIES = libdg.la libdg_la_CPPFLAGS = \ - -I$(top_srcdir)/include -I$(top_srcdir)/hugin \ -I$(top_srcdir)/hugin -I$(top_srcdir)/pugixml/src \ $(SSEFLAGS) \ $(ZITA_CPPFLAGS) $(SNDFILE_CFLAGS) $(PTHREAD_CFLAGS) @@ -47,6 +46,7 @@ EXTRA_DIST = \ $(nodist_libdg_la_SOURCES) \ atomic.h \ audio.h \ + audiotypes.h \ audiocache.h \ audiocacheeventhandler.h \ audiocachefile.h \ @@ -67,6 +67,7 @@ EXTRA_DIST = \ drumgizmo.h \ drumkit.h \ drumkitloader.h \ + event.h \ events.h \ inputfilter.h \ inputprocessor.h \ diff --git a/src/audiotypes.h b/src/audiotypes.h new file mode 100644 index 0000000..5add8cd --- /dev/null +++ b/src/audiotypes.h @@ -0,0 +1,35 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/*************************************************************************** + * sample.h + * + * Fri Jun 3 12:12:17 CEST 2011 + * Copyright 2011 Bent Bisballe Nyeng + * deva@aasimon.org + ****************************************************************************/ + +/* + * This file is part of DrumGizmo. + * + * DrumGizmo is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * DrumGizmo is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with DrumGizmo; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. + */ +#pragma once + +//typedef signed short int sample_t; +typedef float sample_t; + +typedef unsigned int channels_t; +typedef unsigned int channel_t; + +typedef float level_t; diff --git a/src/drumgizmo.cc b/src/drumgizmo.cc index 2c543cd..0e374f2 100644 --- a/src/drumgizmo.cc +++ b/src/drumgizmo.cc @@ -139,7 +139,7 @@ bool DrumGizmo::run(size_t pos, sample_t *samples, size_t nsamples) resample_ratio = 1.0; } - if (settings_getter.audition_counter.hasChanged()) + if(settings_getter.audition_counter.hasChanged()) { settings_getter.audition_counter.getValue(); auto instrument_name = settings.audition_instrument.load(); @@ -154,7 +154,7 @@ bool DrumGizmo::run(size_t pos, sample_t *samples, size_t nsamples) } } - events.emplace_back(event_t{TYPE_ONSET, instrument_index, 0, velocity}); + events.push_back({EventType::OnSet, instrument_index, 0, velocity}); } bool active_events_left = diff --git a/src/event.h b/src/event.h new file mode 100644 index 0000000..2b10e44 --- /dev/null +++ b/src/event.h @@ -0,0 +1,45 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/*************************************************************************** + * event.h + * + * Fri Jun 3 12:10:50 CEST 2011 + * Copyright 2011 Bent Bisballe Nyeng + * deva@aasimon.org + ****************************************************************************/ + +/* + * This file is part of DrumGizmo. + * + * DrumGizmo is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * DrumGizmo is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with DrumGizmo; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. + */ +#pragma once + +#include + +//! Event types +enum class EventType +{ + OnSet, + Stop, +}; + +//! POD datatype for input event transport. +struct event_t +{ + EventType type; //!< The type of the event. + std::size_t instrument; //!< The instrument number. + std::size_t offset; //!< The offset position in the input buffer + float velocity; //!< The velocity if the type is a note on [0; 1] +}; diff --git a/src/inputprocessor.cc b/src/inputprocessor.cc index 0adc389..c004933 100644 --- a/src/inputprocessor.cc +++ b/src/inputprocessor.cc @@ -57,7 +57,7 @@ bool InputProcessor::process(std::vector& events, { for(auto& event: events) { - if(event.type == TYPE_ONSET) + if(event.type == EventType::OnSet) { if(!processOnset(event, pos, resample_ratio)) { @@ -181,7 +181,7 @@ bool InputProcessor::processOnset(event_t& event, bool InputProcessor::processStop(event_t& event) { - if(event.type == TYPE_STOP) + if(event.type == EventType::Stop) { is_stopping = true; } diff --git a/src/inputprocessor.h b/src/inputprocessor.h index 95fdfdb..794ca54 100644 --- a/src/inputprocessor.h +++ b/src/inputprocessor.h @@ -56,7 +56,7 @@ public: private: DrumKit& kit; std::list* activeevents; - bool is_stopping; ///< Is set to true when a TYPE_STOP event has been seen. + bool is_stopping; ///< Is set to true when a EventType::Stop event has been seen. bool processOnset(event_t& event, std::size_t pos, double resample_ratio); bool processStop(event_t& event); diff --git a/test/Makefile.am b/test/Makefile.am index 7dcfd52..80ff73a 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -35,7 +35,7 @@ resource_SOURCES = \ resource_test.cc audiocache_CXXFLAGS = -DOUTPUT=\"audiocache\" \ - -I$(top_srcdir)/src -I$(top_srcdir)/include \ + -I$(top_srcdir)/src \ -I$(top_srcdir)/hugin -DDISABLE_HUGIN $(PTHREAD_CFLAGS) $(SNDFILE_CFLAGS) audiocache_LDFLAGS = $(PTHREAD_LIBS) $(SNDFILE_LIBS) audiocache_SOURCES = \ @@ -52,7 +52,7 @@ audiocache_SOURCES = \ audiocachetest.cc audiocachefile_CXXFLAGS = -DOUTPUT=\"audiocachefile\" \ - -I$(top_srcdir)/src -I$(top_srcdir)/include \ + -I$(top_srcdir)/src \ -I$(top_srcdir)/hugin -DDISABLE_HUGIN $(PTHREAD_CFLAGS) $(SNDFILE_CFLAGS) audiocachefile_LDFLAGS = $(PTHREAD_LIBS) $(SNDFILE_LIBS) audiocachefile_SOURCES = \ @@ -67,7 +67,7 @@ audiocachefile_SOURCES = \ audiocacheidmanager_CXXFLAGS = -DOUTPUT=\"audiocacheidmanager\" \ \ - -I$(top_srcdir)/src -I$(top_srcdir)/include \ + -I$(top_srcdir)/src \ -I$(top_srcdir)/hugin -DDISABLE_HUGIN $(SNDFILE_CFLAGS) audiocacheidmanager_LDFLAGS = $(SNDFILE_LIBS) audiocacheidmanager_SOURCES = \ @@ -77,7 +77,7 @@ audiocacheidmanager_SOURCES = \ audiocacheeventhandler_CXXFLAGS = -DOUTPUT=\"audiocacheeventhandler\" \ \ - -I$(top_srcdir)/src -I$(top_srcdir)/include \ + -I$(top_srcdir)/src \ -I$(top_srcdir)/hugin -DDISABLE_HUGIN $(PTHREAD_CFLAGS) $(SNDFILE_CFLAGS) audiocacheeventhandler_LDFLAGS = $(PTHREAD_LIBS) $(SNDFILE_LIBS) audiocacheeventhandler_SOURCES = \ @@ -90,7 +90,7 @@ audiocacheeventhandler_SOURCES = \ audiocacheeventhandlertest.cc enginetest_CXXFLAGS = -DOUTPUT=\"enginetest\" \ - -I$(top_srcdir)/src -I$(top_srcdir)/include \ + -I$(top_srcdir)/src \ -I$(top_srcdir)/hugin $(PTHREAD_CFLAGS) $(SNDFILE_CFLAGS) enginetest_LDFLAGS = $(PTHREAD_LIBS) $(SNDFILE_LIBS) \ $(top_srcdir)/src/libdg.la @@ -101,7 +101,7 @@ enginetest_SOURCES = \ enginetest.cc paintertest_CXXFLAGS = -DOUTPUT=\"paintertest\" \ - -I$(top_srcdir)/src -I$(top_srcdir)/include -I$(top_srcdir)/plugingui \ + -I$(top_srcdir)/src -I$(top_srcdir)/plugingui \ -I$(top_srcdir)/hugin $(PTHREAD_CFLAGS) paintertest_LDFLAGS = $(top_srcdir)/plugingui/libdggui.la paintertest_SOURCES = \ @@ -196,7 +196,7 @@ notifiertest_SOURCES = \ dgtest.cc dgxmlparsertest_CXXFLAGS = -DOUTPUT=\"dgxmlparsertest\" \ - -I$(top_srcdir)/src -I$(top_srcdir)/include -I$(top_srcdir)/hugin \ + -I$(top_srcdir)/src -I$(top_srcdir)/hugin \ -I$(top_srcdir)/pugixml/src dgxmlparsertest_LDFLAGS = dgxmlparsertest_SOURCES = \ @@ -208,7 +208,7 @@ dgxmlparsertest_SOURCES = \ dgtest.cc domloadertest_CXXFLAGS = -DOUTPUT=\"domloadertest\" \ - -I$(top_srcdir)/src -I$(top_srcdir)/include + -I$(top_srcdir)/src domloadertest_LDFLAGS = \ $(top_srcdir)/src/libdg.la domloadertest_SOURCES = \ @@ -218,7 +218,7 @@ domloadertest_SOURCES = \ dgtest.cc configparsertest_CXXFLAGS = -DOUTPUT=\"configparsertest\" \ - -I$(top_srcdir)/src -I$(top_srcdir)/include -I$(top_srcdir)/hugin \ + -I$(top_srcdir)/src -I$(top_srcdir)/hugin \ -I$(top_srcdir)/pugixml/src configparsertest_LDFLAGS = configparsertest_SOURCES = \ @@ -229,7 +229,7 @@ configparsertest_SOURCES = \ dgtest.cc midimapparsertest_CXXFLAGS = -DOUTPUT=\"midimapparsertest\" \ - -I$(top_srcdir)/src -I$(top_srcdir)/include -I$(top_srcdir)/hugin \ + -I$(top_srcdir)/src -I$(top_srcdir)/hugin \ -I$(top_srcdir)/pugixml/src midimapparsertest_LDFLAGS = midimapparsertest_SOURCES = \ 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