Apply changes suggested in tracker patch 2909975 to fix effect flags for fade, remix, silence, and speed effects.

idigdoug committed 16 years ago

Commit b26f5381 parent e634cfd5 files · +6 −5Browse files

Unified · Split

5 files

@@ -364,7 +364,7 @@ static sox_effect_handler_t sox_fade_effect = { · 363 unmodified lines
364	"[ type ] fade-in-length [ stop-time [ fade-out-length ] ]\n"	364	"[ type ] fade-in-length [ stop-time [ fade-out-length ] ]\n"
365	" Time is in hh:mm:ss.frac format.\n"	365	" Time is in hh:mm:ss.frac format.\n"
366	" Fade type one of q, h, t, l or p.",	366	" Fade type one of q, h, t, l or p.",
367	SOX_EFF_MCHAN,	367	SOX_EFF_MCHAN \| SOX_EFF_LENGTH,
368	sox_fade_getopts,	368	sox_fade_getopts,
369	sox_fade_start,	369	sox_fade_start,
370	sox_fade_flow,	370	sox_fade_flow,

@@ -1,4 +1,4 @@
1	/* noiseprof - Noise Profiling Effect.	1	/* noisered - Noise Reduction Effect.
2	*	2	*
3	* Written by Ian Turner (vectro@vectro.org)	3	* Written by Ian Turner (vectro@vectro.org)
4	*	4	*

@@ -251,7 +251,7 @@ static int channels_start(sox_effect_t * effp) · 250 unmodified lines
251	sox_effect_handler_t const * lsx_channels_effect_fn(void)	251	sox_effect_handler_t const * lsx_channels_effect_fn(void)
252	{	252	{
253	static sox_effect_handler_t handler = {	253	static sox_effect_handler_t handler = {
254	"channels", "number", SOX_EFF_MCHAN \| SOX_EFF_CHAN \| SOX_EFF_MODIFY,	254	"channels", "number", SOX_EFF_MCHAN \| SOX_EFF_CHAN,
255	channels_create, channels_start, flow, NULL, closedown, NULL, sizeof(priv_t)	255	channels_create, channels_start, flow, NULL, closedown, NULL, sizeof(priv_t)
256	};	256	};
257	return &handler;	257	return &handler;

@@ -665,7 +665,7 @@ static int kill(sox_effect_t * effp) · 664 unmodified lines
665	static sox_effect_handler_t sox_silence_effect = {	665	static sox_effect_handler_t sox_silence_effect = {
666	"silence",	666	"silence",
667	"[ -l ] above_periods [ duration thershold[d\|%%] ] [ below_periods duration threshold[d\|%%]]",	667	"[ -l ] above_periods [ duration thershold[d\|%%] ] [ below_periods duration threshold[d\|%%]]",
668	SOX_EFF_MCHAN \| SOX_EFF_MODIFY,	668	SOX_EFF_MCHAN \| SOX_EFF_MODIFY \| SOX_EFF_LENGTH,
669	sox_silence_getopts,	669	sox_silence_getopts,
670	sox_silence_start,	670	sox_silence_start,
671	sox_silence_flow,	671	sox_silence_flow,

 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,
+    "speed", "factor[c]",
+	SOX_EFF_MCHAN | SOX_EFF_RATE | SOX_EFF_LENGTH,
     getopts, start, lsx_flow_copy, 0, 0, 0, sizeof(priv_t)};
   return &handler;
 }

Keyboard shortcuts