Browse Source

Export cleanup.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@4677 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/1.9.9.5
sletz 13 years ago
parent
commit
50abee29f5
8 changed files with 32 additions and 24 deletions
  1. +4
    -1
      common/JackFreewheelDriver.cpp
  2. +3
    -0
      common/JackLoopbackDriver.cpp
  3. +1
    -0
      common/JackNetAPI.cpp
  4. +5
    -5
      common/JackShmMem.h
  5. +3
    -2
      common/JackTime.h
  6. +5
    -5
      linux/JackLinuxTime.c
  7. +5
    -5
      macosx/JackMachTime.c
  8. +6
    -6
      windows/JackWinTime.c

+ 4
- 1
common/JackFreewheelDriver.cpp View File

@@ -37,7 +37,8 @@ int JackFreewheelDriver::Process()


if (fEngine->Process(fBeginDateUst, fEndDateUst)) { if (fEngine->Process(fBeginDateUst, fEndDateUst)) {


if (ResumeRefNum()) { // Signal all clients
// Resume connected clients in the graph
if (ResumeRefNum()) {
jack_error("JackFreewheelDriver::Process: ResumeRefNum error"); jack_error("JackFreewheelDriver::Process: ResumeRefNum error");
res = -1; res = -1;
} }
@@ -61,6 +62,7 @@ int JackFreewheelDriver::Process()


int JackFreewheelDriver::ProcessReadSync() int JackFreewheelDriver::ProcessReadSync()
{ {
// Resume connected clients in the graph
if (ResumeRefNum() < 0) { // Signal all clients if (ResumeRefNum() < 0) { // Signal all clients
jack_error("JackFreewheelDriver::ProcessReadSync: ResumeRefNum error"); jack_error("JackFreewheelDriver::ProcessReadSync: ResumeRefNum error");
return -1; return -1;
@@ -80,6 +82,7 @@ int JackFreewheelDriver::ProcessWriteSync()


int JackFreewheelDriver::ProcessReadAsync() int JackFreewheelDriver::ProcessReadAsync()
{ {
// Resume connected clients in the graph
if (ResumeRefNum() < 0) { // Signal all clients if (ResumeRefNum() < 0) { // Signal all clients
jack_error("JackFreewheelDriver::ProcessReadAsync: ResumeRefNum error"); jack_error("JackFreewheelDriver::ProcessReadAsync: ResumeRefNum error");
return -1; return -1;


+ 3
- 0
common/JackLoopbackDriver.cpp View File

@@ -41,6 +41,7 @@ int JackLoopbackDriver::ProcessReadSync()
memcpy(GetInputBuffer(i), GetOutputBuffer(i), sizeof(jack_default_audio_sample_t) * fEngineControl->fBufferSize); memcpy(GetInputBuffer(i), GetOutputBuffer(i), sizeof(jack_default_audio_sample_t) * fEngineControl->fBufferSize);
} }


// Resume connected clients in the graph
if (ResumeRefNum() < 0) { if (ResumeRefNum() < 0) {
jack_error("JackLoopbackDriver::ProcessReadSync - ResumeRefNum error"); jack_error("JackLoopbackDriver::ProcessReadSync - ResumeRefNum error");
res = -1; res = -1;
@@ -51,6 +52,7 @@ int JackLoopbackDriver::ProcessReadSync()


int JackLoopbackDriver::ProcessWriteSync() int JackLoopbackDriver::ProcessWriteSync()
{ {
// Suspend on connected clients in the graph
if (SuspendRefNum() < 0) { if (SuspendRefNum() < 0) {
jack_error("JackLoopbackDriver::ProcessWriteSync SuspendRefNum error"); jack_error("JackLoopbackDriver::ProcessWriteSync SuspendRefNum error");
return -1; return -1;
@@ -67,6 +69,7 @@ int JackLoopbackDriver::ProcessReadAsync()
memcpy(GetInputBuffer(i), GetOutputBuffer(i), sizeof(jack_default_audio_sample_t) * fEngineControl->fBufferSize); memcpy(GetInputBuffer(i), GetOutputBuffer(i), sizeof(jack_default_audio_sample_t) * fEngineControl->fBufferSize);
} }


// Resume connected clients in the graph
if (ResumeRefNum() < 0) { if (ResumeRefNum() < 0) {
jack_error("JackLoopbackDriver::ProcessReadAsync - ResumeRefNum error"); jack_error("JackLoopbackDriver::ProcessReadAsync - ResumeRefNum error");
res = -1; res = -1;


+ 1
- 0
common/JackNetAPI.cpp View File

@@ -936,6 +936,7 @@ LIB_EXPORT int jack_net_master_close(jack_net_master_t* net)
delete master; delete master;
return 0; 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) 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; JackNetExtMaster* master = (JackNetExtMaster*)net;


+ 5
- 5
common/JackShmMem.h View File

@@ -33,11 +33,11 @@
namespace Jack 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 class JackMem
{ {


+ 3
- 2
common/JackTime.h View File

@@ -32,8 +32,9 @@ extern "C"
SERVER_EXPORT void InitTime(); SERVER_EXPORT void InitTime();
SERVER_EXPORT jack_time_t GetMicroSeconds(void); SERVER_EXPORT jack_time_t GetMicroSeconds(void);
SERVER_EXPORT void JackSleep(long usec); 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 #ifdef __cplusplus
} }


+ 5
- 5
linux/JackLinuxTime.c View File

@@ -43,11 +43,11 @@ jack_time_t (*_jack_get_microseconds)(void) = 0;


#if defined(__gnu_linux__) && (defined(__i386__) || defined(__x86_64__)) #if defined(__gnu_linux__) && (defined(__i386__) || defined(__x86_64__))
#define HPET_SUPPORT #define HPET_SUPPORT
#define HPET_MMAP_SIZE 1024
#define HPET_MMAP_SIZE 1024
#define HPET_CAPS 0x000 #define HPET_CAPS 0x000
#define HPET_PERIOD 0x004 #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__) #if defined(__x86_64__)
typedef uint64_t hpet_counter_t; typedef uint64_t hpet_counter_t;
#else #else
@@ -220,7 +220,7 @@ SERVER_EXPORT void InitTime()
__jack_cpu_mhz = jack_get_mhz (); __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)); 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) { switch (source) {
case JACK_TIMER_CYCLE_COUNTER: case JACK_TIMER_CYCLE_COUNTER:


+ 5
- 5
macosx/JackMachTime.c View File

@@ -13,7 +13,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details. GNU Lesser General Public License for more details.


You should have received a copy of the GNU Lesser General Public License 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. 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; static double __jack_time_ratio;


SERVER_EXPORT void JackSleep(long usec)
SERVER_EXPORT void JackSleep(long usec)
{ {
usleep(usec); usleep(usec);
} }
@@ -39,15 +39,15 @@ SERVER_EXPORT void InitTime()
__jack_time_ratio = ((float)info.numer / info.denom) / 1000; __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); 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 ""; return "";
} }

+ 6
- 6
windows/JackWinTime.c View File

@@ -1,20 +1,20 @@
/* /*
Copyright (C) 2004-2008 Grame Copyright (C) 2004-2008 Grame
This program is free software; you can redistribute it and/or modify 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 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 the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version. (at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details. GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License 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. 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); 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 ""; return "";
} }

Loading…
Cancel
Save