Browse Source

Header cleanup, add --clients and --ports options in configure.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@2957 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/1.90
sletz 14 years ago
parent
commit
f19b74f904
96 changed files with 38 additions and 393 deletions
  1. +1
    -0
      ChangeLog
  2. +0
    -4
      common/JackAPI.cpp
  3. +0
    -4
      common/JackActivationCount.cpp
  4. +0
    -4
      common/JackAudioAdapterInterface.h
  5. +0
    -5
      common/JackAudioDriver.cpp
  6. +0
    -4
      common/JackAudioPort.cpp
  7. +0
    -4
      common/JackClient.cpp
  8. +0
    -4
      common/JackConnectionManager.cpp
  9. +13
    -4
      common/JackConstants.h
  10. +0
    -4
      common/JackControlAPI.cpp
  11. +0
    -4
      common/JackDebugClient.cpp
  12. +0
    -4
      common/JackDriver.cpp
  13. +1
    -6
      common/JackDriverLoader.cpp
  14. +0
    -4
      common/JackDummyDriver.cpp
  15. +0
    -4
      common/JackEngine.cpp
  16. +0
    -4
      common/JackEngineControl.cpp
  17. +0
    -4
      common/JackEngineTiming.cpp
  18. +0
    -4
      common/JackError.cpp
  19. +0
    -4
      common/JackExternalClient.cpp
  20. +0
    -4
      common/JackFrameTimer.cpp
  21. +0
    -5
      common/JackFreewheelDriver.cpp
  22. +0
    -4
      common/JackGlobals.cpp
  23. +0
    -4
      common/JackGraphManager.cpp
  24. +0
    -4
      common/JackInternalClient.cpp
  25. +0
    -4
      common/JackLibAPI.cpp
  26. +0
    -4
      common/JackLibClient.cpp
  27. +0
    -5
      common/JackLoopbackDriver.cpp
  28. +0
    -4
      common/JackMessageBuffer.cpp
  29. +0
    -4
      common/JackMidiAPI.cpp
  30. +0
    -4
      common/JackMidiPort.cpp
  31. +1
    -3
      common/JackNetDriver.cpp
  32. +0
    -4
      common/JackNetInterface.h
  33. +0
    -4
      common/JackPort.cpp
  34. +0
    -4
      common/JackPortType.cpp
  35. +0
    -5
      common/JackRestartThreadedDriver.cpp
  36. +0
    -4
      common/JackServer.cpp
  37. +0
    -4
      common/JackServerAPI.cpp
  38. +0
    -4
      common/JackServerGlobals.cpp
  39. +0
    -4
      common/JackShmMem.cpp
  40. +0
    -5
      common/JackThreadedDriver.cpp
  41. +0
    -4
      common/JackTools.cpp
  42. +0
    -4
      common/JackTransportEngine.cpp
  43. +0
    -5
      common/JackWaitThreadedDriver.cpp
  44. +0
    -4
      common/Jackdmp.cpp
  45. +0
    -4
      common/ringbuffer.c
  46. +1
    -3
      common/shm.c
  47. +0
    -1
      common/shm.h
  48. +0
    -4
      common/timestamps.c
  49. +0
    -4
      linux/alsa/JackAlsaAdapter.cpp
  50. +2
    -9
      linux/alsa/JackAlsaDriver.cpp
  51. +0
    -1
      linux/alsa/alsa_driver.h
  52. +3
    -5
      linux/alsa/alsa_midi_impl.h
  53. +0
    -4
      linux/alsa/alsa_midi_jackmp.cpp
  54. +2
    -6
      linux/alsa/alsa_rawmidi.c
  55. +3
    -6
      linux/alsa/alsa_seqmidi.c
  56. +0
    -4
      linux/alsa/generic_hw.c
  57. +0
    -4
      linux/alsa/hammerfall.c
  58. +0
    -4
      linux/alsa/hdsp.c
  59. +0
    -6
      linux/alsa/ice1712.c
  60. +0
    -4
      linux/alsa/memops.c
  61. +0
    -4
      linux/alsa/usx2y.c
  62. +0
    -5
      linux/firewire/JackFFADODriver.cpp
  63. +0
    -5
      linux/freebob/JackFreebobDriver.cpp
  64. +0
    -4
      macosx/JackMacEngineRPC.cpp
  65. +0
    -4
      macosx/JackMacLibClientRPC.cpp
  66. +0
    -4
      macosx/JackMachClientChannel.cpp
  67. +0
    -4
      macosx/JackMachNotifyChannel.cpp
  68. +0
    -4
      macosx/JackMachPort.cpp
  69. +0
    -4
      macosx/JackMachSemaphore.cpp
  70. +0
    -4
      macosx/JackMachServerChannel.cpp
  71. +0
    -4
      macosx/JackMachServerNotifyChannel.cpp
  72. +0
    -4
      macosx/JackMachThread.cpp
  73. +0
    -4
      macosx/JackMachTime.c
  74. +0
    -4
      macosx/coreaudio/JackCoreAudioAdapter.cpp
  75. +0
    -4
      macosx/coreaudio/JackCoreAudioDriver.cpp
  76. +0
    -4
      posix/JackPosixSemaphore.cpp
  77. +0
    -4
      posix/JackPosixServerLaunch.cpp
  78. +0
    -4
      posix/JackPosixThread.cpp
  79. +0
    -4
      posix/JackProcessSync.cpp
  80. +0
    -4
      posix/JackSocket.cpp
  81. +0
    -4
      posix/JackSocketClientChannel.cpp
  82. +0
    -4
      posix/JackSocketNotifyChannel.cpp
  83. +0
    -4
      posix/JackSocketServerChannel.cpp
  84. +0
    -4
      posix/JackSocketServerNotifyChannel.cpp
  85. +0
    -4
      windows/JackWinEvent.cpp
  86. +0
    -4
      windows/JackWinNamedPipe.cpp
  87. +0
    -4
      windows/JackWinNamedPipeClientChannel.cpp
  88. +0
    -4
      windows/JackWinNamedPipeNotifyChannel.cpp
  89. +0
    -4
      windows/JackWinNamedPipeServerChannel.cpp
  90. +0
    -4
      windows/JackWinNamedPipeServerNotifyChannel.cpp
  91. +2
    -6
      windows/JackWinProcessSync.cpp
  92. +0
    -4
      windows/JackWinSemaphore.cpp
  93. +0
    -4
      windows/JackWinServerLaunch.cpp
  94. +0
    -4
      windows/JackWinThread.cpp
  95. +0
    -4
      windows/portaudio/JackPortAudioDriver.cpp
  96. +9
    -1
      wscript

