Return silence from read_from_sources() if we try to read a channel that our source...

[ardour.git] / libs / midi++2 / midi++ / types.h

diff --git a/libs/midi++2/midi++/types.h b/libs/midi++2/midi++/types.h
index a7929e16f53a0ac6c2a384dd32fdf2aa51e15aef..185e1e6f3f1c12cb4d462cb7f0e0ee44e09ff8ae 100644 (file)
--- a/libs/midi++2/midi++/types.h
+++ b/libs/midi++2/midi++/types.h
@@ -20,6 +20,7 @@
 #ifndef __midi_types_h__
 #define __midi_types_h__
 
+#include <jack/jack.h>
 #include <inttypes.h>
 
 namespace MIDI {
@@ -28,9 +29,12 @@ namespace MIDI {
        typedef float          controller_value_t;
        typedef unsigned char  byte;
        typedef unsigned short pitchbend_t;
-       typedef uint32_t       nframes_t;
        typedef uint32_t       timestamp_t;
 
+       /** XXX: dupes from libardour */
+       typedef int64_t        framecnt_t;
+       typedef jack_nframes_t pframes_t;
+
        enum eventType {
            none = 0x0,
            raw = 0xF4, /* undefined in MIDI spec */