summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--common/wscript4
-rw-r--r--posix/JackPosixTime.c (renamed from freebsd/JackFreeBSDTime.c)18
2 files changed, 5 insertions, 17 deletions
diff --git a/common/wscript b/common/wscript
index 27bb60ff..e22f12f4 100644
--- a/common/wscript
+++ b/common/wscript
@@ -105,8 +105,8 @@ def build(bld):
'../posix/JackPosixMutex.cpp',
'../posix/JackPosixSemaphore.cpp',
'../posix/JackSocket.cpp',
- '../freebsd/JackFreeBSDTime.c',
- ]
+ '../posix/JackPosixTime.c',
+ ]
includes = ['../freebsd', '../posix'] + includes
if bld.env['IS_SUN']:
diff --git a/freebsd/JackFreeBSDTime.c b/posix/JackPosixTime.c
index 66790167..cb712140 100644
--- a/freebsd/JackFreeBSDTime.c
+++ b/posix/JackPosixTime.c
@@ -57,25 +57,13 @@ SERVER_EXPORT void EndTime()
void SetClockSource(jack_timer_type_t source)
{
- jack_log("Clock source : %s", ClockSourceName(source));
-
- switch (source)
- {
- case JACK_TIMER_SYSTEM_CLOCK:
- default:
- _jack_get_microseconds = jack_get_microseconds_from_system;
- break;
- }
+ jack_log("Clock source : %s", ClockSourceName(source));
+ _jack_get_microseconds = jack_get_microseconds_from_system;
}
const char* ClockSourceName(jack_timer_type_t source)
{
- switch (source) {
- case JACK_TIMER_SYSTEM_CLOCK:
- return "system clock via clock_gettime";
- }
-
- return "unknown";
+ return "system clock via clock_gettime";
}
SERVER_EXPORT jack_time_t GetMicroSeconds()