+ 1
- 0
ChangeLog View File

@@ -27,6 +27,7 @@ Michael Voigt
* Correct file permission for jack-shm-registry POSIX shared memory segment.
* Checking for libsamplerate in waf, fix ticket #89."
* Header cleanup, add --clients and --ports options in configure.

2008-09-22 Stephane Letz <letz@grame.fr>


+ 0
- 4
common/JackAPI.cpp View File

@@ -18,10 +18,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include "JackClient.h"
#include "JackError.h"
#include "JackGraphManager.h"


+ 0
- 4
common/JackActivationCount.cpp View File

@@ -17,10 +17,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include "JackAtomic.h"
#include "JackActivationCount.h"
#include "JackConstants.h"


+ 0
- 4
common/JackAudioAdapterInterface.h View File

@@ -20,10 +20,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#ifndef __JackAudioAdapterInterface__
#define __JackAudioAdapterInterface__

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include "ringbuffer.h"
#include "jack.h"
#include "JackError.h"


+ 0
- 5
common/JackAudioDriver.cpp View File

@@ -18,12 +18,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include "JackSystemDeps.h"

#include "JackAudioDriver.h"
#include "JackTime.h"
#include "JackError.h"


+ 0
- 4
common/JackAudioPort.cpp View File

@@ -18,10 +18,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include "JackPortType.h"
#include <string.h>



+ 0
- 4
common/JackClient.cpp View File

