dtas 0.9.0 → 0.10.0

data/lib/dtas/tracklist.rb

@@ -1,8 +1,9 @@
-# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
+# Copyright (C) 2013-2015 all contributors <dtas-all@nongnu.org>
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 require_relative '../dtas'
 require_relative 'serialize'
 
+# the a tracklist object for -player
 # this is inspired by the MPRIS 2.0 TrackList spec
 class DTAS::Tracklist # :nodoc:
   include DTAS::Serialize

data/lib/dtas/unix_accepted.rb

@@ -1,9 +1,9 @@
-# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
+# Copyright (C) 2013-2015 all contributors <dtas-all@nongnu.org>
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 require 'socket'
 require 'io/wait'
-require_relative 'compat_rbx'
 
+# an accepted (client) socket in dtas-player server
 class DTAS::UNIXAccepted # :nodoc:
   attr_reader :to_io
 

data/lib/dtas/unix_client.rb

@@ -1,12 +1,12 @@
-# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
+# Copyright (C) 2013-2015 all contributors <dtas-all@nongnu.org>
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 require_relative '../dtas'
 require_relative 'xs'
 require 'socket'
 require 'io/wait'
 require 'shellwords'
-require_relative 'compat_rbx'
 
+# a socket connection used by dtas-player clients (e.g. dtas-ctl)
 class DTAS::UNIXClient # :nodoc:
   attr_reader :to_io
 

data/lib/dtas/unix_server.rb

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

data/lib/dtas/util.rb

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

data/lib/dtas/watchable.rb

@@ -0,0 +1,54 @@
+# Copyright (C) 2013-2015 all contributors <dtas-all@nongnu.org>
+# License: GPLv3 or later <https://www.gnu.org/licenses/gpl-3.0.txt>
+begin
+  require 'sleepy_penguin'
+rescue LoadError
+end
+
+# used to restart DTAS::Source::SplitFX processing in dtas-player
+# if the YAML file is edited
+module DTAS::Watchable
+  class InotifyReadableIter < SleepyPenguin::Inotify
+    def self.new
+      super(:CLOEXEC)
+    end
+
+    FLAGS = CLOSE_WRITE | MOVED_TO
+
+    def readable_iter
+      or_call = false
+      while event = take(true) # drain the buffer
+        if (event.mask & FLAGS) != 0 && @watching[1] == event.name
+          or_call = true
+        end
+      end
+      if or_call
+        @on_readable.call
+        :delete
+      else
+        :wait_readable
+      end
+    end
+
+    # we must watch the directory, since
+    def watch_file(path, blk)
+      @on_readable = blk
+      @watching = File.split(File.expand_path(path))
+      add_watch(@watching[0], FLAGS)
+    end
+  end
+
+  def watch_begin(blk)
+    @ino = InotifyReadableIter.new
+    @ino.watch_file(@infile, blk)
+    @ino
+  end
+
+  # Closing the inotify descriptor (instead of using inotify_rm_watch)
+  # is cleaner because it avoids EINVAL on race conditions in case
+  # a directory is deleted: https://lkml.org/lkml/2007/7/9/3
+  def watch_end(srv)
+    srv.wait_ctl(@ino, :delete)
+    @ino = @ino.close
+  end
+end if defined?(SleepyPenguin::Inotify)

data/lib/dtas/writable_iter.rb

@@ -1,7 +1,8 @@
-# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
+# Copyright (C) 2013-2015 all contributors <dtas-all@nongnu.org>
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 require_relative '../dtas'
 
+# used to manage writable state for -player pipes
 module DTAS::WritableIter # :nodoc:
   attr_accessor :on_writable
   # we may use the ready_write flag to avoid an extra IO.select

data/lib/dtas/xs.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
+# Copyright (C) 2013-2015 all contributors <dtas-all@nongnu.org>
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 require_relative '../dtas'
 require 'shellwords'
@@ -9,6 +9,6 @@ require 'shellwords'
 # again, filesystems can use any byte value in names except '\0'.
 module DTAS::XS # :nodoc:
   def xs(ary)
-    Shellwords.join(ary.map(&:b))
+    Shellwords.join(Array(ary).map(&:b))
   end
 end

data/perl/dtas-graph

@@ -1,5 +1,5 @@
 #!/usr/bin/perl -w
-# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
+# Copyright (C) 2013-2015 all contributors <dtas-all@nongnu.org>
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 use strict;
 use Graph::Easy; # for ASCII-art graphs

data/test/covshow.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
+# Copyright (C) 2013-2015 all contributors <dtas-all@nongnu.org>
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 #
 # this works with the __covmerge method in test/helper.rb

data/test/helper.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
+# Copyright (C) 2013-2015 all contributors <dtas-all@nongnu.org>
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 $stdout.sync = $stderr.sync = Thread.abort_on_exception = true
 require 'thread'

data/test/player_integration.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
+# 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/helper'
 require 'dtas/player'

