summaryrefslogtreecommitdiff
path: root/config/os
diff options
context:
space:
mode:
authorpaul <paul@0c269be4-1314-0410-8aa9-9f06e86f4224>2007-04-15 16:05:48 +0000
committerpaul <paul@0c269be4-1314-0410-8aa9-9f06e86f4224>2007-04-15 16:05:48 +0000
commitdf3d1b484275d8ae7298855b2544aa8f7619393e (patch)
tree007411b8d5e5ef7fccd53094d8f28fe94adf1ba9 /config/os
parentc7773189f781bfb507bbae16f4d10eb63cbaeb46 (diff)
downloadjack1-df3d1b484275d8ae7298855b2544aa8f7619393e.tar.gz
implement fons' jack_thread_wait API along with internal design changes to support both models (callback and wait) with the same code; fix for use of snd_pcm_link (from takashi); change mem alignment to 64 for better SIMD optimization
git-svn-id: svn+ssh://jackaudio.org/trunk/jack@1025 0c269be4-1314-0410-8aa9-9f06e86f4224
Diffstat (limited to 'config/os')
-rw-r--r--config/os/generic/time.h6
-rw-r--r--config/os/gnu-linux/Makefile.am1
-rw-r--r--config/os/gnu-linux/time.h2
-rw-r--r--config/os/macosx/Makefile.am1
4 files changed, 7 insertions, 3 deletions
diff --git a/config/os/generic/time.h b/config/os/generic/time.h
index 7118ed8..7ebbc2f 100644
--- a/config/os/generic/time.h
+++ b/config/os/generic/time.h
@@ -22,9 +22,11 @@
#ifndef __jack_time_h__
#define __jack_time_h__
-#include <jack/internal.h>
+#include <jack/types.h>
-inline jack_time_t
+extern jack_time_t jack_get_microseconds_from_system (void);
+
+static inline jack_time_t
jack_get_microseconds (void) {
return jack_get_microseconds_from_system ();
}
diff --git a/config/os/gnu-linux/Makefile.am b/config/os/gnu-linux/Makefile.am
index ae10130..56c5dca 100644
--- a/config/os/gnu-linux/Makefile.am
+++ b/config/os/gnu-linux/Makefile.am
@@ -1,2 +1,3 @@
MAINTAINERCLEANFILES = Makefile.in
noinst_HEADERS = time.c time.h
+
diff --git a/config/os/gnu-linux/time.h b/config/os/gnu-linux/time.h
index e97601c..9d308db 100644
--- a/config/os/gnu-linux/time.h
+++ b/config/os/gnu-linux/time.h
@@ -24,7 +24,7 @@
#ifndef __jack_time_h__
#define __jack_time_h__
-#include <jack/internal.h>
+#include <jack/types.h>
extern jack_time_t (*_jack_get_microseconds)(void);
diff --git a/config/os/macosx/Makefile.am b/config/os/macosx/Makefile.am
index b49bd77..6231480 100644
--- a/config/os/macosx/Makefile.am
+++ b/config/os/macosx/Makefile.am
@@ -1,4 +1,5 @@
MAINTAINERCLEANFILES = Makefile.in
noinst_HEADERS = getopt.h ipc.h JACK_LOCATION.h mach_port.h \
poll.h pThreadUtilities.h time.c time.h
+
EXTRA_DIST = jack.xcode/project.pbxproj