shithub: sox

Download patch

ref: 26586111dcf8a6a4e1c4cdacf1ca31f580277f1a
parent: f8a42f45b72f991fcac0afb3aa4fc552ac3be15c
author: robs <robs>
date: Sat Feb 7 02:32:51 EST 2009

effects' hander fns --> lsx_

--- a/src/bend.c
+++ b/src/bend.c
@@ -292,7 +292,7 @@
   return SOX_SUCCESS;
 }
 
-sox_effect_handler_t const *sox_bend_effect_fn(void)
+sox_effect_handler_t const *lsx_bend_effect_fn(void)
 {
   static sox_effect_handler_t handler = {
     "bend", "[-f frame-rate(25)] [-o over-sample(16)] {delay,cents,duration}",
--- a/src/biquads.c
+++ b/src/biquads.c
@@ -372,7 +372,7 @@
 
 
 #define BIQUAD_EFFECT(name,group,usage,flags) \
-sox_effect_handler_t const * sox_##name##_effect_fn(void) { \
+sox_effect_handler_t const * lsx_##name##_effect_fn(void) { \
   static sox_effect_handler_t handler = { \
     #name, usage, flags, \
     group##_getopts, start, lsx_biquad_flow, 0, 0, 0, sizeof(biquad_t)\
--- a/src/chorus.c
+++ b/src/chorus.c
@@ -342,7 +342,7 @@
   NULL, sizeof(priv_t)
 };
 
-const sox_effect_handler_t *sox_chorus_effect_fn(void)
+const sox_effect_handler_t *lsx_chorus_effect_fn(void)
 {
     return &sox_chorus_effect;
 }
--- a/src/compand.c
+++ b/src/compand.c
@@ -272,7 +272,7 @@
   return SOX_SUCCESS;
 }
 
-sox_effect_handler_t const * sox_compand_effect_fn(void)
+sox_effect_handler_t const * lsx_compand_effect_fn(void)
 {
   static sox_effect_handler_t handler = {
     "compand", compand_usage, SOX_EFF_MCHAN | SOX_EFF_GAIN,
--- a/src/contrast.c
+++ b/src/contrast.c
@@ -41,7 +41,7 @@
   return SOX_SUCCESS;
 }
 
-sox_effect_handler_t const * sox_contrast_effect_fn(void)
+sox_effect_handler_t const * lsx_contrast_effect_fn(void)
 {
   static sox_effect_handler_t handler = {"contrast", "[enhancement (75)]",
     SOX_EFF_MCHAN, create, NULL, flow, NULL, NULL, NULL, sizeof(priv_t)};
--- a/src/dcshift.c
+++ b/src/dcshift.c
@@ -182,7 +182,7 @@
   NULL, sizeof(priv_t)
 };
 
-const sox_effect_handler_t *sox_dcshift_effect_fn(void)
+const sox_effect_handler_t *lsx_dcshift_effect_fn(void)
 {
     return &sox_dcshift_effect;
 }
--- a/src/delay.c
+++ b/src/delay.c
@@ -116,7 +116,7 @@
   return SOX_SUCCESS;
 }
 
-sox_effect_handler_t const * sox_delay_effect_fn(void)
+sox_effect_handler_t const * lsx_delay_effect_fn(void)
 {
   static sox_effect_handler_t handler = {
     "delay", "{length}", SOX_EFF_LENGTH | SOX_EFF_MODIFY,
--- a/src/dft_filter.c
+++ b/src/dft_filter.c
@@ -132,7 +132,7 @@
   return SOX_SUCCESS;
 }
 
-sox_effect_handler_t const * sox_dft_filter_effect_fn(void)
+sox_effect_handler_t const * lsx_dft_filter_effect_fn(void)
 {
   static sox_effect_handler_t handler = {
     NULL, NULL, SOX_EFF_GAIN, NULL, start, flow, drain, stop, NULL, 0
--- a/src/dither.c
+++ b/src/dither.c
@@ -276,7 +276,7 @@
   return p->flow(effp, ibuf, obuf, isamp, osamp);
 }
 
-sox_effect_handler_t const * sox_dither_effect_fn(void)
+sox_effect_handler_t const * lsx_dither_effect_fn(void)
 {
   static sox_effect_handler_t handler = {
     "dither", "[-R] [-r|-t] [-s|-f filter] [depth]"
--- a/src/earwax.c
+++ b/src/earwax.c
@@ -89,7 +89,7 @@
 
 /* No drain: preserve audio file length; it's only 32 samples anyway. */
 
-sox_effect_handler_t const *sox_earwax_effect_fn(void)
+sox_effect_handler_t const *lsx_earwax_effect_fn(void)
 {
   static sox_effect_handler_t handler = {"earwax", NULL, SOX_EFF_MCHAN,
     NULL, start, flow, NULL, NULL, NULL, sizeof(priv_t)};
--- a/src/echo.c
+++ b/src/echo.c
@@ -257,7 +257,7 @@
   NULL, sizeof(priv_t)
 };
 
-const sox_effect_handler_t *sox_echo_effect_fn(void)
+const sox_effect_handler_t *lsx_echo_effect_fn(void)
 {
     return &sox_echo_effect;
 }
--- a/src/echos.c
+++ b/src/echos.c
@@ -269,7 +269,7 @@
   NULL, sizeof(priv_t)
 };
 
-const sox_effect_handler_t *sox_echos_effect_fn(void)
+const sox_effect_handler_t *lsx_echos_effect_fn(void)
 {
     return &sox_echos_effect;
 }
--- a/src/effects.c
+++ b/src/effects.c
@@ -417,7 +417,7 @@
 
 /* Free resources related to effect.
  * Note: This currently closes down the effect which might
- * note be obvious from name.
+ * not be obvious from name.
  */
 void sox_delete_effect(sox_effect_t *effp)
 {
@@ -445,7 +445,7 @@
 
 /* Remove all effects from the chain.
  * Note: This currently closes down the effect which might
- * note be obvious from name.
+ * not be obvious from name.
  */
 void sox_delete_effects(sox_effects_chain_t * chain)
 {
@@ -461,7 +461,7 @@
 /* Effects library: */
 
 sox_effect_fn_t sox_effect_fns[] = {
-#define EFFECT(f) sox_##f##_effect_fn,
+#define EFFECT(f) lsx_##f##_effect_fn,
 #include "effects.h"
 #undef EFFECT
   NULL
--- a/src/fade.c
+++ b/src/fade.c
@@ -371,7 +371,7 @@
   kill, sizeof(priv_t)
 };
 
-const sox_effect_handler_t *sox_fade_effect_fn(void)
+const sox_effect_handler_t *lsx_fade_effect_fn(void)
 {
     return &sox_fade_effect;
 }
--- a/src/filter.c
+++ b/src/filter.c
@@ -438,7 +438,7 @@
   NULL, sizeof(priv_t)
 };
 
-const sox_effect_handler_t *sox_filter_effect_fn(void)
+const sox_effect_handler_t *lsx_filter_effect_fn(void)
 {
     return &sox_filter_effect;
 }
--- a/src/fir.c
+++ b/src/fir.c
@@ -67,13 +67,13 @@
     }
     lsx_set_dft_filter(f, p->h, p->n, p->n >> 1);
   }
-  return sox_dft_filter_effect_fn()->start(effp);
+  return lsx_dft_filter_effect_fn()->start(effp);
 }
 
-sox_effect_handler_t const * sox_fir_effect_fn(void)
+sox_effect_handler_t const * lsx_fir_effect_fn(void)
 {
   static sox_effect_handler_t handler;
-  handler = *sox_dft_filter_effect_fn();
+  handler = *lsx_dft_filter_effect_fn();
   handler.name = "fir";
   handler.usage = "[coef-file|coefs]";
   handler.getopts = create;
--- a/src/firfit.c
+++ b/src/firfit.c
@@ -117,13 +117,13 @@
       return SOX_EOF;
     lsx_set_dft_filter(f, make_filter(effp), p->n, p->n >> 1);
   }
-  return sox_dft_filter_effect_fn()->start(effp);
+  return lsx_dft_filter_effect_fn()->start(effp);
 }
 
-sox_effect_handler_t const * sox_firfit_effect_fn(void)
+sox_effect_handler_t const * lsx_firfit_effect_fn(void)
 {
   static sox_effect_handler_t handler;
-  handler = *sox_dft_filter_effect_fn();
+  handler = *lsx_dft_filter_effect_fn();
   handler.name = "firfit";
   handler.usage = "[knots-file]";
   handler.flags |= SOX_EFF_DEPRECATED;
--- a/src/flanger.c
+++ b/src/flanger.c
@@ -234,7 +234,7 @@
 
 
 
-sox_effect_handler_t const * sox_flanger_effect_fn(void)
+sox_effect_handler_t const * lsx_flanger_effect_fn(void)
 {
   static sox_effect_handler_t handler = {
     "flanger", NULL, SOX_EFF_MCHAN,
--- a/src/gain.c
+++ b/src/gain.c
@@ -224,7 +224,7 @@
   return SOX_SUCCESS;
 }
 
-sox_effect_handler_t const * sox_gain_effect_fn(void)
+sox_effect_handler_t const * lsx_gain_effect_fn(void)
 {
   static sox_effect_handler_t handler = {
     "gain", NULL, SOX_EFF_GAIN,
@@ -265,13 +265,13 @@
   if (argc)
     argv2[argc2++] = *argv, --argc, ++argv;
   return argc? lsx_usage(effp) :
-    sox_gain_effect_fn()->getopts(effp, argc2, argv2);
+    lsx_gain_effect_fn()->getopts(effp, argc2, argv2);
 }
 
-sox_effect_handler_t const * sox_norm_effect_fn(void)
+sox_effect_handler_t const * lsx_norm_effect_fn(void)
 {
   static sox_effect_handler_t handler;
-  handler = *sox_gain_effect_fn();
+  handler = *lsx_gain_effect_fn();
   handler.name = "norm";
   handler.usage = "[level]";
   handler.getopts = norm_getopts;
--- a/src/input.c
+++ b/src/input.c
@@ -47,7 +47,7 @@
   return *osamp? SOX_SUCCESS : SOX_EOF;
 }
 
-sox_effect_handler_t const * sox_input_effect_fn(void)
+sox_effect_handler_t const * lsx_input_effect_fn(void)
 {
   static sox_effect_handler_t handler = {
     "input", NULL, SOX_EFF_MCHAN | SOX_EFF_DEPRECATED,
--- a/src/ladspa.c
+++ b/src/ladspa.c
@@ -300,7 +300,7 @@
   NULL, sizeof(priv_t)
 };
 
-const sox_effect_handler_t *sox_ladspa_effect_fn(void)
+const sox_effect_handler_t *lsx_ladspa_effect_fn(void)
 {
   return &sox_ladspa_effect;
 }
--- a/src/loudness.c
+++ b/src/loudness.c
@@ -113,13 +113,13 @@
     }
     lsx_set_dft_filter(f, h, p->n, p->n >> 1);
   }
-  return sox_dft_filter_effect_fn()->start(effp);
+  return lsx_dft_filter_effect_fn()->start(effp);
 }
 
-sox_effect_handler_t const * sox_loudness_effect_fn(void)
+sox_effect_handler_t const * lsx_loudness_effect_fn(void)
 {
   static sox_effect_handler_t handler;
-  handler = *sox_dft_filter_effect_fn();
+  handler = *lsx_dft_filter_effect_fn();
   handler.name = "loudness";
   handler.usage = "[gain [ref]]";
   handler.getopts = create;
--- a/src/mcompand.c
+++ b/src/mcompand.c
@@ -481,7 +481,7 @@
   return SOX_SUCCESS;
 }
 
-const sox_effect_handler_t *sox_mcompand_effect_fn(void)
+const sox_effect_handler_t *lsx_mcompand_effect_fn(void)
 {
   static sox_effect_handler_t handler = {
     "mcompand",
--- a/src/mixer.c
+++ b/src/mixer.c
@@ -541,7 +541,7 @@
     return (SOX_SUCCESS);
 }
 
-sox_effect_handler_t const * sox_mixer_effect_fn(void)
+sox_effect_handler_t const * lsx_mixer_effect_fn(void)
 {
   static sox_effect_handler_t handler = {
     "mixer",
@@ -558,13 +558,13 @@
 {
   char * args[] = {0, "1,1,-1,-1"};
   args[0] = argv[0];
-  return --argc? lsx_usage(effp) : sox_mixer_effect_fn()->getopts(effp, (int)array_length(args), args);
+  return --argc? lsx_usage(effp) : lsx_mixer_effect_fn()->getopts(effp, (int)array_length(args), args);
 }
 
-sox_effect_handler_t const * sox_oops_effect_fn(void)
+sox_effect_handler_t const * lsx_oops_effect_fn(void)
 {
   static sox_effect_handler_t handler;
-  handler = *sox_mixer_effect_fn();
+  handler = *lsx_mixer_effect_fn();
   handler.name = "oops";
   handler.usage = NULL;
   handler.getopts = oops_getopts;
--- a/src/noiseprof.c
+++ b/src/noiseprof.c
@@ -217,7 +217,7 @@
   NULL, sizeof(priv_t)
 };
 
-const sox_effect_handler_t *sox_noiseprof_effect_fn(void)
+const sox_effect_handler_t *lsx_noiseprof_effect_fn(void)
 {
     return &sox_noiseprof_effect;
 }
--- a/src/noisered.c
+++ b/src/noisered.c
@@ -349,7 +349,7 @@
   NULL, sizeof(priv_t)
 };
 
-const sox_effect_handler_t *sox_noisered_effect_fn(void)
+const sox_effect_handler_t *lsx_noisered_effect_fn(void)
 {
     return &sox_noisered_effect;
 }
--- a/src/output.c
+++ b/src/output.c
@@ -48,7 +48,7 @@
   return SOX_SUCCESS; /* All samples output successfully */
 }
 
-sox_effect_handler_t const * sox_output_effect_fn(void)
+sox_effect_handler_t const * lsx_output_effect_fn(void)
 {
   static sox_effect_handler_t handler = {
     "output", NULL, SOX_EFF_MCHAN | SOX_EFF_DEPRECATED,
--- a/src/overdrive.c
+++ b/src/overdrive.c
@@ -63,7 +63,7 @@
   return SOX_SUCCESS;
 }
 
-sox_effect_handler_t const * sox_overdrive_effect_fn(void)
+sox_effect_handler_t const * lsx_overdrive_effect_fn(void)
 {
   static sox_effect_handler_t handler = {"overdrive", "[gain [colour]]",
     SOX_EFF_GAIN, create, start, flow, NULL, NULL, NULL, sizeof(priv_t)};
--- a/src/pad.c
+++ b/src/pad.c
@@ -132,7 +132,7 @@
   return SOX_SUCCESS;
 }
 
-sox_effect_handler_t const * sox_pad_effect_fn(void)
+sox_effect_handler_t const * lsx_pad_effect_fn(void)
 {
   static sox_effect_handler_t handler = {
     "pad", "{length[@position]}", SOX_EFF_MCHAN|SOX_EFF_LENGTH|SOX_EFF_MODIFY,
--- a/src/pan.c
+++ b/src/pan.c
@@ -420,7 +420,7 @@
   NULL, sizeof(priv_t)
 };
 
-const sox_effect_handler_t *sox_pan_effect_fn(void)
+const sox_effect_handler_t *lsx_pan_effect_fn(void)
 {
     return &sox_pan_effect;
 }
--- a/src/phaser.c
+++ b/src/phaser.c
@@ -135,7 +135,7 @@
   return SOX_SUCCESS;
 }
 
-sox_effect_handler_t const * sox_phaser_effect_fn(void)
+sox_effect_handler_t const * lsx_phaser_effect_fn(void)
 {
   static sox_effect_handler_t handler = {
     "phaser", "gain-in gain-out delay decay speed [ -s | -t ]",
--- a/src/rate.c
+++ b/src/rate.c
@@ -531,7 +531,7 @@
   return SOX_SUCCESS;
 }
 
-sox_effect_handler_t const * sox_rate_effect_fn(void)
+sox_effect_handler_t const * lsx_rate_effect_fn(void)
 {
   static sox_effect_handler_t handler = {
     "rate", 0, SOX_EFF_RATE, create, start, flow, drain, stop, 0, sizeof(priv_t)
@@ -583,13 +583,13 @@
     ++argc2;
   }
   return argc > 1? lsx_usage(effp) : 
-    sox_rate_effect_fn()->getopts(effp, argc2, args);
+    lsx_rate_effect_fn()->getopts(effp, argc2, args);
 }
 
-sox_effect_handler_t const * sox_rabbit_effect_fn(void)
+sox_effect_handler_t const * lsx_rabbit_effect_fn(void)
 {
   static sox_effect_handler_t handler;
-  handler = *sox_rate_effect_fn();
+  handler = *lsx_rate_effect_fn();
   handler.name = "rabbit";
   handler.usage = "[-c0|-c1|-c2|-c3|-c4] [rate]";
   handler.getopts = rabbit_getopts;
@@ -615,13 +615,13 @@
   args[2] = arg;
   sprintf(arg, "%f", bandwidth);
   return argc? lsx_usage(effp) : 
-    sox_rate_effect_fn()->getopts(effp, (int)array_length(args), args);
+    lsx_rate_effect_fn()->getopts(effp, (int)array_length(args), args);
 }
 
-sox_effect_handler_t const * sox_polyphase_effect_fn(void)
+sox_effect_handler_t const * lsx_polyphase_effect_fn(void)
 {
   static sox_effect_handler_t handler;
-  handler = *sox_rate_effect_fn();
+  handler = *lsx_rate_effect_fn();
   handler.name = "polyphase";
   handler.usage = "-cutoff factor    Cutoff frequency 0 to 1, default 0.95";
   handler.getopts = polyphase_getopts;
@@ -666,13 +666,13 @@
   args[3] = arg;
   sprintf(arg, "%f", 100 * bandwidth);
   return argc > 2 ? lsx_usage(effp) : 
-    sox_rate_effect_fn()->getopts(effp, quality? 4 : 2, args);
+    lsx_rate_effect_fn()->getopts(effp, quality? 4 : 2, args);
 }
 
-sox_effect_handler_t const * sox_resample_effect_fn(void)
+sox_effect_handler_t const * lsx_resample_effect_fn(void)
 {
   static sox_effect_handler_t handler;
-  handler = *sox_rate_effect_fn();
+  handler = *lsx_rate_effect_fn();
   handler.name = "resample";
   handler.usage = "[ -qs | -q | -ql ] [ rolloff [ beta ] ]",
   handler.getopts = resample_getopts;
--- a/src/remix.c
+++ b/src/remix.c
@@ -168,7 +168,7 @@
   return SOX_SUCCESS;
 }
 
-sox_effect_handler_t const * sox_remix_effect_fn(void)
+sox_effect_handler_t const * lsx_remix_effect_fn(void)
 {
   static sox_effect_handler_t handler = {
     "remix", "[-m|-a] [-p] <0|in-chan[v|d|i volume]{,in-chan[v|d|i volume]}>",
--- a/src/repeat.c
+++ b/src/repeat.c
@@ -91,7 +91,7 @@
   return SOX_SUCCESS;
 }
 
-sox_effect_handler_t const * sox_repeat_effect_fn(void)
+sox_effect_handler_t const * lsx_repeat_effect_fn(void)
 {
   static sox_effect_handler_t effect = {"repeat", "[count]",
     SOX_EFF_MCHAN | SOX_EFF_LENGTH | SOX_EFF_MODIFY,
--- a/src/reverb.c
+++ b/src/reverb.c
@@ -253,7 +253,7 @@
   return SOX_SUCCESS;
 }
 
-sox_effect_handler_t const *sox_reverb_effect_fn(void)
+sox_effect_handler_t const *lsx_reverb_effect_fn(void)
 {
   static sox_effect_handler_t handler = {"reverb",
     "[-w|--wet-only]"
--- a/src/reverse.c
+++ b/src/reverse.c
@@ -77,7 +77,7 @@
   return SOX_SUCCESS;
 }
 
-sox_effect_handler_t const * sox_reverse_effect_fn(void)
+sox_effect_handler_t const * lsx_reverse_effect_fn(void)
 {
   static sox_effect_handler_t handler = {
     "reverse", NULL, SOX_EFF_MODIFY, NULL, start, flow, drain, stop, NULL, sizeof(priv_t)
--- a/src/silence.c
+++ b/src/silence.c
@@ -697,7 +697,7 @@
   kill, sizeof(priv_t)
 };
 
-const sox_effect_handler_t *sox_silence_effect_fn(void)
+const sox_effect_handler_t *lsx_silence_effect_fn(void)
 {
     return &sox_silence_effect;
 }
--- a/src/sinc.c
+++ b/src/sinc.c
@@ -139,13 +139,13 @@
     }
     lsx_set_dft_filter(f, h[longer], n, post_peak);
   }
-  return sox_dft_filter_effect_fn()->start(effp);
+  return lsx_dft_filter_effect_fn()->start(effp);
 }
 
-sox_effect_handler_t const * sox_sinc_effect_fn(void)
+sox_effect_handler_t const * lsx_sinc_effect_fn(void)
 {
   static sox_effect_handler_t handler;
-  handler = *sox_dft_filter_effect_fn();
+  handler = *lsx_dft_filter_effect_fn();
   handler.name = "sinc";
   handler.usage = "[-a att|-b beta] [-p phase|-M|-I|-L] [-t tbw|-n taps] [freqHP][-freqLP [-t tbw|-n taps]]";
   handler.getopts = create;
--- a/src/skeleff.c
+++ b/src/skeleff.c
@@ -123,8 +123,8 @@
  * Function returning effect descriptor. This should be the only
  * externally visible object.
  */
-const sox_effect_handler_t *sox_skel_effect_fn(void);
-const sox_effect_handler_t *sox_skel_effect_fn(void)
+const sox_effect_handler_t *lsx_skel_effect_fn(void);
+const sox_effect_handler_t *lsx_skel_effect_fn(void)
 {
   /*
    * Effect descriptor.
--- a/src/sox_i.h
+++ b/src/sox_i.h
@@ -258,7 +258,7 @@
 
 int lsx_usage(sox_effect_t * effp);
 char * lsx_usage_lines(char * * usage, char const * const * lines, size_t n);
-#define EFFECT(f) extern sox_effect_handler_t const * sox_##f##_effect_fn(void);
+#define EFFECT(f) extern sox_effect_handler_t const * lsx_##f##_effect_fn(void);
 #include "effects.h"
 #undef EFFECT
 
--- a/src/spectrogram.c
+++ b/src/spectrogram.c
@@ -491,7 +491,7 @@
   return SOX_SUCCESS;
 }
 
-sox_effect_handler_t const * sox_spectrogram_effect_fn(void)
+sox_effect_handler_t const * lsx_spectrogram_effect_fn(void)
 {
   static sox_effect_handler_t handler = {
     "spectrogram", 0, SOX_EFF_MODIFY, getopts, start, flow, drain, stop, 0, sizeof(priv_t)};
--- a/src/speed.c
+++ b/src/speed.c
@@ -68,7 +68,7 @@
   return SOX_SUCCESS;
 }
 
-sox_effect_handler_t const * sox_speed_effect_fn(void)
+sox_effect_handler_t const * lsx_speed_effect_fn(void)
 {
   static sox_effect_handler_t handler = {
     "speed", "factor[c]",SOX_EFF_NULL|SOX_EFF_MCHAN|SOX_EFF_RATE|SOX_EFF_LENGTH,
--- a/src/splice.c
+++ b/src/splice.c
@@ -237,7 +237,7 @@
   return SOX_SUCCESS;
 }
 
-sox_effect_handler_t const * sox_splice_effect_fn(void)
+sox_effect_handler_t const * lsx_splice_effect_fn(void)
 {
   static sox_effect_handler_t handler = {
     "splice", "{position[,excess[,leeway]]}", SOX_EFF_MCHAN|SOX_EFF_LENGTH,
--- a/src/stat.c
+++ b/src/stat.c
@@ -330,7 +330,7 @@
   NULL, sizeof(priv_t)
 };
 
-const sox_effect_handler_t *sox_stat_effect_fn(void)
+const sox_effect_handler_t *lsx_stat_effect_fn(void)
 {
   return &sox_stat_effect;
 }
--- a/src/stretch.c
+++ b/src/stretch.c
@@ -311,7 +311,7 @@
   return SOX_SUCCESS;
 }
 
-const sox_effect_handler_t *sox_stretch_effect_fn(void)
+const sox_effect_handler_t *lsx_stretch_effect_fn(void)
 {
   static const sox_effect_handler_t handler = {
     "stretch",
--- a/src/swap.c
+++ b/src/swap.c
@@ -178,7 +178,7 @@
     return (SOX_SUCCESS);
 }
 
-const sox_effect_handler_t *sox_swap_effect_fn(void)
+const sox_effect_handler_t *lsx_swap_effect_fn(void)
 {
   static sox_effect_handler_t handler = {
     "swap", "[1 2 | 1 2 3 4]", SOX_EFF_MCHAN | SOX_EFF_MODIFY,
--- a/src/synth.c
+++ b/src/synth.c
@@ -647,7 +647,7 @@
 
 
 
-const sox_effect_handler_t *sox_synth_effect_fn(void)
+const sox_effect_handler_t *lsx_synth_effect_fn(void)
 {
   static sox_effect_handler_t handler = {
     "synth", "[-n] [len] {type [combine] [[%]freq[k][:|+|/|-[%]freq2[k]] [off [ph [p1 [p2 [p3]]]]]]}",
--- a/src/tempo.c
+++ b/src/tempo.c
@@ -296,7 +296,7 @@
   return SOX_SUCCESS;
 }
 
-sox_effect_handler_t const * sox_tempo_effect_fn(void)
+sox_effect_handler_t const * lsx_tempo_effect_fn(void)
 {
   static sox_effect_handler_t handler = {
     "tempo", "[-q] factor [segment-ms [search-ms [overlap-ms]]]",
@@ -335,10 +335,10 @@
   return result;
 }
 
-sox_effect_handler_t const * sox_pitch_effect_fn(void)
+sox_effect_handler_t const * lsx_pitch_effect_fn(void)
 {
   static sox_effect_handler_t handler;
-  handler = *sox_tempo_effect_fn();
+  handler = *lsx_tempo_effect_fn();
   handler.name = "pitch";
   handler.usage = "[-q] shift-in-cents [segment-ms [search-ms [overlap-ms]]]",
   handler.getopts = pitch_getopts;
@@ -349,10 +349,10 @@
 
 /*------------------------- key (old name for pitch) -------------------------*/
 
-sox_effect_handler_t const * sox_key_effect_fn(void)
+sox_effect_handler_t const * lsx_key_effect_fn(void)
 {
   static sox_effect_handler_t handler;
-  handler = *sox_pitch_effect_fn();
+  handler = *lsx_pitch_effect_fn();
   handler.name = "key";
   handler.flags |= SOX_EFF_DEPRECATED;
   return &handler;
--- a/src/tremolo.c
+++ b/src/tremolo.c
@@ -33,13 +33,13 @@
   args[3] = argv[1];
   sprintf(offset, "%g", 100 - depth / 2);
   args[4] = offset;
-  return sox_synth_effect_fn()->getopts(effp, (int)array_length(args), args);
+  return lsx_synth_effect_fn()->getopts(effp, (int)array_length(args), args);
 }
 
-sox_effect_handler_t const * sox_tremolo_effect_fn(void)
+sox_effect_handler_t const * lsx_tremolo_effect_fn(void)
 {
   static sox_effect_handler_t handler;
-  handler = *sox_synth_effect_fn();
+  handler = *lsx_synth_effect_fn();
   handler.name = "tremolo";
   handler.usage = "speed_Hz [depth_percent]";
   handler.getopts = getopts;
--- a/src/trim.c
+++ b/src/trim.c
@@ -169,7 +169,7 @@
     trim->start = 0;
 }
 
-const sox_effect_handler_t *sox_trim_effect_fn(void)
+const sox_effect_handler_t *lsx_trim_effect_fn(void)
 {
   static sox_effect_handler_t handler = {
     "trim", "start [length]", SOX_EFF_MCHAN | SOX_EFF_LENGTH | SOX_EFF_MODIFY,
--- a/src/vol.c
+++ b/src/vol.c
@@ -175,7 +175,7 @@
   return SOX_SUCCESS;
 }
 
-sox_effect_handler_t const * sox_vol_effect_fn(void)
+sox_effect_handler_t const * lsx_vol_effect_fn(void)
 {
   static sox_effect_handler_t handler = {
     "vol", vol_usage, SOX_EFF_MCHAN | SOX_EFF_GAIN, getopts, start, flow, 0, stop, 0, sizeof(priv_t)