data/test/test_buffer.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
+# 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/helper'
 require 'stringio'

data/test/test_env.rb

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

data/test/test_fadefx.rb

@@ -0,0 +1,45 @@
+# Copyright (C) 2013-2015 all contributors <dtas-all@nongnu.org>
+# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+require_relative 'helper'
+require 'dtas/fadefx'
+require 'dtas/format'
+
+class TestFadeFX < Testcase
+  def test_fadefx
+    ffx = DTAS::FadeFX.new("t1,t3.1;l4,t1")
+    assert_equal 't', ffx.out_prev.type
+    assert_equal 1, ffx.out_prev.flen
+    assert_equal 't', ffx.in_cur.type
+    assert_equal 3.1, ffx.in_cur.flen
+    assert_equal 'l', ffx.out_cur.type
+    assert_equal 4, ffx.out_cur.flen
+    assert_equal 't', ffx.in_next.type
+    assert_equal 1, ffx.in_next.flen
+
+    fmt = DTAS::Format.new
+    fmt.rate = 48000
+    tbeg = 0
+    tlen = 48000 * 9
+
+    # XXX: this isn't testing much...
+    cur = ffx.fade_cur_fx(fmt, tbeg, tlen, %w(vol +3dB))
+    assert_equal(%w(trim 0s 432000s vol +3dB
+                    fade t 3.1 0 0 fade l 0 432000s 4), cur)
+    out = ffx.fade_out_prev_fx(fmt, tbeg, tlen)
+    assert_equal(%w(trim 0s
+                    fade t 0 48000s 48000s pad 384000s@48000s), out)
+    inn = ffx.fade_in_next_fx(fmt, tbeg, tlen)
+    assert_equal(%w(trim 384000s 48000s
+                    fade t 48000s 0 0 pad 384000s@0s), inn)
+  end
+
+  def test_fadefx_no_cur
+    ffx = DTAS::FadeFX.new("t1,;,t1")
+    assert_equal 't', ffx.out_prev.type
+    assert_equal 1, ffx.out_prev.flen
+    assert_nil ffx.in_cur
+    assert_nil ffx.out_cur
+    assert_equal 't', ffx.in_next.type
+    assert_equal 1, ffx.in_next.flen
+  end
+end

data/test/test_format.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
+# 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/helper'
 require 'tempfile'

data/test/test_format_change.rb

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

data/test/test_player.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
+# 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/helper'
 require 'tempfile'

data/test/test_player_client_handler.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
+# 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/helper'
 require 'dtas/player'

data/test/test_player_integration.rb

@@ -1,14 +1,14 @@
-# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
+# 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'
 class TestPlayerIntegration < Testcase
   include PlayerIntegration
+  include DTAS::SpawnFix
 
   def test_cmd_rate
-    pid = fork do
-      @fmt.to_env.each { |k,v| ENV[k] = v }
-      exec("sox -n $SOXFMT - synth 3 pinknoise | #@cmd")
-    end
+    env = ENV.to_hash.merge(@fmt.to_env)
+    cmd = "sox -n $SOXFMT - synth 3 pinknoise | #@cmd"
+    pid = spawn(env, cmd)
     t = Time.now
     _, _ = Process.waitpid2(pid)
     elapsed = Time.now - t
@@ -209,11 +209,11 @@ class TestPlayerIntegration < Testcase
 
   def test_source_ed
     s = client_socket
-    assert_equal "sox av ff", s.req("source ls")
+    assert_equal "sox av ff splitfx", s.req("source ls")
     s.req_ok("source ed av tryorder=-1")
-    assert_equal "av sox ff", s.req("source ls")
+    assert_equal "av sox ff splitfx", s.req("source ls")
     s.req_ok("source ed av tryorder=")
-    assert_equal "sox av ff", s.req("source ls")
+    assert_equal "sox av ff splitfx", s.req("source ls")
 
     s.req_ok("source ed sox command=true")
     sox = YAML.load(s.req("source cat sox"))

data/test/test_process.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
+# 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/helper'
 require 'dtas/process'

data/test/test_rg_integration.rb

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

data/test/test_rg_state.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
+# 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/helper'
 require 'dtas/rg_state'

data/test/test_sink.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
+# 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/helper'
 require 'dtas/sink'

data/test/test_sink_pipe_size.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
+# Copyright (C) 2013-2015 all contributors <dtas-all@nongnu.org>
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 begin
   require 'io/splice'
@@ -11,7 +11,7 @@ begin
       default_sink_pid(s)
       s.req_ok("sink ed default pipe_size=0x1000")
       s.req_ok("sink ed default pipe_size=0x10000")
-      assert_match %r{\AERR }, s.req("sink ed default pipe_size=")
+      s.req_ok("sink ed default pipe_size=")
       s.req_ok("sink ed default pipe_size=4096")
     end if IO.method_defined?(:pipe_size=)
   end

