summaryrefslogtreecommitdiff
path: root/libs/midi++2
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2006-10-21 19:01:50 +0000
committerDavid Robillard <d@drobilla.net>2006-10-21 19:01:50 +0000
commitfedf3d34f32264ac57c6a222b678dc90f2bb1a88 (patch)
treee816c676d12ccc32b7e666792b9a01ab5b5a0367 /libs/midi++2
parent7bd41538d951c3e476655df741adfbebbb990bde (diff)
Merged with trunk R992.
Completely untested other than it compiles, runs, and records somewhat (need to merge again). git-svn-id: svn://localhost/ardour2/branches/midi@999 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/midi++2')
-rw-r--r--libs/midi++2/midi++/types.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/libs/midi++2/midi++/types.h b/libs/midi++2/midi++/types.h
index 797c50a31b..ca7345c0d6 100644
--- a/libs/midi++2/midi++/types.h
+++ b/libs/midi++2/midi++/types.h
@@ -1,14 +1,16 @@
#ifndef __midi_types_h__
#define __midi_types_h__
+#include <inttypes.h>
+
namespace MIDI {
typedef char channel_t;
typedef float controller_value_t;
typedef unsigned char byte;
typedef unsigned short pitchbend_t;
- typedef unsigned int timestamp_t;
- typedef unsigned int nframes_t;
+ typedef uint32_t nframes_t;
+ typedef uint32_t timestamp_t;
enum eventType {
none = 0x0,