diff --git a/libs/ardour/ardour/midi_buffer.h b/libs/ardour/ardour/midi_buffer.h index d713f8787f..7e883e9ef3 100644 --- a/libs/ardour/ardour/midi_buffer.h +++ b/libs/ardour/ardour/midi_buffer.h @@ -23,12 +23,11 @@ #ifndef __ardour_midi_buffer_h__ #define __ardour_midi_buffer_h__ +#include "evoral/Event.h" #include "evoral/EventSink.h" #include "evoral/midi_util.h" #include "evoral/types.h" -#include "midi++/event.h" - #include "ardour/buffer.h" #include "ardour/parameter_types.h" diff --git a/libs/midi++2/midi++/event.h b/libs/midi++2/midi++/event.h deleted file mode 100644 index bd1af668c3..0000000000 --- a/libs/midi++2/midi++/event.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (C) 2008-2015 Paul Davis - * Copyright (C) 2008-2016 David Robillard - * Copyright (C) 2008 Hans Baier - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#ifndef __libmidipp_midi_event_h__ -#define __libmidipp_midi_event_h__ - -#include -#include -#include -#include -#include - -#include "midi++/libmidi_visibility.h" -#include "midi++/types.h" -#include "midi++/events.h" -#include "pbd/xml++.h" - -/** If this is not defined, all methods of MidiEvent are RT safe - * but MidiEvent will never deep copy and (depending on the scenario) - * may not be usable in STL containers, signals, etc. - */ -#define EVORAL_EVENT_ALLOC 1 - -#include "evoral/Event.h" - -#endif /* __libmidipp_midi_event_h__ */ diff --git a/libs/midi++2/midi++/midnam_patch.h b/libs/midi++2/midi++/midnam_patch.h index fd172e5bc9..62b19da0d5 100644 --- a/libs/midi++2/midi++/midnam_patch.h +++ b/libs/midi++2/midi++/midnam_patch.h @@ -35,7 +35,6 @@ #include #include "midi++/libmidi_visibility.h" -#include "midi++/event.h" #include "pbd/xml++.h" namespace MIDI