use lmmsconfig.h rather than config.h and use prefixed macro-names

git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1097 0778d3d1-df1d-0410-868b-ea421aaaa00d
2008-06-08 11:30:47 +00:00
parent 6dcedad4f0
commit d6262bb556
81 changed files with 376 additions and 445 deletions
--- a/plugins/ladspa_effect/caps/Makefile.am
+++ b/plugins/ladspa_effect/caps/Makefile.am
@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS = foreign 1.4


-AM_CXXFLAGS := $(AM_CXXFLAGS) -O2 -I../../../include
+AM_CXXFLAGS := $(AM_CXXFLAGS) -O3 -I../../../include

 DEST = $(DESTDIR)$(libdir)/$(PACKAGE)/ladspa
 SOURCES = $(wildcard *.cc)
--- a/plugins/ladspa_effect/caps/basics.h
+++ b/plugins/ladspa_effect/caps/basics.h
@@ -47,11 +47,9 @@
 #include <stdio.h>
 #include <stdint.h>

-#ifdef HAVE_CONFIG_H
-#include <config.h> 	 
-#endif 	 
+#include "lmmsconfig.h"

-#ifdef HAVE_LADSPA_H 	 
+#ifdef LMMS_HAVE_LADSPA_H 	 
 #include <ladspa.h> 	 
 #else 	 
 #include "ladspa-1.1.h" 	 
--- a/plugins/ladspa_effect/tap/Makefile.am
+++ b/plugins/ladspa_effect/tap/Makefile.am
@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS = foreign 1.4


-AM_CFLAGS := $(AM_CFLAGS) -I../../../include -I. -O3 -Wall -fomit-frame-pointer -fno-strict-aliasing -fstrength-reduce -funroll-loops -ffast-math -c -fPIC -DPIC
+AM_CFLAGS := $(AM_CFLAGS) $(CFLAGS) -I../../../include -I. -O3 -Wall -fomit-frame-pointer -fno-strict-aliasing -fstrength-reduce -funroll-loops -ffast-math -c -fPIC -DPIC

 DEST = $(DESTDIR)$(libdir)/$(PACKAGE)/ladspa

@@ -55,4 +55,4 @@ uninstall:

 all: $(PLUGINS)

-EXTRA_DIST = README COPYING CREDITS $(wildcard tap_*.c) $(wildcard tap_*.h) ladspa.h
+EXTRA_DIST = README COPYING CREDITS $(wildcard tap_*.c) $(wildcard tap_*.h) ladspa-local.h
--- a/plugins/ladspa_effect/tap/ladspa-local.h
+++ b/plugins/ladspa_effect/tap/ladspa-local.h
@@ -1,5 +1,5 @@
 /*
- * ladspa.h - include correct LADSPA-header
+ * ladspa-local.h - include correct LADSPA-header
 *
 * Copyright (c) 2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
 * 
@@ -23,11 +23,9 @@
 */


-#ifdef HAVE_CONFIG_H
-#include <config.h> 	 
-#endif 	 
+#include "lmmsconfig.h"

-#ifdef HAVE_LADSPA_H 	 
+#ifdef LMMS_HAVE_LADSPA_H 	 
 #include <ladspa.h> 	 
 #else 	 
 #include "ladspa-1.1.h" 	 
--- a/plugins/ladspa_effect/tap/tap_autopan.c
+++ b/plugins/ladspa_effect/tap/tap_autopan.c
@@ -27,7 +27,7 @@
 #include <string.h>
 #include <math.h>

-#include "ladspa.h"
+#include "ladspa-local.h"
 #include "tap_utils.h"

 /* The Unique ID of the plugin: */
--- a/plugins/ladspa_effect/tap/tap_chorusflanger.c
+++ b/plugins/ladspa_effect/tap/tap_chorusflanger.c
@@ -25,7 +25,7 @@
 #include <math.h>
 #include <time.h>

-#include "ladspa.h"
+#include "ladspa-local.h"
 #include "tap_utils.h"


--- a/plugins/ladspa_effect/tap/tap_deesser.c
+++ b/plugins/ladspa_effect/tap/tap_deesser.c
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <math.h>

-#include "ladspa.h"
+#include "ladspa-local.h"
 #include "tap_utils.h"

 /* The Unique ID of the plugin: */
--- a/plugins/ladspa_effect/tap/tap_doubler.c
+++ b/plugins/ladspa_effect/tap/tap_doubler.c
@@ -25,7 +25,7 @@
 #include <math.h>
 #include <time.h>

-#include "ladspa.h"
+#include "ladspa-local.h"
 #include "tap_utils.h"


--- a/plugins/ladspa_effect/tap/tap_dynamics_m.c
+++ b/plugins/ladspa_effect/tap/tap_dynamics_m.c
@@ -25,7 +25,7 @@
 #include <string.h>
 #include <math.h>

-#include "ladspa.h"
+#include "ladspa-local.h"
 #include "tap_utils.h"


