shithub: sox

Info  •  Files  •  Log  •  Branches

sndfile: remove support for ancient versions

The features checked for have been in libsndfile for over 10 years.
Versions that old have many bugs and should not be used.

--- a/m4/sndfile.m4

+++ b/m4/sndfile.m4

@@ -53,8 +53,6 @@

       ifelse([$1], , :, [$1])

       have_sndfile="yes"

     ])

-    AC_CHECK_DECL([SF_FORMAT_OGG], AC_DEFINE([HAVE_SNDFILE_1_0_18], 1, [Define if you have libsndfile >= 1.0.18]),, [#include <sndfile.h>])

-    AC_CHECK_DECL([SFC_SET_SCALE_INT_FLOAT_WRITE], AC_DEFINE([HAVE_SFC_SET_SCALE_INT_FLOAT_WRITE], 1, [Define if you have libsndfile with SFC_SFC_SET_SCALE_INT_FLOAT_WRITE]),, [#include <sndfile.h>])

   ])

   CFLAGS="$ac_save_CFLAGS"

   LIBS="$ac_save_LIBS"

--- a/src/sndfile.c

+++ b/src/sndfile.c

@@ -186,10 +186,8 @@

   { "snd",      SF_FORMAT_AU },

   { "caf",      SF_FORMAT_CAF },

   { "flac",     SF_FORMAT_FLAC },

-#ifdef HAVE_SNDFILE_1_0_18

   { "wve",      SF_FORMAT_WVE },

   { "ogg",      SF_FORMAT_OGG },

-#endif

   { "svx",      SF_FORMAT_SVX },

   { "8svx",     SF_FORMAT_SVX },

   { "paf",      SF_ENDIAN_BIG | SF_FORMAT_PAF },

@@ -457,10 +455,8 @@

     return SOX_EOF;

   }

-#ifdef HAVE_SFC_SET_SCALE_INT_FLOAT_WRITE

   if ((sf->sf_info->format & SF_FORMAT_SUBMASK) == SF_FORMAT_FLOAT)

     sf->sf_command(sf->sf_file, SFC_SET_SCALE_INT_FLOAT_WRITE, NULL, SF_TRUE);

-#endif

   return SOX_SUCCESS;

 }