dtas 0.12.1 → 0.13.0

data/lib/dtas/parse_time.rb

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
-# Copyright (C) 2013-2015 all contributors <dtas-all@nongnu.org>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
+# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# frozen_string_literal: true
 require_relative '../dtas'
 
-module DTAS::ParseTime
+module DTAS::ParseTime # :nodoc:
   # convert a string time to seconds, returning a Floot or Integer
   def parse_time(time)
     case time

data/lib/dtas/partstats.rb

@@ -1,6 +1,7 @@
 # -*- encoding: binary -*-
-# Copyright (C) 2013-2015 all contributors <dtas-all@nongnu.org>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
+# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# frozen_string_literal: true
 require_relative '../dtas'
 require_relative 'xs'
 require_relative 'process'
@@ -8,14 +9,14 @@
 
 # backend for the dtas-partstats(1) command
 # Unlike the stuff for dtas-player, dtas-partstats is fairly tied to sox
-class DTAS::PartStats
+class DTAS::PartStats # :nodoc:
   CMD = 'sox "$INFILE" -n $TRIMFX $SOXFX stats $STATSOPTS'
   include DTAS::Process
   include DTAS::SpawnFix
   attr_reader :key_idx
   attr_reader :key_width
 
-  class TrimPart < Struct.new(:tbeg, :tlen, :rate)
+  class TrimPart < Struct.new(:tbeg, :tlen, :rate) # :nodoc:
     def sec
       tbeg / rate
     end
@@ -73,7 +74,7 @@ def run(opts = {})
     fails = []
     do_spawn = lambda do |trim_part|
       pid, rpipe = partstats_spawn(trim_part, opts)
-      rset[rpipe] = [ trim_part, "" ]
+      rset[rpipe] = [ trim_part, ''.b ]
       pids[pid] = [ trim_part, rpipe ]
     end
 

data/lib/dtas/pipe.rb

@@ -1,5 +1,6 @@
-# Copyright (C) 2013-2015 all contributors <dtas-all@nongnu.org>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
+# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# frozen_string_literal: true
 begin
   require 'io/splice'
 rescue LoadError

data/lib/dtas/player.rb

@@ -1,5 +1,6 @@
-# Copyright (C) 2013-2015 all contributors <dtas-all@nongnu.org>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
+# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# frozen_string_literal: true
 require 'yaml'
 require 'shellwords'
 require_relative '../dtas'
@@ -76,7 +77,7 @@ def __wall(msg)
         end
       end
     end
-    $stdout.write(msg << "\n")
+    $stdout.write("#{msg}\n")
   end
 
   # used for state file

data/lib/dtas/player/client_handler.rb

@@ -1,5 +1,6 @@
-# Copyright (C) 2013-2015 all contributors <dtas-all@nongnu.org>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
+# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# frozen_string_literal: true
 require_relative '../xs'
 require_relative '../parse_time'
 
@@ -139,7 +140,7 @@ def dpc_sink(io, msg)
 
       # multiple changes may be made at once
       msg[2..-1].each do |kv|
-        k, v = kv.split(/=/, 2)
+        k, v = kv.split('=', 2)
         case k
         when %r{\Aenv\.([^=]+)\z}
           sink.env[$1] = v
@@ -244,7 +245,7 @@ def dpc_rg(io, msg)
     return io.emit(@rg.to_hsh.to_yaml) if msg.empty?
     before = @rg.to_hsh
     msg.each do |kv|
-      k, v = kv.split(/=/, 2)
+      k, v = kv.split('=', 2)
       case k
       when "mode"
         case v
@@ -259,7 +260,7 @@ def dpc_rg(io, msg)
         rv = set_bool(io, kv, v) { |b| @rg.fallback_track = b }
         rv == true or return rv
       when %r{(?:gain_threshold|norm_threshold|
-              preamp|norm_level|fallback_gain)[+-]?\z}x
+              preamp|norm_level|fallback_gain|volume)[+-]?\z}x
         rv = adjust_numeric(io, @rg, k, v)
         rv == true or return rv
       end