--- a/plugins/ladspa_effect/tap/tap_dynamics_st.c
+++ b/plugins/ladspa_effect/tap/tap_dynamics_st.c
@@ -25,7 +25,7 @@
 #include <string.h>
 #include <math.h>

-#include "ladspa.h"
+#include "ladspa-local.h"
 #include "tap_utils.h"


--- a/plugins/ladspa_effect/tap/tap_echo.c
+++ b/plugins/ladspa_effect/tap/tap_echo.c
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <math.h>

-#include "ladspa.h"
+#include "ladspa-local.h"
 #include "tap_utils.h"

 /* The Unique ID of the plugin: */
--- a/plugins/ladspa_effect/tap/tap_eq.c
+++ b/plugins/ladspa_effect/tap/tap_eq.c
@@ -29,7 +29,7 @@ bugs or malfunction. */
 #include <string.h>
 #include <math.h>

-#include "ladspa.h"
+#include "ladspa-local.h"
 #include "tap_utils.h"

 /* The Unique ID of the plugin */
--- a/plugins/ladspa_effect/tap/tap_eqbw.c
+++ b/plugins/ladspa_effect/tap/tap_eqbw.c
@@ -27,7 +27,7 @@
 #include <string.h>
 #include <math.h>

-#include "ladspa.h"
+#include "ladspa-local.h"
 #include "tap_utils.h"

 /* The Unique ID of the plugin */
--- a/plugins/ladspa_effect/tap/tap_limiter.c
+++ b/plugins/ladspa_effect/tap/tap_limiter.c
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <math.h>

-#include "ladspa.h"
+#include "ladspa-local.h"
 #include "tap_utils.h"

 /* The Unique ID of the plugin: */
--- a/plugins/ladspa_effect/tap/tap_pinknoise.c
+++ b/plugins/ladspa_effect/tap/tap_pinknoise.c
@@ -25,7 +25,7 @@
 #include <math.h>
 #include <time.h>

-#include "ladspa.h"
+#include "ladspa-local.h"
 #include "tap_utils.h"

 /* The Unique ID of the plugin: */
--- a/plugins/ladspa_effect/tap/tap_pitch.c
+++ b/plugins/ladspa_effect/tap/tap_pitch.c
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <math.h>

-#include "ladspa.h"
+#include "ladspa-local.h"
 #include "tap_utils.h"


--- a/plugins/ladspa_effect/tap/tap_reflector.c
+++ b/plugins/ladspa_effect/tap/tap_reflector.c
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <math.h>

-#include "ladspa.h"
+#include "ladspa-local.h"
 #include "tap_utils.h"


--- a/plugins/ladspa_effect/tap/tap_reverb.c
+++ b/plugins/ladspa_effect/tap/tap_reverb.c
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <math.h>

-#include "ladspa.h"
+#include "ladspa-local.h"


 /* ***** VERY IMPORTANT! *****
--- a/plugins/ladspa_effect/tap/tap_rotspeak.c
+++ b/plugins/ladspa_effect/tap/tap_rotspeak.c
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <math.h>

-#include "ladspa.h"
+#include "ladspa-local.h"
 #include "tap_utils.h"

 /* The Unique ID of the plugin: */
--- a/plugins/ladspa_effect/tap/tap_sigmoid.c
+++ b/plugins/ladspa_effect/tap/tap_sigmoid.c
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <math.h>

-#include "ladspa.h"
+#include "ladspa-local.h"
 #include "tap_utils.h"


--- a/plugins/ladspa_effect/tap/tap_tremolo.c
+++ b/plugins/ladspa_effect/tap/tap_tremolo.c
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <math.h>

-#include "ladspa.h"
+#include "ladspa-local.h"
 #include "tap_utils.h"

 /* The Unique ID of the plugin: */
--- a/plugins/ladspa_effect/tap/tap_tubewarmth.c
+++ b/plugins/ladspa_effect/tap/tap_tubewarmth.c
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <math.h>

-#include "ladspa.h"
+#include "ladspa-local.h"
 #include "tap_utils.h"


--- a/plugins/ladspa_effect/tap/tap_vibrato.c
+++ b/plugins/ladspa_effect/tap/tap_vibrato.c
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <math.h>

-#include "ladspa.h"
+#include "ladspa-local.h"
 #include "tap_utils.h"


--- a/plugins/midi_import/midi_import.h
+++ b/plugins/midi_import/midi_import.h
@@ -26,10 +26,6 @@
 #ifndef _MIDI_IMPORT_H
 #define _MIDI_IMPORT_H

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <QtCore/QString>
 #include <QtCore/QPair>
 #include <QtCore/QVector>
@@ -53,9 +49,9 @@ public:
 private:
 	virtual bool tryImport( trackContainer * _tc );

-	bool FASTCALL readSMF( trackContainer * _tc );
-	bool FASTCALL readRIFF( trackContainer * _tc );
-	bool FASTCALL readTrack( int _track_end, QString & _track_name );
+	bool readSMF( trackContainer * _tc );
+	bool readRIFF( trackContainer * _tc );
+	bool readTrack( int _track_end, QString & _track_name );

 	void error( void );

