shithub: sox

Info  •  Files  •  Log  •  Branches

Add missing delete methods to effects.

--- a/src/avg.c

+++ b/src/avg.c

@@ -568,7 +568,7 @@

   st_avg_flow,

   st_effect_nothing_drain,

   st_avg_stop,

-st_effect_nothing

+  st_effect_nothing

 };

 static st_effect_t st_pick_effect = {

@@ -580,7 +580,7 @@

   st_avg_flow,

   st_effect_nothing_drain,

   st_avg_stop,

-st_effect_nothing

+  st_effect_nothing

 };

 const st_effect_t *st_avg_effect_fn(void)

--- a/src/band.c

+++ b/src/band.c

@@ -176,7 +176,7 @@

    st_band_flow,

    st_effect_nothing_drain,

    st_band_stop,

-st_effect_nothing

+  st_effect_nothing

 };

 const st_effect_t *st_band_effect_fn(void)

--- a/src/bandpass.c

+++ b/src/bandpass.c

@@ -1,5 +1,4 @@

 /*

-

   Band-pass effect file for SoX

   Copyright (C) 1999 Jan Paul Schmidt <jps@fundament.org>

@@ -88,6 +87,7 @@

   st_bandpass_start,

   st_butterworth_flow,

   st_effect_nothing_drain,

+  st_effect_nothing,

   st_effect_nothing

 };

--- a/src/breject.c

+++ b/src/breject.c

@@ -88,6 +88,7 @@

   st_bandreject_start,

   st_butterworth_flow,

   st_effect_nothing_drain,

+  st_effect_nothing,

   st_effect_nothing

 };

--- a/src/chorus.c

+++ b/src/chorus.c

@@ -348,7 +348,7 @@

   st_chorus_flow,

   st_chorus_drain,

   st_chorus_stop,

-st_effect_nothing

+  st_effect_nothing

 };

 const st_effect_t *st_chorus_effect_fn(void)

--- a/src/compand.c

+++ b/src/compand.c

@@ -402,7 +402,7 @@

    st_compand_flow,

    st_compand_drain,

    st_compand_stop,

-st_effect_nothing

+  st_effect_nothing

 };

 const st_effect_t *st_compand_effect_fn(void)

--- a/src/copy.c

+++ b/src/copy.c

@@ -64,6 +64,7 @@

   st_copy_start,

   st_copy_flow,

   st_effect_nothing_drain,

+  st_effect_nothing,

   st_effect_nothing

 };

--- a/src/dcshift.c

+++ b/src/dcshift.c

@@ -205,7 +205,7 @@

    st_dcshift_flow,

    st_effect_nothing_drain,

    st_dcshift_stop,

-st_effect_nothing

+  st_effect_nothing

 };

 const st_effect_t *st_dcshift_effect_fn(void)

--- a/src/deemphas.c

+++ b/src/deemphas.c

@@ -200,6 +200,7 @@

   st_deemph_start,

   st_deemph_flow,

   st_effect_nothing_drain,

+  st_effect_nothing,

   st_effect_nothing

 };

--- a/src/earwax.c

+++ b/src/earwax.c

@@ -175,7 +175,7 @@

   st_earwax_flow,

   st_earwax_drain,

   st_earwax_stop,

-st_effect_nothing

+  st_effect_nothing

 };

 const st_effect_t *st_earwax_effect_fn(void)

--- a/src/echo.c

+++ b/src/echo.c

@@ -275,7 +275,7 @@

   st_echo_flow,

   st_echo_drain,

   st_echo_stop,

-st_effect_nothing

+  st_effect_nothing

 };

 const st_effect_t *st_echo_effect_fn(void)

--- a/src/echos.c

+++ b/src/echos.c

@@ -279,7 +279,7 @@

   st_echos_flow,

   st_echos_drain,

   st_echos_stop,

-st_effect_nothing

+  st_effect_nothing

 };

 const st_effect_t *st_echos_effect_fn(void)

--- a/src/equalizer.c

+++ b/src/equalizer.c

@@ -190,8 +190,11 @@

   "equalizer",

   "Usage: equalizer central-frequency Q gain",

   0,

-  st_equalizer_getopts, st_equalizer_start,

-  st_equalizer_flow, st_effect_nothing_drain,

+  st_equalizer_getopts,

+  st_equalizer_start,

+  st_equalizer_flow,

+  st_effect_nothing_drain,

+  st_effect_nothing,

   st_effect_nothing

 };

--- a/src/fade.c

+++ b/src/fade.c

@@ -384,7 +384,7 @@

   st_fade_flow,

   st_fade_drain,

   st_fade_stop,

-st_effect_nothing

+  st_effect_nothing

 };

 const st_effect_t *st_fade_effect_fn(void)

--- a/src/filter.c

+++ b/src/filter.c

@@ -319,7 +319,7 @@

   st_filter_flow,

   st_filter_drain,

   st_filter_stop,

-st_effect_nothing

+  st_effect_nothing

 };

 const st_effect_t *st_filter_effect_fn(void)

--- a/src/flanger.c

+++ b/src/flanger.c

@@ -304,7 +304,7 @@

   st_flanger_flow,

   st_effect_nothing_drain,

   st_flanger_stop,

-st_effect_nothing

+  st_effect_nothing

 };

--- a/src/highp.c

+++ b/src/highp.c

@@ -133,6 +133,7 @@

   st_highp_start,

   st_highp_flow,

   st_effect_nothing_drain,

+  st_effect_nothing,

   st_effect_nothing

 };

--- a/src/highpass.c

+++ b/src/highpass.c

@@ -80,6 +80,7 @@

   st_highpass_start,

   st_butterworth_flow,

   st_effect_nothing_drain,

+  st_effect_nothing,

   st_effect_nothing

 };

--- a/src/lowp.c

+++ b/src/lowp.c

@@ -126,6 +126,7 @@

   st_lowp_start,

   st_lowp_flow,

   st_effect_nothing_drain,

+  st_effect_nothing,

   st_effect_nothing

 };

--- a/src/lowpass.c

+++ b/src/lowpass.c

@@ -69,6 +69,7 @@

   st_lowpass_start,

   st_butterworth_flow,

   st_effect_nothing_drain,

+  st_effect_nothing,

   st_effect_nothing

 };

--- a/src/lua.c

+++ b/src/lua.c

@@ -273,7 +273,7 @@

   st_lua_flow,

   st_lua_drain,

   st_lua_stop,

-st_effect_nothing

+  st_effect_nothing

 };

 /*

--- a/src/mask.c

+++ b/src/mask.c

@@ -92,6 +92,7 @@

   st_mask_start,

   st_mask_flow,

   st_effect_nothing_drain,

+  st_effect_nothing,

   st_effect_nothing

 };

@@ -108,6 +109,7 @@

   st_mask_start,

   st_mask_flow,

   st_effect_nothing_drain,

+  st_effect_nothing,

   st_effect_nothing

 };

--- a/src/mcompand.c

+++ b/src/mcompand.c

@@ -688,7 +688,7 @@

   st_mcompand_flow,

   st_mcompand_drain,

   st_mcompand_stop,

-st_effect_nothing

+  st_effect_nothing

 };

 const st_effect_t *st_mcompand_effect_fn(void)

--- a/src/noiseprof.c

+++ b/src/noiseprof.c

@@ -216,7 +216,7 @@

   st_noiseprof_flow,

   st_noiseprof_drain,

   st_noiseprof_stop,

-st_effect_nothing

+  st_effect_nothing

 };

 const st_effect_t *st_noiseprof_effect_fn(void)

--- a/src/noisered.c

+++ b/src/noisered.c

@@ -333,7 +333,7 @@

   st_noisered_flow,

   st_noisered_drain,

   st_noisered_stop,

-st_effect_nothing

+  st_effect_nothing

 };

 const st_effect_t *st_noisered_effect_fn(void)

--- a/src/pad.c

+++ b/src/pad.c

@@ -127,7 +127,7 @@

   st_pad_flow,

   st_pad_drain,

   st_pad_stop,

-st_effect_nothing

+  st_effect_nothing

 };

 const st_effect_t *st_pad_effect_fn(void)

--- a/src/pan.c

+++ b/src/pan.c

@@ -419,6 +419,7 @@

   st_pan_start,

   st_pan_flow,

   st_effect_nothing_drain,

+  st_effect_nothing,

   st_effect_nothing

 };

--- a/src/phaser.c

+++ b/src/phaser.c

@@ -271,7 +271,7 @@

   st_phaser_flow,

   st_phaser_drain,

   st_phaser_stop,

-st_effect_nothing

+  st_effect_nothing

 };

 const st_effect_t *st_phaser_effect_fn(void)

--- a/src/pitch.c

+++ b/src/pitch.c

@@ -585,7 +585,7 @@

   st_pitch_flow,

   st_pitch_drain,

   st_pitch_stop,

-st_effect_nothing

+  st_effect_nothing

 };

 const st_effect_t *st_pitch_effect_fn(void)

--- a/src/polyphas.c

+++ b/src/polyphas.c

@@ -663,7 +663,7 @@

   st_poly_flow,

   st_poly_drain,

   st_poly_stop,

-st_effect_nothing

+  st_effect_nothing

 };

 const st_effect_t *st_polyphase_effect_fn(void)

--- a/src/rabbit.c

+++ b/src/rabbit.c

@@ -200,7 +200,7 @@

   st_rabbit_flow,

   st_rabbit_drain,

   st_rabbit_stop,

-st_effect_nothing

+  st_effect_nothing

 };

 const st_effect_t *st_rabbit_effect_fn(void)

--- a/src/rate.c

+++ b/src/rate.c

@@ -23,7 +23,7 @@

   st_resample_flow,

   st_resample_drain,

   st_resample_stop,

-st_effect_nothing

+  st_effect_nothing

 };

 const st_effect_t *st_rate_effect_fn(void)

--- a/src/repeat.c

+++ b/src/repeat.c

@@ -208,7 +208,7 @@

   st_repeat_flow,

   st_repeat_drain,

   st_repeat_stop,

-st_effect_nothing

+  st_effect_nothing

 };

 const st_effect_t *st_repeat_effect_fn(void)

--- a/src/resample.c

+++ b/src/resample.c

@@ -729,7 +729,7 @@

    st_resample_flow,

    st_resample_drain,

    st_resample_stop,

-st_effect_nothing

+  st_effect_nothing

 };

 const st_effect_t *st_resample_effect_fn(void)

--- a/src/reverb.c

+++ b/src/reverb.c

@@ -293,7 +293,7 @@

   st_reverb_flow,

   st_reverb_drain,

   st_reverb_stop,

-st_effect_nothing

+  st_effect_nothing

 };

 const st_effect_t *st_reverb_effect_fn(void)

--- a/src/reverse.c

+++ b/src/reverse.c

@@ -140,7 +140,7 @@

   st_reverse_flow,

   st_reverse_drain,

   st_reverse_stop,

-st_effect_nothing

+  st_effect_nothing

 };

 const st_effect_t *st_reverse_effect_fn(void)

--- a/src/silence.c

+++ b/src/silence.c

@@ -665,7 +665,7 @@

   st_silence_flow,

   st_silence_drain,

   st_silence_stop,

-st_effect_nothing

+  st_effect_nothing

 };

 const st_effect_t *st_silence_effect_fn(void)

--- a/src/speed.c

+++ b/src/speed.c

@@ -41,6 +41,6 @@

 {

   static st_effect_t driver = {

     "speed", "Usage: speed factor[c]", ST_EFF_NULL,

-    getopts, NULL, NULL, NULL, NULL};

+    getopts, NULL, NULL, NULL, NULL, NULL};

   return &driver;

 }

--- a/src/stat.c

+++ b/src/stat.c

@@ -327,7 +327,7 @@

   st_stat_flow,

   st_stat_drain,

   st_stat_stop,

-st_effect_nothing

+  st_effect_nothing

 };

 const st_effect_t *st_stat_effect_fn(void)

--- a/src/stio.c

+++ b/src/stio.c

@@ -298,7 +298,7 @@

 {

   len -= len % ft->signal.channels; /* We need a whole number of "wide" samples */

   len = (*ft->h->read)(ft, buf, len);

