From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS22989 208.118.235.0/24 X-Spam-Status: No, score=-2.3 required=3.0 tests=AWL,BAYES_00 shortcircuit=no autolearn=unavailable version=3.3.2 X-Original-To: dtas-all@80x24.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id 7E5491F4F8 for ; Sun, 17 May 2015 01:37:32 +0000 (UTC) Received: from localhost ([::1]:35799 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YtnWF-0005qt-UT for dtas-all@80x24.org; Sat, 16 May 2015 21:37:31 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47764) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YtnWC-0005qX-Vg for dtas-all@nongnu.org; Sat, 16 May 2015 21:37:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YtnW9-0003oT-Rf for dtas-all@nongnu.org; Sat, 16 May 2015 21:37:28 -0400 Received: from dcvr.yhbt.net ([64.71.152.64]:58070) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YtnW9-0003oJ-Lr for dtas-all@nongnu.org; Sat, 16 May 2015 21:37:25 -0400 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 3B6891F4F6; Sun, 17 May 2015 01:37:25 +0000 (UTC) From: Eric Wong To: Subject: [PATCH] splitfx: fix non-generic, user-specified targets Date: Sun, 17 May 2015 01:37:23 +0000 Message-Id: <1431826643-29448-1-git-send-email-e@80x24.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 64.71.152.64 Cc: Eric Wong X-BeenThere: dtas-all@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dtas-all-bounces+dtas-all=80x24.org@nongnu.org Sender: dtas-all-bounces+dtas-all=80x24.org@nongnu.org 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 -- EW