From 62fdf0de990975f0eb95e83d345ffc461cfa9aef Mon Sep 17 00:00:00 2001
From: Eric Wong <e@80x24.org>
Date: Sun, 28 Dec 2014 01:55:20 +0000
Subject: source/splitfx: standardize on $FX for sox effects

This should allow users to setup effects in a more standardized
fashion and avoid needing to specify a "command:" field in their
splitfx YAML files in the general case.
---
 examples/splitfx.sample.yml | 5 +++--
 lib/dtas/source/splitfx.rb  | 7 +++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/examples/splitfx.sample.yml b/examples/splitfx.sample.yml
index 3826012..c1b5872 100644
--- a/examples/splitfx.sample.yml
+++ b/examples/splitfx.sample.yml
@@ -11,8 +11,9 @@ comments:
   ARTIST: John Smith
   ALBUM: Hello World
   YEAR: 2013
-# override the normal sox command for dtas-player playback:
-command: exec sox "$INFILE" $SOXFMT - $TRIMFX $RGFX $FX
+# the sox command for dtas-player playback, there is no need to
+# specify this as it is the default:
+# command: exec sox "$INFILE" $SOXFMT - $TRIMFX $RGFX $FX
 env:
   # these effects may be used in any command in this file, including targets
   FX:
diff --git a/lib/dtas/source/splitfx.rb b/lib/dtas/source/splitfx.rb
index a0899f3..fee27fd 100644
--- a/lib/dtas/source/splitfx.rb
+++ b/lib/dtas/source/splitfx.rb
@@ -10,7 +10,10 @@ class DTAS::Source::SplitFX < DTAS::Source::Sox # :nodoc:
   attr_writer :sox
   include DTAS::Source::Watchable if defined?(DTAS::Source::Watchable)
 
-  SPLITFX_DEFAULTS = SOX_DEFAULTS.merge("tryorder" => 3)
+  SPLITFX_DEFAULTS = SOX_DEFAULTS.merge(
+    "command" => "#{SOX_DEFAULTS["command"]} $FX",
+    "tryorder" => 3,
+  )
 
   def initialize(sox = DTAS::Source::Sox.new)
     command_init(SPLITFX_DEFAULTS)
@@ -52,7 +55,7 @@ class DTAS::Source::SplitFX < DTAS::Source::Sox # :nodoc:
   end
 
   def command_string
-    @ymlhash["command"] || @sox.command_string
+    @ymlhash["command"] || super
   end
 
   def spawn(player_format, rg_state, opts)
-- 
cgit v1.2.3-24-ge0c7