ref: c5ce1c5d96fcf28ccfec7d03b94f0f1c30eda657
parent: 9b2998acbda42e8fb7c0da279c8e0e88994bf0dc
author: cbagwell <cbagwell>
date: Fri Jan 1 20:36:58 EST 2010
Don't use signal.h's kill() name to work around cygwin compiler bugs.
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,11 +5,9 @@
sox-11gamma, followed by a list of prior authors and features.
-sox-14.3.1 2009-xx-xx
+sox-14.3.1 2010-xx-xx
----------
-Previously deprecated features that have been removed in this release:
-
Newly deprecated features (to be removed in future):
Deprec- Feature [O(ption)] Removal
@@ -25,8 +23,8 @@
------- ---------------------- ---------------------- -------
14.2.0 E key alias pitch 14.3.1
14.2.0 E pan ~= mixer/remix 14.3.1
- 14.3.0 F flac: libFLAC 1.1.2,3 libFLAC > 1.1.3 2009-12-14
- 14.3.0 PLAY_RATE_ARG SOX_OPTS 2009-12-14
+ 14.3.0 F flac: libFLAC 1.1.2,3 libFLAC > 1.1.3 14.3.1
+ 14.3.0 PLAY_RATE_ARG SOX_OPTS 14.3.1
14.3.0 E norm -b, norm -i gain -B, gain -en 2010-06-14
14.3.0 E filter ~=sinc 2010-06-14
14.1.0 E resample alias rate 2010-06-14
@@ -92,6 +90,9 @@
o [2859244] Fixes to improve compatibility with MSVC. (Doug Cook)
o Added utilities to help any format handler dlopen() external
libraries at run time instead of link time. (Doug Cook)
+ o Compiling with mingw now has feature parity with cygwin. (Doug Cook
+ and cbagwell)
+
sox-14.3.0 2009-06-14
--- a/src/bend.c
+++ b/src/bend.c
@@ -281,7 +281,7 @@
return SOX_SUCCESS;
}
-static int kill(sox_effect_t * effp)
+static int lsx_kill(sox_effect_t * effp)
{priv_t *p = (priv_t *) effp->priv;
unsigned i;
@@ -296,7 +296,7 @@
{ static sox_effect_handler_t handler = { "bend", "[-f frame-rate(25)] [-o over-sample(16)] {delay,cents,duration}",- 0, create, start, flow, 0, stop, kill, sizeof(priv_t)
+ 0, create, start, flow, 0, stop, lsx_kill, sizeof(priv_t)
};
return &handler;
}
--- a/src/compand.c
+++ b/src/compand.c
@@ -263,7 +263,7 @@
return SOX_SUCCESS;
}
-static int kill(sox_effect_t * effp)
+static int lsx_kill(sox_effect_t * effp)
{priv_t * l = (priv_t *) effp->priv;
@@ -276,7 +276,7 @@
{ static sox_effect_handler_t handler = {"compand", compand_usage, SOX_EFF_MCHAN | SOX_EFF_GAIN,
- getopts, start, flow, drain, stop, kill, sizeof(priv_t)
+ getopts, start, flow, drain, stop, lsx_kill, sizeof(priv_t)
};
return &handler;
}
--- a/src/crop.c
+++ b/src/crop.c
@@ -118,7 +118,7 @@
return SOX_SUCCESS;
}
-static int kill(sox_effect_t * effp)
+static int lsx_kill(sox_effect_t * effp)
{priv_t * p = (priv_t *)effp->priv;
free(p->pos[0].str);
@@ -135,7 +135,7 @@
" +n\tposition relative to previous",
SOX_EFF_MCHAN | /* SOX_EFF_LENGTH | */ SOX_EFF_MODIFY | SOX_EFF_ALPHA,
- create, start, flow, NULL, stop, kill, sizeof(priv_t)
+ create, start, flow, NULL, stop, lsx_kill, sizeof(priv_t)
};
return &handler;
}
--- a/src/delay.c
+++ b/src/delay.c
@@ -25,7 +25,7 @@
sox_sample_t * buffer;
} priv_t;
-static int kill(sox_effect_t * effp)
+static int lsx_kill(sox_effect_t * effp)
{priv_t * p = (priv_t *)effp->priv;
unsigned i;
@@ -47,7 +47,7 @@
for (i = 0; i < p->argc; ++i) {char const * next = lsx_parsesamples(1e5, p->argv[i] = lsx_strdup(argv[i]), &delay, 't');
if (!next || *next) {- kill(effp);
+ lsx_kill(effp);
return lsx_usage(effp);
}
if (delay > max_samples) {@@ -120,7 +120,7 @@
{ static sox_effect_handler_t handler = { "delay", "{length}", SOX_EFF_LENGTH | SOX_EFF_MODIFY,- create, start, flow, drain, stop, kill, sizeof(priv_t)
+ create, start, flow, drain, stop, lsx_kill, sizeof(priv_t)
};
return &handler;
}
--- a/src/fade.c
+++ b/src/fade.c
@@ -307,7 +307,7 @@
* Do anything required when you stop reading samples.
* (free allocated memory, etc.)
*/
-static int kill(sox_effect_t * effp)
+static int lsx_kill(sox_effect_t * effp)
{priv_t * fade = (priv_t *) effp->priv;
@@ -370,7 +370,7 @@
sox_fade_flow,
sox_fade_drain,
NULL,
- kill, sizeof(priv_t)
+ lsx_kill, sizeof(priv_t)
};
const sox_effect_handler_t *lsx_fade_effect_fn(void)
--- a/src/mcompand.c
+++ b/src/mcompand.c
@@ -462,7 +462,7 @@
return SOX_SUCCESS;
}
-static int kill(sox_effect_t * effp)
+static int lsx_kill(sox_effect_t * effp)
{priv_t * c = (priv_t *) effp->priv;
comp_band_t * l;
@@ -493,7 +493,7 @@
" in-dB1,out-dB1[,in-dB2,out-dB2...]\n"
" [ gain [ initial-volume [ delay ] ] ]",
SOX_EFF_MCHAN | SOX_EFF_GAIN,
- getopts, start, flow, drain, stop, kill, sizeof(priv_t)
+ getopts, start, flow, drain, stop, lsx_kill, sizeof(priv_t)
};
return &handler;
--- a/src/mp3.c
+++ b/src/mp3.c
@@ -109,6 +109,7 @@
#ifdef DL_LAME
"libmp3lame",
"lame-enc",
+ "cygmp3lame-0",
#endif
NULL
};
--- a/src/pad.c
+++ b/src/pad.c
@@ -122,7 +122,7 @@
return SOX_SUCCESS;
}
-static int kill(sox_effect_t * effp)
+static int lsx_kill(sox_effect_t * effp)
{priv_t * p = (priv_t *)effp->priv;
unsigned i;
@@ -136,7 +136,7 @@
{ static sox_effect_handler_t handler = { "pad", "{length[@position]}", SOX_EFF_MCHAN|SOX_EFF_LENGTH|SOX_EFF_MODIFY,- create, start, flow, drain, stop, kill, sizeof(priv_t)
+ create, start, flow, drain, stop, lsx_kill, sizeof(priv_t)
};
return &handler;
}
--- a/src/silence.c
+++ b/src/silence.c
@@ -652,7 +652,7 @@
return(SOX_SUCCESS);
}
-static int kill(sox_effect_t * effp)
+static int lsx_kill(sox_effect_t * effp)
{priv_t * silence = (priv_t *) effp->priv;
@@ -671,7 +671,7 @@
sox_silence_flow,
sox_silence_drain,
sox_silence_stop,
- kill, sizeof(priv_t)
+ lsx_kill, sizeof(priv_t)
};
const sox_effect_handler_t *lsx_silence_effect_fn(void)
--- a/src/skeleff.c
+++ b/src/skeleff.c
@@ -115,7 +115,7 @@
* Do anything required when you kill an effect.
* (free allocated memory, etc.)
*/
-static int kill(sox_effect_t UNUSED * effp)
+static int lsx_kill(sox_effect_t UNUSED * effp)
{return SOX_SUCCESS;
}
@@ -135,7 +135,7 @@
*/
static sox_effect_handler_t sox_skel_effect = {"skel", "[OPTION]", SOX_EFF_MCHAN,
- getopts, start, flow, drain, stop, kill, sizeof(priv_t)
+ getopts, start, flow, drain, stop, lsx_kill, sizeof(priv_t)
};
return &sox_skel_effect;
}
--- a/src/splice.c
+++ b/src/splice.c
@@ -265,7 +265,7 @@
return SOX_SUCCESS;
}
-static int kill(sox_effect_t * effp)
+static int lsx_kill(sox_effect_t * effp)
{priv_t * p = (priv_t *)effp->priv;
unsigned i;
@@ -286,7 +286,7 @@
"\n excess At the end of part 1 & the start of part2 (default 0.005)"
"\n leeway Before part2 (default 0.005; set to 0 for cross-fade)",
SOX_EFF_MCHAN | SOX_EFF_LENGTH,
- create, start, flow, drain, stop, kill, sizeof(priv_t)
+ create, start, flow, drain, stop, lsx_kill, sizeof(priv_t)
};
return &handler;
}
--- a/src/synth.c
+++ b/src/synth.c
@@ -725,7 +725,7 @@
-static int kill(sox_effect_t * effp)
+static int lsx_kill(sox_effect_t * effp)
{priv_t * p = (priv_t *) effp->priv;
free(p->getopts_channels);
@@ -740,7 +740,7 @@
static sox_effect_handler_t handler = { "synth", "[-j KEY] [-n] [length [offset [phase [p1 [p2 [p3]]]]]]] {type [combine] [[%]freq[k][:|+|/|-[%]freq2[k]] [offset [phase [p1 [p2 [p3]]]]]]}",SOX_EFF_MCHAN | SOX_EFF_LENGTH | SOX_EFF_GAIN,
- getopts, start, flow, 0, stop, kill, sizeof(priv_t)
+ getopts, start, flow, 0, stop, lsx_kill, sizeof(priv_t)
};
return &handler;
}
--- a/src/trim.c
+++ b/src/trim.c
@@ -148,7 +148,7 @@
return result;
}
-static int kill(sox_effect_t * effp)
+static int lsx_kill(sox_effect_t * effp)
{priv_t * trim = (priv_t *) effp->priv;
@@ -175,7 +175,7 @@
static sox_effect_handler_t handler = {"trim", "start [length]", SOX_EFF_MCHAN | SOX_EFF_LENGTH | SOX_EFF_MODIFY,
sox_trim_getopts, sox_trim_start, sox_trim_flow,
- NULL, NULL, kill, sizeof(priv_t)
+ NULL, NULL, lsx_kill, sizeof(priv_t)
};
return &handler;
}