From 544243e0a14d0d507d0bd0fa34c41861486788e4 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Sun, 10 May 2015 23:17:01 +0000 Subject: splitfx: fix non-generic, user-specified targets Regression appeared in the previous commit, oops. commit ab63c7bb1b69423f8c39a60dd00230c560eecfc4 (splitfx: fix lossy output with player command is in use) --- lib/dtas/splitfx.rb | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/lib/dtas/splitfx.rb b/lib/dtas/splitfx.rb index 1de9229..e4997cc 100644 --- a/lib/dtas/splitfx.rb +++ b/lib/dtas/splitfx.rb @@ -165,7 +165,13 @@ class DTAS::SplitFX # :nodoc: end def splitfx_spawn(target, t, opts) - target = @targets[target] || generic_target(target) + generic = false + if tgt = @targets[target] + target = tgt + else + generic = true + target = generic_target(target) + end outfmt = target["format"] # default format: @@ -178,7 +184,9 @@ class DTAS::SplitFX # :nodoc: # as a self-describing format to the actual encoding instances player_cmd = @command suffix = outfmt.type - outfmt.type = 'sox' if player_cmd + if player_cmd && generic + outfmt.type = 'sox' + end env = outfmt.to_env # set very high quality resampling if using 24-bit or higher output -- cgit v1.2.3-24-ge0c7