dtas 0.13.1 → 0.14.0

data/lib/dtas/partstats.rb

@@ -160,7 +160,7 @@ def run(opts = {})
 
   def parse_stats(stats, trim_part, buf)
     trim_row = [ trim_part ]
-    buf.split(/\n/).each do |line|
+    buf.split("\n").each do |line|
       do_map = true
       case line
       when /\A(\S+ \S+ dB)\s/, /\A(Crest factor)\s+-\s/

data/lib/dtas/player.rb

@@ -115,7 +115,7 @@ def to_hsh
     unless @sinks.empty?
       sinks = rv["sinks"] = []
       # sort sinks by name for human viewability
-      @sinks.keys.sort.each do |name|
+      @sinks.keys.sort!.each do |name|
         sinks << @sinks[name].to_hsh
       end
     end

data/lib/dtas/player/client_handler.rb

@@ -122,7 +122,7 @@ def dpc_sink(io, msg)
     name = msg[1]
     case msg[0]
     when "ls"
-      io.emit(xs(@sinks.keys.sort))
+      io.emit(xs(@sinks.keys.sort!))
     when "rm"
       sink = @sinks.delete(name) or return io.emit("ERR #{name} not found")
       drop_sink(sink)
@@ -422,7 +422,7 @@ def dpc_restart(io, _)
   def dpc_format(io, msg)
     new_fmt = @format.dup
     msg.each do |kv|
-      k, v = kv.split(/=/, 2)
+      k, v = kv.split('=', 2)
       case k
       when "type"
         new_fmt.valid_type?(v) or return io.emit("ERR invalid file type")
@@ -484,7 +484,7 @@ def dpc_source(io, msg)
       __current_requeue
       return io.emit("OK")
     when "ls"
-      s = map.keys.sort { |a,b| map[a].tryorder <=> map[b].tryorder }
+      s = map.keys.sort! { |a,b| map[a].tryorder <=> map[b].tryorder }
       return io.emit(s.join(' '))
     end
 
@@ -497,7 +497,7 @@ def dpc_source(io, msg)
       before = src.to_state_hash.inspect
       sd = src.source_defaults
       msg.each do |kv|
-        k, v = kv.split(/=/, 2)
+        k, v = kv.split('=', 2)
         case k
         when "command"
           src.command = v.empty? ? sd[k] : v
@@ -630,6 +630,20 @@ def _dpc_tl_shuffle(io, msg)
     io.emit("tl shuffle #{prev}")
   end
 
+  def _dpc_tl_consume(io, msg)
+    prev = (!!@tl.consume).to_s
+    v = msg.shift
+    case v
+    when nil
+    else
+      set_bool(io, 'tl consume', v) do |b|
+        @tl.consume = b
+        __wall("tl consume #{b}")
+      end
+    end
+    io.emit("tl consume #{prev}")
+  end
+
   def _dpc_tl_max(io, msg)
     prev = @tl.max
     case msg.shift

data/lib/dtas/source/av_ff_common.rb

@@ -19,6 +19,7 @@ module DTAS::Source::AvFfCommon # :nodoc:
 
   attr_reader :precision # always 32
   attr_reader :format
+  attr_reader :duration
 
   def try(infile, offset = nil, trim = nil)
     rv = source_file_dup(infile, offset, trim)

data/lib/dtas/source/mp3gain.rb

@@ -16,7 +16,7 @@ def mp3gain_comments
     case @infile
     when String
       @infile =~ /\.mp[g23]\z/in or return
