From 7a2d650592fae471fefdca70f686861dd49ac7ce Mon Sep 17 00:00:00 2001
From: Eric Wong <e@80x24.org>
Date: Mon, 30 Jun 2014 05:26:45 +0000
Subject: remove builtin-$FADEFX support

This is more generically supported via variables.
---
 examples/trimfx.sample.yml | 7 ++-----
 lib/dtas/trimfx.rb         | 3 +--
 test/test_trimfx.rb        | 2 +-
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/examples/trimfx.sample.yml b/examples/trimfx.sample.yml
index 3a45401..2cbfbbc 100644
--- a/examples/trimfx.sample.yml
+++ b/examples/trimfx.sample.yml
@@ -15,16 +15,13 @@ comments:
   YEAR: 2013
 track_start: 1
 effects:
-# the fade parameter sets the default fade for every subsequent effect
-- fade=t1,t1;t1,t1 # fade-out-prev,fade-in-main;fade-out-main,fade-in-next
-
 # the following commands are equivalent
-- trim 52 =53 sh sox $SOXIN $SOXOUT $TRIMFX vol -6dB $FADEFX
+- trim 52 =53 sh sox $SOXIN $SOXOUT $TRIMFX vol -6dB
 - trim 52 1 sox vol -6dB # shorthand
 
 # as are the following (for little endian machines)
 - trim 52 1 eca -eadb:-6
 - trim 52 1 sh sox $SOXIN $SOX2ECA $TRIMFX | ecasound $ECAFMT
-  -i stdin -o stdout -eadb:-6 | sox $ECA2SOX - $SOXOUT $FADEFX
+  -i stdin -o stdout -eadb:-6 | sox $ECA2SOX - $SOXOUT
 # SOX2ECA='-tf32 -c$CHANNELS -r$RATE'
 # ECAFMT='-f32_le,$CHANNELS,$RATE
diff --git a/lib/dtas/trimfx.rb b/lib/dtas/trimfx.rb
index 391bbc2..d94d52a 100644
--- a/lib/dtas/trimfx.rb
+++ b/lib/dtas/trimfx.rb
@@ -36,14 +36,13 @@ class DTAS::TrimFX
   def tfx_sox(args)
     @cmd = %w(sox $SOXIN $SOXOUT $TRIMFX)
     @cmd.concat(args)
-    @cmd.concat(%w($FADEFX))
   end
 
   def tfx_eca(args)
     @cmd = %w(sox $SOXIN $SOX2ECA $TRIMFX)
     @cmd.concat(%w(| ecasound $ECAFMT -i stdin -o stdout))
     @cmd.concat(args)
-    @cmd.concat(%w(| sox $ECA2SOX - $SOXOUT $FADEFX))
+    @cmd.concat(%w(| sox $ECA2SOX - $SOXOUT))
   end
 
   def to_sox_arg(format)
diff --git a/test/test_trimfx.rb b/test/test_trimfx.rb
index 3a3bdc0..a8fd902 100644
--- a/test/test_trimfx.rb
+++ b/test/test_trimfx.rb
@@ -45,7 +45,7 @@ class TestTrimFX < Testcase
 
   def test_tfx_effects
     tfx = DTAS::TrimFX.new(%w(trim 1 sox vol -1dB))
-    assert_equal %w(sox $SOXIN $SOXOUT $TRIMFX vol -1dB $FADEFX), tfx.cmd
+    assert_equal %w(sox $SOXIN $SOXOUT $TRIMFX vol -1dB), tfx.cmd
   end
 
   def test_schedule_simple
-- 
cgit v1.2.3-24-ge0c7