diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-12-03 11:51:25 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-12-03 11:51:25 -0500 |
| commit | 8648a8a13b04549362f14a0738947d997ef1abc7 (patch) | |
| tree | 702652b49789b13d647c4c93df985f65361a4118 /libs/midi++2/midi++ | |
| parent | c428ec14b923928690492cab0428f8fad45f7658 (diff) | |
| parent | ae6b0b9f1ab02ab949eaf741b98e69bdab487e92 (diff) | |
fix up wscript/build issues in exportvis after merge with master
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++/mmc.h | 1 | ||||
| -rw-r--r-- | libs/midi++2/midi++/port.h | 4 | ||||
| -rw-r--r-- | libs/midi++2/midi++/types.h | 5 |
4 files changed, 5 insertions, 7 deletions
diff --git a/libs/midi++2/midi++/ipmidi_port.h b/libs/midi++2/midi++/ipmidi_port.h index 5b773d31ac..4aa55828f1 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++/mmc.h b/libs/midi++2/midi++/mmc.h index 2f34b9c793..ffabf863a0 100644 --- a/libs/midi++2/midi++/mmc.h +++ b/libs/midi++2/midi++/mmc.h @@ -20,7 +20,6 @@ #ifndef __midipp_mmc_h_h__ #define __midipp_mmc_h_h__ -#include <jack/types.h> #include "timecode/time.h" #include "pbd/signals.h" diff --git a/libs/midi++2/midi++/port.h b/libs/midi++2/midi++/port.h index 17b660398f..d151a43814 100644 --- a/libs/midi++2/midi++/port.h +++ b/libs/midi++2/midi++/port.h @@ -22,7 +22,9 @@ #include <string> #include <iostream> -#include <jack/types.h> +#include <jack/types.h> /* XXX ... desirable to get rid of this but needed for + * now due to use of JackPortIsXXXX + */ #include "pbd/xml++.h" #include "pbd/crossthread.h" diff --git a/libs/midi++2/midi++/types.h b/libs/midi++2/midi++/types.h index a731855daa..92858eaa60 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> #include "midi++/libmidi_visibility.h" @@ -34,8 +33,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, |