dtas 0.14.0 → 0.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a8368223a46a5e0444391029757906680b7c542
-  data.tar.gz: b5c51de31c4fcf739c16c177b07ed593897bf83a
+  metadata.gz: 0bc3ffcf67bb7f7e020a386299244ce66f10ad4d
+  data.tar.gz: 62e5cb485569bee19c6d68ca70fadf335585fc4d
 SHA512:
-  metadata.gz: 712fb210c0b372c2f3d170345c84f62dce8bd694544c4bc06d04401b5be7eb6e39719d7ad59954f8b2d49aaa9fad24bf20f9b4462c255ece9f864c42fcea6ba3
-  data.tar.gz: 694d7d60ff9d65a2cb23b6904821852f613fac748559930d6d889cfc7ebdcea4e75682237a2b19c092ec4bef30fe6e7b734f66daa0ed593b31d94d3328810d26
+  metadata.gz: 69ffea1179687f8bb6f73bdde76a6b9e1b7d47e39744f17398f392abf1d48b501ec4874b9b282e7143b0f02aa166e0910d3b4d3ca3935f0194d601d346f0fd5f
+  data.tar.gz: bd7f43ad66ba88d8c5d1ca2e0225a38d9a2c7125961bd19e1f74ccbbe44a5be9bd19f4540a8f386ef4f4f75da8c70a5c126fa29dd642130185ec37c53f76951d

data/GIT-VERSION-GEN

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

data/INSTALL

@@ -39,10 +39,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/2016/dtas-0.14.0.tar.gz
+    http://dtas.80x24.org/2016/dtas-0.14.2.tar.gz
 
-    $ tar zxvf dtas-0.14.0.tar.gz
-    $ cd dtas-0.14.0
+    $ tar zxvf dtas-0.14.2.tar.gz
+    $ cd dtas-0.14.2
     $ sudo ruby setup.rb
 
 GNU/Linux users may optionally install "io_splice" and

data/bin/dtas-readahead

@@ -9,6 +9,8 @@
 unless RUBY_PLATFORM =~ /linux/
   warn "this relies on Linux /proc and probably does not work well for you"
 end
+@ffprobe = 'ffprobe'
+@avprobe = 'avprobe'
 
 require 'yaml'
 require 'io/wait'
@@ -97,8 +99,17 @@ def do_ra(fp, pos, w)
       len: '%.3f' % (len / (1024 * 1024.0)),
       pos: pos })
   spawn('soxi', path, @redir)
-  spawn('avprobe', path, @redir)
-  spawn('ffprobe', path, @redir)
+  begin
+    spawn(@avprobe, path, @redir)
+  rescue Errno::ENOENT
+    @avprobe = false unless File.exist?(path)
+  end if @avprobe
+  begin
+    spawn(@ffprobe, path, @redir)
+  rescue Errno::ENOENT
+    @ffprobe = false unless File.exist?(path)
+  end if @ffprobe
+
   fp.advise(:sequential, pos, len)
   Thread.new(fp.dup) { |d| d.advise(:willneed, pos, len); d.close }
 

data/lib/dtas/sigevent/pipe.rb

@@ -4,7 +4,7 @@
 
 # used in various places for safe wakeups from IO.select via signals
 # A fallback for non-Linux systems lacking the "sleepy_penguin" RubyGem
-require_relative 'nonblock'
+require_relative '../nonblock'
 class DTAS::Sigevent # :nodoc:
   attr_reader :to_io
 

data/lib/dtas/source/av_ff_common.rb

@@ -78,28 +78,50 @@ def av_ff_ok?
       break if cmd == prev_cmd
 
       err = "".b
-      s = qx(@env, cmd, err_str: err, no_raise: true)
+      begin
+        s = qx(@env, cmd, err_str: err, no_raise: true)
+      rescue Errno::ENOENT # avprobe/ffprobe not installed
+        return false
+      end
       return false unless probe_ok?(s, err)
-      s.scan(%r{^\[STREAM\]\n(.*?)\n\[/STREAM\]\n}mn) do |_|
-        __parse_astream(cmd, $1) do |index, as|
-          # incomplete streams may have zero channels
-          if as.channels > 0 && as.rate > 0
-            @astreams[index] = as
-            incomplete[index] = nil
-          else
-            incomplete[index] = as
+
+      # old avprobe
+      [ %r{^\[STREAM\]\n(.*?)\n\[/STREAM\]\n}mn,
+        %r{^\[streams\.stream\.\d+\]\n(.*?)\n\n}mn ].each do |re|
+        s.scan(re) do |_|
+          __parse_astream(cmd, $1) do |index, as|
+            # incomplete streams may have zero channels
+            if as.channels > 0 && as.rate > 0
+              @astreams[index] = as
+              incomplete[index] = nil
+            else
+              incomplete[index] = as
+            end
           end
         end
       end
+
       prev_cmd = cmd
     end while incomplete.compact[0]
 
+    # old avprobe
     s.scan(%r{^\[FORMAT\]\n(.*?)\n\[/FORMAT\]\n}m) do |_|
       f = $1.dup
       f =~ /^duration=([\d\.]+)\s*$/nm and @duration = $1.to_f
       # TODO: multi-line/multi-value/repeated tags
       f.gsub!(/^TAG:([^=]+)=(.*)$/ni) { |_| @comments[$1.upcase.freeze] = $2 }
     end
+
+    # new avprobe
+    s.scan(%r{^\[format\.tags\]\n(.*?)\n\n}m) do |_|
+      f = $1.dup
+      f.gsub!(/^([^=]+)=(.*)$/ni) { |_| @comments[$1.upcase.freeze] = $2 }
+    end
+    s.scan(%r{^\[format\]\n(.*?)\n\n}m) do |_|
+      f = $1.dup
+      f =~ /^duration=([\d\.]+)\s*$/nm and @duration = $1.to_f
+    end
+
     ! @astreams.compact.empty?
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtas
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.14.2
 platform: ruby
 authors:
 - dtas hackers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-31 00:00:00.000000000 Z
+date: 2016-03-18 00:00:00.000000000 Z
 dependencies: []
 description: |-
   Free Software command-line tools for audio playback, mastering, and
@@ -205,7 +205,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: duct tape audio suite for *nix