[PATCH] splitfx: allow -p/--sox-pipe option

[Eric Wong]

This allows splitfx YAML files to operate more seamlessly with
external commands such as play(1) especially when combined with
the -t/--trim option.
---
Documentation/dtas-splitfx.txt | 5 +++++
bin/dtas-splitfx | 9 +++++++--
lib/dtas/splitfx.rb | 19 +++++++++++++------
3 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/Documentation/dtas-splitfx.txt b/Documentation/dtas-splitfx.txt
index 2a599ea..c077137 100644
--- a/Documentation/dtas-splitfx.txt
+++ b/Documentation/dtas-splitfx.txt
@@ -59,6 +59,11 @@ to use ecasound(1), too.
of "000". For ease-of-typing, commas in this command-line
argument are automatically expanded to spaces when passed to sox.

+-p, \--sox-pipe
+: Used in place of an output target to specify outputting audio data in
+ the native "sox" format to another sox(1) or play(1) command. This
+ moves printing of output to stderr and disables parallel job invocation.
+
# FILE FORMAT

* infile - string, the pathname of the original audio file
diff --git a/bin/dtas-splitfx b/bin/dtas-splitfx
index d363ab9..fc8cc69 100755
--- a/bin/dtas-splitfx
+++ b/bin/dtas-splitfx
@@ -6,8 +6,8 @@ require 'optparse'
require 'dtas/splitfx'
usage = "#$0 [-n|--dry-run][-j [JOBS]][-s|--silent] SPLITFX_FILE.yml [TARGET]"
overrides = {} # FIXME: not tested
+default_target = "flac"
opts = { jobs: 1 }
-jobs = 1
OptionParser.new('', 24, ' ') do |op|
op.banner = usage
op.on('-n', '--dry-run') { opts[:dryrun] = true }
@@ -19,6 +19,10 @@ OptionParser.new('', 24, ' ') do |op|
op.on('-r', '--rate RATE') { |val| opts[:rate] = val }
op.on('-b', '--bits RATE', Integer) { |val| opts[:bits] = val }
op.on('-t', '--trim POSITION') { |val| opts[:trim] = val.tr(',', ' ') }
+ op.on('-p', '--sox-pipe') do
+ opts[:sox_pipe] = true
+ default_target = 'sox'
+ end
op.parse!(ARGV)
end

@@ -39,8 +43,9 @@ ARGV.each do |arg|
end
end

+trap(:INT) { exit 130 }
file = args.shift or abort usage
-target = args.shift || "flac"
+target = args.shift || default_target
splitfx = DTAS::SplitFX.new
splitfx.import(YAML.load(File.read(file)), overrides)
splitfx.run(target, opts)
diff --git a/lib/dtas/splitfx.rb b/lib/dtas/splitfx.rb
index adc6c77..97e6153 100644
--- a/lib/dtas/splitfx.rb
+++ b/lib/dtas/splitfx.rb
@@ -10,8 +10,7 @@ require 'tempfile'
# Unlike the stuff for dtas-player, dtas-splitfx is fairly tied to sox
# (but we may still pipe to ecasound or anything else)
class DTAS::SplitFX # :nodoc:
- CMD = 'sox "$INFILE" $COMMENTS $OUTFMT "$OUTDIR$TRACKNUMBER.$SUFFIX" '\
- '$TRIMFX $FX $RATEFX $DITHERFX'
+ CMD = 'sox "$INFILE" $COMMENTS $OUTFMT $OUTDST $TRIMFX $FX $RATEFX $DITHERFX'
include DTAS::Process
include DTAS::XS
attr_reader :infile, :env, :command
@@ -155,8 +154,6 @@ class DTAS::SplitFX # :nodoc:
def generic_target(target = "flac")
outfmt = @infmt.dup
outfmt.type = target
- outfmt.bits = @bits if @bits
- outfmt.rate = @rate if @rate
{ "command" => CMD, "format" => outfmt }
end

@@ -174,6 +171,9 @@ class DTAS::SplitFX # :nodoc:
outfmt.type = "flac"
end

+ outfmt.bits = @bits if @bits
+ outfmt.rate = @rate if @rate
+
# player commands will use SOXFMT by default, so we must output that
# as a self-describing format to the actual encoding instances
player_cmd = @command
@@ -211,6 +211,7 @@ class DTAS::SplitFX # :nodoc:
env["OUTFMT"] = xs(outarg)
env["SUFFIX"] = suffix
env["OUTDIR"] = @outdir ? "#@outdir/".squeeze('/') : ''
+ env["OUTDST"] = opts[:sox_pipe] ? "-p" : "$OUTDIR$TRACKNUMBER.$SUFFIX"
env.merge!(t.env)

command = target["command"]
@@ -237,7 +238,7 @@ class DTAS::SplitFX # :nodoc:
show_cmd = expand_cmd(env, command)
end

- puts(show_cmd.join(' ')) unless opts[:silent]
+ @out.puts(show_cmd.join(' ')) unless opts[:silent]
command = 'true' if opts[:dryrun] # still gotta fork

# pgroup: false so Ctrl-C on command-line will immediately stop everything
@@ -353,6 +354,12 @@ class DTAS::SplitFX # :nodoc:
tracks = @tracks.dup
pids = {}
jobs = opts[:jobs] || tracks.size # jobs == nil => everything at once
+ if opts[:sox_pipe]
+ jobs = 1
+ @out = $stderr
+ else
+ @out = $stdout
+ end
jobs.times.each do
t = tracks.shift or break
pid, tmp = splitfx_spawn(target, t, opts)
@@ -367,7 +374,7 @@ class DTAS::SplitFX # :nodoc:
pid, tmp = splitfx_spawn(target, t, opts)
pids[pid] = [ t, tmp ]
end
- puts "DONE #{done[0].inspect}" if $DEBUG
+ @out.puts "DONE #{done[0].inspect}" if $DEBUG
done[1].close!
else
fails << [ t, status ]