ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

remove pointless libs/midi++2/midi++/event.h file

Browse Source 
This was just a proxy for libs/evoral/evoral/Event.h. Note that the #define
that controlled allocation that was at the top of the removed header is
replicated in the Evoral header, so there are no semantic changes
This commit is contained in:
Paul Davis 2020-04-28 12:01:55 -06:00
parent 39844cfbb9
commit 7a1447b75e
3 changed files with 1 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libs/ardour/ardour/midi_buffer.h
View File

@ -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"

43
libs/midi++2/midi++/event.h
View File

@ -1,43 +0,0 @@
/*
* Copyright (C) 2008-2015 Paul Davis <paul@linuxaudiosystems.com>
* Copyright (C) 2008-2016 David Robillard <d@drobilla.net>
* Copyright (C) 2008 Hans Baier <hansfbaier@googlemail.com>
*
* 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 <stdint.h>
#include <cstdlib>
#include <cstring>
#include <sstream>
#include <assert.h>
#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__ */

1
libs/midi++2/midi++/midnam_patch.h
View File

@ -35,7 +35,6 @@
#include <stdint.h>
#include "midi++/libmidi_visibility.h"
#include "midi++/event.h"
#include "pbd/xml++.h"
namespace MIDI