diff options
| author | David Robillard <d@drobilla.net> | 2012-05-24 02:54:10 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2012-05-24 02:54:10 +0000 |
| commit | 27a1cf2cf73703267cac5bda2acca386afb374b3 (patch) | |
| tree | 122ceba55fef1d183d1b32dca1fd60ffdc113112 /libs/midi++2 | |
| parent | effe4de1889bfefba6550dff4244e06c2c7261bd (diff) | |
Compile cleanly with clang.
To compile Ardour with LLVM/clang, do the usual thing but set the CXX and CC
environment variables, e.g.:
CC=/usr/bin/clang CXX=/usr/bin/clang++ ./waf configure build
git-svn-id: svn://localhost/ardour2/branches/3.0@12418 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/midi++2')
| -rw-r--r-- | libs/midi++2/jack_midi_port.cc | 4 | ||||
| -rw-r--r-- | libs/midi++2/midi++/ipmidi_port.h | 3 | ||||
| -rw-r--r-- | libs/midi++2/midi++/port.h | 3 | ||||
| -rw-r--r-- | libs/midi++2/mtc.cc | 2 |
4 files changed, 5 insertions, 7 deletions
diff --git a/libs/midi++2/jack_midi_port.cc b/libs/midi++2/jack_midi_port.cc index 05eebc5aa1..9d7fb8c70e 100644 --- a/libs/midi++2/jack_midi_port.cc +++ b/libs/midi++2/jack_midi_port.cc @@ -40,6 +40,10 @@ using namespace MIDI; using namespace std; using namespace PBD; +namespace Evoral { +template class EventRingBuffer<timestamp_t>; +} + pthread_t JackMIDIPort::_process_thread; Signal0<void> JackMIDIPort::JackHalted; Signal0<void> JackMIDIPort::MakeConnections; diff --git a/libs/midi++2/midi++/ipmidi_port.h b/libs/midi++2/midi++/ipmidi_port.h index 0441626565..32cf1163e6 100644 --- a/libs/midi++2/midi++/ipmidi_port.h +++ b/libs/midi++2/midi++/ipmidi_port.h @@ -37,9 +37,6 @@ #include "pbd/signals.h" #include "pbd/ringbuffer.h" -#include "evoral/Event.hpp" -#include "evoral/EventRingBuffer.hpp" - #include "midi++/types.h" #include "midi++/parser.h" #include "midi++/port.h" diff --git a/libs/midi++2/midi++/port.h b/libs/midi++2/midi++/port.h index 03abd1a41c..89b0e283dc 100644 --- a/libs/midi++2/midi++/port.h +++ b/libs/midi++2/midi++/port.h @@ -29,9 +29,6 @@ #include "pbd/signals.h" #include "pbd/ringbuffer.h" -#include "evoral/Event.hpp" -#include "evoral/EventRingBuffer.hpp" - #include "midi++/types.h" #include "midi++/parser.h" diff --git a/libs/midi++2/mtc.cc b/libs/midi++2/mtc.cc index d1bb7c9bad..affe65ec68 100644 --- a/libs/midi++2/mtc.cc +++ b/libs/midi++2/mtc.cc @@ -300,7 +300,7 @@ Parser::process_mtc_quarter_frame (byte *msg) switch (_mtc_running) { case MTC_Forward: - if ((which_quarter_frame == 7)) { + if (which_quarter_frame == 7) { /* we've reached the final of 8 quarter frame messages. store the time, reset the pending time holder, |