X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fsox%2Ffilter_sox.c;h=42bf8128845ff8cd4a3c5962ecdbfd64f31c7d1c;hb=1971a6aa9301e7c841b7dda42eab6fff7d69763c;hp=561fa657e96883b043de4916cbd8262cedb811f1;hpb=ee550b8c693729b1a6cb216de578446785612777;p=melted diff --git a/src/modules/sox/filter_sox.c b/src/modules/sox/filter_sox.c index 561fa65..42bf812 100644 --- a/src/modules/sox/filter_sox.c +++ b/src/modules/sox/filter_sox.c @@ -35,16 +35,20 @@ # define ST_SUCCESS SOX_SUCCESS # define st_sample_t sox_sample_t # define eff_t sox_effect_t* -# define st_size_t sox_size_t # define ST_LIB_VERSION_CODE SOX_LIB_VERSION_CODE # define ST_LIB_VERSION SOX_LIB_VERSION +# if (ST_LIB_VERSION_CODE >= ST_LIB_VERSION(14,2,0)) +# define st_size_t size_t +# else +# define st_size_t sox_size_t +# endif # define ST_SIGNED_WORD_TO_SAMPLE(d,clips) SOX_SIGNED_16BIT_TO_SAMPLE(d,clips) -#if (ST_LIB_VERSION_CODE >= ST_LIB_VERSION(14,1,0)) -# define ST_SSIZE_MIN SOX_SAMPLE_MIN -#else -# define ST_SSIZE_MIN SOX_SSIZE_MIN -#endif -# define ST_SAMPLE_TO_SIGNED_WORD(d,clips) SOX_SAMPLE_TO_SIGNED_16BIT(d,clips) +# if (ST_LIB_VERSION_CODE >= ST_LIB_VERSION(14,1,0)) +# define ST_SSIZE_MIN SOX_SAMPLE_MIN +# else +# define ST_SSIZE_MIN SOX_SSIZE_MIN +# endif +# define ST_SAMPLE_TO_SIGNED_WORD(d,clips) SOX_SAMPLE_TO_SIGNED_16BIT(d,clips) #else # include #endif