diff options
| author | Hans Fugal <hans@fugal.net> | 2006-08-11 15:24:49 +0000 |
|---|---|---|
| committer | Hans Fugal <hans@fugal.net> | 2006-08-11 15:24:49 +0000 |
| commit | af0680d49beac9beabe35815a0ed7a5b11538a82 (patch) | |
| tree | 8e8f216e76ceb4539b11f7c4eedb133d53421263 /libs/ardour/ardour/cycles.h | |
| parent | a1aa6d2ae1a4a337f5b6b74aa4aaa28ba1d3ba4d (diff) | |
r308@gandalf: fugalh | 2006-08-11 08:49:54 -0600
OS X MacTypes.h/libgnomecanvasmm Rect problem workaround when COREAUDIO=0
git-svn-id: svn://localhost/ardour2/branches/undo@788 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour/cycles.h')
| -rw-r--r-- | libs/ardour/ardour/cycles.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/libs/ardour/ardour/cycles.h b/libs/ardour/ardour/cycles.h index f194988da9..ad3e512669 100644 --- a/libs/ardour/ardour/cycles.h +++ b/libs/ardour/ardour/cycles.h @@ -186,8 +186,19 @@ static inline cycles_t get_cycles (void) /* begin mach */ #elif defined(__APPLE__) -#include <CoreAudio/CoreAudioTypes.h> + +#ifdef HAVE_COREAUDIO #include <CoreAudio/HostTime.h> +#else // Due to MacTypes.h and libgnomecanvasmm Rect conflict +typedef unsigned long long UInt64; + +extern UInt64 +AudioGetCurrentHostTime(); + +extern UInt64 +AudioConvertHostTimeToNanos(UInt64 inHostTime); +#endif + typedef UInt64 cycles_t; static inline cycles_t get_cycles (void) { |