projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update recorded MIDI regions as notes arrive. Fixes one cause of infinite note-lengt...
[ardour.git]
/
libs
/
ardour
/
ardour
/
cycles.h
diff --git
a/libs/ardour/ardour/cycles.h
b/libs/ardour/ardour/cycles.h
index ad3e5126690471aee915459af4e2f45fed2282c1..9f6d9b4b5c3ed1837414588a34c7e2a151c2e3b9 100644
(file)
--- a/
libs/ardour/ardour/cycles.h
+++ b/
libs/ardour/ardour/cycles.h
@@
-1,7
+1,7
@@
/*
Copyright (C) 2001 Paul Davis
Code derived from various headers from the Linux kernel
/*
Copyright (C) 2001 Paul Davis
Code derived from various headers from the Linux kernel
-
+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
@@
-16,7
+16,6
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id$
*/
#ifndef __ardour_cycles_h__
*/
#ifndef __ardour_cycles_h__
@@
-38,7
+37,7
@@
* We only use the low 32 bits, and we'd simply better make sure
* that we reschedule before that wraps. Scheduling at least every
* four billion cycles just basically sounds like a good idea,
* We only use the low 32 bits, and we'd simply better make sure
* that we reschedule before that wraps. Scheduling at least every
* four billion cycles just basically sounds like a good idea,
- * regardless of how fast the machine is.
+ * regardless of how fast the machine is.
*/
typedef uint64_t cycles_t;
*/
typedef uint64_t cycles_t;
@@
-49,10
+48,10
@@
extern cycles_t cacheflush_time;
static inline cycles_t get_cycles (void)
{
static inline cycles_t get_cycles (void)
{
-
uint32_t long
ret;
+
cycles_t
ret;
rdtscll(ret);
rdtscll(ret);
- return ret;
+ return ret
& 0xffffffff
;
}
#elif defined(__powerpc__)
}
#elif defined(__powerpc__)
@@
-104,7
+103,7
@@
get_cycles (void)
* Standard way to access the cycle counter.
* Currently only used on SMP for scheduling.
*
* Standard way to access the cycle counter.
* Currently only used on SMP for scheduling.
*
- * Only the low 32 bits are available as a continuously counting entity.
+ * Only the low 32 bits are available as a continuously counting entity.
* But this only means we'll force a reschedule every 8 seconds or so,
* which isn't an evil thing.
*/
* But this only means we'll force a reschedule every 8 seconds or so,
* which isn't an evil thing.
*/
@@
-187,17
+186,7
@@
static inline cycles_t get_cycles (void)
/* begin mach */
#elif defined(__APPLE__)
/* begin mach */
#elif defined(__APPLE__)
-#ifdef HAVE_COREAUDIO
#include <CoreAudio/HostTime.h>
#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)
typedef UInt64 cycles_t;
static inline cycles_t get_cycles (void)