dtas 0.7.0 → 0.8.0

data/bin/dtas-xdelay

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 USAGE = "Usage: #$0 [-x FREQ] [-l] /dev/fd/LO /dev/fd/HI DELAY [DELAY ...]"
 require 'optparse'

data/dtas-linux.gemspec

@@ -1,4 +1,4 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 #
 # this just declares dependencies to make gem installation a little easier

data/dtas-mpris.gemspec

@@ -1,4 +1,4 @@
-# Copyright 2013, Eric Wong <normalperson@yhbt.net> and all contributors.
+# Copyright 2013-2014, Eric Wong <e@80x24.org> and all contributors.
 # License: GPLv2 or later <http://www.gnu.org/licenses/gpl-2.0.txt>
 # This is GPLv2+ instead of GPLv3+ because ruby-dbus is LGPLv2.1 (only)
 Gem::Specification.new do |s|

data/dtas.gemspec

@@ -1,4 +1,4 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 Gem::Specification.new do |s|
   manifest = File.read('.gem-manifest').split(/\n/)

data/examples/trimfx.sample.yml

@@ -15,16 +15,13 @@ comments:
   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 =53 sh sox $SOXIN $SOXOUT $TRIMFX vol -6dB
 - 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
+  -i stdin -o stdout -eadb:-6 | sox $ECA2SOX - $SOXOUT
 # SOX2ECA='-tf32 -c$CHANNELS -r$RATE'
 # ECAFMT='-f32_le,$CHANNELS,$RATE

data/lib/dtas.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 module DTAS # :nodoc:
 end

data/lib/dtas/buffer.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 require 'io/wait'
 require_relative '../dtas'

data/lib/dtas/buffer/read_write.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 require 'io/nonblock'
 require_relative '../../dtas'

data/lib/dtas/buffer/splice.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 require 'io/nonblock'
 require 'io/splice'

data/lib/dtas/command.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 # common code for wrapping SoX/ecasound/... commands
 require_relative 'serialize'

data/lib/dtas/compat_onenine.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 
 # Make Ruby 1.9.3 look like Ruby 2.0.0 to us

data/lib/dtas/compat_rbx.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> 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

data/lib/dtas/cue_index.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 require_relative '../dtas'
 class DTAS::CueIndex

data/lib/dtas/disclaimer.rb

@@ -1,5 +1,5 @@
 # :enddoc:
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 DTAS_PROGNAME = File.basename($0)
 DTAS_DISCLAIMER = <<EOF

data/lib/dtas/edit_client.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 require 'tempfile'
 require 'yaml'

data/lib/dtas/format.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 # class represents an audio format (type/bits/channels/sample rate/...)
 require_relative '../dtas'

data/lib/dtas/parse_time.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 require_relative '../dtas'
 module DTAS::ParseTime

data/lib/dtas/partstats.rb

@@ -1,5 +1,5 @@
 # -*- encoding: binary -*-
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> 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'

data/lib/dtas/pipe.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 begin
   require 'io/splice'

data/lib/dtas/player.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 require 'yaml'
 require 'shellwords'
@@ -52,7 +52,7 @@ class DTAS::Player # :nodoc:
   end
 
   def source_map_reload
-    @sources = @source_map.values.sort_by { |src| src.tryorder }
+    @sources = @source_map.values.sort_by(&:tryorder)
   end
 
   def wall(msg)

data/lib/dtas/player/client_handler.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 require_relative '../xs'
 module DTAS::Player::ClientHandler # :nodoc:
@@ -583,7 +583,7 @@ module DTAS::Player::ClientHandler # :nodoc:
       @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 = @tl.get_tracks(msg.map!(&:to_i))
       res.map! { |tid, file| "#{tid}=#{file ? Shellwords.escape(file) : ''}" }
       io.emit("#{res.size} #{res.join(' ')}")
     when "tracks"
@@ -618,11 +618,11 @@ module DTAS::Player::ClientHandler # :nodoc:
   def __bp_prev_next(io, msg, cur, bp)
     case type = msg[1]
     when nil, "track"
-      bp.keep_if { |ci| ci.track? }
+      bp.keep_if(&:track?)
     when "pregap"
-      bp.keep_if { |ci| ci.pregap? }
+      bp.keep_if(&:pregap?)
     when "subindex" # any subindex
-      bp.keep_if { |ci| ci.subindex? }
+      bp.keep_if(&:subindex?)
     when /\A\d+\z/ # exact subindex match
       si = type.to_i
       bp.keep_if { |ci| ci.index == si }

data/lib/dtas/process.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 require 'io/wait'
 require_relative '../dtas'

data/lib/dtas/replaygain.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 #
 # Represents ReplayGain metadata for a DTAS::Source

data/lib/dtas/rg_state.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 #
 # provides support for generating appropriate effects for ReplayGain

data/lib/dtas/serialize.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 module DTAS::Serialize # :nodoc:
   def ivars_to_hash(ivars, rv = {})

data/lib/dtas/sigevent.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 begin
   raise LoadError, "no eventfd with _DTAS_POSIX" if ENV["_DTAS_POSIX"]

