From ab63c7bb1b69423f8c39a60dd00230c560eecfc4 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Sun, 10 May 2015 23:00:39 +0000 Subject: splitfx: fix lossy output with player command is in use 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. --- lib/dtas/splitfx.rb | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'lib/dtas/splitfx.rb') 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})" -- cgit v1.2.3-24-ge0c7