dtas 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c54778751c0184208c6b3320212ab7e773483b32
-  data.tar.gz: d2a8569104855efac0f6c139ac98cd24e63a5df5
+  metadata.gz: 469ec379619540656d9a2decafe6eea0a53d963c
+  data.tar.gz: 7893b222746613c3365c1ea7a2b98276708a1ad5
 SHA512:
-  metadata.gz: 649e06bd203fe263e49283255390af8de78189fffcc69c33ca7851555e845c6055062cb4d2556f59ddc0291e627ce93cb75aa5e6b0f4494849ed63e9d59e5279
-  data.tar.gz: dac95c3d27d76984cb0f0493354059531843489dfa393da4a52e07eccbc108f730e899388b5fad19d1a00cc5a0cb2ade6f0bd5c44566a4929e762c608e239d63
+  metadata.gz: 762b5e63dadda1b2c6128103a7899b6d981f52b025ebeb967139d9a6253bca433fcd8b96a3d066eb73aebcc4362ba289d2a88fa882f8fdbaefd66a231ceef59d
+  data.tar.gz: 278c853d6f5bb6116bf8d9c6516c2a6412d72ce2036d77fe9d6abc19b088208af78b1027f5949b1625d8d6e846235a3477c28fa9c59ad94de28437ba20032962

data/Documentation/dtas-env.txt

@@ -24,7 +24,7 @@ INFILE - the primary input file for playback or processing.
 (e.g. "/path/to/ex.flac")
 
 RGFX - the sox effect used for applying ReplayGain compensation.
-Only used during playback in dtas-player.  (e.g. "vol -6.0dB").
+Only used during playback in dtas-player.  (e.g. "gain -6.0").
 Removing this prevents ReplayGain from working and may damage
 playback equipment with loudly mastered music.
 

data/Documentation/dtas-player_effects.txt

@@ -7,9 +7,9 @@ They are applied in the order described.
   rely on inter-track information.
 
   Examples include:
-  - ReplayGain (simple vol/gain changes)
+  - ReplayGain (simple gain changes)
   - anything which does not change the length of the audio:
-    vol, stereo, highpass, lowpass, loudness, bass, treble, equalizer, ...
+    gain, stereo, highpass, lowpass, loudness, bass, treble, equalizer, ...
 
   Modifying source effects should introduce no extra gaps in playback.
   Effects which modify the length of the audio is not recommended here,
@@ -34,7 +34,7 @@ They are applied in the order described.
   - delaying a certain channel or frequency range for time-alignment
   - compressors/limiters
   - reverb
-  - vol
+  - gain
   - remix (for stereo image adjustments)
 
   Additionally, effects which are necessary due to the limitation of the

data/Documentation/dtas-splitfx.txt

@@ -35,12 +35,28 @@ to use ecasound(1), too.
 :    Disable automatic setting of the DITHERFX env.  This also passes
     the option to sox(1) via SOX_OPTS.
 
+-O, \--outdir OUTDIR
+:    Set output directory instead of current directory.
+    User-created targets must allow a placeholder for the
+    (by default, an empty string) $OUTDIR environment variable
+    in the output command.
+
+-C, \--compression FACTOR
+:    Set the compression factor passed to sox(1).  See soxformat(7)
+    for more information on how it works across different formats.
+
+-r, \--rate RATE
+:    Override the output sample rate in the specified TARGET
+
+-b, \--bits BITS
+:    Override the output bit depth in the specified TARGET
+
 # FILE FORMAT
 
 * infile - string, the pathname of the original audio file
 * env - ordered hash of environment variables to set for all commands
     env: !omap
-      FX: vol +3dB stats
+      FX: gain 3 stats
 * comments - hash of common tags for all audio (e.g. ARTIST, ALBUM, YEAR)
     comments:
       ARTIST: John Smith
