dtas 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4ce17f3d71d013e20442d569236e8ea2b56a091
-  data.tar.gz: f8177dd1cae23bbf4f679b8cfca1062f8583f5e2
+  metadata.gz: 95cea9c51fc4befa828c208dabf229b37dbc3582
+  data.tar.gz: 4bb3019027d4864ea6d6e9fd8026b236c2f0070f
 SHA512:
-  metadata.gz: 7d57e1c9be990a92163771a89075cf0432cbe6f4441f4c79ba7efe09288a41fb76b055faf37339ab6de2247a89ad9b36a0e45da5deff39f14b376e417d5e11ca
-  data.tar.gz: 5c3ae2d8e5d06f46afe06472b27c9de90c095e7651d69379d45b71589adb3e6d2fffdd24442b095f1e48b0335206ff98a52ff79edcd6845b92bef97fdee364d9
+  metadata.gz: 795146ad7d81aeabfa30ad36b1de0bf92402428f1c6388f9ba5e2e51df95a773feaf312d38889aa88ee9ab635d61e6b9f082518a03b9614636107b4ebb5dc331
+  data.tar.gz: 75076a786083803900a61adee4847326866f6e08cd8bf624c1b3b4fa021e1f80a991c37be78782caae3888ec5d3c26c6869f29de6bc016c5b65dd90c499e3a6c

data/GIT-VERSION-GEN

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

data/bin/dtas-partstats

@@ -0,0 +1,39 @@
+#!/usr/bin/env ruby
+# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# TODO
+# - option parsing: sox effects, stats effect options
+# - support piping out to external processes
+# - configurable output formatting
+# - Sequel/SQLite support
+require 'dtas/partstats'
+infile = ARGV[0] or abort "usage: #$0 INFILE"
+ps = DTAS::PartStats.new(infile)
+opts = {
+  jobs: `nproc 2>/dev/null || echo 2`.to_i
+}
+stats = ps.run(opts)
+
+headers = ps.key_idx.to_a
+headers = headers.sort_by! { |(n,i)| i }.map! { |(n,_)| n }
+width = ps.key_width
+print "    time "
+puts(headers.map do |h|
+  cols = width[h]
+  sprintf("% #{(cols * 6)+cols-1}s", h.tr(' ','_'))
+end.join(" | "))
+
+stats.each do |row|
+  trim_part = row.shift
+  print "#{trim_part.hhmmss} "
+  puts(row.map do |group|
+    group.map do |f|
+      case f
+      when Float
+        sprintf("% 6.2f", f)
+      else
+        sprintf("% 6s", f)
+      end
+    end.join(" ")
+  end.join(" | "))
+end

data/bin/dtas-tl

