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>
Subject: [PATCH] dtas-splitfx: use the top-level command used by -player
Date: Sat,  3 Jan 2015 03:08:53 +0000	[thread overview]
Message-ID: <1420254534-9581-2-git-send-email-e@80x24.org> (raw)

If somebody is using dtas-player to help edit a file for
dtas-splitfx, it is likely they will want to use it when
generating the final files (regardless of "target" format).
---
 lib/dtas/splitfx.rb | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/lib/dtas/splitfx.rb b/lib/dtas/splitfx.rb
index e31972a..dac2a97 100644
--- a/lib/dtas/splitfx.rb
+++ b/lib/dtas/splitfx.rb
@@ -78,6 +78,7 @@ class DTAS::SplitFX # :nodoc:
     @tracks = []
     @infmt = nil # wait until input is assigned
     @cuebp = nil # for playback
+    @command = nil # top-level, for playback
   end
 
   def _bool(hash, key)
@@ -134,6 +135,7 @@ class DTAS::SplitFX # :nodoc:
 
     load_input!(hash)
     load_tracks!(hash)
+    @command = hash["command"] # nil by default
   end
 
   def load_input!(hash)
@@ -193,10 +195,23 @@ class DTAS::SplitFX # :nodoc:
     env.merge!(t.env)
 
     command = target["command"]
-    tmp = Shellwords.split(command).map do |arg|
-      qx(env, "printf %s \"#{arg}\"")
+
+    # if a default dtas-player command is set, use that.
+    # we'll clobber our default environment since we assume play_cmd
+    # 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
+      sub_env = { 'INFILE' => '-', 'FX' => '', 'TRIMFX' => '' }
+      sub_env_s = sub_env.inject("") { |s,(k,v)| s << "#{k}=#{v} " }
+      command = "#{player_cmd} | (#{sub_env_s}; #{command})"
+      show_cmd = [ _expand_cmd(env, player_cmd), '|', '(', "#{sub_env_s};",
+                   _expand_cmd(env.merge(sub_env), command), ')' ].flatten
+    else
+      show_cmd = _expand_cmd(env, command)
     end
-    echo = "echo #{xs(tmp)}"
+
+    echo = "echo #{xs(show_cmd)}"
     if opts[:dryrun]
       command = echo
     else
@@ -347,4 +362,10 @@ class DTAS::SplitFX # :nodoc:
     env["INFILE"] = infile
     env["INDIR"], env["INBASE"] = File.split(File.expand_path(infile))
   end
+
+  def _expand_cmd(env, command)
+    Shellwords.split(command).map do |arg|
+      qx(env, "printf %s \"#{arg}\"")
+    end
+  end
 end
-- 
EW



                 reply	other threads:[~2015-01-03  3:09 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=1420254534-9581-2-git-send-email-e@80x24.org \
    --to=e@80x24.org \
    --cc=dtas-all@nongnu.org \
    --subject='Re: [PATCH] dtas-splitfx: use the top-level command used by -player' \
    /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).