@@ -301,7 +302,10 @@ def dpc_current(io, msg)
     tmp["current_inflight"] = @sink_buf.inflight
     tmp["format"] = @format.to_hash.delete_if { |_,v| v.nil? }
     tmp["bypass"] = @bypass.sort!
-    tmp["paused"] = @paused
+    t = @trim and tmp['trim'] = t.join(' ')
+    if tmp['paused'] = @paused
+      first = @queue[0] and tmp['current_paused'] = first
+    end
     rg = @rg.to_hsh
     tmp["rg"] = rg unless rg.empty?
     if @targets[0]
@@ -599,12 +603,15 @@ def _dpc_tl_add(io, msg)
 
   def _dpc_tl_repeat(io, msg)
     prev = @tl.repeat.to_s
+    do_wall = true
     case msg.shift
     when 'true' then @tl.repeat = true
     when 'false' then @tl.repeat = false
     when '1' then @tl.repeat = 1
     when nil
+      do_wall = false
     end
+    __wall("tl repeat #{@tl.repeat}") if do_wall
     io.emit("tl repeat #{prev}")
   end
 
@@ -615,7 +622,10 @@ def _dpc_tl_shuffle(io, msg)
     when 'debug' then return io.emit(@tl.shuffle.to_yaml) # TODO: remove
     when nil
     else
-      set_bool(io, 'tl shuffle', v) { |b| @tl.shuffle = b }
+      set_bool(io, 'tl shuffle', v) do |b|
+        @tl.shuffle = b
+        __wall("tl shuffle #{b}")
+      end
     end
     io.emit("tl shuffle #{prev}")
   end
@@ -655,7 +665,7 @@ def _dpc_tl_get(io, msg)
 
   def _dpc_tl_tracks(io, msg)
     tracks = @tl.tracks
-    io.emit("#{tracks.size} " << tracks.map!(&:to_s).join(' '))
+    io.emit("#{tracks.size} #{tracks.map!(&:to_s).join(' ')}")
   end
 
   def _dpc_tl_goto(io, msg)
@@ -790,7 +800,9 @@ def dpc_trim(io, msg)
     else
       return io.emit('ERR usage: trim [off|TBEG [TLEN]]')
     end
-    io.emit(t ? t.map(&:to_s).join(' ') : 'off')
+    t = t ? t.map(&:to_s).join(' ') : 'off'
+    __wall("trim #{t}")
+    io.emit(t)
   end
 end
 # :startdoc:

data/lib/dtas/process.rb

@@ -1,5 +1,6 @@
-# Copyright (C) 2013-2015 all contributors <dtas-all@nongnu.org>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
+# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# frozen_string_literal: true
 require 'io/wait'
 require 'shellwords'
 require_relative '../dtas'
@@ -87,7 +88,7 @@ def qx(env, cmd = {}, opts = {})
       cmd, opts = env, cmd
       env = {}
     end
-    buf = ''
+    buf = ''.b
     r, w = DTAS::Nonblock.pipe
     opts = opts.merge(out: w)
     r.binmode
@@ -102,7 +103,7 @@ def qx(env, cmd = {}, opts = {})
     w.close
     if err_str
       we.close
-      res = "".b
+      res = ''.b
       want = { r => res, re => err_str }
       begin
         readable = IO.select(want.keys) or next

data/lib/dtas/replaygain.rb

@@ -1,5 +1,6 @@
-# Copyright (C) 2013-2015 all contributors <dtas-all@nongnu.org>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
+# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# frozen_string_literal: true
 
 # Represents ReplayGain metadata for a DTAS::Source, only used by -player
 # cleanup/validate values to prevent malicious files from making us
@@ -39,7 +40,7 @@ def to_env
   def initialize(comments)
     comments or return
 
-    # the replaygain standard specifies 89.0 dB, but maybe some apps are
+    # the ReplayGain standard specifies 89.0 dB, but maybe some apps are
     # different...
     @reference_loudness = check_gain(comments["REPLAYGAIN_REFERENCE_LOUDNESS"])
 
