everything related to duct tape audio suite (dtas)
 help / color / mirror / code / Atom feed
From: Eric Wong <e@80x24.org>
To: <dtas-all@nongnu.org>
Cc: Eric Wong <e@80x24.org>
Subject: [PATCH] source/splitfx: standardize on $FX for sox effects
Date: Sun, 28 Dec 2014 04:12:04 +0000	[thread overview]
Message-ID: <1419739924-23982-2-git-send-email-e@80x24.org> (raw)

This should allow users to setup effects in a more standardized
fashion and avoid needing to specify a "command:" field in their
splitfx YAML files in the general case.
---
 examples/splitfx.sample.yml | 5 +++--
 lib/dtas/source/splitfx.rb  | 7 +++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/examples/splitfx.sample.yml b/examples/splitfx.sample.yml
index 3826012..c1b5872 100644
--- a/examples/splitfx.sample.yml
+++ b/examples/splitfx.sample.yml
@@ -11,8 +11,9 @@ comments:
   ARTIST: John Smith
   ALBUM: Hello World
   YEAR: 2013
-# override the normal sox command for dtas-player playback:
-command: exec sox "$INFILE" $SOXFMT - $TRIMFX $RGFX $FX
+# the sox command for dtas-player playback, there is no need to
+# specify this as it is the default:
+# command: exec sox "$INFILE" $SOXFMT - $TRIMFX $RGFX $FX
 env:
   # these effects may be used in any command in this file, including targets
   FX:
diff --git a/lib/dtas/source/splitfx.rb b/lib/dtas/source/splitfx.rb
index a0899f3..fee27fd 100644
--- a/lib/dtas/source/splitfx.rb
+++ b/lib/dtas/source/splitfx.rb
@@ -10,7 +10,10 @@ class DTAS::Source::SplitFX < DTAS::Source::Sox # :nodoc:
   attr_writer :sox
   include DTAS::Source::Watchable if defined?(DTAS::Source::Watchable)
 
-  SPLITFX_DEFAULTS = SOX_DEFAULTS.merge("tryorder" => 3)
+  SPLITFX_DEFAULTS = SOX_DEFAULTS.merge(
+    "command" => "#{SOX_DEFAULTS["command"]} $FX",
+    "tryorder" => 3,
+  )
 
   def initialize(sox = DTAS::Source::Sox.new)
     command_init(SPLITFX_DEFAULTS)
@@ -52,7 +55,7 @@ class DTAS::Source::SplitFX < DTAS::Source::Sox # :nodoc:
   end
 
   def command_string
-    @ymlhash["command"] || @sox.command_string
+    @ymlhash["command"] || super
   end
 
   def spawn(player_format, rg_state, opts)
-- 
EW



                 reply	other threads:[~2014-12-28  4:12 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://80x24.org/dtas/README

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1419739924-23982-2-git-send-email-e@80x24.org \
    --to=e@80x24.org \
    --cc=dtas-all@nongnu.org \
    --subject='Re: [PATCH] source/splitfx: standardize on $FX for sox effects' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Code repositories for project(s) associated with this inbox:

	../../dtas.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).