about summary refs log tree commit homepage
path: root/lib/dtas/splitfx.rb
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2015-05-10 23:00:39 +0000
committerEric Wong <e@80x24.org>2015-05-10 23:02:59 +0000
commitab63c7bb1b69423f8c39a60dd00230c560eecfc4 (patch)
treee237d46a2132be64bf9279174ae4c8bec2492c71 /lib/dtas/splitfx.rb
parent2594f4d57cc4fd86af7e1007aa610f02ad030ab3 (diff)
downloaddtas-ab63c7bb1b69423f8c39a60dd00230c560eecfc4.tar.gz
We must ensure lossy encodings do not get lossily-encoded twice,
only once at the final stage.  There is no effect for lossless
outputs as lossless is the common case for splitfx users.
Diffstat (limited to 'lib/dtas/splitfx.rb')
-rw-r--r--lib/dtas/splitfx.rb10
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/dtas/splitfx.rb b/lib/dtas/splitfx.rb
index a14d221..1de9229 100644
--- a/lib/dtas/splitfx.rb
+++ b/lib/dtas/splitfx.rb
@@ -173,6 +173,12 @@ class DTAS::SplitFX # :nodoc:
       outfmt = @infmt.dup
       outfmt.type = "flac"
     end
+
+    # player commands will use SOXFMT by default, so we must output that
+    # as a self-describing format to the actual encoding instances
+    player_cmd = @command
+    suffix = outfmt.type
+    outfmt.type = 'sox' if player_cmd
     env = outfmt.to_env
 
     # set very high quality resampling if using 24-bit or higher output
@@ -204,7 +210,7 @@ class DTAS::SplitFX # :nodoc:
     outarg = outfmt.to_sox_arg
     outarg << "-C#@compression" if @compression
     env["OUTFMT"] = xs(outarg)
-    env["SUFFIX"] = outfmt.type
+    env["SUFFIX"] = suffix
     env["OUTDIR"] = @outdir ? "#@outdir/".squeeze('/') : ''
     env.merge!(t.env)
 
@@ -215,7 +221,7 @@ class DTAS::SplitFX # :nodoc:
     # already takes those into account.  In other words, use our
     # target-specific commands like a dtas-player sink:
     #   @command | (INFILE= FX= TRIMFX=; target['command'])
-    if player_cmd = @command
+    if player_cmd
       sub_env = { 'INFILE' => '-', 'FX' => '', 'TRIMFX' => '' }
       sub_env_s = sub_env.inject("") { |s,(k,v)| s << "#{k}=#{v} " }
       command = "#{player_cmd} | (#{sub_env_s}; #{command})"