data/test/test_sink_tee_integration.rb

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

data/test/test_source_av.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
+# 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/helper'
 require 'dtas/source/av'

data/test/test_source_sox.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
+# 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/helper'
 require 'dtas/source/sox'

data/test/test_splitfx.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2014, Eric Wong <e@80x24.org> and all contributors
+# Copyright (C) 2013-2015 all contributors <dtas-all@nongnu.org>
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 require 'yaml'
 require 'dtas/splitfx'
@@ -6,6 +6,19 @@ require 'thread'
 require_relative 'helper'
 
 class TestSplitfx < Testcase
+  include DTAS::SpawnFix
+
+  def tmp_err(path)
+    err = $stderr.dup
+    $stderr.reopen(path, 'a')
+    begin
+      yield
+    ensure
+      $stderr.reopen(err)
+      err.close
+    end
+  end
+
   def test_t2s
     sfx = DTAS::SplitFX.new
     sfx.instance_eval do
@@ -15,6 +28,17 @@ class TestSplitfx < Testcase
     assert_equal 118554030, sfx.t2s('44:48.3')
   end
 
+  def assert_contains_stats(file)
+    buf = File.read(file)
+    [ 'DC offset', 'Min level', 'Max level', 'Pk lev dB',
+      'RMS lev dB', 'RMS Pk dB', 'RMS Tr dB', 'Crest factor', 'Flat factor',
+      'Pk count', 'Bit-depth', 'Num samples',
+      'Length s', 'Scale max', 'Window s'
+    ].each do |re|
+      assert_match(/^#{re}/, buf, buf)
+    end
+  end
+
   def test_example
     hash = YAML.load(File.read("examples/splitfx.sample.yml"))
     sfx = DTAS::SplitFX.new
@@ -25,19 +49,25 @@ class TestSplitfx < Testcase
         opts = { jobs: nil, silent: true }
 
         # ensure default FLAC target works
-        WAIT_ALL_MTX.synchronize { sfx.run("flac", opts) }
+        WAIT_ALL_MTX.synchronize do
+          tmp_err('err.txt') { sfx.run("flac", opts) }
+        end
         expect = %w(1.flac 2.flac foo.flac)
         assert_equal expect, Dir["*.flac"].sort
 
         # compare results with expected output
-        res_cmd = "sox 1.flac 2.flac -ts32 -c2 -r44100 result.s32"
-        res_pid = fork { exec res_cmd }
-        exp_cmd = "sox foo.flac -ts32 -c2 -r44100 expect.s32 trim 4"
-        exp_pid = fork { exec exp_cmd }
+        res_cmd = "sox 1.flac 2.flac -ts32 -c2 -r44100 result.s32 stats"
+        res_pid = spawn(res_cmd, err: 'b.txt')
+        exp_cmd = "sox foo.flac -ts32 -c2 -r44100 expect.s32 trim 4 stats"
+        exp_pid = spawn(exp_cmd, err: 'a.txt')
         _, s = Process.waitpid2(res_pid)
         assert s.success?, "#{res_cmd}: #{s.inspect}"
         _, s = Process.waitpid2(exp_pid)
         assert s.success?, "#{exp_cmd}: #{s.inspect}"
+        assert_equal File.read('a.txt'), File.read('b.txt')
+
+        assert_contains_stats('err.txt')
+
         cmp = "cmp result.s32 expect.s32"
         assert system(cmp), cmp
 
@@ -46,13 +76,10 @@ class TestSplitfx < Testcase
         # hasn't made it into Debian, yet)
         if `which opusenc 2>/dev/null`.size > 0 &&
            `which opusdec 2>/dev/null`.size > 0
-          err = $stderr.dup
-          begin
-            $stderr.reopen("/dev/null", "a")
-            WAIT_ALL_MTX.synchronize { sfx.run("opusenc", opts) }
-          ensure
-            $stderr.reopen(err)
+          WAIT_ALL_MTX.synchronize do
+            tmp_err('opus.err.txt') { sfx.run("opusenc", opts) }
           end
+          assert_contains_stats('opus.err.txt')
 
           # ensure opus lengths match flac ones, we decode using opusdec
           # since sox does not yet have opus support in Debian 7.0
@@ -64,7 +91,10 @@ class TestSplitfx < Testcase
 
           # ensure 16/44.1kHz FLAC works (CDDA-like)
           File.unlink('1.flac', '2.flac')
-          WAIT_ALL_MTX.synchronize { sfx.run("flac-cdda", opts) }
+          WAIT_ALL_MTX.synchronize do
+            tmp_err('flac-cdda.err.txt') { sfx.run("flac-cdda", opts) }
+          end
+          assert_contains_stats('flac-cdda.err.txt')
           %w(1 2).each do |nr|
             assert_equal `soxi -D #{nr}.flac`, `soxi -D #{nr}.wav`
           end