From 7b47191aa4c88b3daa4c980013f0047cb7ae7f6d Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Tue, 19 May 2015 08:17:39 +0000 Subject: splitfx: avoid double-truncation with user command It's probably harmless as the sub (second) command is usually innocuous as fars a modifying dynamic range, but it makes the command-line output confusing. --- lib/dtas/splitfx.rb | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/dtas/splitfx.rb b/lib/dtas/splitfx.rb index 6bac27f..5a1431a 100644 --- a/lib/dtas/splitfx.rb +++ b/lib/dtas/splitfx.rb @@ -177,9 +177,6 @@ class DTAS::SplitFX # :nodoc: # as a self-describing format to the actual encoding instances player_cmd = @command suffix = outfmt.type - if player_cmd && generic - outfmt.type = 'sox' - end env = outfmt.to_env # set very high quality resampling if using 24-bit or higher output @@ -223,8 +220,15 @@ class DTAS::SplitFX # :nodoc: # target-specific commands like a dtas-player sink: # @command | (INFILE= FX= TRIMFX=; target['command']) if player_cmd - sub_env = { 'INFILE' => '-', 'FX' => '', 'TRIMFX' => '' } + sub_env = { + 'INFILE' => '-p', + 'FX' => '', + 'TRIMFX' => '', + 'SOXFMT' => '' + } sub_env_s = sub_env.inject("") { |s,(k,v)| s << "#{k}=#{v} " } + env['SOXFMT'] = '-tsox' + sub_env['OUTFMT'] = env.delete('OUTFMT') show_cmd = [ _expand_cmd(env, player_cmd), '|', '(', "#{sub_env_s};", _expand_cmd(env.merge(sub_env), command), ')' ].flatten command = "#{player_cmd} | (#{sub_env_s}; #{command})" -- cgit v1.2.3-24-ge0c7