dtas 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95cea9c51fc4befa828c208dabf229b37dbc3582
-  data.tar.gz: 4bb3019027d4864ea6d6e9fd8026b236c2f0070f
+  metadata.gz: 161846cfdf7681efdb615adfff1fbdf0fff1efe7
+  data.tar.gz: c3c4c03f5f66ba0df0d26f59d216f0e0d4046e4d
 SHA512:
-  metadata.gz: 795146ad7d81aeabfa30ad36b1de0bf92402428f1c6388f9ba5e2e51df95a773feaf312d38889aa88ee9ab635d61e6b9f082518a03b9614636107b4ebb5dc331
-  data.tar.gz: 75076a786083803900a61adee4847326866f6e08cd8bf624c1b3b4fa021e1f80a991c37be78782caae3888ec5d3c26c6869f29de6bc016c5b65dd90c499e3a6c
+  metadata.gz: 6df024d59f87441b02c45cd1461c3598afcc80e0fe34b138531b9ad657fe01836cdfe6438d560607ae0642c23accbbd5fb89d17305fd60200f714b6467ea9082
+  data.tar.gz: 82dcabe750e95a1650ec1e4c83da1fc25e1752a75bbb4670982f73b813965e3729c4f59197174df16de68cf4c53877436b91b9b208ab92b002fced1a0abdff29

data/Documentation/dtas-splitfx.txt

@@ -31,6 +31,10 @@ to use ecasound(1), too.
 -s, \--quiet, \--silent
 :    Silent operation, commands are not printed as executed
 
+-D, \--no-dither
+:    Disable automatic setting of the DITHERFX env.  This also passes
+    the option to sox(1) via SOX_OPTS.
+
 # FILE FORMAT
 
 * infile - string, the pathname of the original audio file

data/GIT-VERSION-GEN

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

data/INSTALL

@@ -40,10 +40,10 @@ For future upgrades of dtas (upgrades to dtas-linux will be infrequent)
 
 Grab the latest tarball from our HTTP site:
 
-    http://dtas.80x24.org/2013/dtas-0.5.0.tar.gz
+    http://dtas.80x24.org/2013/dtas-0.7.0.tar.gz
 
-    $ tar zxvf dtas-0.5.0.tar.gz
-    $ cd dtas-0.5.0
+    $ tar zxvf dtas-0.7.0.tar.gz
+    $ cd dtas-0.7.0
     $ sudo ruby setup.rb
 
 GNU/Linux users may optionally install "io_splice" and

data/bin/dtas-splitfx

@@ -13,6 +13,7 @@ OptionParser.new('', 24, '  ') do |op|
   op.on('-n', '--dry-run') { opts[:dryrun] = true }
   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.parse!(ARGV)
 end
 

data/lib/dtas/buffer/read_write.rb

@@ -26,12 +26,14 @@ module DTAS::Buffer::ReadWrite # :nodoc:
   # always block when we have a single target
   def broadcast_one(targets)
     buf = _rbuf
