[PD-cvs] SF.net SVN: pure-data:[10356] trunk/externals/iem/iemmatrix/src

zmoelnig at users.sourceforge.net zmoelnig at users.sourceforge.net
Mon Nov 3 11:20:52 CET 2008


Revision: 10356
          http://pure-data.svn.sourceforge.net/pure-data/?rev=10356&view=rev
Author:   zmoelnig
Date:     2008-11-03 10:20:51 +0000 (Mon, 03 Nov 2008)

Log Message:
-----------
added checks for sndfile to configure; properly use this in mtx_sndfileread

Modified Paths:
--------------
    trunk/externals/iem/iemmatrix/src/config.h.in
    trunk/externals/iem/iemmatrix/src/configure.ac
    trunk/externals/iem/iemmatrix/src/mtx_sndfileread.c

Modified: trunk/externals/iem/iemmatrix/src/config.h.in
===================================================================
--- trunk/externals/iem/iemmatrix/src/config.h.in	2008-11-03 10:10:12 UTC (rev 10355)
+++ trunk/externals/iem/iemmatrix/src/config.h.in	2008-11-03 10:20:51 UTC (rev 10356)
@@ -1,10 +1,11 @@
 #ifndef CONFIG_H_
 #define CONFIG_H_
 
-
 /* do we have fftw3 installed? */
 #undef HAVE_FFTW3_H
 
+/* do we have libsndfile installed? */
+#undef HAVE_SNDFILE_H
 
 
 #endif /* CONFIG_H_ */

Modified: trunk/externals/iem/iemmatrix/src/configure.ac
===================================================================
--- trunk/externals/iem/iemmatrix/src/configure.ac	2008-11-03 10:10:12 UTC (rev 10355)
+++ trunk/externals/iem/iemmatrix/src/configure.ac	2008-11-03 10:20:51 UTC (rev 10356)
@@ -66,10 +66,13 @@
 AC_CHECK_LIB(m, main)
 dnl Replace `main' with a function in -lpthread:
 dnl AC_CHECK_LIB(pthread, main)
-dnl Replace `main' with a function in -lstk:
+dnl Replace `main' with a function in -lfftw3:
 AC_CHECK_LIB(fftw3, fftw_destroy_plan)
 
+dnl for soundfile reading (and writing, if we do that...)
+AC_CHECK_LIB(sndfile, sf_close)
 
+
 if test "x$with_pd" != "x"; then
  if test -d "${with_pd}/src"; then
   INCLUDES="-I${with_pd}/src ${INCLUDES}"
@@ -96,7 +99,7 @@
 
 dnl Checks for header files.
 AC_HEADER_STDC
-AC_CHECK_HEADERS(stdlib.h stdio.h string.h math.h time.h sys/time.h fftw3.h)
+AC_CHECK_HEADERS(stdlib.h stdio.h string.h math.h time.h sys/time.h fftw3.h sndfile.h)
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_HEADER_TIME

Modified: trunk/externals/iem/iemmatrix/src/mtx_sndfileread.c
===================================================================
--- trunk/externals/iem/iemmatrix/src/mtx_sndfileread.c	2008-11-03 10:10:12 UTC (rev 10355)
+++ trunk/externals/iem/iemmatrix/src/mtx_sndfileread.c	2008-11-03 10:20:51 UTC (rev 10356)
@@ -1,7 +1,9 @@
+
+#include "iemmatrix.h"
+
 #ifdef HAVE_SNDFILE_H
 # include <sndfile.h>
 #endif
-#include "iemmatrix.h"
 
 #ifdef __WIN32__
 # include <io.h>
@@ -289,9 +291,6 @@
   class_addmethod(mtx_sndfileread_class, (t_method)mtx_sndfileread_close, gensym("close"), A_NULL, 0);
   class_addbang(mtx_sndfileread_class, (t_method)mtx_sndfileread_frame);
   class_addfloat(mtx_sndfileread_class, (t_method)mtx_sndfileread_frames);
-#ifndef HAVE_SNDFILE_H
-  post("mtx_sndfileread won't work: compiled without libsndfile!");
-#endif
 }
 
 void iemtx_sndfileread_setup (void)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Pd-cvs mailing list