@@ -18,10 +18,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include "JackClient.h"
#include "JackGraphManager.h"
#include "JackClientControl.h"


+ 0
- 4
common/JackConnectionManager.cpp View File

@@ -17,10 +17,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include <iostream>
#include <assert.h>
#include "JackConnectionManager.h"


+ 13
- 4
common/JackConstants.h View File

@@ -20,8 +20,12 @@
#ifndef __JackConstants__
#define __JackConstants__

namespace Jack
{
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif

//namespace Jack
//{

#define VERSION "1.90"

@@ -32,14 +36,19 @@ namespace Jack

#define JACK_CLIENT_NAME_SIZE 64

#define FIRST_AVAILABLE_PORT 1
#ifndef PORT_NUM
#define PORT_NUM 512
#endif

#define DRIVER_PORT_NUM 256
#define PORT_NUM_FOR_CLIENT 256
#define FIRST_AVAILABLE_PORT 1

#define CONNECTION_NUM_FOR_PORT 256

#ifndef CLIENT_NUM
#define CLIENT_NUM 64
#endif

#define AUDIO_DRIVER_REFNUM 0 // Audio driver is initialized first, it will get the refnum 0
#define FREEWHEEL_DRIVER_REFNUM 1 // Freewheel driver is initialized second, it will get the refnum 1
@@ -82,6 +91,6 @@ namespace Jack
#define EMPTY 0xFFFD
#define FREE 0xFFFC

} // end of namespace
//} // end of namespace

#endif

+ 0
- 4
common/JackControlAPI.cpp View File

@@ -20,10 +20,6 @@

*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#ifndef WIN32
#include <stdbool.h>
#include <stdint.h>


+ 0
- 4
common/JackDebugClient.cpp View File

@@ -17,10 +17,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include "JackDebugClient.h"
#include "JackEngineControl.h"
#include "JackError.h"


+ 0
- 4
common/JackDriver.cpp View File

@@ -18,10 +18,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include "JackSystemDeps.h"
#include "JackDriver.h"
#include "JackTime.h"


+ 1
- 6
common/JackDriverLoader.cpp View File

@@ -18,23 +18,18 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include "JackSystemDeps.h"
#include "JackDriverLoader.h"
#include "JackConstants.h"
#include "JackError.h"
#include <getopt.h>
#include <stdio.h>
#include <errno.h>

#ifndef WIN32
#include <dirent.h>
#endif

#include <errno.h>

jack_driver_desc_t * jackctl_driver_get_desc(jackctl_driver_t * driver);

static void


+ 0
- 4
common/JackDummyDriver.cpp View File

@@ -18,10 +18,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include "JackDummyDriver.h"
#include "JackEngineControl.h"
#include "JackGraphManager.h"


+ 0
- 4
common/JackEngine.cpp View File

@@ -17,10 +17,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include <iostream>
#include <fstream>
#include <assert.h>


+ 0
- 4
common/JackEngineControl.cpp View File

@@ -18,10 +18,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include "JackClientInterface.h"
#include "JackEngineControl.h"
#include "JackGraphManager.h"


+ 0
- 4
common/JackEngineTiming.cpp View File

@@ -18,10 +18,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include "JackEngineTiming.h"
#include "JackGraphManager.h"
#include "JackClientControl.h"


+ 0
- 4
common/JackError.cpp View File

@@ -19,10 +19,6 @@

*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include <stdarg.h>
#include <stdio.h>
#include "JackError.h"


+ 0
- 4
common/JackExternalClient.cpp View File

@@ -18,10 +18,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include "JackExternalClient.h"
#include "JackClientControl.h"
#include "JackGlobals.h"


+ 0
- 4
common/JackFrameTimer.cpp View File

@@ -18,10 +18,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include "JackFrameTimer.h"
#include "JackError.h"
#include <math.h>


+ 0
- 5
common/JackFreewheelDriver.cpp View File

@@ -18,12 +18,7 @@

*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include "JackSystemDeps.h"

#include "JackFreewheelDriver.h"
#include "JackEngineControl.h"
#include "JackLockedEngine.h"


