shithub: sox

Download patch

ref: 5e0fe822645dd8afaff7be94591612a36b5b8e8c
parent: 26586111dcf8a6a4e1c4cdacf1ca31f580277f1a
author: robs <robs>
date: Sat Feb 7 02:49:16 EST 2009 

formats' handler fns --> lsx_


--- a/src/8svx.c
+++ b/src/8svx.c
@@ -353,7 +353,7 @@
         lsx_writedw(ft, (unsigned) nsamples); /* samples in file */
 }
 
-SOX_FORMAT_HANDLER(svx)
+LSX_FORMAT_HANDLER(svx)
 {
   static char const * const names[] = {"8svx", NULL};
   static unsigned const write_encodings[] = {SOX_ENCODING_SIGN2, 8, 0, 0};
--- a/src/aifc-fmt.c
+++ b/src/aifc-fmt.c
@@ -18,7 +18,7 @@
 #include "sox_i.h"
 #include "aiff.h"
 
-SOX_FORMAT_HANDLER(aifc)
+LSX_FORMAT_HANDLER(aifc)
 {
   static char const * const names[] = {"aifc", "aiffc", NULL};
   static unsigned const write_encodings[] = {
--- a/src/aiff-fmt.c
+++ b/src/aiff-fmt.c
@@ -18,7 +18,7 @@
 #include "sox_i.h"
 #include "aiff.h"
 
-SOX_FORMAT_HANDLER(aiff)
+LSX_FORMAT_HANDLER(aiff)
 {
   static char const * const names[] = {"aiff", "aif", NULL};
   static unsigned const write_encodings[] = {
--- a/src/alsa.c
+++ b/src/alsa.c
@@ -262,7 +262,7 @@
   return stop(ft);
 }
 
-SOX_FORMAT_HANDLER(alsa)
+LSX_FORMAT_HANDLER(alsa)
 {
   static char const * const names[] = {"alsa", NULL};
   static unsigned const write_encodings[] = {
--- a/src/amr-nb.c
+++ b/src/amr-nb.c
@@ -40,7 +40,7 @@
 static char const magic[] = "#!AMR\n";
 #define AMR_CODED_MAX       32                  /* max coded size */
 #define AMR_ENCODING        SOX_ENCODING_AMR_NB
-#define AMR_FORMAT_FN       sox_amr_nb_format_fn
+#define AMR_FORMAT_FN       lsx_amr_nb_format_fn
 #define AMR_FRAME           160                 /* 20ms @ 8kHz */
 #define AMR_MODE_MAX        7
 #define AMR_NAMES           "amr-nb", "anb"
--- a/src/amr-wb.c
+++ b/src/amr-wb.c
@@ -30,7 +30,7 @@
 static char const magic[] = "#!AMR-WB\n";
 #define AMR_CODED_MAX       NB_SERIAL_MAX
 #define AMR_ENCODING        SOX_ENCODING_AMR_WB
-#define AMR_FORMAT_FN       sox_amr_wb_format_fn
+#define AMR_FORMAT_FN       lsx_amr_wb_format_fn
 #define AMR_FRAME           L_FRAME16k
 #define AMR_MODE_MAX        8
 #define AMR_NAMES           "amr-wb", "awb"
--- a/src/ao.c
+++ b/src/ao.c
@@ -120,7 +120,7 @@
   return SOX_SUCCESS;
 }
 
-SOX_FORMAT_HANDLER(ao)
+LSX_FORMAT_HANDLER(ao)
 {
   static char const * const names[] = {"ao", NULL};
   static unsigned const encodings[] = {SOX_ENCODING_SIGN2, 16, 0, 0};
--- a/src/au.c
+++ b/src/au.c
@@ -212,7 +212,7 @@
   return error? SOX_EOF: SOX_SUCCESS;
 }
 
-SOX_FORMAT_HANDLER(au)
+LSX_FORMAT_HANDLER(au)
 {
   static char const * const names[] = {"au", "snd", NULL};
   static unsigned const write_encodings[] = {
--- a/src/avr.c
+++ b/src/avr.c
@@ -269,7 +269,7 @@
   return(SOX_SUCCESS);
 }
 
-SOX_FORMAT_HANDLER(avr)
+LSX_FORMAT_HANDLER(avr)
 {
   static char const * const names[] = { "avr", NULL };
   static unsigned const write_encodings[] = {
--- a/src/caf.c
+++ b/src/caf.c
@@ -19,7 +19,7 @@
 
 #if defined HAVE_SNDFILE_1_0_12
 
-SOX_FORMAT_HANDLER(caf)
+LSX_FORMAT_HANDLER(caf)
 {
   static char const * const names[] = {"caf", NULL};
   static unsigned const write_encodings[] = {
@@ -29,7 +29,7 @@
     SOX_ENCODING_ULAW, 8, 0,
     0};
   static sox_format_handler_t handler;
-  handler = *sox_sndfile_format_fn();
+  handler = *lsx_sndfile_format_fn();
   handler.description = "Apples's Core Audio Format";
   handler.names = names;
   handler.write_formats = write_encodings;
--- a/src/cdr.c
+++ b/src/cdr.c
@@ -33,7 +33,7 @@
   return SOX_SUCCESS;
 }
 
-SOX_FORMAT_HANDLER(cdr)
+LSX_FORMAT_HANDLER(cdr)
 {
   static char const * const names[] = {"cdda", "cdr", NULL};
   static unsigned const write_encodings[] = {SOX_ENCODING_SIGN2, 16, 0, 0};
--- a/src/coreaudio.c
+++ b/src/coreaudio.c
@@ -304,7 +304,7 @@
   return SOX_SUCCESS;
 }
 
-SOX_FORMAT_HANDLER(coreaudio)
+LSX_FORMAT_HANDLER(coreaudio)
 {
   static char const *const names[] = { "coreaudio", NULL };
   static unsigned const write_encodings[] = {
--- a/src/cvsd-fmt.c
+++ b/src/cvsd-fmt.c
@@ -17,7 +17,7 @@
 
 #include "cvsd.h"
 
-SOX_FORMAT_HANDLER(cvsd)
+LSX_FORMAT_HANDLER(cvsd)
 {
   static char const * const names[] = {"cvsd", "cvs", NULL};
   static unsigned const write_encodings[] = {SOX_ENCODING_CVSD, 1, 0, 0};
@@ -101,7 +101,7 @@
   return len;
 }
 
-SOX_FORMAT_HANDLER(cvu)
+LSX_FORMAT_HANDLER(cvu)
 {
   static char const * const names[] = {"cvu", NULL};
   static unsigned const write_encodings[] = {SOX_ENCODING_CVSD, 1, 0, 0};
--- a/src/dat.c
+++ b/src/dat.c
@@ -148,7 +148,7 @@
     return done;
 }
 
-SOX_FORMAT_HANDLER(dat)
+LSX_FORMAT_HANDLER(dat)
 {
   static char const * const names[] = {"dat", NULL};
   static unsigned const write_encodings[] = {SOX_ENCODING_FLOAT_TEXT, 0, 0};
--- a/src/dvms-fmt.c
+++ b/src/dvms-fmt.c
@@ -17,7 +17,7 @@
 
 #include "cvsd.h"
 
-SOX_FORMAT_HANDLER(dvms)
+LSX_FORMAT_HANDLER(dvms)
 {
   static char const * const names[] = {"dvms", "vms", NULL};
   static unsigned const write_encodings[] = {SOX_ENCODING_CVSD, 1, 0, 0};
--- a/src/fap.c
+++ b/src/fap.c
@@ -19,12 +19,12 @@
 
 #if defined HAVE_SNDFILE
 
-SOX_FORMAT_HANDLER(fap)
+LSX_FORMAT_HANDLER(fap)
 {
   static char const * const names[] = {"fap", NULL};
   static unsigned const write_encodings[] = {SOX_ENCODING_SIGN2, 24, 16, 8,0,0};
   static sox_format_handler_t handler;
-  handler = *sox_sndfile_format_fn();
+  handler = *lsx_sndfile_format_fn();
   handler.description =
     "Ensoniq PARIS digitial audio editing system (little endian)";
   handler.names = names;
--- a/src/ffmpeg.c
+++ b/src/ffmpeg.c
@@ -477,7 +477,7 @@
   return SOX_SUCCESS;
 }
 
-SOX_FORMAT_HANDLER(ffmpeg)
+LSX_FORMAT_HANDLER(ffmpeg)
 {
   /* Format file suffixes */
   /* For now, comment out formats built in to SoX */
--- a/src/flac.c
+++ b/src/flac.c
@@ -496,7 +496,7 @@
 
 
 
-SOX_FORMAT_HANDLER(flac)
+LSX_FORMAT_HANDLER(flac)
 {
   static char const * const names[] = {"flac", NULL};
   static unsigned const encodings[] = {SOX_ENCODING_FLAC, 8, 16, 24, 0, 0};
--- a/src/formats.c
+++ b/src/formats.c
@@ -1062,12 +1062,12 @@
 
 #else /* Static format handlers */
 
-#define FORMAT(f) extern sox_format_handler_t const * sox_##f##_format_fn(void);
+#define FORMAT(f) extern sox_format_handler_t const * lsx_##f##_format_fn(void);
 #include "formats.h"
 #undef FORMAT
 
 sox_format_tab_t sox_format_fns[] = {
-  #define FORMAT(f) {NULL, sox_##f##_format_fn},
+  #define FORMAT(f) {NULL, lsx_##f##_format_fn},
   #include "formats.h"
   #undef FORMAT
   {NULL, NULL}
--- a/src/gsm.c
+++ b/src/gsm.c
@@ -240,7 +240,7 @@
         return sox_gsmstopread(ft); /* destroy handles and free buffers */
 }
 
-SOX_FORMAT_HANDLER(gsm)
+LSX_FORMAT_HANDLER(gsm)
 {
   static char const * const names[] = {"gsm", NULL};
   static sox_rate_t   const write_rates[] = {8000, 0};
--- a/src/hcom.c
+++ b/src/hcom.c
@@ -461,7 +461,7 @@
   return rc;
 }
 
-SOX_FORMAT_HANDLER(hcom)
+LSX_FORMAT_HANDLER(hcom)
 {
   static char const * const names[]       = {"hcom", NULL};
   static sox_rate_t   const write_rates[] = {22050,22050/2,22050/3,22050/4.,0};
--- a/src/htk.c
+++ b/src/htk.c
@@ -58,7 +58,7 @@
       || lsx_writew(ft, Waveform) ? SOX_EOF : SOX_SUCCESS;
 }
 
-SOX_FORMAT_HANDLER(htk)
+LSX_FORMAT_HANDLER(htk)
 {
   static char const * const names[] = {"htk", NULL};
   static unsigned const write_encodings[] = {SOX_ENCODING_SIGN2, 16, 0, 0};
--- a/src/ima-fmt.c
+++ b/src/ima-fmt.c
@@ -19,7 +19,7 @@
 #include "adpcms.h"
 #include "vox.h"
 
-SOX_FORMAT_HANDLER(ima)
+LSX_FORMAT_HANDLER(ima)
 {
   static char const * const names[] = {"ima", NULL};
   static unsigned const write_encodings[] = {SOX_ENCODING_IMA_ADPCM, 4, 0, 0};
--- a/src/lpc10.c
+++ b/src/lpc10.c
@@ -214,7 +214,7 @@
   return SOX_SUCCESS;
 }
 
-SOX_FORMAT_HANDLER(lpc10)
+LSX_FORMAT_HANDLER(lpc10)
 {
   static char const * const names[] = {"lpc10", "lpc", NULL};
   static sox_rate_t   const write_rates[] = {8000, 0};
--- a/src/mat4.c
+++ b/src/mat4.c
@@ -19,7 +19,7 @@
 
 #if defined HAVE_SNDFILE
 
-SOX_FORMAT_HANDLER(mat4)
+LSX_FORMAT_HANDLER(mat4)
 {
   static char const * const names[] = {"mat4", "mat", NULL};
   static unsigned const write_encodings[] = {
@@ -27,7 +27,7 @@
     SOX_ENCODING_FLOAT, 32, 64, 0,
     0};
   static sox_format_handler_t handler;
-  handler = *sox_sndfile_format_fn();
+  handler = *lsx_sndfile_format_fn();
   handler.description = "Gnu Octave 2.0 format";
   handler.names = names;
   handler.write_formats = write_encodings;
--- a/src/mat5.c
+++ b/src/mat5.c
@@ -19,7 +19,7 @@
 
 #if defined HAVE_SNDFILE
 
-SOX_FORMAT_HANDLER(mat5)
+LSX_FORMAT_HANDLER(mat5)
 {
   static char const * const names[] = {"mat5", NULL};
   static unsigned const write_encodings[] = {
@@ -27,7 +27,7 @@
     SOX_ENCODING_FLOAT, 32, 64, 0,
     0};
   static sox_format_handler_t handler;
-  handler = *sox_sndfile_format_fn();
+  handler = *lsx_sndfile_format_fn();
   handler.description = "Gnu Octave 2.1 format";
   handler.names = names;
   handler.write_formats = write_encodings;
--- a/src/maud.c
+++ b/src/maud.c
@@ -315,7 +315,7 @@
         lsx_writedw(ft, p->nsamples * (ft->encoding.bits_per_sample >> 3)); /* samples in file */
 }
 
-SOX_FORMAT_HANDLER(maud)
+LSX_FORMAT_HANDLER(maud)
 {
   static char const * const names[] = {"maud", NULL};
   static unsigned const write_encodings[] = {
--- a/src/mp3.c
+++ b/src/mp3.c
@@ -501,7 +501,7 @@
 #define stopwrite NULL
 #endif /* HAVE_LAME_LAME_H */
 
-SOX_FORMAT_HANDLER(mp3)
+LSX_FORMAT_HANDLER(mp3)
 {
   static char const * const names[] = {"mp3", "mp2", "audio/mpeg", NULL};
   static unsigned const write_encodings[] = {
--- a/src/nulfile.c
+++ b/src/nulfile.c
@@ -47,7 +47,7 @@
   return len; /* Return number of samples "written". */
 }
 
-SOX_FORMAT_HANDLER(nul)
+LSX_FORMAT_HANDLER(nul)
 {
   static const char * const names[] = {"null", NULL};
   static sox_format_handler_t const handler = {SOX_LIB_VERSION_CODE,
--- a/src/oss.c
+++ b/src/oss.c
@@ -195,7 +195,7 @@
     return(SOX_SUCCESS);
 }
 
-SOX_FORMAT_HANDLER(oss)
+LSX_FORMAT_HANDLER(oss)
 {
   static char const * const names[] = {"ossdsp", "oss", NULL};
   static unsigned const write_encodings[] = {
--- a/src/paf.c
+++ b/src/paf.c
@@ -19,12 +19,12 @@
 
 #if defined HAVE_SNDFILE
 
-SOX_FORMAT_HANDLER(paf)
+LSX_FORMAT_HANDLER(paf)
 {
   static char const * const names[] = {"paf", NULL};
   static unsigned const write_encodings[] = {SOX_ENCODING_SIGN2, 24, 16, 8,0,0};
   static sox_format_handler_t handler;
-  handler = *sox_sndfile_format_fn();
+  handler = *lsx_sndfile_format_fn();
   handler.description =
     "Ensoniq PARIS digitial audio editing system (big endian)";
   handler.names = names;
--- a/src/prc.c
+++ b/src/prc.c
@@ -429,7 +429,7 @@
   lsx_writedw(ft, p->nbytes);    /* Number of bytes of data */
 }
 
-SOX_FORMAT_HANDLER(prc)
+LSX_FORMAT_HANDLER(prc)
 {
   static char const * const names[]           = {"prc", NULL};
   static sox_rate_t   const write_rates[]     = {8000, 0};
--- a/src/pulseaudio.c
+++ b/src/pulseaudio.c
@@ -152,7 +152,7 @@
   return SOX_SUCCESS;
 }
 
-SOX_FORMAT_HANDLER(pulseaudio)
+LSX_FORMAT_HANDLER(pulseaudio)
 {
   static char const *const names[] = { "pulseaudio", NULL };
   static unsigned const write_encodings[] = {
--- a/src/pvf.c
+++ b/src/pvf.c
@@ -19,12 +19,12 @@
 
 #if defined HAVE_SNDFILE
 
-SOX_FORMAT_HANDLER(pvf)
+LSX_FORMAT_HANDLER(pvf)
 {
   static char const * const names[] = {"pvf", NULL};
   static unsigned const write_encodings[] = {SOX_ENCODING_SIGN2, 32, 16, 8,0,0};
   static sox_format_handler_t handler;
-  handler = *sox_sndfile_format_fn();
+  handler = *lsx_sndfile_format_fn();
   handler.description = "Portable Voice Format";
   handler.names = names;
   handler.write_formats = write_encodings;
--- a/src/raw-fmt.c
+++ b/src/raw-fmt.c
@@ -21,7 +21,7 @@
   return lsx_rawstart(ft, sox_false, sox_false, sox_true, SOX_ENCODING_UNKNOWN, 0);
 }
 
-SOX_FORMAT_HANDLER(raw)
+LSX_FORMAT_HANDLER(raw)
 {
   static char const * const names[] = {"raw", NULL};
   static unsigned const encodings[] = {
--- a/src/raw.h
+++ b/src/raw.h
@@ -19,8 +19,8 @@
 static int id ## _start(sox_format_t * ft) { \
   return lsx_rawstart(ft, sox_true, sox_true, sox_true, SOX_ENCODING_ ## encoding, size); \
 } \
-const sox_format_handler_t *sox_ ## id ## _format_fn(void); \
-const sox_format_handler_t *sox_ ## id ## _format_fn(void) { \
+const sox_format_handler_t *lsx_ ## id ## _format_fn(void); \
+const sox_format_handler_t *lsx_ ## id ## _format_fn(void) { \
   static unsigned const write_encodings[] = { \
     SOX_ENCODING_ ## encoding, size, 0, 0}; \
   static sox_format_handler_t handler = { \
--- a/src/sd2.c
+++ b/src/sd2.c
@@ -19,12 +19,12 @@
 
 #if defined HAVE_SNDFILE
 
-SOX_FORMAT_HANDLER(sd2)
+LSX_FORMAT_HANDLER(sd2)
 {
   static char const * const names[] = {"sd2", NULL};
   static unsigned const write_encodings[] = {SOX_ENCODING_SIGN2, 24, 16, 8,0,0};
   static sox_format_handler_t handler;
-  handler = *sox_sndfile_format_fn();
+  handler = *lsx_sndfile_format_fn();
   handler.description = "Sound Designer II";
   handler.names = names;
   handler.write_formats = write_encodings;
--- a/src/sf.c
+++ b/src/sf.c
@@ -134,7 +134,7 @@
   return error? SOX_EOF: SOX_SUCCESS;
 }
 
-SOX_FORMAT_HANDLER(sf)
+LSX_FORMAT_HANDLER(sf)
 {
   static char const * const names[] = {"sf", "ircam", NULL};
   static unsigned const write_encodings[] = {
--- a/src/skelform.c
+++ b/src/skelform.c
@@ -190,7 +190,7 @@
   return SOX_SUCCESS;
 }
 
-SOX_FORMAT_HANDLER(skel)
+LSX_FORMAT_HANDLER(skel)
 {
   /* Format file suffixes */
   static const char *names[] = {"skel",NULL };
--- a/src/smp.c
+++ b/src/smp.c
@@ -396,7 +396,7 @@
         return(SOX_SUCCESS);
 }
 
-SOX_FORMAT_HANDLER(smp)
+LSX_FORMAT_HANDLER(smp)
 {
   static char const * const names[] = {"smp", NULL};
   static unsigned const write_encodings[] = {SOX_ENCODING_SIGN2, 16, 0, 0};
--- a/src/sndfile.c
+++ b/src/sndfile.c
@@ -401,7 +401,7 @@
   return SOX_SUCCESS;
 }
 
-SOX_FORMAT_HANDLER(sndfile)
+LSX_FORMAT_HANDLER(sndfile)
 {
   static char const * const names[] = {
     "sndfile", /* Special type to force use of sndfile for the following: */
--- a/src/sndio.c
+++ b/src/sndio.c
@@ -220,7 +220,7 @@
   return len - todo;
 }
 
-SOX_FORMAT_HANDLER(sndio)
+LSX_FORMAT_HANDLER(sndio)
 {
   static char const * const names[] = {"sndio", NULL};
   static unsigned const write_encodings[] = {
--- a/src/sounder.c
+++ b/src/sounder.c
@@ -40,7 +40,7 @@
       SOX_EOF : SOX_SUCCESS;
 }
 
-SOX_FORMAT_HANDLER(sounder)
+LSX_FORMAT_HANDLER(sounder)
 {
   static char const * const names[] = {"sndr", NULL};
   static unsigned const write_encodings[] = {SOX_ENCODING_UNSIGNED, 8, 0, 0};
--- a/src/soundtool.c
+++ b/src/soundtool.c
@@ -63,7 +63,7 @@
       || lsx_writechars(ft, text_buf, sizeof(text_buf))?  SOX_EOF:SOX_SUCCESS;
 }
 
-SOX_FORMAT_HANDLER(soundtool)
+LSX_FORMAT_HANDLER(soundtool)
 {
   static char const * const names[] = {"sndt", NULL};
   static unsigned const write_encodings[] = {SOX_ENCODING_UNSIGNED, 8, 0, 0};
--- a/src/sox-fmt.c
+++ b/src/sox-fmt.c
@@ -90,7 +90,7 @@
   return error? SOX_EOF: SOX_SUCCESS;
 }
 
-SOX_FORMAT_HANDLER(sox)
+LSX_FORMAT_HANDLER(sox)
 {
   static char const * const names[] = {"sox", NULL};
   static unsigned const write_encodings[] = {SOX_ENCODING_SIGN2, 32, 0, 0};
--- a/src/sox_i.h
+++ b/src/sox_i.h
@@ -232,9 +232,9 @@
 int lsx_check_read_params(sox_format_t * ft, unsigned channels,
     sox_rate_t rate, sox_encoding_t encoding, unsigned bits_per_sample,
     off_t num_samples, sox_bool check_length);
-#define SOX_FORMAT_HANDLER(name) \
-sox_format_handler_t const * sox_##name##_format_fn(void); \
-sox_format_handler_t const * sox_##name##_format_fn(void)
+#define LSX_FORMAT_HANDLER(name) \
+sox_format_handler_t const * lsx_##name##_format_fn(void); \
+sox_format_handler_t const * lsx_##name##_format_fn(void)
 #define div_bits(size, bits) (off_t)((double)(size) * 8 / bits)
 
 /* Raw I/O */
@@ -250,7 +250,7 @@
 #define lsx_rawstopread NULL
 #define lsx_rawstopwrite NULL
 
-extern sox_format_handler_t const * sox_sndfile_format_fn(void);
+extern sox_format_handler_t const * lsx_sndfile_format_fn(void);
 
 char * lsx_cat_comments(sox_comments_t comments);
 
--- a/src/sphere.c
+++ b/src/sphere.c
@@ -176,7 +176,7 @@
   return SOX_SUCCESS;
 }
 
-SOX_FORMAT_HANDLER(sphere)
+LSX_FORMAT_HANDLER(sphere)
 {
   static char const *const names[] = {"sph", "nist", NULL};
   static unsigned const write_encodings[] = {
--- a/src/sunaudio.c
+++ b/src/sunaudio.c
@@ -305,7 +305,7 @@
     return (SOX_SUCCESS);
 }
 
-SOX_FORMAT_HANDLER(sunau)
+LSX_FORMAT_HANDLER(sunau)
 {
   static char const * const names[] = {"sunau", NULL};
   static unsigned const write_encodings[] = {
--- a/src/tx16w.c
+++ b/src/tx16w.c
@@ -367,7 +367,7 @@
     return(SOX_SUCCESS);
 }
 
-SOX_FORMAT_HANDLER(txw)
+LSX_FORMAT_HANDLER(txw)
 {
   static char const * const names[] = {"txw", NULL};
   static sox_rate_t   const write_rates[] = {1e5/6, 1e5/3, 1e5/2, 0};
--- a/src/voc.c
+++ b/src/voc.c
@@ -772,7 +772,7 @@
   }
 }
 
-SOX_FORMAT_HANDLER(voc)
+LSX_FORMAT_HANDLER(voc)
 {
   static char const *const names[] = { "voc", NULL };
   static unsigned const write_encodings[] = {
--- a/src/vorbis.c
+++ b/src/vorbis.c
@@ -390,7 +390,7 @@
   return ov_pcm_seek(vb->vf, (ogg_int64_t)(offset / ft->signal.channels))? SOX_EOF:SOX_SUCCESS;
 }
 
-SOX_FORMAT_HANDLER(vorbis)
+LSX_FORMAT_HANDLER(vorbis)
 {
   static const char *names[] = {"vorbis", "ogg", NULL};
   static unsigned encodings[] = {SOX_ENCODING_VORBIS, 0, 0};
--- a/src/vox-fmt.c
+++ b/src/vox-fmt.c
@@ -19,7 +19,7 @@
 #include "adpcms.h"
 #include "vox.h"
 
-SOX_FORMAT_HANDLER(vox)
+LSX_FORMAT_HANDLER(vox)
 {
   static char const * const names[] = {"vox", NULL};
   static unsigned const write_encodings[] = {SOX_ENCODING_OKI_ADPCM, 4, 0, 0};
--- a/src/w64.c
+++ b/src/w64.c
@@ -19,7 +19,7 @@
 
 #if defined HAVE_SNDFILE
 
-SOX_FORMAT_HANDLER(w64)
+LSX_FORMAT_HANDLER(w64)
 {
   static char const * const names[] = {"w64", NULL};
   static unsigned const write_encodings[] = {
@@ -33,7 +33,7 @@
     SOX_ENCODING_GSM, 0,
     0};
   static sox_format_handler_t handler;
-  handler = *sox_sndfile_format_fn();
+  handler = *lsx_sndfile_format_fn();
   handler.description = "Sound Forge Audio Format";
   handler.names = names;
   handler.write_formats = write_encodings;
--- a/src/wav.c
+++ b/src/wav.c
@@ -1629,7 +1629,7 @@
   return ft->sox_errno;
 }
 
-SOX_FORMAT_HANDLER(wav)
+LSX_FORMAT_HANDLER(wav)
 {
   static char const * const names[] = {"wav", "wavpcm", "amb", NULL};
   static unsigned const write_encodings[] = {
--- a/src/wavpack.c
+++ b/src/wavpack.c
@@ -161,7 +161,7 @@
   return WavpackSeekSample(p->codec, (uint32_t) (offset / ft->signal.channels))? SOX_SUCCESS : SOX_EOF;
 }
 
-SOX_FORMAT_HANDLER(wavpack)
+LSX_FORMAT_HANDLER(wavpack)
 {
   static char const * const names[] = {"wv", NULL};
   static unsigned const write_encodings[] = {
--- a/src/wve.c
+++ b/src/wve.c
@@ -45,7 +45,7 @@
       || lsx_writechars(ft, ID2, sizeof(ID2))? SOX_EOF:SOX_SUCCESS;
 }
 
-SOX_FORMAT_HANDLER(wve)
+LSX_FORMAT_HANDLER(wve)
 {
   static char const * const names[] = {"wve", NULL};
   static sox_rate_t   const write_rates[] = {8000, 0};
--- a/src/xa.c
+++ b/src/xa.c
@@ -277,7 +277,7 @@
     return SOX_SUCCESS;
 }
 
-SOX_FORMAT_HANDLER(xa)
+LSX_FORMAT_HANDLER(xa)
 {
   static char const * const names[] = {"xa", NULL };
   static sox_format_handler_t const handler = {SOX_LIB_VERSION_CODE,
--- a/src/xi.c
+++ b/src/xi.c
@@ -19,12 +19,12 @@
 
 #if defined HAVE_SNDFILE
 
-SOX_FORMAT_HANDLER(xi)
+LSX_FORMAT_HANDLER(xi)
 {
   static char const * const names[] = {"xi", NULL};
   static unsigned const write_encodings[] = {SOX_ENCODING_DPCM, 16, 8, 0, 0};
   static sox_format_handler_t handler;
-  handler = *sox_sndfile_format_fn();
+  handler = *lsx_sndfile_format_fn();
   handler.description = "Fasttracker 2";
   handler.names = names;
   handler.write_formats = write_encodings;