[PD-cvs] pd/src s_audio.c,1.1.1.1.2.8,1.1.1.1.2.9 s_audio_jack.c,1.1.2.8,1.1.2.9 s_main.c,1.1.1.4.2.17,1.1.1.4.2.18 s_inter.c,1.1.1.3.2.17,1.1.1.3.2.18 configure.in,1.1.1.4.2.23,1.1.1.4.2.24 makefile.in,1.1.1.3.2.17,1.1.1.3.2.18 d_fft.c,1.1.1.1.16.4,1.1.1.1.16.5
Tim Blechmann
timblech at users.sourceforge.net
Fri Oct 8 19:58:29 CEST 2004
- Previous message: [PD-cvs] pd/src d_array.c,1.1.1.3.2.5,1.1.1.3.2.6 d_osc.c,1.1.1.2.2.3,1.1.1.2.2.4 s_inter.c,1.1.1.3.2.16,1.1.1.3.2.17 s_loader.c,1.1.1.2.2.1,1.1.1.2.2.2 s_stuff.h,1.1.1.1.2.5,1.1.1.1.2.6
- Next message: [PD-cvs] pd/src d_soundfile.c,1.1.1.2.2.24,1.1.1.2.2.25
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31623
Modified Files:
Tag: devel_0_37
s_audio.c s_audio_jack.c s_main.c s_inter.c configure.in
makefile.in d_fft.c
Log Message:
cleanup of configure script: fftw & jack
Index: s_inter.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_inter.c,v
retrieving revision 1.1.1.3.2.17
retrieving revision 1.1.1.3.2.18
diff -C2 -d -r1.1.1.3.2.17 -r1.1.1.3.2.18
*** s_inter.c 7 Oct 2004 23:11:56 -0000 1.1.1.3.2.17
--- s_inter.c 8 Oct 2004 17:58:27 -0000 1.1.1.3.2.18
***************
*** 682,686 ****
p1 = sched_get_priority_min(SCHED_FIFO);
p2 = sched_get_priority_max(SCHED_FIFO);
! #ifdef USEAPI_JACK
p3 = (higher ? p1 + 7 : p1 + 5);
#else
--- 682,686 ----
p1 = sched_get_priority_min(SCHED_FIFO);
p2 = sched_get_priority_max(SCHED_FIFO);
! #ifdef HAVE_LIBJACK
p3 = (higher ? p1 + 7 : p1 + 5);
#else
Index: s_main.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_main.c,v
retrieving revision 1.1.1.4.2.17
retrieving revision 1.1.1.4.2.18
diff -C2 -d -r1.1.1.4.2.17 -r1.1.1.4.2.18
*** s_main.c 20 Sep 2004 16:44:03 -0000 1.1.1.4.2.17
--- s_main.c 8 Oct 2004 17:58:27 -0000 1.1.1.4.2.18
***************
*** 353,357 ****
#endif
! #ifdef USEAPI_JACK
"-jack -- use JACK audio API\n",
#endif
--- 353,357 ----
#endif
! #ifdef HAVE_LIBJACK
"-jack -- use JACK audio API\n",
#endif
***************
*** 643,647 ****
}
#endif
! #ifdef USEAPI_JACK
else if (!strcmp(*argv, "-jack"))
{
--- 643,647 ----
}
#endif
! #ifdef HAVE_LIBJACK
else if (!strcmp(*argv, "-jack"))
{
Index: configure.in
===================================================================
RCS file: /cvsroot/pure-data/pd/src/configure.in,v
retrieving revision 1.1.1.4.2.23
retrieving revision 1.1.1.4.2.24
diff -C2 -d -r1.1.1.4.2.23 -r1.1.1.4.2.24
*** configure.in 7 Oct 2004 21:34:31 -0000 1.1.1.4.2.23
--- configure.in 8 Oct 2004 17:58:27 -0000 1.1.1.4.2.24
***************
*** 5,8 ****
--- 5,9 ----
AC_SUBST(MORECFLAGS)
AC_SUBST(EXT)
+ AC_SUBST(DEFS)
AC_SUBST(OPT_CFLAGS)
AC_SUBST(SYSSRC)
***************
*** 20,37 ****
AC_ARG_ENABLE(alsa, [ --disable-alsa disable ALSA],
alsa=$enableval,alsa=yes)
AC_ARG_ENABLE(jack, [ --enable-jack jack audio server],
! jack=$enableval,jack=no)
AC_ARG_ENABLE(portaudio, [ --enable-portaudio portaudio],
portaudio=$enableval,portaudio=no)
AC_ARG_ENABLE(debug, [ --enable-debug debugging support],
USE_DEBUG=$enableval,USE_DEBUG=no)
AC_ARG_ENABLE(static, [ --enable-static link statically],
static=$enableval,static=no)
! AC_ARG_ENABLE(fftw, [ --enable-fftw fftw3 support],fftw=$enableval,fftw=no)
AC_ARG_ENABLE(icc, [ --enable-icc icc support],icc=$enableval,icc=no)
AC_ARG_ENABLE(optimize, [ --enable-optimize enables optimized builds for: pentium4, pentium3, G4, G5],optimize=$enableval,optimize=no)
AC_ARG_ENABLE(simd, [ --enable-simd use SIMD code],simdcode=$enableval,simdcode=no)
AC_ARG_ENABLE(threadedgui, [ --enable-threadedgui use yves degoyon's threaded gui patch],threadedgui=$enableval,threadedgui=no)
AC_ARG_ENABLE(threadedsf, [ --enable-threadedsf use threaded soundfiler (EXPERIMENTAL, implies --enable-gathreadlocks)],threadedsf=$enableval,threadedsf=no)
AC_ARG_ENABLE(gathreadlocks, [ --enable-gathreadlocks t_garray threadlocks (EXPERIMENTAL)],gathreadlocks=$enableval,gathreadlocks=no)
--- 21,54 ----
AC_ARG_ENABLE(alsa, [ --disable-alsa disable ALSA],
alsa=$enableval,alsa=yes)
+
AC_ARG_ENABLE(jack, [ --enable-jack jack audio server],
! AC_CHECK_LIB(rt,shm_open)
! AC_CHECK_LIB(jack,jack_set_error_function)
! AC_CHECK_LIB(jack,jack_set_xrun_callback,
! MORECFLAGS="$MORECFLAGS -DJACK_XRUN")
! )
!
AC_ARG_ENABLE(portaudio, [ --enable-portaudio portaudio],
portaudio=$enableval,portaudio=no)
+
AC_ARG_ENABLE(debug, [ --enable-debug debugging support],
USE_DEBUG=$enableval,USE_DEBUG=no)
+
AC_ARG_ENABLE(static, [ --enable-static link statically],
static=$enableval,static=no)
!
! AC_ARG_ENABLE(fftw, [ --enable-fftw fftw3 support],
! AC_CHECK_LIB(fftw3f,fftwf_plan_dft_r2c_1d))
!
AC_ARG_ENABLE(icc, [ --enable-icc icc support],icc=$enableval,icc=no)
+
AC_ARG_ENABLE(optimize, [ --enable-optimize enables optimized builds for: pentium4, pentium3, G4, G5],optimize=$enableval,optimize=no)
+
AC_ARG_ENABLE(simd, [ --enable-simd use SIMD code],simdcode=$enableval,simdcode=no)
+
AC_ARG_ENABLE(threadedgui, [ --enable-threadedgui use yves degoyon's threaded gui patch],threadedgui=$enableval,threadedgui=no)
+
AC_ARG_ENABLE(threadedsf, [ --enable-threadedsf use threaded soundfiler (EXPERIMENTAL, implies --enable-gathreadlocks)],threadedsf=$enableval,threadedsf=no)
+
AC_ARG_ENABLE(gathreadlocks, [ --enable-gathreadlocks t_garray threadlocks (EXPERIMENTAL)],gathreadlocks=$enableval,gathreadlocks=no)
***************
*** 119,126 ****
- if test "$fftw" == "yes"; then
- MORECFLAGS=$MORECFLAGS" -DUSE_FFTW"
- fi
-
if test "$threadedgui" == "yes"; then
MORECFLAGS=$MORECFLAGS" -DTHREADED_GUI"
--- 136,139 ----
***************
*** 150,166 ****
fi
- dnl Checking for JACK
-
- if test "$jack" == "yes"; then
- AC_CHECK_LIB(rt,shm_open,LIBS="$LIBS -lrt")
- AC_CHECK_LIB(jack,jack_set_xrun_callback,LIBS="$LIBS -ljack";jack=xrun,jack=no)
- AC_CHECK_LIB(jack,jack_set_error_function,LIBS="$LIBS -ljack";jack=yes,jack=no)
- fi
-
- dnl Checking for FFTW3
- if test "$fftw" == "yes"; then
- AC_CHECK_LIB(fftw3f,fftwf_plan_dft_r2c_1d,PDLIB="$PDLIB -lfftw3f"; fftw=yes,fftw=no)
- fi
-
dnl Set processor flags
if test "$icc" == "yes"; then
--- 163,166 ----
***************
*** 186,190 ****
fi
! LDFLAGS="-Wl,-export-dynamic"
if test "$static" == "yes"; then
LDFLAGS="$LDFLAGS -static"
--- 186,190 ----
fi
! LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
if test "$static" == "yes"; then
LDFLAGS="$LDFLAGS -static"
***************
*** 308,318 ****
EXTERNTARGET=pd_darwin
- if test x$jack == "xyes";
- then
- LDFLAGS=$LDFLAGS" -framework Jack"
- MORECFLAGS=$MORECFLAGS" -DUSEAPI_JACK"
- SYSSRC=$SYSSRC" s_audio_jack.c"
- fi
-
dnl Set processor flags
if test "$optimize" == "G3"; then
--- 308,311 ----
***************
*** 332,350 ****
fi
- # support for jack, on either linux or darwin:
- if test x$jack == "xyes";
- then
- MORECFLAGS=$MORECFLAGS" -DUSEAPI_JACK"
- SYSSRC=$SYSSRC" s_audio_jack.c"
- LDFLAGS=$LDFLAGS" -lrt -ljack"
- fi
- if test x$jack == "xrun";
- then
- MORECFLAGS=$MORECFLAGS" -DUSEAPI_JACK -DJACK_XRUN"
- SYSSRC=$SYSSRC" s_audio_jack.c"
- LDFLAGS=$LDFLAGS" -lrt -ljack"
- fi
-
-
# extra flags for alpha machines
if test `uname -m | awk '{print $1}'` = alpha;
--- 325,328 ----
Index: makefile.in
===================================================================
RCS file: /cvsroot/pure-data/pd/src/makefile.in,v
retrieving revision 1.1.1.3.2.17
retrieving revision 1.1.1.3.2.18
diff -C2 -d -r1.1.1.3.2.17 -r1.1.1.3.2.18
*** makefile.in 7 Oct 2004 18:00:51 -0000 1.1.1.3.2.17
--- makefile.in 8 Oct 2004 17:58:27 -0000 1.1.1.3.2.18
***************
*** 19,23 ****
GLIB = @LIBS@
! LDFLAGS = @LDFLAGS@
LIB = @PDLIB@
--- 19,23 ----
GLIB = @LIBS@
! LDFLAGS = @LDFLAGS@
LIB = @PDLIB@
***************
*** 26,31 ****
-Wno-unused -Wno-parentheses -Wno-switch
ARCH_CFLAGS = -DPD -DUNIX
! CFLAGS += $(ARCH_CFLAGS) $(WARN_CFLAGS) $(OPT_CFLAGS) $(MORECFLAGS)
# the sources
--- 26,32 ----
-Wno-unused -Wno-parentheses -Wno-switch
ARCH_CFLAGS = -DPD -DUNIX
+ DEFS = @DEFS@
! CFLAGS += $(DEFS) $(ARCH_CFLAGS) $(WARN_CFLAGS) $(OPT_CFLAGS) $(MORECFLAGS)
# the sources
***************
*** 40,44 ****
m_conf.c m_glob.c m_sched.c \
s_main.c s_inter.c s_file.c s_print.c \
! s_loader.c s_path.c s_entry.c s_audio.c s_midi.c \
d_ugen.c d_ctl.c d_arithmetic.c d_osc.c d_filter.c d_dac.c d_misc.c \
d_math.c d_fft.c d_mayer_fft.c d_fftroutine.c d_array.c d_global.c \
--- 41,45 ----
m_conf.c m_glob.c m_sched.c \
s_main.c s_inter.c s_file.c s_print.c \
! s_loader.c s_path.c s_entry.c s_audio.c s_audio_jack.c s_midi.c \
d_ugen.c d_ctl.c d_arithmetic.c d_osc.c d_filter.c d_dac.c d_misc.c \
d_math.c d_fft.c d_mayer_fft.c d_fftroutine.c d_array.c d_global.c \
***************
*** 91,96 ****
$(PDEXEC): $(OBJ)
! cd ../obj; $(CC) $(LDFLAGS) $(DBG_CFLAGS) -o $(PDEXEC) $(OBJ) \
! $(LIB)
$(BIN_DIR)/pd-gui: $(GOBJ) $(GSRC)
--- 92,97 ----
$(PDEXEC): $(OBJ)
! cd ../obj; $(CC) $(LDFLAGS) $(GLIB) $(DBG_CFLAGS) -o $(PDEXEC) $(OBJ) \
! $(LIB)
$(BIN_DIR)/pd-gui: $(GOBJ) $(GSRC)
Index: d_fft.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/d_fft.c,v
retrieving revision 1.1.1.1.16.4
retrieving revision 1.1.1.1.16.5
diff -C2 -d -r1.1.1.1.16.4 -r1.1.1.1.16.5
*** d_fft.c 15 Jun 2004 10:07:33 -0000 1.1.1.1.16.4
--- d_fft.c 8 Oct 2004 17:58:27 -0000 1.1.1.1.16.5
***************
*** 5,14 ****
#include "m_pd.h"
! #ifdef USE_FFTW
#include "fftw3.h"
#include <string.h>
#endif
! #ifndef USE_FFTW
/* ------------------------ fft~ and ifft~ -------------------------------- */
static t_class *sigfft_class, *sigifft_class;
--- 5,14 ----
#include "m_pd.h"
! #ifdef HAVE_LIBFFTW3F
#include "fftw3.h"
#include <string.h>
#endif
! #ifndef HAVE_LIBFFTW3F
/* ------------------------ fft~ and ifft~ -------------------------------- */
static t_class *sigfft_class, *sigifft_class;
***************
*** 609,613 ****
}
! #endif
/* end of FFTW support */
--- 609,613 ----
}
! #endif /* HAVE_LIBFFTW3F */
/* end of FFTW support */
***************
*** 706,710 ****
sigframp_setup();
! #ifndef USE_FFTW
sigfft_setup();
sigrfft_setup();
--- 706,710 ----
sigframp_setup();
! #ifndef HAVE_LIBFFTW3F
sigfft_setup();
sigrfft_setup();
***************
*** 714,718 ****
sigrifftw_setup();
sigrfftw_setup();
! #endif
}
--- 714,718 ----
sigrifftw_setup();
sigrfftw_setup();
! #endif /* HAVE_LIBFFTW3F */
}
Index: s_audio.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_audio.c,v
retrieving revision 1.1.1.1.2.8
retrieving revision 1.1.1.1.2.9
diff -C2 -d -r1.1.1.1.2.8 -r1.1.1.1.2.9
*** s_audio.c 22 Feb 2004 17:36:51 -0000 1.1.1.1.2.8
--- s_audio.c 8 Oct 2004 17:58:27 -0000 1.1.1.1.2.9
***************
*** 304,308 ****
else
#endif
! #ifdef USEAPI_JACK
if (sys_audioapi == API_JACK)
jack_open_audio((naudioindev > 0 ? chindev[0] : 0),
--- 304,308 ----
else
#endif
! #ifdef HAVE_LIBJACK
if (sys_audioapi == API_JACK)
jack_open_audio((naudioindev > 0 ? chindev[0] : 0),
***************
*** 351,355 ****
else
#endif
! #ifdef USEAPI_JACK
if (sys_audioapi == API_JACK)
jack_close_audio();
--- 351,355 ----
else
#endif
! #ifdef HAVE_LIBJACK
if (sys_audioapi == API_JACK)
jack_close_audio();
***************
*** 416,420 ****
else
#endif
! #ifdef USEAPI_JACK
if (sys_audioapi == API_JACK)
return (jack_send_dacs());
--- 416,420 ----
else
#endif
! #ifdef HAVE_LIBJACK
if (sys_audioapi == API_JACK)
return (jack_send_dacs());
***************
*** 520,524 ****
else
#endif
! #ifdef USEAPI_JACK
if (sys_audioapi == API_JACK)
{
--- 520,524 ----
else
#endif
! #ifdef HAVE_LIBJACK
if (sys_audioapi == API_JACK)
{
***************
*** 713,717 ****
else
#endif
! #ifdef USEAPI_JACK
if (sys_audioapi == API_JACK)
jack_listdevs();
--- 713,717 ----
else
#endif
! #ifdef HAVE_LIBJACK
if (sys_audioapi == API_JACK)
jack_listdevs();
***************
*** 831,835 ****
n++;
#endif
! #ifdef USEAPI_JACK
sprintf(buf + strlen(buf), "{jack %d} ", API_JACK); n++;
#endif
--- 831,835 ----
n++;
#endif
! #ifdef HAVE_LIBJACK
sprintf(buf + strlen(buf), "{jack %d} ", API_JACK); n++;
#endif
Index: s_audio_jack.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_audio_jack.c,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -C2 -d -r1.1.2.8 -r1.1.2.9
*** s_audio_jack.c 6 May 2004 08:28:12 -0000 1.1.2.8
--- s_audio_jack.c 8 Oct 2004 17:58:27 -0000 1.1.2.9
***************
*** 1,6 ****
-
-
/* ----------------------- Experimental routines for jack -------------- */
! #ifdef USEAPI_JACK
#include <stdio.h>
--- 1,4 ----
/* ----------------------- Experimental routines for jack -------------- */
! #ifdef HAVE_LIBJACK
#include <stdio.h>
***************
*** 383,385 ****
}
! #endif /* JACK */
--- 381,383 ----
}
! #endif /* HAVE_LIBJACK */
- Previous message: [PD-cvs] pd/src d_array.c,1.1.1.3.2.5,1.1.1.3.2.6 d_osc.c,1.1.1.2.2.3,1.1.1.2.2.4 s_inter.c,1.1.1.3.2.16,1.1.1.3.2.17 s_loader.c,1.1.1.2.2.1,1.1.1.2.2.2 s_stuff.h,1.1.1.1.2.5,1.1.1.1.2.6
- Next message: [PD-cvs] pd/src d_soundfile.c,1.1.1.2.2.24,1.1.1.2.2.25
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Pd-cvs
mailing list