--- a/plugins/vst_base/communication.h
+++ b/plugins/vst_base/communication.h
@@ -2,7 +2,7 @@
 * communication.h - header file defining stuff concerning communication between
 *                   LVSL-server and -client
 *
- * Copyright (c) 2005-2007 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ * Copyright (c) 2005-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
 * 
 * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
 *
@@ -27,11 +27,9 @@
 #ifndef _COMMUNICATION_H
 #define _COMMUNICATION_H

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "lmmsconfig.h"

-#ifdef HAVE_UNISTD_H
+#ifdef LMMS_HAVE_UNISTD_H
 #include <unistd.h>
 #endif

--- a/plugins/vst_base/lvsl_client.cpp
+++ b/plugins/vst_base/lvsl_client.cpp
@@ -24,6 +24,7 @@


 #include "lvsl_client.h"
+#include "lmmsconfig.h"

 #include <QtCore/QLocale>
 #include <QtCore/QTime>
@@ -33,37 +34,33 @@
 #include <QtGui/QX11EmbedContainer>
 #include <QtGui/QX11Info>

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#ifdef HAVE_UNISTD_H
+#ifdef LMMS_HAVE_UNISTD_H
 #include <unistd.h>
 #endif

-#ifdef HAVE_SIGNAL_H
+#ifdef LMMS_HAVE_SIGNAL_H
 #include <signal.h>
 #endif

 #include <cstdio>

-#ifdef HAVE_SYS_IPC_H
+#ifdef LMMS_HAVE_SYS_IPC_H
 #include <sys/ipc.h>
 #endif

-#ifdef HAVE_SYS_SHM_H
+#ifdef LMMS_HAVE_SYS_SHM_H
 #include <sys/shm.h>
 #endif

-#ifdef HAVE_SYS_SELECT_H
+#ifdef LMMS_HAVE_SYS_SELECT_H
 #include <sys/select.h>
 #endif

-#ifdef HAVE_SYS_TIME_H
+#ifdef LMMS_HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif

-#ifdef HAVE_SYS_WAIT_H
+#ifdef LMMS_HAVE_SYS_WAIT_H
 #include <sys/wait.h>
 #endif

--- a/plugins/vst_base/lvsl_server.cpp
+++ b/plugins/vst_base/lvsl_server.cpp
@@ -28,35 +28,33 @@
 */


-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "lmmsconfig.h"

-#ifdef HAVE_PTHREAD_H
+#ifdef LMMS_HAVE_PTHREAD_H
 #include <pthread.h>
 #endif

-#ifdef HAVE_SYS_TYPES_H
+#ifdef LMMS_HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif

-#ifdef HAVE_SYS_IPC_H
+#ifdef LMMS_HAVE_SYS_IPC_H
 #include <sys/ipc.h>
 #endif

-#ifdef HAVE_SYS_SHM_H
+#ifdef LMMS_HAVE_SYS_SHM_H
 #include <sys/shm.h>
 #endif

-#ifdef HAVE_STDARG_H
+#ifdef LMMS_HAVE_STDARG_H
 #include <stdarg.h>
 #endif

-#ifdef HAVE_SIGNAL_H
+#ifdef LMMS_HAVE_SIGNAL_H
 #include <signal.h>
 #endif

-#ifdef HAVE_SCHED_H
+#ifdef LMMS_HAVE_SCHED_H
 #include <sched.h>
 #endif

@@ -94,7 +92,7 @@ struct ERect
 #include "communication.h"


-#ifdef HAVE_TLS
+#ifdef LMMS_HAVE_TLS
 static __thread int ejmpbuf_valid = false;
 static __thread jmp_buf ejmpbuf;
 #else
@@ -1027,7 +1025,7 @@ DWORD WINAPI VSTPlugin::guiEventLoop( LPVOID _param )
 	_this->m_guiThreadID = GetCurrentThreadId();

 	// "guard point" to trap errors that occur during plugin loading
-#ifdef HAVE_TLS
+#ifdef LMMS_HAVE_TLS
 	if( sigsetjmp( ejmpbuf, 1 ) )
 	{
 		lvsMessage( "creating the editor for %s failed",
@@ -1105,7 +1103,7 @@ DWORD WINAPI VSTPlugin::guiEventLoop( LPVOID _param )
 			SWP_NOOWNERZORDER | SWP_NOZORDER
 #endif
 			);
-#ifdef HAVE_TLS
+#ifdef LMMS_HAVE_TLS
 	ejmpbuf_valid = false;
 #else
 	*ejmpbuf_valid = false;
@@ -1177,7 +1175,7 @@ int main( void )
 		return( -1 );
 	}

-#ifdef HAVE_SCHED_H
+#ifdef LMMS_HAVE_SCHED_H
 	// try to set realtime-priority
 	struct sched_param sparam;
 	sparam.sched_priority = ( sched_get_priority_max( SCHED_FIFO ) +