@@ -106,13 +122,13 @@ use in targets:
 * TRIMFX - essential, this supplys the necessary sox(1) trim effect to
   each track. In other words, this is: "trim ${TBEG}s ${TLEN}s"
 * COMMENTS - expands to --comment-file=PATH for sox(1)
-* OUTFMT - sox(1) arguments for the output format (e.g. "-ts32 -c2 * -r44100")
+* OUTDIR - placeholder for --outdir, defaults to an empty string
 * SUFFIX - the suffix of the output format without "." (e.g. "flac", "ogg")
 * TRACKNUMBER - the track number, useful for comments and filenames
 * RATEFX - rate effect and arguments for sox(1) resampling
 * DITHERFX - dither effect and arguments for sox(1) dithering
 * FX - any user-specified sox effects which encompases the entire file.
-  (e.g. "highpass 35 vol +3dB stats")
+  (e.g. "highpass 35 gain 3 stats")
 
 # TARGETS
 
@@ -144,10 +160,10 @@ imbalance in a live concert recording from the audience:
     targets:
       flac24:
         command: sox -M
-          "|sox $INFILE -c1 -p $TRIMFX remix 1v1 vol +9.5dB"
-          "|sox $INFILE -c1 -p $TRIMFX remix 2v1 vol +8.5dB"
+          "|sox $INFILE -c1 -p $TRIMFX remix 1v1 gain 9.5"
+          "|sox $INFILE -c1 -p $TRIMFX remix 2v1 gain 8.5"
           $COMMENTS $OUTFMT
-          bandYYYY-MM-DD.FOO.t0"$TRACKNUMBER.$SUFFIX"
+          ${OUTDIR}bandYYYY-MM-DD.FOO.t0"$TRACKNUMBER.$SUFFIX"
           $RATEFX $DITHERFX stats
         format:
           type: flac
@@ -163,7 +179,7 @@ For reference, the "opusenc" default target is implemented as follows:
            --raw-bits $BITS_PER_SAMPLE
            $OPUSENC_BITRATE --raw-rate $RATE --raw-chan $CHANNELS
            --raw-endianness $ENDIAN_OPUSENC
-           $OPUSENC_COMMENTS - $TRACKNUMBER.opus
+           $OPUSENC_COMMENTS - $OUTDIR$TRACKNUMBER.opus
         format:
           bits: 16
           rate: 48000

data/GIT-VERSION-GEN

@@ -4,7 +4,7 @@
 CONSTANT = "DTAS::VERSION"
 RVF = "lib/dtas/version.rb"
 GVF = "GIT-VERSION-FILE"
-DEF_VER = "v0.10.0"
+DEF_VER = "v0.11.0"
 vn = DEF_VER
 
 # First see if there is a version file (included in release tarballs),

data/Rakefile

@@ -6,7 +6,7 @@ task "NEWS" do
   latest = nil
   fp = Tempfile.new("NEWS", ".")
   fp.sync = true
-  `git tag -l`.split(/\n/).reverse.each do |tag|
+  `git tag -l --sort=-v:refname`.split(/\n/).each do |tag|
     %r{\Av(.+)} =~ tag or next
     version = $1
     header, subject, body = `git cat-file tag #{tag}`.split(/\n\n/, 3)

data/bin/dtas-splitfx

@@ -14,6 +14,10 @@ OptionParser.new('', 24, '  ') do |op|
   op.on('-j', '--jobs [JOBS]', Integer) { |val| opts[:jobs] = val }
   op.on('-s', '--quiet', '--silent') { |val| opts[:silent] = true }
   op.on('-D', '--no-dither') { |val| opts[:no_dither] = true }
+  op.on('-O', '--outdir OUTDIR') { |val| opts[:outdir] = val }
+  op.on('-C', '--compression FACTOR') { |val| opts[:compression] = val }
+  op.on('-r', '--rate RATE') { |val| opts[:rate] = val }
+  op.on('-b', '--bits RATE', Integer) { |val| opts[:bits] = val }
   op.parse!(ARGV)
 end
 