+ 0
- 4
common/JackGlobals.cpp View File

@@ -17,10 +17,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include "JackGlobals.h"

static bool gKeyRealtimeInitialized = false;


+ 0
- 4
common/JackGraphManager.cpp View File

@@ -18,10 +18,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include "JackGraphManager.h"
#include "JackConstants.h"
#include "JackError.h"


+ 0
- 4
common/JackInternalClient.cpp View File

@@ -18,10 +18,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include "JackSystemDeps.h"

#ifndef WIN32


+ 0
- 4
common/JackLibAPI.cpp View File

@@ -18,10 +18,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include "JackDebugClient.h"
#include "JackLibClient.h"
#include "JackChannel.h"


+ 0
- 4
common/JackLibClient.cpp View File

@@ -17,10 +17,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include "JackLibClient.h"
#include "JackTime.h"
#include "JackLibGlobals.h"


+ 0
- 5
common/JackLoopbackDriver.cpp View File

@@ -18,12 +18,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include "JackSystemDeps.h"

#include "JackLoopbackDriver.h"
#include "JackEngineControl.h"
#include "JackGraphManager.h"


+ 0
- 4
common/JackMessageBuffer.cpp View File

@@ -27,10 +27,6 @@
*
*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include "JackMessageBuffer.h"
#include "JackGlobals.h"
#include "JackError.h"


+ 0
- 4
common/JackMidiAPI.cpp View File

@@ -18,10 +18,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include "JackError.h"
#include "JackMidiPort.h"
#include "JackCompilerDeps.h"


+ 0
- 4
common/JackMidiPort.cpp View File

@@ -18,10 +18,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include "JackError.h"
#include "JackPortType.h"
#include "JackMidiPort.h"


+ 1
- 3
common/JackNetDriver.cpp View File

@@ -19,12 +19,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

#include "JackNetDriver.h"
#include "JackEngineControl.h"
#include "JackClientControl.h"
#include "JackGraphManager.h"
#include "JackDriverLoader.h"
#include "JackThreadedDriver.h"
#include "JackWaitThreadedDriver.h"


using namespace std;

namespace Jack


+ 0
- 4
common/JackNetInterface.h View File

@@ -21,10 +21,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#ifndef __JackNetInterface__
#define __JackNetInterface__

#ifdef HAVE_CONFIG_H
#include "config.h"
#endif

#include "JackNetTool.h"

namespace Jack


+ 0
- 4
common/JackPort.cpp View File

@@ -18,10 +18,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include "JackPort.h"
#include "JackError.h"
#include "JackPortType.h"


+ 0
- 4
common/JackPortType.cpp View File

@@ -17,10 +17,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include "JackPortType.h"
#include <string.h>
#include <assert.h>


+ 0
- 5
common/JackRestartThreadedDriver.cpp View File

@@ -18,12 +18,7 @@

*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include "JackSystemDeps.h"

#include "JackRestartThreadedDriver.h"
#include "JackException.h"



+ 0
- 4
common/JackServer.cpp View File

@@ -18,10 +18,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include "JackSystemDeps.h"
#include "JackServer.h"
#include "JackTime.h"


+ 0
- 4
common/JackServerAPI.cpp View File

@@ -18,10 +18,6 @@ This program is free software; you can redistribute it and/or modify

*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include "JackSystemDeps.h"
#include "JackGraphManager.h"
#include "JackInternalClient.h"


+ 0
- 4
common/JackServerGlobals.cpp View File

@@ -17,10 +17,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include "JackServerGlobals.h"
#include "JackTools.h"
#include "shm.h"


+ 0
- 4
common/JackShmMem.cpp View File

@@ -18,10 +18,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include "JackError.h"
#include "JackShmMem.h"
#include <stdio.h>


+ 0
- 5
common/JackThreadedDriver.cpp View File

@@ -18,12 +18,7 @@

*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include "JackSystemDeps.h"

#include "JackThreadedDriver.h"
#include "JackError.h"
#include "JackGlobals.h"


