diff --git a/common/JackFreewheelDriver.cpp b/common/JackFreewheelDriver.cpp index 2bfb1d15..d0234f3b 100644 --- a/common/JackFreewheelDriver.cpp +++ b/common/JackFreewheelDriver.cpp @@ -37,7 +37,8 @@ int JackFreewheelDriver::Process() if (fEngine->Process(fBeginDateUst, fEndDateUst)) { - if (ResumeRefNum()) { // Signal all clients + // Resume connected clients in the graph + if (ResumeRefNum()) { jack_error("JackFreewheelDriver::Process: ResumeRefNum error"); res = -1; } @@ -61,6 +62,7 @@ int JackFreewheelDriver::Process() int JackFreewheelDriver::ProcessReadSync() { + // Resume connected clients in the graph if (ResumeRefNum() < 0) { // Signal all clients jack_error("JackFreewheelDriver::ProcessReadSync: ResumeRefNum error"); return -1; @@ -80,6 +82,7 @@ int JackFreewheelDriver::ProcessWriteSync() int JackFreewheelDriver::ProcessReadAsync() { + // Resume connected clients in the graph if (ResumeRefNum() < 0) { // Signal all clients jack_error("JackFreewheelDriver::ProcessReadAsync: ResumeRefNum error"); return -1; diff --git a/common/JackLoopbackDriver.cpp b/common/JackLoopbackDriver.cpp index d24ba2db..ef449b03 100644 --- a/common/JackLoopbackDriver.cpp +++ b/common/JackLoopbackDriver.cpp @@ -41,6 +41,7 @@ int JackLoopbackDriver::ProcessReadSync() memcpy(GetInputBuffer(i), GetOutputBuffer(i), sizeof(jack_default_audio_sample_t) * fEngineControl->fBufferSize); } + // Resume connected clients in the graph if (ResumeRefNum() < 0) { jack_error("JackLoopbackDriver::ProcessReadSync - ResumeRefNum error"); res = -1; @@ -51,6 +52,7 @@ int JackLoopbackDriver::ProcessReadSync() int JackLoopbackDriver::ProcessWriteSync() { + // Suspend on connected clients in the graph if (SuspendRefNum() < 0) { jack_error("JackLoopbackDriver::ProcessWriteSync SuspendRefNum error"); return -1; @@ -67,6 +69,7 @@ int JackLoopbackDriver::ProcessReadAsync() memcpy(GetInputBuffer(i), GetOutputBuffer(i), sizeof(jack_default_audio_sample_t) * fEngineControl->fBufferSize); } + // Resume connected clients in the graph if (ResumeRefNum() < 0) { jack_error("JackLoopbackDriver::ProcessReadAsync - ResumeRefNum error"); res = -1; diff --git a/common/JackNetAPI.cpp b/common/JackNetAPI.cpp index c9300832..dfefdd0d 100644 --- a/common/JackNetAPI.cpp +++ b/common/JackNetAPI.cpp @@ -936,6 +936,7 @@ LIB_EXPORT int jack_net_master_close(jack_net_master_t* net) delete master; return 0; } + LIB_EXPORT int jack_net_master_recv(jack_net_master_t* net, int audio_input, float** audio_input_buffer, int midi_input, void** midi_input_buffer) { JackNetExtMaster* master = (JackNetExtMaster*)net; diff --git a/common/JackShmMem.h b/common/JackShmMem.h index 397434fc..1905b321 100644 --- a/common/JackShmMem.h +++ b/common/JackShmMem.h @@ -33,11 +33,11 @@ namespace Jack { -SERVER_EXPORT void LockMemoryImp(void* ptr, size_t size); -SERVER_EXPORT void InitLockMemoryImp(void* ptr, size_t size); -SERVER_EXPORT void UnlockMemoryImp(void* ptr, size_t size); -SERVER_EXPORT void LockAllMemory(); -SERVER_EXPORT void UnlockAllMemory(); +void LockMemoryImp(void* ptr, size_t size); +void InitLockMemoryImp(void* ptr, size_t size); +void UnlockMemoryImp(void* ptr, size_t size); +void LockAllMemory(); +void UnlockAllMemory(); class JackMem { diff --git a/common/JackTime.h b/common/JackTime.h index 505903c6..5339ff47 100644 --- a/common/JackTime.h +++ b/common/JackTime.h @@ -32,8 +32,9 @@ extern "C" SERVER_EXPORT void InitTime(); SERVER_EXPORT jack_time_t GetMicroSeconds(void); SERVER_EXPORT void JackSleep(long usec); - SERVER_EXPORT void SetClockSource(jack_timer_type_t source); - SERVER_EXPORT const char* ClockSourceName(jack_timer_type_t source); + + void SetClockSource(jack_timer_type_t source); + const char* ClockSourceName(jack_timer_type_t source); #ifdef __cplusplus } diff --git a/linux/JackLinuxTime.c b/linux/JackLinuxTime.c index 18e616eb..327b9442 100644 --- a/linux/JackLinuxTime.c +++ b/linux/JackLinuxTime.c @@ -43,11 +43,11 @@ jack_time_t (*_jack_get_microseconds)(void) = 0; #if defined(__gnu_linux__) && (defined(__i386__) || defined(__x86_64__)) #define HPET_SUPPORT -#define HPET_MMAP_SIZE 1024 +#define HPET_MMAP_SIZE 1024 #define HPET_CAPS 0x000 #define HPET_PERIOD 0x004 -#define HPET_COUNTER 0x0f0 -#define HPET_CAPS_COUNTER_64BIT (1 << 13) +#define HPET_COUNTER 0x0f0 +#define HPET_CAPS_COUNTER_64BIT (1 << 13) #if defined(__x86_64__) typedef uint64_t hpet_counter_t; #else @@ -220,7 +220,7 @@ SERVER_EXPORT void InitTime() __jack_cpu_mhz = jack_get_mhz (); } -SERVER_EXPORT void SetClockSource(jack_timer_type_t source) +void SetClockSource(jack_timer_type_t source) { jack_log("Clock source : %s", ClockSourceName(source)); @@ -245,7 +245,7 @@ SERVER_EXPORT void SetClockSource(jack_timer_type_t source) } } -SERVER_EXPORT const char* ClockSourceName(jack_timer_type_t source) +const char* ClockSourceName(jack_timer_type_t source) { switch (source) { case JACK_TIMER_CYCLE_COUNTER: diff --git a/macosx/JackMachTime.c b/macosx/JackMachTime.c index c24ae313..92840084 100644 --- a/macosx/JackMachTime.c +++ b/macosx/JackMachTime.c @@ -13,7 +13,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License -along with this program; if not, write to the Free Software +along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ @@ -26,7 +26,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. static double __jack_time_ratio; -SERVER_EXPORT void JackSleep(long usec) +SERVER_EXPORT void JackSleep(long usec) { usleep(usec); } @@ -39,15 +39,15 @@ SERVER_EXPORT void InitTime() __jack_time_ratio = ((float)info.numer / info.denom) / 1000; } -SERVER_EXPORT jack_time_t GetMicroSeconds(void) +SERVER_EXPORT jack_time_t GetMicroSeconds(void) { return (jack_time_t) (mach_absolute_time () * __jack_time_ratio); } -SERVER_EXPORT void SetClockSource(jack_timer_type_t source) +void SetClockSource(jack_timer_type_t source) {} -SERVER_EXPORT const char* ClockSourceName(jack_timer_type_t source) +const char* ClockSourceName(jack_timer_type_t source) { return ""; } diff --git a/windows/JackWinTime.c b/windows/JackWinTime.c index 065ea9f9..74a2d0a1 100644 --- a/windows/JackWinTime.c +++ b/windows/JackWinTime.c @@ -1,20 +1,20 @@ /* Copyright (C) 2004-2008 Grame - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - + You should have received a copy of the GNU Lesser General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - + */ @@ -39,10 +39,10 @@ SERVER_EXPORT jack_time_t GetMicroSeconds(void) return (jack_time_t)(((double)t1.QuadPart) / ((double)_jack_freq.QuadPart) * 1000000.0); } -SERVER_EXPORT void SetClockSource(jack_timer_type_t source) +void SetClockSource(jack_timer_type_t source) {} -SERVER_EXPORT const char* ClockSourceName(jack_timer_type_t source) +const char* ClockSourceName(jack_timer_type_t source) { return ""; }