data/examples/splitfx.sample.yml

@@ -17,7 +17,7 @@ env: !omap
   SOX_OPTS: $SOX_OPTS -R
   FX:
     # highpass -1 120 highpass 40 highpass 40
-    # vol +1.5dB
+    # gain 1.5
     stats
 track_start: 1 # 0 for pregap/intro tracks
 cdda_align: true

data/examples/tfx.sample.yml

@@ -16,8 +16,8 @@ comments:
 track_start: 1
 effects:
 # the following commands are equivalent
-- trim 52 =53 sh sox $SOXIN $SOXOUT $TRIMFX vol -6dB
-- trim 52 1 sox vol -6dB # shorthand
+- trim 52 =53 sh sox $SOXIN $SOXOUT $TRIMFX gain -6
+- trim 52 1 sox gain -6 # shorthand
 
 # as are the following (for little endian machines)
 - trim 52 1 eca -eadb:-6

data/lib/dtas/rg_state.rb

@@ -5,8 +5,10 @@
 # MAYBE: account for non-standard reference loudness (89.0 dB is standard)
 require_relative '../dtas'
 require_relative 'serialize'
+require_relative 'util'
 class DTAS::RGState # :nodoc:
   include DTAS::Serialize
+  include DTAS::Util
 
   RG_MODE = {
     # attribute name => method to use
@@ -53,19 +55,19 @@ class DTAS::RGState # :nodoc:
     to_hash.delete_if { |k,v| RG_DEFAULT[k] == v }
   end
 
-  # returns a dB argument to the "vol" effect, nil if nothing found
+  # returns a dB argument to the "gain" effect, nil if nothing found
   def rg_vol_gain(val)
     val = val.to_f + @preamp
     return if val.abs < @gain_threshold
-    sprintf('vol %0.8gdB', val)
+    sprintf('gain %0.8g', val)
   end
 
-  # returns a linear argument to the "vol" effect
+  # returns a DB argument to the "gain" effect
   def rg_vol_norm(val)
     diff = @norm_level - val.to_f
     return if (@norm_level - diff).abs < @norm_threshold
     diff += @norm_level
-    sprintf('vol %0.8g', diff)
+    sprintf('gain %0.8g', linear_to_db(diff))
   end
 
   # The ReplayGain fallback adjustment value (in dB), in case a file is
@@ -77,7 +79,7 @@ class DTAS::RGState # :nodoc:
     val = @fallback_gain + @preamp
     return if val.abs < @gain_threshold
     warn(reason) if $DEBUG
-    "vol #{val}dB"
+    "gain #{val}"
   end
 
   # returns an array (for command-line argument) for the effect needed

data/lib/dtas/splitfx.rb

@@ -10,7 +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 "$TRACKNUMBER.$SUFFIX" '\
+  CMD = 'sox "$INFILE" $COMMENTS $OUTFMT "$OUTDIR$TRACKNUMBER.$SUFFIX" '\
         '$TRIMFX $FX $RATEFX $DITHERFX'
   include DTAS::Process
   include DTAS::XS
@@ -55,6 +55,10 @@ class DTAS::SplitFX # :nodoc:
     @track_zpad = true
     @t2s = method(:t2s)
     @infile = nil
+    @outdir = nil
+    @compression = nil
+    @rate = nil
+    @bits = nil
     @targets = {
       "flac-cdda" => {
         "command" => CMD,
@@ -72,7 +76,7 @@ class DTAS::SplitFX # :nodoc:
            '$OPUSENC_BITRATE --raw-rate $RATE --raw-chan $CHANNELS ' \
            '--raw-endianness $ENDIAN_OPUSENC ' \
            '$OPUSENC_COMMENTS ' \
-           '- $TRACKNUMBER.opus',
+           '- $OUTDIR$TRACKNUMBER.opus',
         "format" => {
           "bits" => 16,
           "rate" => 48000,
@@ -155,6 +159,8 @@ 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
 
@@ -184,7 +190,7 @@ class DTAS::SplitFX # :nodoc:
     # add noise-shaped dither for 16-bit (sox manual seems to recommend this)
     if opts[:no_dither]
       env["SOX_OPTS"] = "#{ENV["SOX_OPTS"]} -D"
-    else outfmt.bits && outfmt.bits <= 16
+    elsif outfmt.bits && outfmt.bits <= 16
       env["DITHERFX"] = "dither -s"
     end
     comments = Tempfile.new(%W(dtas-splitfx-#{t.comments["TRACKNUMBER"]} .txt))
@@ -195,8 +201,11 @@ class DTAS::SplitFX # :nodoc:
     end
     env["COMMENTS"] = "--comment-file=#{comments.path}"
     infile_env(env, @infile)
-    env["OUTFMT"] = xs(outfmt.to_sox_arg)
+    outarg = outfmt.to_sox_arg
+    outarg << "-C#@compression" if @compression
+    env["OUTFMT"] = xs(outarg)
     env["SUFFIX"] = outfmt.type
+    env["OUTDIR"] = @outdir ? "#@outdir/".squeeze('/') : ''
     env.merge!(t.env)
 
     command = target["command"]
@@ -323,6 +332,14 @@ class DTAS::SplitFX # :nodoc:
   end
 
   def run(target, opts = {})
+    if @outdir = opts[:outdir]
+      require 'fileutils'
+      FileUtils.mkpath(@outdir)
+    end
+    @compression = opts[:compression]
+    @rate = opts[:rate]
+    @bits = opts[:bits]
+
     fails = []
     tracks = @tracks.dup
     pids = {}

data/lib/dtas/tracklist.rb

@@ -69,12 +69,13 @@ class DTAS::Tracklist # :nodoc:
   def advance_track(repeat_ok = true)
     return if @list.empty?
     # @repeat == 1 for single track repeat
-    next_pos = @goto_pos || @pos + (@repeat == 1 ? 0 : 1)
+    repeat = repeat_ok ? @repeat : false
+    next_pos = @goto_pos || @pos + (repeat == 1 ? 0 : 1)
     next_off = @goto_off # nil by default
     @goto_pos = @goto_off = nil
     if @list[next_pos]
       @pos = next_pos
-    elsif @repeat && repeat_ok
+    elsif repeat
       next_pos = @pos = 0
     else
       return

data/test/test_rg_integration.rb

@@ -1,8 +1,10 @@
 # Copyright (C) 2013-2015 all contributors <dtas-all@nongnu.org>
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 require './test/player_integration'
+require 'dtas/util'
 class TestRgIntegration < Testcase
   include PlayerIntegration
+  include DTAS::Util
 
   def tmp_pluck(len = 5)
     pluck = Tempfile.open(%w(pluck .flac))
@@ -58,10 +60,10 @@ class TestRgIntegration < Testcase
       assert_match expect, cur["current"]["env"]["RGFX"]
     end
 
-    check_gain.call(%r{vol -3dB}, "album_gain")
-    check_gain.call(%r{vol -2dB}, "track_gain")
-    check_gain.call(%r{vol 1\.3}, "track_peak")
-    check_gain.call(%r{vol 1\.0}, "album_peak")
+    check_gain.call(%r{gain -3}, "album_gain")
+    check_gain.call(%r{gain -2}, "track_gain")
+    check_gain.call(%r{gain 0\.0}, "album_peak")
+    check_gain.call(%r{gain 2\.5}, "track_peak")
 
     s.req_ok("rg preamp+=1")
     rg = YAML.load(yaml = s.req("rg"))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtas
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - dtas hackers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-13 00:00:00.000000000 Z
+date: 2015-05-10 00:00:00.000000000 Z
 dependencies: []
 description: |-
   Free Software command-line tools for audio playback, mastering, and