data/lib/dtas/sigevent/efd.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 class DTAS::Sigevent < SleepyPenguin::EventFD # :nodoc:
   include SleepyPenguin

data/lib/dtas/sigevent/pipe.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 class DTAS::Sigevent # :nodoc:
   attr_reader :to_io

data/lib/dtas/sink.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 require 'yaml'
 require_relative '../dtas'
@@ -102,7 +102,7 @@ class DTAS::Sink # :nodoc:
     end
 
     @pid = dtas_spawn(format.to_env.merge!(@env), cmd, opts)
-    inputs.each_value { |rpipe| rpipe.close }
+    inputs.each_value(&:close)
     rv
   end
 

data/lib/dtas/source.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 require_relative '../dtas'
 

data/lib/dtas/source/av.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 require_relative '../../dtas'
 require_relative 'av_ff_common'

data/lib/dtas/source/av_ff_common.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 require_relative '../../dtas'
 require_relative '../source'

data/lib/dtas/source/cmd.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 require_relative '../../dtas'
 require_relative '../source'

data/lib/dtas/source/common.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 module DTAS::Source::Common # :nodoc:
   attr_reader :dst_zero_byte

data/lib/dtas/source/ff.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 require_relative '../../dtas'
 require_relative 'av_ff_common'

data/lib/dtas/source/file.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 require_relative '../../dtas'
 require_relative '../source'

data/lib/dtas/source/mp3gain.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 require_relative '../process'
 

data/lib/dtas/source/sox.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 require_relative '../../dtas'
 require_relative '../source'

data/lib/dtas/splitfx.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 # Unlike the stuff for dtas-player, dtas-splitfx is fairly tied to sox
 # (but we may still pipe to ecasound or anything else)

data/lib/dtas/state_file.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 require 'yaml'
 require 'tempfile'

data/lib/dtas/tracklist.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 require_relative '../dtas'
 require_relative 'serialize'

data/lib/dtas/trimfx.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 require_relative '../dtas'
 require_relative 'parse_time'
@@ -36,14 +36,13 @@ class DTAS::TrimFX
   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))
+    @cmd.concat(%w(| sox $ECA2SOX - $SOXOUT))
   end
 
   def to_sox_arg(format)
@@ -75,4 +74,66 @@ class DTAS::TrimFX
     @tbeg = tbeg
     @tlen = tlen
   end
+
+  def <=>(other)
+    tbeg <=> other.tbeg
+  end
+
+  # for stable sorting
+  class TFXSort < Struct.new(:tfx, :idx)
+    def <=>(other)
+      cmp = tfx <=> other.tfx
+      0 == cmp ? idx <=> other.idx : cmp
+    end
+  end
+
+  # there'll be multiple epochs if ranges overlap
+  def self.schedule(ary)
+    sorted = []
+    ary.each_with_index { |tfx, i| sorted << TFXSort[tfx, i] }
+    sorted.sort!
+    rv = []
+    epoch = 0
+    prev_end = 0
+    defer = []
+    begin
+      while tfxsort = sorted.shift
+        tfx = tfxsort.tfx
+        if tfx.tbeg >= prev_end
+          prev_end = tfx.tbeg + tfx.tlen
+          (rv[epoch] ||= []) << tfx
+        else
+          defer << tfxsort
+        end
+      end
+      if defer[0]
+        epoch += 1
+        sorted = defer
+        defer = []
+        prev_end = 0
+      end
+    end while sorted[0]
+    rv
+  end
+
+  def self.expand(ary, total_len)
+    rv = []
+    schedule(ary).each_with_index do |sary, i|
+      tip = 0
+      dst = rv[i] = []
+      while tfx = sary.shift
+        if tfx.tbeg > tip
+          nfx = new(%W(trim #{tip} =#{tfx.tbeg}))
+          dst << nfx
+          dst << tfx
+          tip = tfx.tbeg + tfx.tlen
+        end
+      end
+      if tip < total_len
+        nfx = new(%W(trim #{tip} =#{total_len}))
+        dst << nfx
+      end
+    end
+    rv
+  end
 end

data/lib/dtas/unix_accepted.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 require 'socket'
 require 'io/wait'
@@ -57,6 +57,8 @@ class DTAS::UNIXAccepted # :nodoc:
     begin
       begin
         msg, _, _ = io.recvmsg_nonblock(nread)
+      rescue Errno::EAGAIN
+        return :wait_readable
       rescue EOFError, SystemCallError
         return nil
       end

data/lib/dtas/unix_client.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 require_relative '../dtas'
 require_relative 'xs'
@@ -13,7 +13,7 @@ class DTAS::UNIXClient # :nodoc:
   include DTAS::XS
 
   def self.default_path
-    (ENV["DTAS_PLAYER_SOCK"] || File.expand_path("~/.dtas/player.sock")).b
+    (ENV["DTAS_PLAYER_SOCK"] || File.expand_path("~/.dtas/player.sock"))
   end
 
   def initialize(path = self.class.default_path)