-      qx(%W(mp3gain -s c #@infile)).split(/\n/).each do |line|
+      qx(%W(mp3gain -s c #@infile)).split("\n").each do |line|
         case line
         when /^Recommended "(Track|Album)" dB change:\s*(\S+)/
           tmp["REPLAYGAIN_#{$1.upcase}_GAIN"] = $2

data/lib/dtas/source/sox.rb

@@ -21,8 +21,7 @@ class DTAS::Source::Sox # :nodoc:
   )
 
   # we use this to be less noisy when seeking a file
-  @last_failed = nil
-  def self.try_to_fail_harder(infile, s, cmd)
+  def try_to_fail_harder(infile, s, cmd)
     msg = nil
     case s
     when %r{\A0\s*\z} then msg = "detected zero samples"
@@ -37,6 +36,7 @@ def self.try_to_fail_harder(infile, s, cmd)
   end
 
   def initialize
+    @last_failed = nil
     command_init(SOX_DEFAULTS)
   end
 
@@ -45,7 +45,7 @@ def try(infile, offset = nil, trim = nil)
     cmd = %W(soxi -s #{infile})
     s = qx(@env.dup, cmd, err_str: err, no_raise: true)
     return if err =~ /soxi FAIL formats:/
-    self.class.try_to_fail_harder(infile, s, cmd) or return
+    try_to_fail_harder(infile, s, cmd) or return
     source_file_dup(infile, offset, trim)
   end
 
@@ -53,6 +53,10 @@ def format
     @format ||= DTAS::Format.from_file(@env, @infile)
   end
 
+  def duration
+    samples / format.rate.to_f
+  end
+
   # This is the number of samples according to the samples in the source
   # file itself, not the decoded output
   def samples
@@ -71,7 +75,7 @@ def __load_comments
         key, value = line.split('=', 2)
         key && value or next
         # TODO: multi-line/multi-value/repeated tags
-        tmp[key.upcase] = value
+        tmp[key.upcase.freeze] = value
       end
     end
     tmp

data/lib/dtas/source/splitfx.rb

@@ -107,6 +107,10 @@ def samples
     @sox.samples
   end
 
+  def duration
+    @sox.duration
+  end
+
   def source_defaults
     SPLITFX_DEFAULTS
   end

data/lib/dtas/tracklist.rb

@@ -12,11 +12,13 @@ class DTAS::Tracklist # :nodoc:
   attr_accessor :repeat # true, false, 1
   attr_reader :shuffle  # false or shuffled @list
   attr_accessor :max # integer
+  attr_accessor :consume # boolean
 
   TL_DEFAULTS = {
     'pos' => -1,
     'repeat' => false,
     'max' => 20_000,
+    'consume' => false,
   }
   SIVS = TL_DEFAULTS.keys
 
@@ -116,20 +118,25 @@ def tracks
   def advance_track(repeat_ok = true)
     cur = @shuffle || @list
     return if cur.empty?
+    prev = cur[@pos] if @consume && @pos >= 0
     # @repeat == 1 for single track repeat
     repeat = repeat_ok ? @repeat : false
     next_pos = @goto_pos || @pos + (repeat == 1 ? 0 : 1)
     next_off = @goto_off # nil by default
     @goto_pos = @goto_off = nil
-    if cur[next_pos]
+
+    if nxt = cur[next_pos]
       @pos = next_pos
+      remove_track(prev.track_id) if prev
     else
+      remove_track(prev.track_id) if prev
       # reshuffle the tracklist when we've exhausted it
       cur.shuffle! if @shuffle
-      return unless repeat
+      return if !repeat || cur.empty?
       next_pos = @pos = 0
+      nxt = cur[0]
     end
-    [ cur[next_pos].to_path, next_off ]
+    [ nxt.to_path, next_off ]
   end
 
   def cur_track
@@ -189,14 +196,18 @@ def _idx_of(list, track_id)
 
   def remove_track(track_id)
     idx = _idx_of(@list, track_id) or return false
+    track = @list.delete_at(idx)
     if @shuffle
-      si = _idx_of(@shuffle, track_id) or return false
-      @shuffle.delete_at(si)
+      idx = _idx_of(@shuffle, track_id) or return false
+      @shuffle.delete_at(idx)
     end
-    track = @list.delete_at(idx)
     len = @list.size
-    @pos = len - 1 if @pos >= len
-    @goto_pos = @goto_pos = nil # TODO: reposition?
+    if @pos >= len
+      @pos = len - 1
+    elsif idx <= @pos
+      @pos -= 1
+    end
+    @goto_pos = @goto_off = nil # TODO: reposition?
     track.to_path
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtas
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.14.0
 platform: ruby
 authors:
 - dtas hackers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-17 00:00:00.000000000 Z
+date: 2016-01-31 00:00:00.000000000 Z
 dependencies: []
 description: |-
   Free Software command-line tools for audio playback, mastering, and
@@ -42,22 +42,22 @@ files:
 - COPYING
 - Documentation/.gitignore
 - Documentation/GNUmakefile
-- Documentation/dtas-archive.txt
-- Documentation/dtas-console.txt
-- Documentation/dtas-ctl.txt
-- Documentation/dtas-cueedit.txt
-- Documentation/dtas-enq.txt
-- Documentation/dtas-env.txt
-- Documentation/dtas-msinkctl.txt
-- Documentation/dtas-player.txt
-- Documentation/dtas-player_effects.txt
-- Documentation/dtas-player_protocol.txt
-- Documentation/dtas-player_sink_examples.txt
-- Documentation/dtas-sinkedit.txt
-- Documentation/dtas-sourceedit.txt
-- Documentation/dtas-splitfx.txt
-- Documentation/dtas-tl.txt
-- Documentation/dtas-xdelay.txt
+- Documentation/dtas-archive.pod
+- Documentation/dtas-console.pod
+- Documentation/dtas-ctl.pod
+- Documentation/dtas-cueedit.pod
+- Documentation/dtas-enq.pod
+- Documentation/dtas-env.pod
+- Documentation/dtas-msinkctl.pod
+- Documentation/dtas-player.pod
+- Documentation/dtas-player_effects.pod
+- Documentation/dtas-player_protocol.pod
+- Documentation/dtas-player_sink_examples.pod
+- Documentation/dtas-sinkedit.pod
+- Documentation/dtas-sourceedit.pod
+- Documentation/dtas-splitfx.pod
+- Documentation/dtas-tl.pod
+- Documentation/dtas-xdelay.pod
 - Documentation/update-footer.rb
 - GIT-VERSION-FILE
 - GIT-VERSION-GEN
@@ -144,10 +144,12 @@ files:
 - man/dtas-archive.1
 - man/dtas-console.1
 - man/dtas-ctl.1
+- man/dtas-cueedit.1
 - man/dtas-enq.1
 - man/dtas-env.7
 - man/dtas-msinkctl.1
 - man/dtas-player.1
+- man/dtas-player_effects.7
 - man/dtas-player_protocol.7
 - man/dtas-player_sink_examples.7
 - man/dtas-sinkedit.1

data/Documentation/dtas-archive.txt

@@ -1,62 +0,0 @@
-% dtas-archive(1) dtas user manual
-%
-
-# NAME
-
-dtas-archive - paranoid audio file copy
-
-# SYNOPSYS
-
-dtas-archive [OPTIONS] SOURCE DESTINATION
-
-# DESCRIPTION
-
-dtas-archive is intended for archiving audio data to/from laptops,
-marginal USB ports, and computers without ECC memory, attempting
-to read data multiple times in an attempt to detect memory or
-bus corruption.  dtas-archive may only be effective on machines
-running the Linux kernel where posix_fadvise(2) can be used to
-drop caches for a particular file after fsync(2).
-
-dtas-archive spawns sox(1) to archive audio data (likely uncompressed
-WAVE) to FLAC and verifies the result using sndfile-cmp(1), a tool
-implemented by different than sox and less likely to share the same bugs
-(if any) as sox.
-
-# OPTIONS
-
--j, \--jobs [JOBS]
-:    Number of jobs to run in parallel.  Incrementing this may hurt
-     performance on slow storage devices.  Default: 1
-
--n, \--dry-run
-:    Print, but do not run the commands to be executed
-
--s, \--quiet, \--silent
-:    Silent operation, commands are not printed as executed
-
--S, \--stats
-:    Run and save the text output of the sox "stats" effect as
-     $DESTINATION_FILE_WITHOUT_SUFFIX.stats next to the output file
-
--k, \--keep-going
-:    Continue after error
-
--r, \--repeat [COUNT]
-:    Number of times to repeat the sndfile-cmp(1) check.  Default: 1
-
-# COPYRIGHT
-
-Copyright 2015-2016 all contributors <dtas-all@nongnu.org>.\
-License: GPL-3.0+ <http://www.gnu.org/licenses/gpl-3.0.txt>
-
-# CONTACT
-
-All feedback welcome via plain-text mail to: <dtas-all@nongnu.org>\
-Mailing list archives available at <http://80x24.org/dtas-all/> and
-<ftp://lists.gnu.org/dtas-all/>\
-No subscription is necessary to post to the mailing list.
-
-# SEE ALSO
-
-sndfile-cmp(1), sox(1)

data/Documentation/dtas-console.txt

@@ -1,73 +0,0 @@
-% dtas-console(1) dtas user manual
-
-# NAME
-
-dtas-console - rudimentary curses console client for dtas-player
-
-# SYNOPSIS
-
-dtas-console
-
-# DESCRIPTION
-
-dtas-console displays the elapsed decoder time of the track, which can be
-used as an approximation of the current playback time of a track.
-
-It cannot display an accurate playback time due to variable buffering
-in the sinks and pipes.
-
-See dtas-player_protocol(7) for a detailed description of the protocol.
-
-# KEYBOARD CONTROL
-
-Key bindings are inspired partially by mplayer(1)
-
-- 'j'/'k' - seek backward/forward 5 seconds
-- LEFT/RIGHT - seek backward/forward 10 seconds
-- UP/DOWN - seek forward/backward 1 minute
-- PGUP/PGDWN - seek forward/backward 10 minutes
-- SPACE - toggle play/pause state of the playback
-- 'p'/'P' - decrease/increase timer resolution
-- BACKSPACE - seek to the beginning of the track
-- 7/8 - decrease/increase ReplayGain preamp
-- 9/0 - decrease/increase software volume
-- '=' - set software volume to 1.0 (no adjustment)
-- 'm' - mute set software volume to 0.0 (mute)
-- 'f'/'F' - decrease/increase ReplayGain fallback_gain value
-- 'r'/'R' - cycle forward/backwards through ReplayGain modes
-- 'q'/Ctrl-C - exit dtas-console
-- 'o' - toggle display between HH:MM:SS and absolute seconds
-
-# ENVIRONMENT
-
-DTAS_PLAYER_SOCK - the path to the dtas-player control socket.
-This defaults to ~/.dtas/player.sock
-
-# CAVEATS
-
-Increasing timer resolution increases the number of CPU wakeups and
-power consumption.   This defeats the efforts of dtas-player
-configurations which use large buffers (especially in the sink) to
-reduce wakeups and power consumption.
-
-In rare cases (or poorly-configured systems), increased wakeups from
-dtas-console will also increase contention with the sound card,
-negatively affecting audio quality even if CPU utilization is not
-a problem.
-
-# CONTACT
-
-All feedback welcome via plain-text mail to: <dtas-all@nongnu.org>\
-Mailing list archives available at <http://80x24.org/dtas-all/> and
-<ftp://lists.gnu.org/dtas-all/>\
-No subscription is necessary to post to the mailing list.
-
-# COPYRIGHT
-
-Copyright 2013-2016 all contributors <dtas-all@nongnu.org>.\
-License: GPL-3.0+ <http://www.gnu.org/licenses/gpl-3.0.txt>
-
-# SEE ALSO
-
-dtas-player(1), dtas-player_protocol(7), dtas-ctl(1), dtas-sinkedit(1),
-dtas-sourceedit(1)

data/Documentation/dtas-cueedit.txt

@@ -1,36 +0,0 @@
-% dtas-cueedit(1) dtas user manual
-%
-
-# NAME
-
-dtas-cueedit - edit embedded cuesheets in audio files
-
-# SYNOPSYS
-
-dtas-cueedit /path/to/audio.flac
-
-# DESCRIPTION
-
-dtas-cueedit spawns an editor to edit the embedded cuesheet in FLAC files.
-In the future, other audio formats with embedded cuesheets may be supported.
-Use with the metaflac(1) is required.
-
-# ENVIRONMENT
-
-VISUAL / EDITOR - your favorite *nix text editor, defaults to 'vi' if unset.
-
-# CONTACT
-
-All feedback welcome via plain-text mail to: <dtas-all@nongnu.org>\
-Mailing list archives available at <http://80x24.org/dtas-all/> and
-<ftp://lists.gnu.org/dtas-all/>\
-No subscription is necessary to post to the mailing list.
-
-# COPYRIGHT
-
-Copyright 2013-2016 all contributors <dtas-all@nongnu.org>.\
-License: GPL-3.0+ <http://www.gnu.org/licenses/gpl-3.0.txt>
-
-# SEE ALSO
-
-metaflac(1)