-  if (len != ST_EOF)

+  if (len != 0)

     len -= len % ft->signal.channels; /* Belt & braces */

   return len;

 }

--- a/src/stretch.c

+++ b/src/stretch.c

@@ -399,7 +399,7 @@

   st_stretch_flow,

   st_stretch_drain,

   st_stretch_stop,

-st_effect_nothing

+  st_effect_nothing

 };

 const st_effect_t *st_stretch_effect_fn(void)

--- a/src/swap.c

+++ b/src/swap.c

@@ -191,7 +191,8 @@

   st_swap_start,

   st_swap_flow,

   st_effect_nothing_drain,

-  st_effect_nothing

+  st_effect_nothing,

+  st_effect_nothing  

 };

 const st_effect_t *st_swap_effect_fn(void)

--- a/src/synth.c

+++ b/src/synth.c

@@ -713,6 +713,7 @@

   st_synth_start,

   st_synth_flow,

   st_effect_nothing_drain,

+  st_effect_nothing,

   st_effect_nothing

 };

--- a/src/tone.c

+++ b/src/tone.c

@@ -155,6 +155,7 @@

   st_biquad_shelf_start,

   st_biquad_flow,

   st_effect_nothing_drain,

+  st_effect_nothing,

   st_effect_nothing

 };

@@ -175,6 +176,7 @@

   st_biquad_shelf_start,

   st_biquad_flow,

   st_effect_nothing_drain,

+  st_effect_nothing,

   st_effect_nothing

 };

--- a/src/trim.c

+++ b/src/trim.c

@@ -202,7 +202,7 @@

   st_trim_flow,

   st_effect_nothing_drain,

   st_trim_stop,

-st_effect_nothing

+  st_effect_nothing

 };

 const st_effect_t *st_trim_effect_fn(void)

--- a/src/vibro.c

+++ b/src/vibro.c

@@ -117,6 +117,7 @@

   st_vibro_start,

   st_vibro_flow,

   st_effect_nothing_drain,

+  st_effect_nothing,

   st_effect_nothing

 };

--- a/src/vol.c

+++ b/src/vol.c

@@ -206,7 +206,7 @@

   st_vol_flow,

   st_effect_nothing_drain,

   st_vol_stop,

-st_effect_nothing

+  st_effect_nothing

 };

 const st_effect_t *st_vol_effect_fn(void)