+ 0
- 4
common/JackTools.cpp View File

@@ -17,10 +17,6 @@

*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include "JackConstants.h"
#include "JackDriverLoader.h"
#include "JackTools.h"


+ 0
- 4
common/JackTransportEngine.cpp View File

@@ -18,10 +18,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include "JackTransportEngine.h"
#include "JackClientInterface.h"
#include "JackClientControl.h"


+ 0
- 5
common/JackWaitThreadedDriver.cpp View File

@@ -18,12 +18,7 @@

*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include "JackSystemDeps.h"

#include "JackWaitThreadedDriver.h"
#include "JackGlobals.h"
#include "JackClient.h"


+ 0
- 4
common/Jackdmp.cpp View File

@@ -18,10 +18,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include <iostream>
#include <assert.h>
#include <cassert>


+ 0
- 4
common/ringbuffer.c View File

@@ -20,10 +20,6 @@
This is safe for the case of one read thread and one write thread.
*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include <stdlib.h>
#include <string.h>
#ifdef USE_MLOCK


+ 1
- 3
common/shm.c View File

@@ -31,9 +31,7 @@
*
*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif
#include "JackConstants.h"
#ifdef WIN32
#include <process.h>


+ 0
- 1
common/shm.h View File

@@ -6,7 +6,6 @@
#include "types.h"
#include "JackCompilerDeps.h"


#define TRUE 1
#define FALSE 0



+ 0
- 4
common/timestamps.c View File

@@ -17,10 +17,6 @@

*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include <stdlib.h>
#include <string.h>
#include "timestamps.h"


+ 0
- 4
linux/alsa/JackAlsaAdapter.cpp View File

@@ -17,10 +17,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include "JackAlsaAdapter.h"
#include "JackServer.h"
#include "JackEngineControl.h"


+ 2
- 9
linux/alsa/JackAlsaDriver.cpp View File

@@ -18,13 +18,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include <iostream>
#include <unistd.h>

#include <math.h>
#include <stdio.h>
#include <memory.h>
@@ -44,7 +39,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#include "JackPort.h"
#include "JackGraphManager.h"
#include "JackLockedEngine.h"

#include "JackPosixThread.h"
#include "JackCompilerDeps.h"
#include "hammerfall.h"
#include "hdsp.h"
#include "ice1712.h"
@@ -52,9 +48,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#include "generic.h"
#include "memops.h"

#include "JackPosixThread.h"
#include "JackCompilerDeps.h"