@@ -56,7 +56,7 @@ when "reto"
   re = ignorecase ? %r{#{re}}i : %r{#{re}}
   get_track_ids(c).each do |track_id|
     res = c.req("tl get #{track_id}")
-    res.sub!(/\A1 /, '')
+    res.sub!(/\A1 \d+=/, '')
     if re =~ res
       req = %W(tl goto #{track_id})
       req << time if time

data/examples/trimfx.sample.yml

@@ -0,0 +1,30 @@
+# To the extent possible under law, Eric Wong has waived all copyright and
+# related or neighboring rights to this example.
+# Note: be sure to update test/test_trimfx.rb if you change this,
+# test_trimfx.rb relies on this.
+---
+infile: foo.flac
+env:
+  PATH: $PATH
+  SOX_OPTS: $SOX_OPTS -R
+  I2: second.flac
+  I3: third.flac
+comments:
+  ARTIST: John Smith
+  ALBUM: Hello World
+  YEAR: 2013
+track_start: 1
+effects:
+# the fade parameter sets the default fade for every subsequent effect
+- fade=t1,t1;t1,t1 # fade-out-prev,fade-in-main;fade-out-main,fade-in-next
+
+# the following commands are equivalent
+- trim 52 =53 sh sox $SOXIN $SOXOUT $TRIMFX vol -6dB $FADEFX
+- trim 52 1 sox vol -6dB # shorthand
+
+# as are the following (for little endian machines)
+- trim 52 1 eca -eadb:-6
+- trim 52 1 sh sox $SOXIN $SOX2ECA $TRIMFX | ecasound $ECAFMT
+  -i stdin -o stdout -eadb:-6 | sox $ECA2SOX - $SOXOUT $FADEFX
+# SOX2ECA='-tf32 -c$CHANNELS -r$RATE'
+# ECAFMT='-f32_le,$CHANNELS,$RATE

data/lib/dtas/buffer.rb

@@ -1,6 +1,8 @@
 # Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+require 'io/wait'
 require_relative '../dtas'
+require_relative 'compat_rbx' # IO#nread
 
 class DTAS::Buffer # :nodoc:
   begin
@@ -47,16 +49,13 @@ class DTAS::Buffer # :nodoc:
   # - some type of StandardError
   # - nil
   def broadcast(targets)
-    bytes = inflight
-    return :wait_readable if 0 == bytes # spurious wakeup
-
     case targets.size
     when 0
       :ignore # this will pause decoders
     when 1
-      broadcast_one(targets, bytes)
+      broadcast_one(targets)
     else # infinity
-      broadcast_inf(targets, bytes)
+      broadcast_inf(targets)
     end
   end
 

data/lib/dtas/buffer/read_write.rb

@@ -1,6 +1,5 @@
 # Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
-require 'io/wait'
 require 'io/nonblock'
 require_relative '../../dtas'
 require_relative '../pipe'
@@ -17,25 +16,30 @@ module DTAS::Buffer::ReadWrite # :nodoc:
   def discard(bytes)
     buf = _rbuf
     begin
-      @to_io.read(bytes, buf) or break # EOF
+      @to_io.readpartial(bytes, buf)
       bytes -= buf.bytesize
+    rescue EOFError
+      return
     end until bytes == 0
   end
 
   # always block when we have a single target
-  def broadcast_one(targets, bytes)
+  def broadcast_one(targets)
     buf = _rbuf
-    @to_io.read(bytes, buf)
+    @to_io.readpartial(MAX_AT_ONCE, buf)
     n = targets[0].write(buf) # IO#write has write-in-full behavior
     @bytes_xfer += n
     :wait_readable
+  rescue EOFError
+    nil
   rescue Errno::EPIPE, IOError => e
     __dst_error(targets[0], e)
     targets.clear
     nil # do not return error here, we already spewed an error message
   end
 
-  def broadcast_inf(targets, bytes)
+  def broadcast_inf(targets)
+    bytes = inflight
     nr_nb = targets.count { |sink| sink.nonblock? }
     if nr_nb == 0 || nr_nb == targets.size
       # if all targets are full, don't start until they're all writable
@@ -56,7 +60,8 @@ module DTAS::Buffer::ReadWrite # :nodoc:
     bytes = bytes > MAX_AT_ONCE ? MAX_AT_ONCE : bytes
     buf = _rbuf
     @to_io.read(bytes, buf)
-    @bytes_xfer += buf.bytesize
+    n = buf.bytesize
+    @bytes_xfer += n
 
     targets.delete_if do |dst|
       begin

data/lib/dtas/buffer/splice.rb

@@ -1,6 +1,5 @@
 # Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
-require 'io/wait'
 require 'io/nonblock'
 require 'io/splice'
 require_relative '../../dtas'
@@ -8,6 +7,7 @@ require_relative '../pipe'
 
 module DTAS::Buffer::Splice # :nodoc:
   MAX_AT_ONCE = 4096 # page size in Linux
+  MAX_AT_ONCE_1 = 65536
   MAX_SIZE = File.read("/proc/sys/fs/pipe-max-size").to_i
   DEVNULL = File.open("/dev/null", "r+")
   F_MOVE = IO::Splice::F_MOVE
@@ -28,9 +28,9 @@ module DTAS::Buffer::Splice # :nodoc:
     IO.splice(@to_io, nil, DEVNULL, nil, bytes)
   end
 
-  def broadcast_one(targets, bytes)
+  def broadcast_one(targets)
     # single output is always non-blocking
-    s = IO.trysplice(@to_io, nil, targets[0], nil, bytes, F_MOVE)
+    s = IO.trysplice(@to_io, nil, targets[0], nil, MAX_AT_ONCE_1, F_MOVE)
     if Symbol === s
       targets # our one and only target blocked on write
     else
@@ -48,11 +48,14 @@ module DTAS::Buffer::Splice # :nodoc:
     most_teed = 0
     targets.delete_if do |dst|
       begin
-        t = dst.nonblock? ?
+        t = (dst.nonblock? || most_teed == 0) ?
             IO.trytee(@to_io, dst, chunk_size) :
             IO.tee(@to_io, dst, chunk_size, WAITALL)
         if Integer === t
-          most_teed = t if t > most_teed
+          if t > most_teed
+            chunk_size = t if most_teed == 0
+            most_teed = t
+          end
         else
           blocked << dst
         end
@@ -65,7 +68,7 @@ module DTAS::Buffer::Splice # :nodoc:
     most_teed
   end
 
-  def broadcast_inf(targets, bytes)
+  def broadcast_inf(targets)
     if targets.none? { |sink| sink.nonblock? }
       # if all targets are blocking, don't start until they're all writable
       r = IO.select(nil, targets, nil, 0) or return targets
@@ -80,9 +83,10 @@ module DTAS::Buffer::Splice # :nodoc:
     end
 
     # don't pin too much on one target
-    bytes = bytes > MAX_AT_ONCE ? MAX_AT_ONCE : bytes
-
+    bytes = MAX_AT_ONCE
     last = targets.pop # we splice to the last one, tee to the rest
+
+    # this may return zero if all targets were non-blocking
     most_teed = __broadcast_tee(blocked, targets, bytes)
 
     # don't splice more than the largest amount we successfully teed
@@ -90,7 +94,7 @@ module DTAS::Buffer::Splice # :nodoc:
 
     begin
       targets << last
-      if last.nonblock?
+      if last.nonblock? || most_teed == 0
         s = IO.trysplice(@to_io, nil, last, nil, bytes, F_MOVE)
         if Symbol === s
           blocked << last

data/lib/dtas/compat_rbx.rb

@@ -0,0 +1,12 @@
+# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+
+# ref: https://github.com/rubysl/rubysl-io-wait/issues/1
+# this ignores buffers and is Linux-only
+class IO
+  def nread
+    buf = "\0" * 8
+    ioctl(0x541B, buf)
+    buf.unpack("l_")[0]
+  end
+end if ! IO.method_defined?(:nread) && RUBY_PLATFORM =~ /linux/

data/lib/dtas/fadefx.rb

@@ -0,0 +1,32 @@
+# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+require_relative '../dtas'
+require_relative 'parse_time'
+
+class DTAS::FadeFX
+  include DTAS::ParseTime
+  attr_reader :out_prev, :in_main, :out_main, :in_next
+  F = Struct.new(:type, :len)
+
+  def initialize(args)
+    args =~ /\Afade=([^,]*),([^,]*);([^,]*),([^,]*)\z/ or
+      raise ArgumentError, "bad fade format"
+    fades = [ $1, $2, $3, $4 ]
+    %w(out_prev in_main out_main in_next).each do |iv|
+      instance_variable_set("@#{iv}", parse!(fades.shift))
+    end
+  end
+
+  # q - quarter of a sine wave
+  # h - half a sine wave
+  # t - linear (`triangular') slope
+  # l - logarithmic
+  # p - inverted parabola
+  # default is 't' (sox defaults to 'l', but triangular makes more sense
+  # when concatenating
+  def parse!(str)
+    type = "t"
+    str.sub!(/\A([a-z])/, "") and type = $1
+    F[type, parse_time(str)]
+  end
+end

data/lib/dtas/format.rb

@@ -35,6 +35,32 @@ class DTAS::Format # :nodoc:
     fmt
   end
 
+  # some of these are sox-only, but that's what we mainly care about
+  # for audio-editing.  We only use ffmpeg/avconv for odd files during
+  # playback.
+
+  extend DTAS::Process
+
+  def self.precision(env, infile)
+    # sox.git f4562efd0aa3
+    qx(env, %W(soxi -p #{infile}), err: "/dev/null").to_i
+  rescue # fallback to parsing the whole output
+    s = qx(env, %W(soxi #{infile}), err: "/dev/null")
+    s =~ /Precision\s+:\s*(\d+)-bit/n
+    v = $1.to_i
+    return v if v > 0
+    raise TypeError, "could not determine precision for #{infile}"
+  end
+
+  def self.from_file(env, infile)
+    fmt = new
+    fmt.channels = qx(env, %W(soxi -c #{infile})).to_i
+    fmt.type = qx(env, %W(soxi -t #{infile})).strip
+    fmt.rate = qx(env, %W(soxi -r #{infile})).to_i
+    fmt.bits ||= precision(env, infile)
+    fmt
+  end
+
   def initialize
     FORMAT_DEFAULTS.each do |k,v|
       instance_variable_set("@#{k}", v)

data/lib/dtas/parse_time.rb

@@ -0,0 +1,29 @@
+# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+require_relative '../dtas'
+module DTAS::ParseTime
+  def parse_time(time)
+    case time
+    when /\A\d+\z/
+      time.to_i
+    when /\A[\d\.]+\z/
+      time.to_f
+    when /\A[:\d\.]+\z/
+      hhmmss = time.dup
+      rv = hhmmss.sub!(/\.(\d+)\z/, "") ? "0.#$1".to_f : 0
+
+      # deal with HH:MM:SS
+      t = hhmmss.split(/:/)
+      raise ArgumentError, "Bad time format: #{hhmmss}" if t.size > 3
+
+      mult = 1
+      while part = t.pop
+        rv += part.to_i * mult
+        mult *= 60
+      end
+      rv
+    else
+      raise ArgumentError, "unparseable: #{time.inspect}"
+    end
+  end
+end

data/lib/dtas/partstats.rb

@@ -0,0 +1,187 @@
+# -*- encoding: binary -*-
+# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Unlike the stuff for dtas-player, dtas-partstats is fairly tied to sox
+require_relative '../dtas'
+require_relative 'xs'
+require_relative 'process'
+require_relative 'sigevent'
+
+class DTAS::PartStats
+  CMD = 'sox "$INFILE" -n $TRIMFX $SOXFX stats $STATSOPTS'
+  include DTAS::Process
+  attr_reader :key_idx
+  attr_reader :key_width
+
+  class TrimPart < Struct.new(:tbeg, :tlen, :rate)
+    def sec
+      tbeg / rate
+    end
+
+    def hhmmss
+      Time.at(sec).strftime("%H:%M:%S")
+    end
+  end
+
+  def initialize(infile)
+    @infile = infile
+    %w(samples rate channels).each do |iv|
+      sw = iv[0] # -s, -r, -c
+      i = qx(%W(soxi -#{sw} #@infile)).to_i
+      raise ArgumentError, "invalid #{iv}: #{i}" if i <= 0
+      instance_variable_set("@#{iv}", i)
+    end
+
+    # "Pk lev dB" => 1, "RMS lev dB" => 2, ...
+    @key_nr = 0
+    @key_idx = Hash.new { |h,k| h[k] = (@key_nr += 1) }
+    @key_width = {}
+  end
+
+  def partitions(chunk_sec)
+    n = 0
+    part_samples = chunk_sec * @rate
+    rv = []
+    begin
+      rv << TrimPart.new(n, part_samples, @rate)
+      n += part_samples
+    end while n < @samples
+    rv
+  end
+
+  def spawn(trim_part, opts)
+    rd, wr = IO.pipe
+    env = opts[:env]
+    env = env ? env.dup : {}
+    env["INFILE"] = @infile
+    env["TRIMFX"] = "trim #{trim_part.tbeg}s #{trim_part.tlen}s"
+    opts = { pgroup: true, close_others: true, err: wr }
+    pid = begin
+      Process.spawn(env, CMD, opts)
+    rescue Errno::EINTR # Ruby bug?
+      retry
+    end
+    wr.close
+    [ pid, rd ]
+  end
+
+  def run(opts = {})
+    sev = DTAS::Sigevent.new
+    trap(:CHLD) { sev.signal }
+    jobs = opts[:jobs] || 2
+    pids = {}
+    rset = {}
+    stats = []
+    fails = []
+    do_spawn = lambda do |trim_part|
+      pid, rpipe = spawn(trim_part, opts)
+      rset[rpipe] = [ trim_part, "" ]
+      pids[pid] = [ trim_part, rpipe ]
+    end
+
+    parts = partitions(opts[:chunk_length] || 10)
+    jobs.times do
+      trim_part = parts.shift or break
+      do_spawn.call(trim_part)
+    end
+
+    rset[sev] = true
+
+    while pids.size > 0
+      r = IO.select(rset.keys) or next
+      r[0].each do |rd|
+        if DTAS::Sigevent === rd
+          rd.readable_iter do |_,_|
+            begin
+              pid, status = Process.waitpid2(-1, Process::WNOHANG)
+              pid or break
+              done = pids.delete(pid)
+              done_part = done[0]
+              if status.success?
+                trim_part = parts.shift and do_spawn.call(trim_part)
+                puts "DONE #{done_part}" if $DEBUG
+              else
+                fails << [ done_part, status ]
+              end
+            rescue Errno::ECHILD
+              break
+            end while true
+          end
+        else
+          # spurious wakeup should not happen on local pipes,
+          # so readpartial should be safe
+          trim_part, buf = rset[rd]
+          begin
+            buf << rd.readpartial(666)
+          rescue EOFError
+            rset.delete(rd)
+            rd.close
+            parse_stats(stats, trim_part, buf)
+          end
+        end
+      end
+    end
+
+    return stats if fails.empty? && parts.empty?
+    fails.each do |(trim_part,status)|
+      warn "FAIL #{status.inspect} #{trim_part}"
+    end
+    false
+  ensure
+    sev.close
+  end
+
+# "sox INFILE -n stats" example output
+=begin
+             Overall     Left      Right
+DC offset   0.001074  0.000938  0.001074
+Min level  -0.997711 -0.997711 -0.997711
+Max level   0.997681  0.997681  0.997681
+Pk lev dB      -0.02     -0.02     -0.02
+RMS lev dB    -10.38     -9.90    -10.92
+RMS Pk dB      -4.62     -4.62     -5.10
+RMS Tr dB     -87.25    -86.58    -87.25
+Crest factor       -      3.12      3.51
+Flat factor    19.41     19.66     18.89
+Pk count        117k      156k     77.4k
+Bit-depth      16/16     16/16     16/16
+Num samples    17.2M
+Length s     389.373
+Scale max   1.000000
+Window s       0.050
+
+becomes:
+  [
+    TrimPart,
+    [ -0.02, -0.02, -0.02 ], # Pk lev dB
+    [ -10.38, -9.90, -10.92 ], # RMS lev dB
+    ...
+  ]
+=end
+
+  def parse_stats(stats, trim_part, buf)
+    trim_row = [ trim_part ]
+    buf.split(/\n/).each do |line|
+      do_map = true
+      case line
+      when /\A(\S+ \S+ dB)\s/, /\A(Crest factor)\s+-\s/
+        nshift = 3
+      when /\A(Flat factor)\s/
+        nshift = 2
+      when /\A(Pk count)\s/
+        nshift = 2
+        do_map = false
+      else
+        next
+      end
+      key = $1
+      key.freeze
+      key_idx = @key_idx[key]
+      parts = line.split(/\s+/)
+      nshift.times { parts.shift } # remove stuff we don't need
+      @key_width[key] = parts.size
+      trim_row[key_idx] = do_map ? parts.map!(&:to_f) : parts
+    end
+    stats[trim_part.tbeg / trim_part.tlen] = trim_row
+  end
+end

data/lib/dtas/pipe.rb

@@ -22,6 +22,11 @@ class DTAS::Pipe < IO # :nodoc:
     def pipe_size=(_)
     end
   end
+
+  # avoid syscall, we never change IO#nonblock= directly
+  def nonblock?
+    false
+  end
 end
 
 # for non-blocking sinks, this avoids extra fcntl(..., F_GETFL) syscalls

data/lib/dtas/player.rb

@@ -165,9 +165,13 @@ class DTAS::Player # :nodoc:
     rv
   end
 
+  def need_to_queue
+    @current || @queue[0] || @paused
+  end
+
   def enq_handler(io, msg)
     # check @queue[0] in case we have no sinks
-    if @current || @queue[0] || @paused
+    if need_to_queue
       @queue << msg
     else
       next_source(msg)
@@ -177,7 +181,7 @@ class DTAS::Player # :nodoc:
 
   def do_enq_head(io, msg)
     # check @queue[0] in case we have no sinks
-    if @current || @queue[0] || @paused
+    if need_to_queue
       @queue.unshift(msg)
     else
       next_source(msg)
@@ -415,7 +419,6 @@ class DTAS::Player # :nodoc:
 
   def player_idle
     stop_sinks if @sink_buf.inflight == 0
-    @tl.reset unless @paused
     wall("idle")
   end
 

data/lib/dtas/player/client_handler.rb

@@ -344,7 +344,12 @@ module DTAS::Player::ClientHandler # :nodoc:
     # no wall, next_source will wall on new track
     @paused = false
     return if @current
-    next_source(_next)
+    n = _next
+    unless n
+      @tl.reset
+      n = _next
+    end
+    next_source(n)
   end
 
   def do_play_pause
@@ -549,12 +554,11 @@ module DTAS::Player::ClientHandler # :nodoc:
       rescue ArgumentError => e
         return io.emit("ERR #{e.message}")
       end
-      _tl_skip if set_as_current
 
-      # start playing if we're the only track
-      if @tl.size == 1 && !(@current || @queue[0] || @paused)
-        next_source(_next)
-      end
+      _tl_skip if set_as_current # if @current is playing, it will restart soon
+
+      # start playing if we're currently idle
+      next_source(_next) unless need_to_queue
       io.emit("#{track_id}")
     when "repeat"
       case msg.shift
@@ -568,15 +572,16 @@ module DTAS::Player::ClientHandler # :nodoc:
     when "remove"
       track_id = msg.shift or return io.emit("ERR track_id not specified")
       track_id = track_id.to_i
-      cur = @tl.cur_track
+      @tl.remove_track(track_id) or return io.emit("MISSING")
 
       # skip if we're removing the currently playing track
-      if cur.object_id == track_id && @current &&
-             @current.respond_to?(:infile) && @current.infile == cur
+      if @current && @current.respond_to?(:infile) &&
+         @current.infile.object_id == track_id
         _tl_skip
       end
-
-      io.emit(@tl.remove_track(track_id) ? "OK" : "MISSING")
+      # drop it from the queue, too, in case it just got requeued or paused
+      @queue.delete_if { |t| Array === t && t[0].object_id == track_id }
+      io.emit("OK")
     when "get"
       res = @tl.get_tracks(msg.map! { |i| i.to_i })
       res.map! { |tid, file| "#{tid}=#{file ? Shellwords.escape(file) : ''}" }
@@ -589,9 +594,7 @@ module DTAS::Player::ClientHandler # :nodoc:
       offset = msg.shift # may be nil
       if @tl.go_to(track_id.to_i, offset)
         _tl_skip
-        if !(@current || @queue[0] || @paused)
-          next_source(_next)
-        end
+        next_source(_next) unless need_to_queue
         io.emit("OK")
       else
         io.emit("MISSING")

data/lib/dtas/source/sox.rb

@@ -47,26 +47,8 @@ class DTAS::Source::Sox # :nodoc:
     source_file_dup(infile, offset)
   end
 
-  def precision
-    qx(@env, %W(soxi -p #@infile), err: "/dev/null").to_i # sox.git f4562efd0aa3
-  rescue # fallback to parsing the whole output
-    s = qx(@env, %W(soxi #@infile), err: "/dev/null")
-    s =~ /Precision\s+:\s*(\d+)-bit/n
-    v = $1.to_i
-    return v if v > 0
-    raise TypeError, "could not determine precision for #@infile"
-  end
-
   def format
-    @format ||= begin
-      fmt = DTAS::Format.new
-      path = @infile
-      fmt.channels = qx(@env, %W(soxi -c #{path})).to_i
-      fmt.type = qx(@env, %W(soxi -t #{path})).strip
-      fmt.rate = qx(@env, %W(soxi -r #{path})).to_i
-      fmt.bits ||= precision
-      fmt
-    end
+    @format ||= DTAS::Format.from_file(@env, @infile)
   end
 
   # This is the number of samples according to the samples in the source

data/lib/dtas/splitfx.rb

@@ -134,27 +134,12 @@ class DTAS::SplitFX # :nodoc:
     load_tracks!(hash)
   end
 
-  # FIXME: duplicate from dtas/source/sox
-  def precision
-    qx(@env, %W(soxi -p #@infile), err: "/dev/null").to_i # sox.git f4562efd0aa3
-  rescue # fallback to parsing the whole output
-    s = qx(@env, %W(soxi #@infile), err: "/dev/null")
-    s =~ /Precision\s+:\s*(\d+)-bit/n
-    v = $1.to_i
-    return v if v > 0
-    raise TypeError, "could not determine precision for #@infile"
-  end
-
   def load_input!(hash)
     @infile = hash["infile"] or raise ArgumentError, "'infile' not specified"
     if infmt = hash["infmt"] # rarely needed
       @infmt = DTAS::Format.load(infmt)
     else # likely
-      @infmt = DTAS::Format.new
-      @infmt.channels = qx(@env, %W(soxi -c #@infile)).to_i
-      @infmt.rate = qx(@env, %W(soxi -r #@infile)).to_i
-      @infmt.bits ||= precision
-      # we don't care for type
+      @infmt = DTAS::Format.from_file(@env, @infile)
     end
   end
 
@@ -167,6 +152,12 @@ class DTAS::SplitFX # :nodoc:
   def spawn(target, t, opts)
     target = @targets[target] || generic_target(target)
     outfmt = target["format"]
+
+    # default format:
+    unless outfmt
+      outfmt = @infmt.dup
+      outfmt.type = "flac"
+    end
     env = outfmt.to_env
 
     # set very high quality resampling if using 24-bit or higher output

data/lib/dtas/tracklist.rb

@@ -91,21 +91,33 @@ class DTAS::Tracklist # :nodoc:
       idx = by_track_id[after_track_id] or
         raise ArgumentError, "after_track_id invalid"
       @list[idx, 1] = [ @list[idx], track ]
-      @pos = idx + 1 if set_as_current
+      if set_as_current
+        @pos = idx + 1
+      else
+        @pos += 1 if @pos > idx
+      end
     else # nil = first_track
       @list.unshift(track)
-      @pos = 0 if set_as_current
+      if set_as_current
+        @pos = 0
+      else
+        @pos += 1 if @pos >= 0
+      end
     end
     track.object_id
   end
 
   def remove_track(track_id)
     by_track_id = _track_id_map
-    if idx = by_track_id.delete(track_id)
-      @list[idx] = nil
-      @list.compact!
-      # TODO: what do we do with @pos (and the currently-playing track)
+    idx = by_track_id.delete(track_id) or return false
+    @list[idx] = nil
+    @list.compact!
+    len = @list.size
+    if @pos >= len
+      @pos = len == 0 ? TL_DEFAULTS["pos"] : len
     end
+    @goto_pos = @goto_pos = nil # TODO: reposition?
+    true
   end
 
   def go_to(track_id, offset_hhmmss = nil)

data/lib/dtas/trimfx.rb

@@ -0,0 +1,78 @@
+# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+require_relative '../dtas'
+require_relative 'parse_time'
+require 'shellwords'
+
+class DTAS::TrimFX
+  include DTAS::ParseTime
+
+  attr_reader :tbeg
+  attr_reader :tlen
+  attr_reader :cmd
+
+  def initialize(args)
+    args = args.dup
+    case args.shift
+    when "trim"
+      parse_trim!(args)
+    when "all"
+      @tbeg = 0
+      @tlen = nil
+    else
+      raise ArgumentError, "#{args.inspect} not understood"
+    end
+    case tmp =  args.shift
+    when "sh" then @cmd = args
+    when "sox" then tfx_sox(args)
+    when "eca" then tfx_eca(args)
+    when nil
+      @cmd = []
+    else
+      raise ArgumentError, "unknown effect type: #{tmp}"
+    end
+  end
+
+  def tfx_sox(args)
+    @cmd = %w(sox $SOXIN $SOXOUT $TRIMFX)
+    @cmd.concat(args)
+    @cmd.concat(%w($FADEFX))
+  end
+
+  def tfx_eca(args)
+    @cmd = %w(sox $SOXIN $SOX2ECA $TRIMFX)
+    @cmd.concat(%w(| ecasound $ECAFMT -i stdin -o stdout))
+    @cmd.concat(args)
+    @cmd.concat(%w(| sox $ECA2SOX - $SOXOUT $FADEFX))
+  end
+
+  def to_sox_arg(format)
+    if @tbeg && @tlen
+      beg = @tbeg * format.rate
+      len = @tlen * format.rate
+      %W(trim #{beg.round}s #{len.round}s)
+    elsif @tbeg
+      return [] if @tbeg == 0
+      beg = @tbeg * format.rate
+      %W(trim #{beg.round}s)
+    else
+      []
+    end
+  end
+
+  def parse_trim!(args)
+    tbeg = parse_time(args.shift)
+    if args[0] =~ /\A=?[\d\.]+\z/
+      tlen = args.shift
+      is_stop_time = tlen.sub!(/\A=/, "") ? true : false
+      tlen = parse_time(tlen)
+      if is_stop_time
+        tlen = tlen - tbeg
+      end
+    else
+      tlen = nil
+    end
+    @tbeg = tbeg
+    @tlen = tlen
+  end
+end

data/lib/dtas/unix_accepted.rb

@@ -2,6 +2,7 @@
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 require 'socket'
 require 'io/wait'
+require_relative 'compat_rbx'
 
 class DTAS::UNIXAccepted # :nodoc:
   attr_reader :to_io

data/lib/dtas/unix_client.rb

@@ -5,6 +5,7 @@ require_relative 'xs'
 require 'socket'
 require 'io/wait'
 require 'shellwords'
+require_relative 'compat_rbx'
 
 class DTAS::UNIXClient # :nodoc:
   attr_reader :to_io
@@ -16,7 +17,7 @@ class DTAS::UNIXClient # :nodoc:
   end
 
   def initialize(path = self.class.default_path)
-    @to_io = Socket.new(:AF_UNIX, :SOCK_SEQPACKET, 0)
+    @to_io = Socket.new(:UNIX, :SEQPACKET, 0)
     @to_io.connect(Socket.pack_sockaddr_un(path))
   end
 

data/lib/dtas/unix_server.rb

@@ -26,13 +26,13 @@ class DTAS::UNIXServer # :nodoc:
     # lock down access by default, arbitrary commands may run as the
     # same user dtas-player runs as:
     old_umask = File.umask(0077)
-    @to_io = Socket.new(:AF_UNIX, :SOCK_SEQPACKET, 0)
+    @to_io = Socket.new(:UNIX, :SEQPACKET, 0)
     addr = Socket.pack_sockaddr_un(path)
     begin
       @to_io.bind(addr)
     rescue Errno::EADDRINUSE
       # maybe we have an old path leftover from a killed process
-      tmp = Socket.new(:AF_UNIX, :SOCK_SEQPACKET, 0)
+      tmp = Socket.new(:UNIX, :SEQPACKET, 0)
       begin
         tmp.connect(addr)
         raise RuntimeError, "socket `#{path}' is in use", []

data/test/test_buffer.rb

@@ -51,13 +51,9 @@ class TestBuffer < Testcase
   def test_broadcast_1
     buf = new_buffer
     r, w = IO.pipe
-    assert_equal :wait_readable, buf.broadcast([w])
-    assert_equal 0, buf.bytes_xfer
     buf.wr.write "HIHI"
     assert_equal :wait_readable, buf.broadcast([w])
     assert_equal 4, buf.bytes_xfer
-    assert_equal :wait_readable, buf.broadcast([w])
-    assert_equal 4, buf.bytes_xfer
     tmp = [w]
     r.close
     buf.wr.write "HIHI"
@@ -90,20 +86,6 @@ class TestBuffer < Testcase
     a[1].nonblock = false
     b[0].read(b[0].nread)
     b[1].write(max)
-    t = Thread.new do
-      sleep 0.005
-      [ a[0].read(max.size).size, b[0].read(max.size).size ]
-    end
-    assert_equal 5, buf.__broadcast_tee(blocked, [a[1], b[1]], 5)
-    assert_equal [a[1]], blocked
-    assert_equal [ max.size, max.size ], t.value
-    b[0].close
-    tmp = [a[1], b[1]]
-
-    newerr = tmperr { assert_equal 5, buf.__broadcast_tee(blocked, tmp, 5) }
-    assert_equal [a[1]], blocked
-    assert_match(%r{dropping}, newerr.string)
-    assert_equal [a[1]], tmp
   end
 
   def test_broadcast
@@ -115,8 +97,6 @@ class TestBuffer < Testcase
     assert_equal 5, buf.bytes_xfer
     assert_equal "HELLO", a[0].read(5)
     assert_equal "HELLO", b[0].read(5)
-    assert_equal :wait_readable, buf.broadcast([a[1], b[1]])
-    assert_equal 5, buf.bytes_xfer
 
     return unless b[1].respond_to?(:pipe_size)
 

data/test/test_fadefx.rb

@@ -0,0 +1,18 @@
+# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+require_relative 'helper'
+require 'dtas/fadefx'
+
+class TestFadeFX < Testcase
+  def test_fadefx
+    ffx = DTAS::FadeFX.new("fade=t1,t3.1;l4,t1")
+    assert_equal 't', ffx.out_prev.type
+    assert_equal 1, ffx.out_prev.len
+    assert_equal 't', ffx.in_main.type
+    assert_equal 3.1, ffx.in_main.len
+    assert_equal 'l', ffx.out_main.type
+    assert_equal 4, ffx.out_main.len
+    assert_equal 't', ffx.in_next.type
+    assert_equal 1, ffx.in_next.len
+  end
+end

data/test/test_trimfx.rb

@@ -0,0 +1,50 @@
+# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+require './test/helper'
+require 'dtas/trimfx'
+require 'dtas/format'
+require 'yaml'
+
+class TestTrimFX < Testcase
+  def test_example
+    ex = YAML.load(File.read("examples/trimfx.sample.yml"))
+    effects = []
+    ex["effects"].each do |line|
+      words = Shellwords.split(line)
+      case words[0]
+      when "trim"
+        tfx = DTAS::TrimFX.new(words)
+        assert_equal 52.0, tfx.tbeg
+        assert_equal 1.0, tfx.tlen
+        effects << tfx
+      end
+    end
+    assert_equal 4, effects.size
+  end
+
+  def test_all
+    tfx = DTAS::TrimFX.new(%w(all))
+    assert_equal 0, tfx.tbeg
+    assert_nil tfx.tlen
+    assert_equal [], tfx.to_sox_arg(DTAS::Format.new)
+  end
+
+  def test_time
+    tfx = DTAS::TrimFX.new(%w(trim 2:30 3.1))
+    assert_equal 150, tfx.tbeg
+    assert_equal 3.1, tfx.tlen
+  end
+
+  def test_to_sox_arg
+    tfx = DTAS::TrimFX.new(%w(trim 1 0.5))
+    assert_equal %w(trim 44100s 22050s), tfx.to_sox_arg(DTAS::Format.new)
+
+    tfx = DTAS::TrimFX.new(%w(trim 1 sox vol -1dB))
+    assert_equal %w(trim 44100s), tfx.to_sox_arg(DTAS::Format.new)
+  end
+
+  def test_tfx_effects
+    tfx = DTAS::TrimFX.new(%w(trim 1 sox vol -1dB))
+    assert_equal %w(sox $SOXIN $SOXOUT $TRIMFX vol -1dB $FADEFX), tfx.cmd
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtas
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - dtas hackers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-30 00:00:00.000000000 Z
+date: 2013-10-19 00:00:00.000000000 Z
 dependencies: []
 description: |-
   Free Software command-line tools for audio playback, mastering, and
@@ -24,6 +24,7 @@ executables:
 - dtas-cueedit
 - dtas-enq
 - dtas-msinkctl
+- dtas-partstats
 - dtas-player
 - dtas-sinkedit
 - dtas-sourceedit
@@ -65,6 +66,7 @@ files:
 - bin/dtas-cueedit
 - bin/dtas-enq
 - bin/dtas-msinkctl
+- bin/dtas-partstats
 - bin/dtas-player
 - bin/dtas-sinkedit
 - bin/dtas-sourceedit
@@ -76,16 +78,21 @@ files:
 - dtas.gemspec
 - examples/README
 - examples/splitfx.sample.yml
+- examples/trimfx.sample.yml
 - lib/dtas.rb
 - lib/dtas/buffer.rb
 - lib/dtas/buffer/read_write.rb
 - lib/dtas/buffer/splice.rb
 - lib/dtas/command.rb
 - lib/dtas/compat_onenine.rb
+- lib/dtas/compat_rbx.rb
 - lib/dtas/cue_index.rb
 - lib/dtas/disclaimer.rb
 - lib/dtas/edit_client.rb
+- lib/dtas/fadefx.rb
 - lib/dtas/format.rb
+- lib/dtas/parse_time.rb
+- lib/dtas/partstats.rb
 - lib/dtas/pipe.rb
 - lib/dtas/player.rb
 - lib/dtas/player/client_handler.rb
@@ -109,6 +116,7 @@ files:
 - lib/dtas/splitfx.rb
 - lib/dtas/state_file.rb
 - lib/dtas/tracklist.rb
+- lib/dtas/trimfx.rb
 - lib/dtas/unix_accepted.rb
 - lib/dtas/unix_client.rb
 - lib/dtas/unix_server.rb
@@ -135,6 +143,7 @@ files:
 - test/player_integration.rb
 - test/test_buffer.rb
 - test/test_env.rb
+- test/test_fadefx.rb
 - test/test_format.rb
 - test/test_format_change.rb
 - test/test_player.rb
@@ -150,6 +159,7 @@ files:
 - test/test_source_sox.rb
 - test/test_splitfx.rb
 - test/test_tracklist.rb
+- test/test_trimfx.rb
 - test/test_unixserver.rb
 - test/test_util.rb
 homepage: http://dtas.80x24.org/