diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-11-27 12:44:23 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-11-27 12:44:23 -0500 |
| commit | ac4d691fe9d45c7606e865bba07405f6476a1565 (patch) | |
| tree | d4e4e0417028316301c31cab6127e8028ab23741 /libs/midi++2/midi++ | |
| parent | f1db14923e5d14331d1bf869d32862a2cf3460bb (diff) | |
remove unintended linkage between libmidipp and jack
Diffstat (limited to 'libs/midi++2/midi++')
| -rw-r--r-- | libs/midi++2/midi++/ipmidi_port.h | 2 | ||||
| -rw-r--r-- | libs/midi++2/midi++/types.h | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/libs/midi++2/midi++/ipmidi_port.h b/libs/midi++2/midi++/ipmidi_port.h index c077170026..8d5cecdf11 100644 --- a/libs/midi++2/midi++/ipmidi_port.h +++ b/libs/midi++2/midi++/ipmidi_port.h @@ -41,8 +41,6 @@ #include <glibmm/threads.h> -#include <jack/types.h> - #include "pbd/xml++.h" #include "pbd/crossthread.h" #include "pbd/signals.h" diff --git a/libs/midi++2/midi++/types.h b/libs/midi++2/midi++/types.h index 185e1e6f3f..598bb8ab5a 100644 --- a/libs/midi++2/midi++/types.h +++ b/libs/midi++2/midi++/types.h @@ -20,7 +20,6 @@ #ifndef __midi_types_h__ #define __midi_types_h__ -#include <jack/jack.h> #include <inttypes.h> namespace MIDI { @@ -32,8 +31,8 @@ namespace MIDI { typedef uint32_t timestamp_t; /** XXX: dupes from libardour */ - typedef int64_t framecnt_t; - typedef jack_nframes_t pframes_t; + typedef int64_t framecnt_t; + typedef uint32_t pframes_t; enum eventType { none = 0x0, |