namespace Jack
{



+ 0
- 1
linux/alsa/alsa_driver.h View File

@@ -36,7 +36,6 @@
#include "hardware.h"
#include "driver.h"
#include "memops.h"

#include "alsa_midi.h"

typedef void (*ReadCopyFunction) (jack_default_audio_sample_t *dst, char *src,


+ 3
- 5
linux/alsa/alsa_midi_impl.h View File

@@ -19,6 +19,7 @@
#ifndef __jack_alsa_midi_impl_h__
#define __jack_alsa_midi_impl_h__

#include "JackConstants.h"

#ifdef JACKMP

@@ -59,12 +60,11 @@ extern "C"

#else // usual jack

#include "jack/jack.h"
#include "jack/thread.h"
#include "jack.h"
#include "thread.h"

#endif


#if defined(STANDALONE)
#define MESSAGE(...) fprintf(stderr, __VA_ARGS__)
#elif !defined(JACKMP)
@@ -80,8 +80,6 @@ extern "C"
#define debug_log(...)
#endif


#include "alsa_midi.h"


#endif /* __jack_alsa_midi_impl_h__ */

+ 0
- 4
linux/alsa/alsa_midi_jackmp.cpp View File

@@ -16,10 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include "JackAlsaDriver.h"
#include "JackPort.h"
#include "alsa_midi_impl.h"


+ 2
- 6
linux/alsa/alsa_rawmidi.c View File

@@ -18,10 +18,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

/* Required for clock_nanosleep(). Thanks, Nedko */
#define _GNU_SOURCE

@@ -33,9 +29,9 @@
#include <limits.h>
#include <ctype.h>
#include <alsa/asoundlib.h>
#include <jack/ringbuffer.h>
#include <jack/midiport.h>

#include "ringbuffer.h"
#include "midiport.h"
#include "alsa_midi_impl.h"
#include "midi_pack.h"
#include "midi_unpack.h"


+ 3
- 6
linux/alsa/alsa_seqmidi.c View File

@@ -38,13 +38,8 @@
* create new ports or mark existing as dead
*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include <alsa/asoundlib.h>
#include <jack/midiport.h>
#include <jack/ringbuffer.h>

#include <stdlib.h>
#include <stdio.h>
#include <signal.h>
@@ -53,6 +48,8 @@
#include <time.h>
#include <ctype.h>

#include "midiport.h"
#include "ringbuffer.h"
#include "alsa_midi_impl.h"
#include "JackError.h"



+ 0
- 4
linux/alsa/generic_hw.c View File

@@ -18,10 +18,6 @@
$Id: generic_hw.c,v 1.2 2005/08/29 10:36:28 letz Exp $
*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include "hardware.h"
#include "alsa_driver.h"



+ 0
- 4
linux/alsa/hammerfall.c View File

@@ -18,10 +18,6 @@
$Id: hammerfall.c,v 1.3 2005/09/29 14:51:59 letz Exp $
*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include "hardware.h"
#include "alsa_driver.h"
#include "hammerfall.h"


+ 0
- 4
linux/alsa/hdsp.c View File

@@ -19,10 +19,6 @@
$Id: hdsp.c,v 1.3 2005/09/29 14:51:59 letz Exp $
*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include "hardware.h"
#include "alsa_driver.h"
#include "hdsp.h"


+ 0
- 6
linux/alsa/ice1712.c View File

@@ -21,12 +21,6 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

//#include <jack/hardware.h>

#include "hardware.h"
#include "alsa_driver.h"
#include "ice1712.h"


+ 0
- 4
linux/alsa/memops.c View File

@@ -18,10 +18,6 @@
$Id: memops.c,v 1.2 2005/08/29 10:36:28 letz Exp $
*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#define _ISOC9X_SOURCE 1
#define _ISOC99_SOURCE 1



+ 0
- 4
linux/alsa/usx2y.c View File

@@ -18,10 +18,6 @@

*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include "hardware.h"
#include "alsa_driver.h"
#include "usx2y.h"


+ 0
- 5
linux/firewire/JackFFADODriver.cpp View File

@@ -19,13 +19,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include <iostream>
#include <unistd.h>

#include <math.h>
#include <stdio.h>
#include <memory.h>


+ 0
- 5
linux/freebob/JackFreebobDriver.cpp View File

@@ -19,13 +19,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include <iostream>
#include <unistd.h>

#include <math.h>
#include <stdio.h>
#include <memory.h>


+ 0
- 4
macosx/JackMacEngineRPC.cpp View File

@@ -17,10 +17,6 @@ This program is free software; you can redistribute it and/or modify

*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include "JackServer.h"
#include "JackLockedEngine.h"
#include "JackRPCEngine.h"


+ 0
- 4
macosx/JackMacLibClientRPC.cpp View File

@@ -17,10 +17,6 @@ This program is free software; you can redistribute it and/or modify

*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include "JackLibClient.h"
#include "JackMachClientChannel.h"
#include "JackRPCEngine.h"


+ 0
- 4
macosx/JackMachClientChannel.cpp View File

@@ -17,10 +17,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include "JackMachClientChannel.h"
#include "JackRPCEngine.h"
#include "JackRPCClientServer.c"


+ 0
- 4
macosx/JackMachNotifyChannel.cpp View File

@@ -17,10 +17,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include "JackMachNotifyChannel.h"
#include "JackRPCClient.h"
#include "JackError.h"


+ 0
- 4
macosx/JackMachPort.cpp View File

@@ -17,10 +17,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include "JackMachPort.h"
#include "JackError.h"



+ 0
- 4
macosx/JackMachSemaphore.cpp View File

@@ -17,10 +17,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include "JackMachSemaphore.h"
#include "JackError.h"
#include <stdio.h>


+ 0
- 4
macosx/JackMachServerChannel.cpp View File

@@ -17,10 +17,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include "JackMachServerChannel.h"
#include "JackRPCEngineServer.c"
#include "JackError.h"


+ 0
- 4
macosx/JackMachServerNotifyChannel.cpp View File

@@ -17,10 +17,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include "JackMachServerNotifyChannel.h"
#include "JackRPCEngineUser.c"
#include "JackConstants.h"


+ 0
- 4
macosx/JackMachThread.cpp View File

@@ -18,10 +18,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include "JackMachThread.h"
#include "JackError.h"



+ 0
- 4
macosx/JackMachTime.c View File

@@ -18,10 +18,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include "JackTime.h"
#include "JackError.h"
#include <mach/mach_time.h>


+ 0
- 4
macosx/coreaudio/JackCoreAudioAdapter.cpp View File

@@ -17,10 +17,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include "JackCoreAudioAdapter.h"
#include "JackError.h"
#include <unistd.h>


+ 0
- 4
macosx/coreaudio/JackCoreAudioDriver.cpp View File

@@ -17,10 +17,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include "JackCoreAudioDriver.h"
#include "JackEngineControl.h"
#include "JackMachThread.h"


+ 0
- 4
posix/JackPosixSemaphore.cpp View File

@@ -17,10 +17,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include "JackPosixSemaphore.h"
#include "JackConstants.h"
#include "JackError.h"


+ 0
- 4
posix/JackPosixServerLaunch.cpp View File

@@ -18,10 +18,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#ifndef JACK_LOCATION
#include "config.h"
#endif


+ 0
- 4
posix/JackPosixThread.cpp View File

@@ -18,10 +18,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include "JackPosixThread.h"
#include "JackError.h"
#include "JackTime.h"


+ 0
- 4
posix/JackProcessSync.cpp View File

@@ -17,10 +17,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include "JackProcessSync.h"
#include "JackError.h"



+ 0
- 4
posix/JackSocket.cpp View File

@@ -17,10 +17,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include "JackSocket.h"
#include "JackError.h"
#include <string.h>


+ 0
- 4
posix/JackSocketClientChannel.cpp View File

@@ -17,10 +17,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include "JackSocketClientChannel.h"
#include "JackRequest.h"
#include "JackClient.h"


+ 0
- 4
posix/JackSocketNotifyChannel.cpp View File

@@ -17,10 +17,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include "JackRequest.h"
#include "JackSocketNotifyChannel.h"
#include "JackError.h"


+ 0
- 4
posix/JackSocketServerChannel.cpp View File

@@ -17,10 +17,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include "JackSocketServerChannel.h"
#include "JackRequest.h"
#include "JackServer.h"


+ 0
- 4
posix/JackSocketServerNotifyChannel.cpp View File

@@ -17,10 +17,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include "JackSocketServerNotifyChannel.h"
#include "JackError.h"
#include "JackRequest.h"


+ 0
- 4
windows/JackWinEvent.cpp View File

@@ -17,10 +17,6 @@ This program is free software; you can redistribute it and/or modify

*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include "JackWinEvent.h"
#include "JackError.h"
#include <assert.h>


+ 0
- 4
windows/JackWinNamedPipe.cpp View File

@@ -17,10 +17,6 @@ This program is free software; you can redistribute it and/or modify

*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include "JackWinNamedPipe.h"
#include "JackError.h"
#include <assert.h>


+ 0
- 4
windows/JackWinNamedPipeClientChannel.cpp View File

@@ -17,10 +17,6 @@ Copyright (C) 2004-2006 Grame

*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include "JackWinNamedPipeClientChannel.h"
#include "JackRequest.h"
#include "JackClient.h"


+ 0
- 4
windows/JackWinNamedPipeNotifyChannel.cpp View File

@@ -17,10 +17,6 @@ Copyright (C) 2004-2006 Grame

*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include "JackRequest.h"
#include "JackWinNamedPipeNotifyChannel.h"
#include "JackError.h"


+ 0
- 4
windows/JackWinNamedPipeServerChannel.cpp View File

@@ -17,10 +17,6 @@ Copyright (C) 2004-2006 Grame

*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include "JackWinNamedPipeServerChannel.h"
#include "JackNotification.h"
#include "JackRequest.h"


+ 0
- 4
windows/JackWinNamedPipeServerNotifyChannel.cpp View File

@@ -17,10 +17,6 @@ This program is free software; you can redistribute it and/or modify

*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include "JackWinNamedPipeServerNotifyChannel.h"
#include "JackError.h"
#include "JackRequest.h"


+ 2
- 6
windows/JackWinProcessSync.cpp View File

@@ -17,12 +17,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include "JackWinProcessSync.h"
#include "JackError.h"
#include "JackWinProcessSync.h"
#include "JackError.h"

namespace Jack
{


+ 0
- 4
windows/JackWinSemaphore.cpp View File

@@ -17,10 +17,6 @@ This program is free software; you can redistribute it and/or modify

*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include "JackWinSemaphore.h"
#include "JackError.h"
#include <stdio.h>


+ 0
- 4
windows/JackWinServerLaunch.cpp View File

@@ -18,10 +18,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif
#include "JackServerLaunch.h"
int try_start_server(jack_varargs_t* va, jack_options_t options, jack_status_t* status)


+ 0
- 4
windows/JackWinThread.cpp View File

@@ -18,10 +18,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include "JackWinThread.h"
#include "JackError.h"
#include "JackTime.h"


+ 0
- 4
windows/portaudio/JackPortAudioDriver.cpp View File

@@ -17,10 +17,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

*/

#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif

#include "JackDriverLoader.h"
#include "driver_interface.h"
#include "JackPortAudioDriver.h"


+ 9
- 1
wscript View File

@@ -66,6 +66,8 @@ def set_options(opt):
opt.add_option('--dbus', action='store_true', default=False, help='Enable D-Bus JACK (jackdbus)')
opt.add_option('--doxygen', action='store_true', default=False, help='Enable build of doxygen documentation')
opt.add_option('--monitor', action='store_true', default=False, help='Build with monitoring records')
opt.add_option('--clients', default=64, type="int", dest="clients", help='Maximum number of JACK clients')
opt.add_option('--ports', default=512, type="int", dest="ports", help='Maximum number of ports')
opt.sub_options('dbus')

def configure(conf):
@@ -98,6 +100,9 @@ def configure(conf):
conf.env['BUILD_DOXYGEN_DOCS'] = Params.g_options.doxygen
conf.env['BUILD_WITH_MONITOR'] = Params.g_options.monitor

conf.define('CLIENT_NUM', Params.g_options.clients)
conf.define('PORT_NUM', Params.g_options. ports)

conf.define('ADDON_DIR', os.path.normpath(conf.env['PREFIX'] + '/lib/jack'))
conf.define('JACK_LOCATION', os.path.normpath(conf.env['PREFIX'] + '/bin'))
conf.define('__SMP__', 1)
@@ -124,12 +129,15 @@ def configure(conf):
else:
version_msg += " svn revision will checked and eventually updated during build"
print version_msg
print

print "Build with a maximum of %d JACK clients" % conf.env['CLIENT_NUM']
print "Build with a maximum of %d ports" % conf.env['PORT_NUM']
display_msg("Install prefix", conf.env['PREFIX'], 'CYAN')
display_msg("Drivers directory", conf.env['ADDON_DIR'], 'CYAN')
display_feature('Build doxygen documentation', conf.env['BUILD_DOXYGEN_DOCS'])
display_feature('Build with monitoring records', conf.env['BUILD_WITH_MONITOR'])
if conf.env['IS_LINUX']:
display_feature('Build with ALSA support', conf.env['BUILD_DRIVER_ALSA'] == True)
display_feature('Build with FireWire (FreeBob) support', conf.env['BUILD_DRIVER_FREEBOB'] == True)


Loading…
Cancel
Save