-    @to_io.readpartial(MAX_AT_ONCE, buf)
+    @to_io.read_nonblock(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::EAGAIN
+    :wait_readable
   rescue Errno::EPIPE, IOError => e
     __dst_error(targets[0], e)
     targets.clear
@@ -39,8 +41,7 @@ module DTAS::Buffer::ReadWrite # :nodoc:
   end
 
   def broadcast_inf(targets)
-    bytes = inflight
-    nr_nb = targets.count { |sink| sink.nonblock? }
+    nr_nb = targets.count(&:nonblock?)
     if nr_nb == 0 || nr_nb == targets.size
       # if all targets are full, don't start until they're all writable
       r = IO.select(nil, targets, nil, 0) or return targets
@@ -57,6 +58,7 @@ module DTAS::Buffer::ReadWrite # :nodoc:
     again = {}
 
     # don't pin too much on one target
+    bytes = inflight
     bytes = bytes > MAX_AT_ONCE ? MAX_AT_ONCE : bytes
     buf = _rbuf
     @to_io.read(bytes, buf)

data/lib/dtas/buffer/splice.rb

@@ -69,7 +69,9 @@ module DTAS::Buffer::Splice # :nodoc:
   end
 
   def broadcast_inf(targets)
-    if targets.none? { |sink| sink.nonblock? }
+    if targets.all?(&:ready_write_optimized?)
+      blocked = []
+    elsif targets.none?(&:nonblock?)
       # if all targets are blocking, don't start until they're all writable
       r = IO.select(nil, targets, nil, 0) or return targets
       blocked = targets - r[1]

data/lib/dtas/player.rb

@@ -300,12 +300,19 @@ class DTAS::Player # :nodoc:
     end
   end
 
+  def _optimize_write_prepare(targets)
+    targets.each do |dst|
+      dst.wait_writable_prepare
+      @srv.wait_ctl(dst, :wait_writable)
+    end
+  end
+
   # returns a wait_ctl arg for self
   def broadcast_iter(buf, targets)
     case rv = buf.broadcast(targets)
     when Array # array of blocked sinks
       # have sinks wake up the this buffer when they're writable
-      trade_ctl = proc { @srv.wait_ctl(buf, :wait_readable) }
+      trade_ctl = proc { @srv.wait_ctl(buf, :hot_read) }
       rv.each do |dst|
         dst.on_writable = trade_ctl
         @srv.wait_ctl(dst, :wait_writable)
@@ -315,6 +322,7 @@ class DTAS::Player # :nodoc:
       # via DTAS::Sink#writable_iter
       :ignore
     else # :wait_readable or nil
+      _optimize_write_prepare(targets)
       rv
     end
   end

data/lib/dtas/player/client_handler.rb

@@ -265,7 +265,7 @@ module DTAS::Player::ClientHandler # :nodoc:
   end
 
   def active_sinks
-    sinks = @targets.map { |t| t.sink }
+    sinks = @targets.map(&:sink)
     sinks.uniq!
     sinks
   end
@@ -588,7 +588,7 @@ module DTAS::Player::ClientHandler # :nodoc:
       io.emit("#{res.size} #{res.join(' ')}")
     when "tracks"
       tracks = @tl.tracks
-      io.emit("#{tracks.size} " << tracks.map! { |i| i.to_s }.join(' '))
+      io.emit("#{tracks.size} " << tracks.map!(&:to_s).join(' '))
     when "goto"
       track_id = msg.shift or return io.emit("ERR track_id not specified")
       offset = msg.shift # may be nil
@@ -660,7 +660,7 @@ module DTAS::Player::ClientHandler # :nodoc:
       bp = cur.cuebreakpoints
       case msg[0]
       when nil
-        tmp = { "infile" => cur.infile, "cue" => bp.map { |ci| ci.to_hash } }
+        tmp = { "infile" => cur.infile, "cue" => bp.map(&:to_hash) }
         io.emit(tmp.to_yaml)
       when "next", "prev"
         return __bp_prev_next(io, msg, cur, bp)

data/lib/dtas/splitfx.rb

@@ -173,7 +173,11 @@ class DTAS::SplitFX # :nodoc:
     end
 
     # add noise-shaped dither for 16-bit (sox manual seems to recommend this)
-    outfmt.bits && outfmt.bits <= 16 and env["DITHERFX"] = "dither -s"
+    if opts[:no_dither]
+      env["SOX_OPTS"] = "#{ENV["SOX_OPTS"]} -D"
+    else outfmt.bits && outfmt.bits <= 16
+      env["DITHERFX"] = "dither -s"
+    end
     comments = Tempfile.new(%W(dtas-splitfx-#{t.comments["TRACKNUMBER"]} .txt))
     comments.sync = true
     t.comments.each do |k,v|

data/lib/dtas/unix_server.rb

@@ -69,6 +69,11 @@ class DTAS::UNIXServer # :nodoc:
 
   def wait_ctl(io, err)
     case err
+    when :hot_read
+      # this is only safe when we're iterating through ready writers
+      # the linear search for Array#include? is not expensive since
+      # we usually don't have a lot of sinks.
+      @hot_read << io unless @hot_read.include?(io)
     when :wait_readable
       @readers[io] = true
     when :wait_writable
@@ -93,17 +98,17 @@ class DTAS::UNIXServer # :nodoc:
   end
 
   def run_once
-    begin
-      # give IO.select one-shot behavior, snapshot and replace the watchlist
-      r = IO.select(@readers.keys, @writers.keys) or return
-      r[1].each do |io|
-        @writers.delete(io)
-        wait_ctl(io, io.writable_iter)
-      end
-      r[0].each do |io|
-        @readers.delete(io)
-        wait_ctl(io, io.readable_iter { |_io, msg| yield(_io, msg) })
-      end
+    # give IO.select one-shot behavior, snapshot and replace the watchlist
+    r = IO.select(@readers.keys, @writers.keys) or return
+    @hot_read = r[0]
+    r[1].each do |io|
+      @writers.delete(io)
+      wait_ctl(io, io.writable_iter)
+    end
+    @hot_read = nil
+    r[0].each do |io|
+      @readers.delete(io)
+      wait_ctl(io, io.readable_iter { |_io, msg| yield(_io, msg) })
     end
   end
 end

data/lib/dtas/writable_iter.rb

@@ -4,9 +4,24 @@ require_relative '../dtas'
 
 module DTAS::WritableIter # :nodoc:
   attr_accessor :on_writable
+  # we may use the ready_write flag to avoid an extra IO.select
+  attr_accessor :ready_write
 
   def writable_iter_init
+    @mark_writable = proc { @ready_write = true }
     @on_writable = nil
+    @ready_write = true
+  end
+
+  def ready_write_optimized?
+    rv = @ready_write
+    @ready_write = false
+    rv
+  end
+
+  def wait_writable_prepare
+    @ready_write = false
+    @on_writable ||= @mark_writable
   end
 
   # this is used to exchange our own writable status for the readable
@@ -14,6 +29,7 @@ module DTAS::WritableIter # :nodoc:
   def writable_iter
     if owr = @on_writable
       @on_writable = nil
+      @ready_write = true
       owr.call # this triggers readability watching of DTAS::Buffer
     end
     :ignore

data/test/test_buffer.rb

@@ -15,6 +15,11 @@ class TestBuffer < Testcase
 
   def pipe
     ret = IO.pipe
+    ret.each do |x|
+      def x.ready_write_optimized?
+        false
+      end
+    end
     @to_close.concat(ret)
     ret
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtas
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - dtas hackers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-19 00:00:00.000000000 Z
+date: 2013-12-30 00:00:00.000000000 Z
 dependencies: []
 description: |-
   Free Software command-line tools for audio playback, mastering, and
@@ -34,7 +34,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - COPYING
 - Documentation/.gitignore
 - Documentation/GNUmakefile
@@ -172,17 +172,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: duct tape audio suite for *nix