From f19b74f9043b90f3878d91cf5c75dc78f1efcfac Mon Sep 17 00:00:00 2001 From: sletz Date: Thu, 2 Oct 2008 13:58:46 +0000 Subject: [PATCH] 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 | 1 + common/JackAPI.cpp | 4 ---- common/JackActivationCount.cpp | 4 ---- common/JackAudioAdapterInterface.h | 4 ---- common/JackAudioDriver.cpp | 5 ----- common/JackAudioPort.cpp | 4 ---- common/JackClient.cpp | 4 ---- common/JackConnectionManager.cpp | 4 ---- common/JackConstants.h | 17 +++++++++++++---- common/JackControlAPI.cpp | 4 ---- common/JackDebugClient.cpp | 4 ---- common/JackDriver.cpp | 4 ---- common/JackDriverLoader.cpp | 7 +------ common/JackDummyDriver.cpp | 4 ---- common/JackEngine.cpp | 4 ---- common/JackEngineControl.cpp | 4 ---- common/JackEngineTiming.cpp | 4 ---- common/JackError.cpp | 4 ---- common/JackExternalClient.cpp | 4 ---- common/JackFrameTimer.cpp | 4 ---- common/JackFreewheelDriver.cpp | 5 ----- common/JackGlobals.cpp | 4 ---- common/JackGraphManager.cpp | 4 ---- common/JackInternalClient.cpp | 4 ---- common/JackLibAPI.cpp | 4 ---- common/JackLibClient.cpp | 4 ---- common/JackLoopbackDriver.cpp | 5 ----- common/JackMessageBuffer.cpp | 4 ---- common/JackMidiAPI.cpp | 4 ---- common/JackMidiPort.cpp | 4 ---- common/JackNetDriver.cpp | 4 +--- common/JackNetInterface.h | 4 ---- common/JackPort.cpp | 4 ---- common/JackPortType.cpp | 4 ---- common/JackRestartThreadedDriver.cpp | 5 ----- common/JackServer.cpp | 4 ---- common/JackServerAPI.cpp | 4 ---- common/JackServerGlobals.cpp | 4 ---- common/JackShmMem.cpp | 4 ---- common/JackThreadedDriver.cpp | 5 ----- common/JackTools.cpp | 4 ---- common/JackTransportEngine.cpp | 4 ---- common/JackWaitThreadedDriver.cpp | 5 ----- common/Jackdmp.cpp | 4 ---- common/ringbuffer.c | 4 ---- common/shm.c | 4 +--- common/shm.h | 1 - common/timestamps.c | 4 ---- linux/alsa/JackAlsaAdapter.cpp | 4 ---- linux/alsa/JackAlsaDriver.cpp | 11 ++--------- linux/alsa/alsa_driver.h | 1 - linux/alsa/alsa_midi_impl.h | 8 +++----- linux/alsa/alsa_midi_jackmp.cpp | 4 ---- linux/alsa/alsa_rawmidi.c | 8 ++------ linux/alsa/alsa_seqmidi.c | 9 +++------ linux/alsa/generic_hw.c | 4 ---- linux/alsa/hammerfall.c | 4 ---- linux/alsa/hdsp.c | 4 ---- linux/alsa/ice1712.c | 6 ------ linux/alsa/memops.c | 4 ---- linux/alsa/usx2y.c | 4 ---- linux/firewire/JackFFADODriver.cpp | 5 ----- linux/freebob/JackFreebobDriver.cpp | 5 ----- macosx/JackMacEngineRPC.cpp | 4 ---- macosx/JackMacLibClientRPC.cpp | 4 ---- macosx/JackMachClientChannel.cpp | 4 ---- macosx/JackMachNotifyChannel.cpp | 4 ---- macosx/JackMachPort.cpp | 4 ---- macosx/JackMachSemaphore.cpp | 4 ---- macosx/JackMachServerChannel.cpp | 4 ---- macosx/JackMachServerNotifyChannel.cpp | 4 ---- macosx/JackMachThread.cpp | 4 ---- macosx/JackMachTime.c | 4 ---- macosx/coreaudio/JackCoreAudioAdapter.cpp | 4 ---- macosx/coreaudio/JackCoreAudioDriver.cpp | 4 ---- posix/JackPosixSemaphore.cpp | 4 ---- posix/JackPosixServerLaunch.cpp | 4 ---- posix/JackPosixThread.cpp | 4 ---- posix/JackProcessSync.cpp | 4 ---- posix/JackSocket.cpp | 4 ---- posix/JackSocketClientChannel.cpp | 4 ---- posix/JackSocketNotifyChannel.cpp | 4 ---- posix/JackSocketServerChannel.cpp | 4 ---- posix/JackSocketServerNotifyChannel.cpp | 4 ---- windows/JackWinEvent.cpp | 4 ---- windows/JackWinNamedPipe.cpp | 4 ---- windows/JackWinNamedPipeClientChannel.cpp | 4 ---- windows/JackWinNamedPipeNotifyChannel.cpp | 4 ---- windows/JackWinNamedPipeServerChannel.cpp | 4 ---- windows/JackWinNamedPipeServerNotifyChannel.cpp | 4 ---- windows/JackWinProcessSync.cpp | 8 ++------ windows/JackWinSemaphore.cpp | 4 ---- windows/JackWinServerLaunch.cpp | 4 ---- windows/JackWinThread.cpp | 4 ---- windows/portaudio/JackPortAudioDriver.cpp | 4 ---- wscript | 10 +++++++++- 96 files changed, 38 insertions(+), 393 deletions(-) diff --git a/ChangeLog b/ChangeLog index bdd6e23b..88223b3d 100644 --- a/ChangeLog +++ b/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 diff --git a/common/JackAPI.cpp b/common/JackAPI.cpp index ddb62d72..478db8bc 100644 --- a/common/JackAPI.cpp +++ b/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" diff --git a/common/JackActivationCount.cpp b/common/JackActivationCount.cpp index 839b25f1..1b266405 100644 --- a/common/JackActivationCount.cpp +++ b/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" diff --git a/common/JackAudioAdapterInterface.h b/common/JackAudioAdapterInterface.h index fd280aee..74b6bbfd 100644 --- a/common/JackAudioAdapterInterface.h +++ b/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" diff --git a/common/JackAudioDriver.cpp b/common/JackAudioDriver.cpp index 14df7bc0..57d92724 100644 --- a/common/JackAudioDriver.cpp +++ b/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" diff --git a/common/JackAudioPort.cpp b/common/JackAudioPort.cpp index a447d2e0..765c3c4e 100644 --- a/common/JackAudioPort.cpp +++ b/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 diff --git a/common/JackClient.cpp b/common/JackClient.cpp index 3b98c767..a94e00f3 100644 --- a/common/JackClient.cpp +++ b/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" diff --git a/common/JackConnectionManager.cpp b/common/JackConnectionManager.cpp index d7fb0365..1b0a4e01 100644 --- a/common/JackConnectionManager.cpp +++ b/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 #include #include "JackConnectionManager.h" diff --git a/common/JackConstants.h b/common/JackConstants.h index 38965f45..b92540e3 100644 --- a/common/JackConstants.h +++ b/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 diff --git a/common/JackControlAPI.cpp b/common/JackControlAPI.cpp index eb738d4a..319afea5 100644 --- a/common/JackControlAPI.cpp +++ b/common/JackControlAPI.cpp @@ -20,10 +20,6 @@ */ -#if defined(HAVE_CONFIG_H) -#include "config.h" -#endif - #ifndef WIN32 #include #include diff --git a/common/JackDebugClient.cpp b/common/JackDebugClient.cpp index 5d0660b6..3ff29b7d 100644 --- a/common/JackDebugClient.cpp +++ b/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" diff --git a/common/JackDriver.cpp b/common/JackDriver.cpp index 26c218e8..79aec599 100644 --- a/common/JackDriver.cpp +++ b/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" diff --git a/common/JackDriverLoader.cpp b/common/JackDriverLoader.cpp index ef7bb565..a2f286d7 100644 --- a/common/JackDriverLoader.cpp +++ b/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 #include +#include #ifndef WIN32 #include #endif -#include - jack_driver_desc_t * jackctl_driver_get_desc(jackctl_driver_t * driver); static void diff --git a/common/JackDummyDriver.cpp b/common/JackDummyDriver.cpp index 48016873..5f31cb88 100644 --- a/common/JackDummyDriver.cpp +++ b/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" diff --git a/common/JackEngine.cpp b/common/JackEngine.cpp index 7cc2fbd3..f6f113c3 100644 --- a/common/JackEngine.cpp +++ b/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 #include #include diff --git a/common/JackEngineControl.cpp b/common/JackEngineControl.cpp index 67b7deff..7a2f03ce 100644 --- a/common/JackEngineControl.cpp +++ b/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" diff --git a/common/JackEngineTiming.cpp b/common/JackEngineTiming.cpp index 5663ec82..12c74e93 100644 --- a/common/JackEngineTiming.cpp +++ b/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" diff --git a/common/JackError.cpp b/common/JackError.cpp index 305ab8ec..38c19bd1 100644 --- a/common/JackError.cpp +++ b/common/JackError.cpp @@ -19,10 +19,6 @@ */ -#if defined(HAVE_CONFIG_H) -#include "config.h" -#endif - #include #include #include "JackError.h" diff --git a/common/JackExternalClient.cpp b/common/JackExternalClient.cpp index c853de0e..c86f1d17 100644 --- a/common/JackExternalClient.cpp +++ b/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" diff --git a/common/JackFrameTimer.cpp b/common/JackFrameTimer.cpp index 6e4d1c37..bd6d9b53 100644 --- a/common/JackFrameTimer.cpp +++ b/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 diff --git a/common/JackFreewheelDriver.cpp b/common/JackFreewheelDriver.cpp index 5c4c713e..161c3897 100644 --- a/common/JackFreewheelDriver.cpp +++ b/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" diff --git a/common/JackGlobals.cpp b/common/JackGlobals.cpp index 8669d1aa..ca870d07 100644 --- a/common/JackGlobals.cpp +++ b/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; diff --git a/common/JackGraphManager.cpp b/common/JackGraphManager.cpp index 5b935060..d5c3585c 100644 --- a/common/JackGraphManager.cpp +++ b/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" diff --git a/common/JackInternalClient.cpp b/common/JackInternalClient.cpp index b6f777d3..8e596255 100644 --- a/common/JackInternalClient.cpp +++ b/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 diff --git a/common/JackLibAPI.cpp b/common/JackLibAPI.cpp index ed5c808c..e818408f 100644 --- a/common/JackLibAPI.cpp +++ b/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" diff --git a/common/JackLibClient.cpp b/common/JackLibClient.cpp index ed3d6fdb..39a854e6 100644 --- a/common/JackLibClient.cpp +++ b/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" diff --git a/common/JackLoopbackDriver.cpp b/common/JackLoopbackDriver.cpp index 868d67d3..3c9df5b0 100644 --- a/common/JackLoopbackDriver.cpp +++ b/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" diff --git a/common/JackMessageBuffer.cpp b/common/JackMessageBuffer.cpp index ae144ab9..4d202bee 100644 --- a/common/JackMessageBuffer.cpp +++ b/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" diff --git a/common/JackMidiAPI.cpp b/common/JackMidiAPI.cpp index 1367302d..b06a93a2 100644 --- a/common/JackMidiAPI.cpp +++ b/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" diff --git a/common/JackMidiPort.cpp b/common/JackMidiPort.cpp index 6df025e1..1a35cbb9 100644 --- a/common/JackMidiPort.cpp +++ b/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" diff --git a/common/JackNetDriver.cpp b/common/JackNetDriver.cpp index f735919e..4d3837a8 100644 --- a/common/JackNetDriver.cpp +++ b/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 diff --git a/common/JackNetInterface.h b/common/JackNetInterface.h index 04bac24e..1bd95fb3 100644 --- a/common/JackNetInterface.h +++ b/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 diff --git a/common/JackPort.cpp b/common/JackPort.cpp index da6622ed..bf01fcd9 100644 --- a/common/JackPort.cpp +++ b/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" diff --git a/common/JackPortType.cpp b/common/JackPortType.cpp index 5e3961ed..7f720805 100644 --- a/common/JackPortType.cpp +++ b/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 #include diff --git a/common/JackRestartThreadedDriver.cpp b/common/JackRestartThreadedDriver.cpp index 5bc7feac..125b1697 100644 --- a/common/JackRestartThreadedDriver.cpp +++ b/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" diff --git a/common/JackServer.cpp b/common/JackServer.cpp index 7a1a4ec0..216e0a3a 100644 --- a/common/JackServer.cpp +++ b/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" diff --git a/common/JackServerAPI.cpp b/common/JackServerAPI.cpp index b2f47819..50b5b83a 100644 --- a/common/JackServerAPI.cpp +++ b/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" diff --git a/common/JackServerGlobals.cpp b/common/JackServerGlobals.cpp index d2f2fb6d..ea1d7d20 100644 --- a/common/JackServerGlobals.cpp +++ b/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" diff --git a/common/JackShmMem.cpp b/common/JackShmMem.cpp index 3edb7318..9934ee0f 100644 --- a/common/JackShmMem.cpp +++ b/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 diff --git a/common/JackThreadedDriver.cpp b/common/JackThreadedDriver.cpp index cde17da4..9e72b91e 100644 --- a/common/JackThreadedDriver.cpp +++ b/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" diff --git a/common/JackTools.cpp b/common/JackTools.cpp index 48cec0b9..45744d2a 100644 --- a/common/JackTools.cpp +++ b/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" diff --git a/common/JackTransportEngine.cpp b/common/JackTransportEngine.cpp index 0b25f6b0..861b123e 100644 --- a/common/JackTransportEngine.cpp +++ b/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" diff --git a/common/JackWaitThreadedDriver.cpp b/common/JackWaitThreadedDriver.cpp index 6cd6fc96..f3632d8d 100644 --- a/common/JackWaitThreadedDriver.cpp +++ b/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" diff --git a/common/Jackdmp.cpp b/common/Jackdmp.cpp index fb74f9f2..eaeca361 100644 --- a/common/Jackdmp.cpp +++ b/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 #include #include diff --git a/common/ringbuffer.c b/common/ringbuffer.c index a495eb75..de4cb406 100644 --- a/common/ringbuffer.c +++ b/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 #include #ifdef USE_MLOCK diff --git a/common/shm.c b/common/shm.c index 35b67294..a5c0af15 100644 --- a/common/shm.c +++ b/common/shm.c @@ -31,9 +31,7 @@ * */ -#if defined(HAVE_CONFIG_H) -#include "config.h" -#endif +#include "JackConstants.h" #ifdef WIN32 #include diff --git a/common/shm.h b/common/shm.h index b6195948..c566f15f 100644 --- a/common/shm.h +++ b/common/shm.h @@ -6,7 +6,6 @@ #include "types.h" #include "JackCompilerDeps.h" - #define TRUE 1 #define FALSE 0 diff --git a/common/timestamps.c b/common/timestamps.c index 7e9a46d6..7a48e8a9 100644 --- a/common/timestamps.c +++ b/common/timestamps.c @@ -17,10 +17,6 @@ */ -#if defined(HAVE_CONFIG_H) -#include "config.h" -#endif - #include #include #include "timestamps.h" diff --git a/linux/alsa/JackAlsaAdapter.cpp b/linux/alsa/JackAlsaAdapter.cpp index ad739f77..2afffdfc 100644 --- a/linux/alsa/JackAlsaAdapter.cpp +++ b/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" diff --git a/linux/alsa/JackAlsaDriver.cpp b/linux/alsa/JackAlsaDriver.cpp index 00735857..2a615be8 100644 --- a/linux/alsa/JackAlsaDriver.cpp +++ b/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 #include - #include #include #include @@ -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 { diff --git a/linux/alsa/alsa_driver.h b/linux/alsa/alsa_driver.h index 9cd01202..13a78073 100644 --- a/linux/alsa/alsa_driver.h +++ b/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, diff --git a/linux/alsa/alsa_midi_impl.h b/linux/alsa/alsa_midi_impl.h index db2069bf..e71e823b 100644 --- a/linux/alsa/alsa_midi_impl.h +++ b/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__ */ diff --git a/linux/alsa/alsa_midi_jackmp.cpp b/linux/alsa/alsa_midi_jackmp.cpp index c984a696..1e276244 100644 --- a/linux/alsa/alsa_midi_jackmp.cpp +++ b/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" diff --git a/linux/alsa/alsa_rawmidi.c b/linux/alsa/alsa_rawmidi.c index 601078f4..8633bdb4 100644 --- a/linux/alsa/alsa_rawmidi.c +++ b/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 #include #include -#include -#include +#include "ringbuffer.h" +#include "midiport.h" #include "alsa_midi_impl.h" #include "midi_pack.h" #include "midi_unpack.h" diff --git a/linux/alsa/alsa_seqmidi.c b/linux/alsa/alsa_seqmidi.c index e5a99b72..ba8ffadd 100644 --- a/linux/alsa/alsa_seqmidi.c +++ b/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 -#include -#include + #include #include #include @@ -53,6 +48,8 @@ #include #include +#include "midiport.h" +#include "ringbuffer.h" #include "alsa_midi_impl.h" #include "JackError.h" diff --git a/linux/alsa/generic_hw.c b/linux/alsa/generic_hw.c index d05c1ec9..30e7f340 100644 --- a/linux/alsa/generic_hw.c +++ b/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" diff --git a/linux/alsa/hammerfall.c b/linux/alsa/hammerfall.c index d2bb972b..74f7941e 100644 --- a/linux/alsa/hammerfall.c +++ b/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" diff --git a/linux/alsa/hdsp.c b/linux/alsa/hdsp.c index 7665b81f..64dcb407 100644 --- a/linux/alsa/hdsp.c +++ b/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" diff --git a/linux/alsa/ice1712.c b/linux/alsa/ice1712.c index 177a03e9..96892210 100644 --- a/linux/alsa/ice1712.c +++ b/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 - #include "hardware.h" #include "alsa_driver.h" #include "ice1712.h" diff --git a/linux/alsa/memops.c b/linux/alsa/memops.c index 5280ce88..23a857f0 100644 --- a/linux/alsa/memops.c +++ b/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 diff --git a/linux/alsa/usx2y.c b/linux/alsa/usx2y.c index 7b1a2201..92236925 100644 --- a/linux/alsa/usx2y.c +++ b/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" diff --git a/linux/firewire/JackFFADODriver.cpp b/linux/firewire/JackFFADODriver.cpp index 41356e36..b2f233d3 100644 --- a/linux/firewire/JackFFADODriver.cpp +++ b/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 #include - #include #include #include diff --git a/linux/freebob/JackFreebobDriver.cpp b/linux/freebob/JackFreebobDriver.cpp index 065aa377..8881e66c 100644 --- a/linux/freebob/JackFreebobDriver.cpp +++ b/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 #include - #include #include #include diff --git a/macosx/JackMacEngineRPC.cpp b/macosx/JackMacEngineRPC.cpp index 0988968c..0303eb77 100644 --- a/macosx/JackMacEngineRPC.cpp +++ b/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" diff --git a/macosx/JackMacLibClientRPC.cpp b/macosx/JackMacLibClientRPC.cpp index 725c018e..07f5e51c 100644 --- a/macosx/JackMacLibClientRPC.cpp +++ b/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" diff --git a/macosx/JackMachClientChannel.cpp b/macosx/JackMachClientChannel.cpp index a5875575..17866ee9 100644 --- a/macosx/JackMachClientChannel.cpp +++ b/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" diff --git a/macosx/JackMachNotifyChannel.cpp b/macosx/JackMachNotifyChannel.cpp index 83dc202e..86236304 100644 --- a/macosx/JackMachNotifyChannel.cpp +++ b/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" diff --git a/macosx/JackMachPort.cpp b/macosx/JackMachPort.cpp index 2aeffae0..d0d236b7 100644 --- a/macosx/JackMachPort.cpp +++ b/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" diff --git a/macosx/JackMachSemaphore.cpp b/macosx/JackMachSemaphore.cpp index 8b2581ce..3e902752 100644 --- a/macosx/JackMachSemaphore.cpp +++ b/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 diff --git a/macosx/JackMachServerChannel.cpp b/macosx/JackMachServerChannel.cpp index d82510af..fc86e265 100644 --- a/macosx/JackMachServerChannel.cpp +++ b/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" diff --git a/macosx/JackMachServerNotifyChannel.cpp b/macosx/JackMachServerNotifyChannel.cpp index 9412e405..926011a9 100644 --- a/macosx/JackMachServerNotifyChannel.cpp +++ b/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" diff --git a/macosx/JackMachThread.cpp b/macosx/JackMachThread.cpp index bad943be..2d809c2a 100644 --- a/macosx/JackMachThread.cpp +++ b/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" diff --git a/macosx/JackMachTime.c b/macosx/JackMachTime.c index 7c4d38ad..f6f8f2eb 100644 --- a/macosx/JackMachTime.c +++ b/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 diff --git a/macosx/coreaudio/JackCoreAudioAdapter.cpp b/macosx/coreaudio/JackCoreAudioAdapter.cpp index 4746e99e..0d4e28f0 100644 --- a/macosx/coreaudio/JackCoreAudioAdapter.cpp +++ b/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 diff --git a/macosx/coreaudio/JackCoreAudioDriver.cpp b/macosx/coreaudio/JackCoreAudioDriver.cpp index 31274623..f8fd3c92 100644 --- a/macosx/coreaudio/JackCoreAudioDriver.cpp +++ b/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" diff --git a/posix/JackPosixSemaphore.cpp b/posix/JackPosixSemaphore.cpp index b836217c..96e72ffe 100644 --- a/posix/JackPosixSemaphore.cpp +++ b/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" diff --git a/posix/JackPosixServerLaunch.cpp b/posix/JackPosixServerLaunch.cpp index 97747ac5..645f0a1a 100644 --- a/posix/JackPosixServerLaunch.cpp +++ b/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 diff --git a/posix/JackPosixThread.cpp b/posix/JackPosixThread.cpp index cb6b3942..2cabae6f 100644 --- a/posix/JackPosixThread.cpp +++ b/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" diff --git a/posix/JackProcessSync.cpp b/posix/JackProcessSync.cpp index 8a488310..0e122096 100644 --- a/posix/JackProcessSync.cpp +++ b/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" diff --git a/posix/JackSocket.cpp b/posix/JackSocket.cpp index db700f08..5c57e984 100644 --- a/posix/JackSocket.cpp +++ b/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 diff --git a/posix/JackSocketClientChannel.cpp b/posix/JackSocketClientChannel.cpp index 1b62d03d..a14e4cc3 100644 --- a/posix/JackSocketClientChannel.cpp +++ b/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" diff --git a/posix/JackSocketNotifyChannel.cpp b/posix/JackSocketNotifyChannel.cpp index 196c849f..b0c44867 100644 --- a/posix/JackSocketNotifyChannel.cpp +++ b/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" diff --git a/posix/JackSocketServerChannel.cpp b/posix/JackSocketServerChannel.cpp index ae415bc0..2a0a2eb6 100644 --- a/posix/JackSocketServerChannel.cpp +++ b/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" diff --git a/posix/JackSocketServerNotifyChannel.cpp b/posix/JackSocketServerNotifyChannel.cpp index c5758967..b147fe06 100644 --- a/posix/JackSocketServerNotifyChannel.cpp +++ b/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" diff --git a/windows/JackWinEvent.cpp b/windows/JackWinEvent.cpp index 13c83d5b..d8cc3db2 100644 --- a/windows/JackWinEvent.cpp +++ b/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 diff --git a/windows/JackWinNamedPipe.cpp b/windows/JackWinNamedPipe.cpp index 69943041..81569da5 100644 --- a/windows/JackWinNamedPipe.cpp +++ b/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 diff --git a/windows/JackWinNamedPipeClientChannel.cpp b/windows/JackWinNamedPipeClientChannel.cpp index c213fada..4cfc8fe1 100644 --- a/windows/JackWinNamedPipeClientChannel.cpp +++ b/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" diff --git a/windows/JackWinNamedPipeNotifyChannel.cpp b/windows/JackWinNamedPipeNotifyChannel.cpp index 4d04cea5..991f260c 100644 --- a/windows/JackWinNamedPipeNotifyChannel.cpp +++ b/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" diff --git a/windows/JackWinNamedPipeServerChannel.cpp b/windows/JackWinNamedPipeServerChannel.cpp index 9a561c67..a44739b0 100644 --- a/windows/JackWinNamedPipeServerChannel.cpp +++ b/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" diff --git a/windows/JackWinNamedPipeServerNotifyChannel.cpp b/windows/JackWinNamedPipeServerNotifyChannel.cpp index 1a70ff12..7f2f14cf 100644 --- a/windows/JackWinNamedPipeServerNotifyChannel.cpp +++ b/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" diff --git a/windows/JackWinProcessSync.cpp b/windows/JackWinProcessSync.cpp index 17427994..2b70b378 100644 --- a/windows/JackWinProcessSync.cpp +++ b/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 { diff --git a/windows/JackWinSemaphore.cpp b/windows/JackWinSemaphore.cpp index 35ba3450..cea74c2e 100644 --- a/windows/JackWinSemaphore.cpp +++ b/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 diff --git a/windows/JackWinServerLaunch.cpp b/windows/JackWinServerLaunch.cpp index 24e685fc..eeda81a8 100644 --- a/windows/JackWinServerLaunch.cpp +++ b/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) diff --git a/windows/JackWinThread.cpp b/windows/JackWinThread.cpp index e3faef79..cd23c8fb 100644 --- a/windows/JackWinThread.cpp +++ b/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" diff --git a/windows/portaudio/JackPortAudioDriver.cpp b/windows/portaudio/JackPortAudioDriver.cpp index 9c090d79..8a87c9e2 100644 --- a/windows/portaudio/JackPortAudioDriver.cpp +++ b/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" diff --git a/wscript b/wscript index 748b2eaf..afbc5e69 100644 --- a/wscript +++ b/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)