@@ -49,8 +50,8 @@ def initialize(comments)
     @album_peak = check_float(comments["REPLAYGAIN_ALBUM_PEAK"])
   end
 
-  def self.new(comments)
-    tmp = super
-    tmp.track_gain ? tmp : nil
+  def self.new(comments, field)
+    tmp = super(comments)
+    tmp.__send__(field) ? tmp : nil
   end
 end

data/lib/dtas/rg_state.rb

@@ -1,5 +1,6 @@
-# Copyright (C) 2013-2015 all contributors <dtas-all@nongnu.org>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
+# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# frozen_string_literal: true
 #
 # provides support for generating appropriate effects for ReplayGain
 # MAYBE: account for non-standard reference loudness (89.0 dB is standard)
@@ -19,6 +20,7 @@ class DTAS::RGState # :nodoc:
   }
 
   RG_DEFAULT = {
+    "volume" => 1.0,
     # skip the effect if the adjustment is too small to be noticeable
     "gain_threshold" => 0.00000001, # in dB
     "norm_threshold" => 0.00000001,
@@ -34,6 +36,13 @@ class DTAS::RGState # :nodoc:
   SIVS = RG_DEFAULT.keys
   SIVS.each { |iv| attr_accessor iv }
 
+  undef_method :volume=
+
+  def volume=(val)
+    val = 0 if val.to_i < 0
+    @volume = val.round(4)
+  end
+
   def initialize
     RG_DEFAULT.each do |k,v|
       instance_variable_set("@#{k}", v)
@@ -50,24 +59,38 @@ def to_hash
     ivars_to_hash(SIVS)
   end
 
+  def vol_db
+    linear_to_db(@volume)
+  end
+
   def to_hsh
     # no point in dumping default values, it's just a waste of space
     to_hash.delete_if { |k,v| RG_DEFAULT[k] == v }
   end
 
+  def to_sox_gain(val)
+    case val.infinite?
+    when -1 then return 'gain -192'
+    when 1 then return 'gain 192'
+    else
+      sprintf('gain %0.8g', val).freeze
+    end
+  end
+
   # returns a dB argument to the "gain" effect, nil if nothing found
   def rg_vol_gain(val)
-    val = val.to_f + @preamp
+    val = val.to_f + @preamp + vol_db
     return if val.abs < @gain_threshold
-    sprintf('gain %0.8g', val)
+    to_sox_gain(val)
   end
 
   # returns a DB argument to the "gain" effect
   def rg_vol_norm(val)
-    diff = @norm_level - val.to_f
-    return if (@norm_level - diff).abs < @norm_threshold
-    diff += @norm_level
-    sprintf('gain %0.8g', linear_to_db(diff))
+    n = @norm_level == 1.0 ? @volume : @norm_level
+    diff = n - val.to_f
+    return if (n - diff).abs < @norm_threshold
+    diff += n
+    to_sox_gain(linear_to_db(diff))
   end
 
   # The ReplayGain fallback adjustment value (in dB), in case a file is
@@ -75,20 +98,21 @@ def rg_vol_norm(val)
   # eardrums and amplifiers in case a file without then necessary ReplayGain
   # tag slips into the queue
   def rg_fallback_effect(reason)
-    @fallback_gain or return
-    val = @fallback_gain + @preamp
+    val = (@fallback_gain || 0) + @preamp + vol_db
     return if val.abs < @gain_threshold
     warn(reason) if $DEBUG
-    "gain #{val}"
+    to_sox_gain(val)
   end
 
   # returns an array (for command-line argument) for the effect needed
   # to apply ReplayGain
   # this may return nil
   def effect(source)
-    return unless @mode
-    rg = source.replaygain or
-      return rg_fallback_effect("ReplayGain tags missing")
+    unless @mode
+      return @volume == 1.0 ? nil : to_sox_gain(vol_db)
+    end
+    rg = source.replaygain(@mode) or
+      return rg_fallback_effect("ReplayGain tags missing for #@mode")
     val = rg.__send__(@mode)
     if ! val && @fallback_track && @mode =~ /\Aalbum_(\w+)/
       tag = "track_#$1"

data/lib/dtas/serialize.rb

@@ -1,5 +1,6 @@
-# Copyright (C) 2013-2015 all contributors <dtas-all@nongnu.org>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
+# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# frozen_string_literal: true
 
 # used to serialize player state to the state file
 module DTAS::Serialize # :nodoc:

data/lib/dtas/sigevent.rb

@@ -1,5 +1,6 @@
-# Copyright (C) 2013-2015 all contributors <dtas-all@nongnu.org>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
+# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# frozen_string_literal: true
 begin
   raise LoadError, "no eventfd with _DTAS_POSIX" if ENV["_DTAS_POSIX"]
   require 'sleepy_penguin'

data/lib/dtas/sigevent/efd.rb

@@ -1,5 +1,5 @@
-# Copyright (C) 2013-2015 all contributors <dtas-all@nongnu.org>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
+# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
 
 # used in various places for safe wakeups from IO.select via signals
 # This requires a modern Linux system and the "sleepy_penguin" RubyGem

data/lib/dtas/sigevent/pipe.rb

@@ -1,5 +1,6 @@
-# Copyright (C) 2013-2015 all contributors <dtas-all@nongnu.org>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
+# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# frozen_string_literal: true
 
 # used in various places for safe wakeups from IO.select via signals
 # A fallback for non-Linux systems lacking the "sleepy_penguin" RubyGem
@@ -9,7 +10,7 @@ class DTAS::Sigevent # :nodoc:
 
   def initialize
     @to_io, @wr = DTAS::Nonblock.pipe
-    @rbuf = ''
+    @rbuf = ''.b
   end
 
   def signal

data/lib/dtas/sink.rb

@@ -1,5 +1,6 @@
-# Copyright (C) 2013-2015 all contributors <dtas-all@nongnu.org>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
+# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# frozen_string_literal: true
 require 'yaml'
 require_relative '../dtas'
 require_relative 'pipe'

data/lib/dtas/source.rb

@@ -1,5 +1,6 @@
-# Copyright (C) 2013-2015 all contributors <dtas-all@nongnu.org>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
+# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# frozen_string_literal: true
 require_relative '../dtas'
 
 module DTAS::Source # :nodoc:

data/lib/dtas/source/av.rb

@@ -1,5 +1,6 @@
-# Copyright (C) 2013-2015 all contributors <dtas-all@nongnu.org>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
+# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# frozen_string_literal: true
 require_relative '../../dtas'
 require_relative 'av_ff_common'
 

data/lib/dtas/source/av_ff_common.rb

@@ -1,5 +1,6 @@
-# Copyright (C) 2013-2015 all contributors <dtas-all@nongnu.org>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
+# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# frozen_string_literal: true
 require_relative '../../dtas'
 require_relative '../source'
 require_relative '../replaygain'
@@ -75,7 +76,7 @@ def av_ff_ok?
       cmd.concat(%W(-show_streams -show_format #@infile))
       break if cmd == prev_cmd
 
-      err = ""
+      err = "".b
       s = qx(@env, cmd, err_str: err, no_raise: true)
       return false unless probe_ok?(s, err)
       s.scan(%r{^\[STREAM\]\n(.*?)\n\[/STREAM\]\n}mn) do |_|
@@ -93,10 +94,10 @@ def av_ff_ok?
     end while incomplete.compact[0]
 
     s.scan(%r{^\[FORMAT\]\n(.*?)\n\[/FORMAT\]\n}m) do |_|
-      f = $1
+      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] = $2 }
+      f.gsub!(/^TAG:([^=]+)=(.*)$/ni) { |_| @comments[$1.upcase.freeze] = $2 }
     end
     ! @astreams.compact.empty?
   end

data/lib/dtas/source/cmd.rb

@@ -1,5 +1,6 @@
-# Copyright (C) 2013-2015 all contributors <dtas-all@nongnu.org>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <dtas-all@nongnu.org>
+# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
+# frozen_string_literal: true
 require_relative '../../dtas'
 require_relative '../source'
 require_relative '../command'