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

ChangeLog

@@ -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>
 	

common/JackAPI.cpp

@@ -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"

common/JackActivationCount.cpp

@@ -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"

common/JackAudioAdapterInterface.h

@@ -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"

common/JackAudioDriver.cpp

@@ -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"

common/JackAudioPort.cpp

@@ -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>
 

common/JackClient.cpp

@@ -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"

common/JackConnectionManager.cpp

@@ -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"

common/JackConstants.h

@@ -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

common/JackControlAPI.cpp

@@ -20,10 +20,6 @@
 
 */
 
-#if defined(HAVE_CONFIG_H)
-#include "config.h"
-#endif
-
 #ifndef WIN32
 #include <stdbool.h>
 #include <stdint.h>

common/JackDebugClient.cpp

@@ -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"

common/JackDriver.cpp

@@ -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"

common/JackDriverLoader.cpp

@@ -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

common/JackDummyDriver.cpp

@@ -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"

common/JackEngine.cpp

@@ -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>

common/JackEngineControl.cpp

@@ -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"

common/JackEngineTiming.cpp

@@ -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"

common/JackError.cpp

@@ -19,10 +19,6 @@
 
 */
 
-#if defined(HAVE_CONFIG_H)
-#include "config.h"
-#endif
-
 #include <stdarg.h>
 #include <stdio.h>
 #include "JackError.h"

common/JackExternalClient.cpp

@@ -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"

common/JackFrameTimer.cpp

@@ -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>

common/JackFreewheelDriver.cpp

@@ -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"

common/JackGlobals.cpp

@@ -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;

common/JackGraphManager.cpp

@@ -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"

common/JackInternalClient.cpp

@@ -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

common/JackLibAPI.cpp

@@ -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"

common/JackLibClient.cpp

@@ -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"

common/JackLoopbackDriver.cpp

@@ -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"

common/JackMessageBuffer.cpp

@@ -27,10 +27,6 @@
  *
  */
 
-#if defined(HAVE_CONFIG_H)
-#include "config.h"
-#endif
-
 #include "JackMessageBuffer.h"
 #include "JackGlobals.h"
 #include "JackError.h"

common/JackMidiAPI.cpp

@@ -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"

common/JackMidiPort.cpp

@@ -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"

common/JackNetDriver.cpp

@@ -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

common/JackNetInterface.h

@@ -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

common/JackPort.cpp

@@ -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"

common/JackPortType.cpp

@@ -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>

common/JackRestartThreadedDriver.cpp

@@ -18,12 +18,7 @@
 
 */
 
-#if defined(HAVE_CONFIG_H)
-#include "config.h"
-#endif
-
 #include "JackSystemDeps.h"
-
 #include "JackRestartThreadedDriver.h"
 #include "JackException.h"
 

common/JackServer.cpp

@@ -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"

common/JackServerAPI.cpp

@@ -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"

common/JackServerGlobals.cpp

@@ -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"

common/JackShmMem.cpp

@@ -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>

common/JackThreadedDriver.cpp

@@ -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"

common/JackTools.cpp

@@ -17,10 +17,6 @@
 
 */
 
-#if defined(HAVE_CONFIG_H)
-#include "config.h"
-#endif
-
 #include "JackConstants.h"
 #include "JackDriverLoader.h"
 #include "JackTools.h"

common/JackTransportEngine.cpp

@@ -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"

common/JackWaitThreadedDriver.cpp

@@ -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"

common/Jackdmp.cpp

@@ -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>

common/ringbuffer.c

@@ -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

common/shm.c

@@ -31,9 +31,7 @@
  *
  */
 
-#if defined(HAVE_CONFIG_H)
-#include "config.h"
-#endif
+#include "JackConstants.h"
  
 #ifdef WIN32
 #include <process.h>

common/shm.h

@@ -6,7 +6,6 @@
 #include "types.h"
 #include "JackCompilerDeps.h"
 
-
 #define TRUE 1
 #define FALSE 0
 

common/timestamps.c

@@ -17,10 +17,6 @@
 
 */
 
-#if defined(HAVE_CONFIG_H)
-#include "config.h"
-#endif
-
 #include <stdlib.h>
 #include <string.h>
 #include "timestamps.h"

linux/alsa/JackAlsaAdapter.cpp

@@ -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"

linux/alsa/JackAlsaDriver.cpp

@@ -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
 {
 

linux/alsa/alsa_driver.h

@@ -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,

linux/alsa/alsa_midi_impl.h

@@ -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__ */

linux/alsa/alsa_midi_jackmp.cpp

@@ -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"

linux/alsa/alsa_rawmidi.c

@@ -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"

linux/alsa/alsa_seqmidi.c

@@ -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"
 

linux/alsa/generic_hw.c

@@ -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"
 

linux/alsa/hammerfall.c

@@ -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"

linux/alsa/hdsp.c

@@ -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"

linux/alsa/ice1712.c

@@ -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"

linux/alsa/memops.c

@@ -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
 

linux/alsa/usx2y.c

@@ -18,10 +18,6 @@
 
 */
 
-#if defined(HAVE_CONFIG_H)
-#include "config.h"
-#endif
-
 #include "hardware.h"
 #include "alsa_driver.h"
 #include "usx2y.h"

linux/firewire/JackFFADODriver.cpp

@@ -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>

linux/freebob/JackFreebobDriver.cpp

@@ -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>

macosx/JackMacEngineRPC.cpp

@@ -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"

macosx/JackMacLibClientRPC.cpp

@@ -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"

macosx/JackMachClientChannel.cpp

@@ -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"

macosx/JackMachNotifyChannel.cpp

@@ -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"

macosx/JackMachPort.cpp

@@ -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"
 

macosx/JackMachSemaphore.cpp

@@ -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>

macosx/JackMachServerChannel.cpp

@@ -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"

macosx/JackMachServerNotifyChannel.cpp

@@ -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"

macosx/JackMachThread.cpp

@@ -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"
 

macosx/JackMachTime.c

@@ -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>

macosx/coreaudio/JackCoreAudioAdapter.cpp

@@ -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>

macosx/coreaudio/JackCoreAudioDriver.cpp

@@ -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"

posix/JackPosixSemaphore.cpp

@@ -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"

posix/JackPosixServerLaunch.cpp

@@ -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

posix/JackPosixThread.cpp

@@ -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"

posix/JackProcessSync.cpp

@@ -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"
 

posix/JackSocket.cpp

@@ -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>

posix/JackSocketClientChannel.cpp

@@ -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"

posix/JackSocketNotifyChannel.cpp

@@ -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"

posix/JackSocketServerChannel.cpp

@@ -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"

posix/JackSocketServerNotifyChannel.cpp

@@ -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"

windows/JackWinEvent.cpp

@@ -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>

windows/JackWinNamedPipe.cpp

@@ -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>

windows/JackWinNamedPipeClientChannel.cpp

@@ -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"

windows/JackWinNamedPipeNotifyChannel.cpp

@@ -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"

windows/JackWinNamedPipeServerChannel.cpp

@@ -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"

windows/JackWinNamedPipeServerNotifyChannel.cpp

@@ -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"

windows/JackWinProcessSync.cpp

@@ -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
 {

windows/JackWinSemaphore.cpp

@@ -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>

windows/JackWinServerLaunch.cpp

@@ -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)

windows/JackWinThread.cpp

@@ -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"

windows/portaudio/JackPortAudioDriver.cpp

@@ -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"

wscript

@@ -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)