shithub: sox

Download patch

ref: cb5960d923c710661644e8ff5aec7c1302acb26e
parent: 9af5583e01095e0c2b4986e39567932405d09d60
author: Chris Bagwell <chris@cnpbagwell.com>
date: Mon Feb 20 06:15:31 EST 2012 

caf fix for new libsndfile 1.0.12 minimum

Must have missed caf.c's check for specific libsndfile.
Also, noticed cmake was referencing undefined value
so updated to most recent libsndfile value.


--- a/src/caf.c
+++ b/src/caf.c
@@ -17,7 +17,7 @@
 
 #include "sox_i.h"
 
-#if defined HAVE_SNDFILE_1_0_12
+#if defined HAVE_SNDFILE
 
 LSX_FORMAT_HANDLER(caf)
 {
--- a/src/formats.h
+++ b/src/formats.h
@@ -109,9 +109,7 @@
 #endif
 #if defined HAVE_SNDFILE && (defined STATIC_SNDFILE || !defined HAVE_LIBLTDL)
   FORMAT(sndfile)
-  #if defined HAVE_SNDFILE_1_0_12
   FORMAT(caf)
-  #endif
   FORMAT(fap)
   FORMAT(mat4)
   FORMAT(mat5)
--- a/src/soxconfig.h.cmake
+++ b/src/soxconfig.h.cmake
@@ -36,7 +36,7 @@
 #cmakedefine HAVE_POPEN               1
 #cmakedefine HAVE_PULSEAUDIO          1
 #cmakedefine HAVE_SNDFILE             1
-#cmakedefine HAVE_SNDFILE_1_0_12      1
+#cmakedefine HAVE_SNDFILE_1_0_18      1
 #cmakedefine HAVE_SNDIO               1
 #cmakedefine HAVE_STDINT_H            1
 #cmakedefine HAVE_STRCASECMP          1