X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fmidi%2B%2B2%2Fmidi%2B%2B%2Ftypes.h;h=92858eaa601c7f89d18bf172d1fc572a1923de40;hb=cf806123ca5faaef483f898daba3f7bd38ec62eb;hp=185e1e6f3f1c12cb4d462cb7f0e0ee44e09ff8ae;hpb=73192bc1a7ea55fa1864dc3826845b15c00dd2ec;p=ardour.git

diff --git a/libs/midi++2/midi++/types.h b/libs/midi++2/midi++/types.h
index 185e1e6f3f..92858eaa60 100644
--- a/libs/midi++2/midi++/types.h
+++ b/libs/midi++2/midi++/types.h
@@ -20,9 +20,10 @@
 #ifndef __midi_types_h__
 #define __midi_types_h__
 
-#include <jack/jack.h>
 #include <inttypes.h>
 
+#include "midi++/libmidi_visibility.h"
+
 namespace MIDI {
 
 	typedef char           channel_t;
@@ -32,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,
@@ -60,10 +61,10 @@ namespace MIDI {
 	    reset = 0xFF
     };
 
-    extern const char *controller_names[];
+    LIBMIDIPP_API extern const char *controller_names[];
 	byte decode_controller_name (const char *name);
 
-    struct EventTwoBytes {
+    struct LIBMIDIPP_API EventTwoBytes {
 	union {
 	    byte note_number;
 	    byte controller_number;
@@ -74,14 +75,14 @@ namespace MIDI {
 	};
     };
 
-    enum MTC_FPS {
+    enum LIBMIDIPP_API MTC_FPS {
 	    MTC_24_FPS = 0,
 	    MTC_25_FPS = 1,
 	    MTC_30_FPS_DROP = 2,
 	    MTC_30_FPS = 3
     };
 
-    enum MTC_Status {
+    enum LIBMIDIPP_API MTC_Status {
 	    MTC_Stopped = 0,
 	    MTC_Forward,
 	    MTC_Backward