dtas 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d233bbb0a87d1fc6c4bdb7f18eba692c721a3333
-  data.tar.gz: 8f14c5645b6535bd6c22b1e4854ef39ec85d528a
+  metadata.gz: a4ce17f3d71d013e20442d569236e8ea2b56a091
+  data.tar.gz: f8177dd1cae23bbf4f679b8cfca1062f8583f5e2
 SHA512:
-  metadata.gz: 93592a5294b214260e938746ad75408a32889aae8c3667a49ede5952364dd6a9f3d99b793a77c134a9bd66ec15a21eda0f078475d2d375543ebf153714170c68
-  data.tar.gz: 8fc83ba70d8a7a57f2e4ca26c936bd237b0fd9f4130142f8c500d7eeb4a0f7b15542bf305b79e891c7a2acd7f5edb3750281776ad7d730edc95fcdd3078c5b1b
+  metadata.gz: 7d57e1c9be990a92163771a89075cf0432cbe6f4441f4c79ba7efe09288a41fb76b055faf37339ab6de2247a89ad9b36a0e45da5deff39f14b376e417d5e11ca
+  data.tar.gz: 5c3ae2d8e5d06f46afe06472b27c9de90c095e7651d69379d45b71589adb3e6d2fffdd24442b095f1e48b0335206ff98a52ff79edcd6845b92bef97fdee364d9

data/.gitignore

@@ -1,5 +1,6 @@
 # Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+/GIT-VERSION-FILE
 /Manifest.txt
 /NEWS
 /pkg
@@ -10,3 +11,6 @@
 /man
 *.gem
 *.gz
+.manifest
+.gem-manifest
+.tgz-manifest

data/Documentation/dtas-console.txt

@@ -32,7 +32,7 @@ Key bindings are inspired partially by mplayer(1)
 - 9/0 - decrease/increase ReplayGain preamp
 - 'f'/'F' - decrease/increase ReplayGain fallback_gain value
 - 'r'/'R' - cycle forward/backwards through ReplayGain modes
-- Ctrl-C - exit dtas-console
+- 'q'/Ctrl-C - exit dtas-console
 
 # ENVIRONMENT
 

data/Documentation/dtas-player_protocol.txt

@@ -80,6 +80,23 @@ Commands here should be alphabetized according to `LC_ALL=C sort'
 * clear - clear current queue (current track/command continues running)
   PENDING: this may be renamed to "queue clear" or "queue-clear"
 
+* cue - display the index/offsets of the file based on the embedded
+  cue sheet, if any
+
+* cue next - skip to the next section of the track based on the
+  embedded cue sheet.  This may skip to the next track if there is
+  no embedded cue sheet or if playing the last (embedded) track
+
+* cue prev - skip to the previous section of the track based on
+  the embedded cue sheet.  This may just seek to the beginning
+  if there is no embedded cue sheet or if we are playing the first
+  (embedded) track.
+
+* cue goto INTEGER - go to the embedded track with cue index denoted
+  by INTEGER (0 is first track as returned by "cue").  Negative
+  values of INTEGER allows selecting track relative to the last
+  track (-1 is the last track, -2 is the penultimate, and so on).
+
 * current - output information about the currently-playing track/command
   in YAML.  The structure of this is unstable and subject to change.
 
@@ -111,20 +128,30 @@ Commands here should be alphabetized according to `LC_ALL=C sort'
   Changing this will affect the $SOXFMT and $ECAFMT environments passed
   to source and sink commands.  Changing this implies a "restart"
   Changing rate to 48000 is probably useful if you plan on playing to some
-  laptop sound cards.
+  laptop sound cards.  In all cases where "bypass" is supported, it
+  removes the guarantee of gapless playback as the audio device(s)
+  will likely need to be restarted.
+
 
-    + channels=UNSIGNED - (default: 2 (stereo)) - number of channels
-      to use internally.  sox will internally invoke the remix effect
-      when decoding.
+    + channels=(UNSIGNED|bypass) - (default: 2 (stereo)) - number of
+      channels to use internally.  sox will internally invoke the remix
+      effect when decoding.  This supports the value "bypass" (without
+      quotes) to avoid the automatic remix effect.  Using "bypass" mode
+      removes the guarantee of gapless playback, as the audio device will
+      likely need to be restarted, introducing an audible gap.
     + endian=(big|little|swap) - (default: native) - there is probably no
       point in changing this unless you output over a network sink to
       a machine of different endianess.
-    + bits=UNSIGNED - (default: implied from type) - sample precision (decoded)
+    + bits=(UNSIGNED|bypass) - (default: implied from type) - sample precision
+      (decoded)
       This may be pointless and removed in the future, since the sample
-      precision is implied from type.
-    + rate=UNSIGNED - (default: 44100) - sample rate of audio
+      precision is implied from type.  This supports the value of "bypass"
+      to avoid dither/truncation in later stages.
+    + rate=(UNSIGNED|bypass) - (default: 44100) - sample rate of audio
       Typical values of rate are 44100, 48000, 88200, 96000.  Not all
       DSP effects are compatible with all sampling rates/channels.
+      This supports the value of "bypass" as well to avoid introducing
+      software resamplers into the playback chain.
     + type=(s16|s24|s32|u16|u24|u32|f32|f64) - (default: s32)
       change the raw PCM format.  s32 currently offers the best performance
       when only sox/play are used.  f32 may offer better performance if

data/Documentation/dtas-tl.txt

@@ -31,7 +31,7 @@ HH:MM:SS.FRAC format.
 * reto REGEXP [POS] - play first track with path matching REGEXP immediately,
 optionally seek to POS.  POS should be a timestamp in HH:MM:SS.FRAC format.
 * next - play the next track in the tracklist
-* previous - play the previous track in the tracklist
+* prev - play the previous track in the tracklist
 * repeat 1 - repeat the current track
 * repeat false - disable repeat
 * repeat true - enable repeat of the whole tracklist
@@ -54,7 +54,7 @@ to skip forward in the tracklist
 
 to skip backwards in the tracklist
 
-        $ dtas-tl previous
+        $ dtas-tl prev
 
 # ENVIRONMENT
 

data/GIT-VERSION-GEN

@@ -3,7 +3,8 @@
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 CONSTANT = "DTAS::VERSION"
 RVF = "lib/dtas/version.rb"
-DEF_VER = "v0.4.0"
+GVF = "GIT-VERSION-FILE"
+DEF_VER = "v0.5.0"
 vn = DEF_VER
 
 # First see if there is a version file (included in release tarballs),
@@ -28,4 +29,13 @@ if new_ruby_version != cur_ruby_version
   File.open(RVF, "w") { |fp| fp.write(new_ruby_version) }
 end
 File.chmod(0644, RVF)
+
+# generate the makefile snippet
+new_make_version = "VERSION = #{vn}\n"
+cur_make_version = File.read(GVF) rescue nil
+if new_make_version != cur_make_version
+  File.open(GVF, "w") { |fp| fp.write(new_make_version) }
+end
+File.chmod(0644, GVF)
+
 puts vn if $0 == __FILE__

data/GNUmakefile

@@ -1,7 +1,7 @@
 # Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 all::
-
+pkg = dtas
 RUBY = ruby
 GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
 	@./GIT-VERSION-GEN
@@ -10,10 +10,9 @@ lib := lib
 
 all:: test
 test_units := $(wildcard test/test_*.rb)
-test: test-unit
-test-unit: $(test_units)
+test: $(test_units)
 $(test_units):
-	$(RUBY) -w -I $(lib) $@ $(RUBY_TEST_OPTS)
+	$(RUBY) -w -I $(lib) $@ -v
 
 check-warnings:
 	@(for i in $$(git ls-files '*.rb'| grep -v '^setup\.rb$$'); \
@@ -26,5 +25,54 @@ coverage:
 	$(MAKE) check
 	$(RUBY) ./test/covshow.rb
 
-.PHONY: all .FORCE-GIT-VERSION-FILE test $(test_units)
-.PHONY: check-warnings
+pkggem := pkg/$(pkg)-$(VERSION).gem
+pkgtgz := pkg/$(pkg)-$(VERSION).tar.gz
+
+fix-perms:
+	git ls-tree -r HEAD | awk '/^100644 / {print $$NF}' | xargs chmod 644
+	git ls-tree -r HEAD | awk '/^100755 / {print $$NF}' | xargs chmod 755
+
+gem: $(pkggem)
+
+install-gem: $(pkggem)
+	gem install $(CURDIR)/$<
+
+$(pkggem): .gem-manifest
+	VERSION=$(VERSION) gem build $(pkg).gemspec
+	mkdir -p pkg
+	mv $(@F) $@
+
+pkg_extra := GIT-VERSION-FILE lib/dtas/version.rb NEWS
+NEWS:
+	rake -s $@
+gem-man:
+	$(MAKE) -C Documentation/ gem-man
+tgz-man:
+	$(MAKE) -C Documentation/ install-man mandir=$(CURDIR)/man
+.PHONY: tgz-man gem-man
+
+.gem-manifest: .manifest gem-man
+	(ls man/*.?; cat .manifest) | LC_ALL=C sort > $@+
+	cmp $@+ $@ || mv $@+ $@; rm -f $@+
+.tgz-manifest: .manifest tgz-man
+	(ls man/*/*; cat .manifest) | LC_ALL=C sort > $@+
+	cmp $@+ $@ || mv $@+ $@; rm -f $@+
+.manifest: NEWS fix-perms
+	rm -rf man
+	(git ls-files; \
+	 for i in $(pkg_extra); do echo $$i; done) | \
+	 LC_ALL=C sort > $@+
+	cmp $@+ $@ || mv $@+ $@; rm -f $@+
+$(pkgtgz): distdir = pkg/$(pkg)-$(VERSION)
+$(pkgtgz): .tgz-manifest
+	@test -n "$(distdir)"
+	$(RM) -r $(distdir)
+	mkdir -p $(distdir)
+	tar cf - $$(cat .tgz-manifest) | (cd $(distdir) && tar xf -)
+	cd pkg && tar cf - $(pkg)-$(VERSION) | gzip -9 > $(@F)+
+	mv $@+ $@
+
+package: $(pkgtgz) $(pkggem)
+
+.PHONY: all .FORCE-GIT-VERSION-FILE test $(test_units) NEWS
+.PHONY: check-warnings fix-perms

data/INSTALL

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

data/Rakefile

@@ -1,71 +1,39 @@
 # Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
-load "./GIT-VERSION-GEN"
-manifest = "Manifest.txt"
-gitidx = File.stat(".git/index") rescue nil
-if ! File.exist?(manifest) || File.stat(manifest).mtime < gitidx.mtime
-  system("git ls-files > #{manifest}")
-  File.open(manifest, "a") do |fp|
-    fp.puts "NEWS"
-    fp.puts "lib/dtas/version.rb"
-
-    if system("make -C Documentation")
-      require 'fileutils'
-      FileUtils.rm_rf 'man'
-      if system("make -C Documentation gem-man")
-        `git ls-files -o man`.split(/\n/).each do |man|
-          fp.puts man
-        end
-      else
-        warn "failed to install manpages for distribution"
-      end
-    else
-      warn "failed to build manpages for distribution"
-    end
-  end
-  File.open("NEWS", "w") do |fp|
-    `git tag -l`.split(/\n/).reverse.each do |tag|
-      %r{\Av(.+)} =~ tag or next
-      version = $1
-      header, subject, body = `git cat-file tag #{tag}`.split(/\n\n/, 3)
-      header = header.split(/\n/)
-      tagger = header.grep(/\Atagger /)[0]
-      time = Time.at(tagger.split(/ /)[-2].to_i).utc
-      date = time.strftime("%Y-%m-%d")
-
-      fp.write("# #{version} / #{date}\n\n#{subject}\n\n#{body}")
-    end
-    fp.flush
-    if fp.size <= 5
-      fp.puts "Unreleased"
+require 'tempfile'
+include Rake::DSL
+task "NEWS" do
+  latest = nil
+  fp = Tempfile.new("NEWS", ".")
+  fp.sync = true
+  `git tag -l`.split(/\n/).reverse.each do |tag|
+    %r{\Av(.+)} =~ tag or next
+    version = $1
+    header, subject, body = `git cat-file tag #{tag}`.split(/\n\n/, 3)
+    header = header.split(/\n/)
+    tagger = header.grep(/\Atagger /)[0]
+    time = Time.at(tagger.split(/ /)[-2].to_i).utc
+    latest ||= time
+    date = time.strftime("%Y-%m-%d")
+    fp.puts "# #{version} / #{date}\n\n#{subject}"
+    if body && body.strip.size > 0
+      fp.puts "\n\n#{body}"
     end
-
-    fp.write("\n# COPYRIGHT\n")
-    bdfl = 'Eric Wong <normalperson@yhbt.net>'
-    fp.puts "Copyright (C) 2013, #{bdfl} and all contributors"
-    fp.puts "License: GPLv3 or later (http://www.gnu.org/licenses/gpl-3.0.txt)"
+    fp.puts
   end
+  fp.puts "Unreleased" unless fp.size > 0
+  fp.puts "# COPYRIGHT"
+  bdfl = 'Eric Wong <normalperson@yhbt.net>'
+  fp.puts "Copyright (C) 2013, #{bdfl} and all contributors"
+  fp.puts "License: GPLv3 or later (http://www.gnu.org/licenses/gpl-3.0.txt)"
+  fp.rewind
+  assert_equal fp.read, File.read("NEWS") rescue nil
+  fp.chmod 0644
+  File.rename(fp.path, "NEWS")
+  fp.close!
 end
 
-require 'hoe'
-Hoe.plugin :git
-include Rake::DSL
-
-h = Hoe.spec('dtas') do |p|
-  developer 'Eric Wong', 'e@80x24.org'
-
-  self.readme_file = 'README'
-  self.history_file = 'NEWS'
-  self.urls = %w(http://dtas.80x24.org/)
-  self.summary = x = File.readlines("README")[0].split(/\s+/)[1].chomp
-  self.description = self.paragraphs_of("README", 1)
-  # no public APIs, no HTML, either
-  self.need_rdoc = false
-  self.extra_rdoc_files = []
-  license "GPLv3+"
-end
-
-task :rsync_docs do
+task rsync_docs: "NEWS" do
   dest = ENV["RSYNC_DEST"] || "80x24.org:/srv/dtas/"
   top = %w(INSTALL NEWS README COPYING)
   files = []
@@ -73,9 +41,9 @@ task :rsync_docs do
   # git-set-file-times is distributed with rsync,
   # Also available at: http://yhbt.net/git-set-file-times
   # on Debian systems: /usr/share/doc/rsync/scripts/git-set-file-times.gz
-  sh("git", "set-file-times", "Documentation")
+  sh("git", "set-file-times", "Documentation", "examples", *top)
 
-  Dir['Documentation/*.txt'].to_a.concat(top).each do |txt|
+  `git ls-files Documentation/*.txt`.split(/\n/).concat(top).each do |txt|
     gz = "#{txt}.gz"
     tmp = "#{gz}.#$$"
     sh("gzip -9 < #{txt} > #{tmp}")
@@ -86,41 +54,7 @@ task :rsync_docs do
     files << gz
   end
   sh("rsync --chmod=Fugo=r -av #{files.join(' ')} #{dest}")
-end
-
-task :coverage do
-  env = {
-    "COVERAGE" => "1",
-    "RUBYOPT" => "-r./test/helper",
-  }
-  File.open("coverage.dump", "w").close # clear
-  pid = Process.spawn(env, "rake")
-  _, status = Process.waitpid2(pid)
-  require './test/covshow'
-  exit status.exitstatus
-end
-
-base = "dtas-#{h.version}"
-task tarball: "pkg/#{base}" do
-  Dir.chdir("pkg") do
-    tgz = "#{base}.tar.gz"
-    tmp = "#{tgz}.#$$"
-    sh "tar cf - #{base} | gzip -9 > #{tmp}"
-    File.rename(tmp, tgz)
-  end
-end
 
-task "pkg/#{base}" => :fix_perms
-
-task :fix_perms do
-  sh "git ls-tree -r HEAD | awk '/^100644 / {print $NF}' | xargs chmod 644"
-  sh "git ls-tree -r HEAD | awk '/^100755 / {print $NF}' | xargs chmod 755"
-end
-
-task dist: [ :tarball, :package ] do
-  Dir.chdir("pkg") do
-    %w(dtas-linux dtas-mpris).each do |gem|
-      sh "gem build ../#{gem}.gemspec"
-    end
-  end
+  examples = `git ls-files examples`.split("\n")
+  sh("rsync --chmod=Fugo=r -av #{examples.join(' ')} #{dest}/examples/")
 end

data/bin/dtas-console

@@ -172,6 +172,7 @@ begin
         case key = Curses.getch
         when "j" then c.req_ok("seek -5")
         when "k" then c.req_ok("seek +5")
+        when "q" then exit(0)
         when Curses::KEY_DOWN then c.req_ok("seek -60")
         when Curses::KEY_UP then c.req_ok("seek +60")
         when Curses::KEY_LEFT then c.req_ok("seek -10")

data/bin/dtas-sinkedit

@@ -18,8 +18,7 @@ orig = YAML.load(buf)
 tmp.write(buf << DTAS_DISCLAIMER)
 cmd = "#{editor} #{tmp.path}"
 system(cmd) or abort "#{cmd} failed: #$?"
-tmp.rewind
-sink = YAML.load(tmp.read)
+sink = YAML.load(File.read(tmp.path))
 
 cmd = %W(sink ed #{name})
 update_cmd_env(cmd, orig, sink)

data/bin/dtas-sourceedit

@@ -22,16 +22,16 @@ abort(buf) if buf =~ /\AERR/
 orig = YAML.load(buf)
 
 if st_in.file? || st_in.pipe?
-  tmp = $stdin
+  buf = $stdin.read
 else
   tmp = tmpyaml
   tmp.write(buf << DTAS_DISCLAIMER)
   cmd = "#{editor} #{tmp.path}"
   system(cmd) or abort "#{cmd} failed: #$?"
-  tmp.rewind
+  buf = File.read(tmp.path)
 end
 
-source = YAML.load(tmp.read)
+source = YAML.load(buf)
 cmd = %W(source ed #{name})
 update_cmd_env(cmd, orig, source)
 

data/dtas.gemspec

@@ -0,0 +1,15 @@
+# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> 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/)
+  s.name = %q{dtas}
+  s.version = ENV["VERSION"]
+  s.authors = ["dtas hackers"]
+  s.summary = "duct tape audio suite for *nix"
+  s.description = File.read("README").split(/\n\n/)[1].strip
+  s.email = %q{e@80x24.org}
+  s.executables = manifest.grep(%r{\Abin/}).map { |s| s.sub(%r{\Abin/}, "") }
+  s.files = manifest
+  s.homepage = 'http://dtas.80x24.org/'
+  s.licenses = "GPLv3+"
+end

data/lib/dtas/cue_index.rb

@@ -0,0 +1,39 @@
+# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+require_relative '../dtas'
+class DTAS::CueIndex
+  attr_reader :offset
+  attr_reader :index
+
+  def initialize(index, offset)
+    @index = index.to_i
+
+    # must be compatible with the sox "trim" effect
+    @offset = offset # "#{INTEGER}s" (samples) or HH:MM:SS:FRAC
+  end
+
+  def to_hash
+    { "index" => @index, "offset" => @offset }
+  end
+
+  def offset_samples(format)
+    case @offset
+    when /\A(\d+)s\z/
+      $1.to_i
+    else
+      format.hhmmss_to_samples(@offset)
+    end
+  end
+
+  def pregap?
+    @index == 0
+  end
+
+  def track?
+    @index == 1
+  end
+
+  def subindex?
+    @index > 1
+  end
+end

data/lib/dtas/format.rb

@@ -81,6 +81,14 @@ class DTAS::Format # :nodoc:
     ivars_to_hash(SIVS)
   end
 
+  def ==(other)
+    a = to_hash
+    b = other.to_hash
+    a["bits"] ||= bits_per_sample
+    b["bits"] ||= other.bits_per_sample
+    a == b
+  end
+
   # for the _decoded_ output
   def bits_per_sample
     return @bits if @bits

data/lib/dtas/player.rb

@@ -33,6 +33,7 @@ class DTAS::Player # :nodoc:
     @queue = [] # files for sources, or commands
     @paused = false
     @format = DTAS::Format.new
+    @bypass = [] # %w(rate bits channels) (not worth Hash overhead)
 
     @sinks = {} # { user-defined name => sink }
     @targets = [] # order matters
@@ -55,7 +56,10 @@ class DTAS::Player # :nodoc:
   end
 
   def wall(msg)
-    msg = xs(Array(msg))
+    __wall(xs(Array(msg)))
+  end
+
+  def __wall(msg)
     @watchers.delete_if do |io, _|
       if io.closed?
         true
@@ -84,6 +88,7 @@ class DTAS::Player # :nodoc:
 
     # Arrays
     rv["queue"] = @queue
+    rv["bypass"] = @bypass.sort!
 
     %w(rg sink_buf format).each do |k|
       rv[k] = instance_variable_get("@#{k}").to_hsh
@@ -123,7 +128,7 @@ class DTAS::Player # :nodoc:
         v = v["buffer_size"]
         @sink_buf.buffer_size = v
       end
-      %w(socket queue paused).each do |k|
+      %w(socket queue paused bypass).each do |k|
         v = hash[k] or next
         instance_variable_set("@#{k}", v)
       end
@@ -201,6 +206,8 @@ class DTAS::Player # :nodoc:
       io.emit("OK")
     when "rg"
       rg_handler(io, msg)
+    when "cue"
+      cue_handler(io, msg)
     when "skip"
       skip_handler(io, msg)
     when "sink"
@@ -366,31 +373,46 @@ class DTAS::Player # :nodoc:
   def next_source(source_spec)
     @current = nil
     if source_spec
-      # restart sinks iff we were idle
-      spawn_sinks(source_spec) or return
-
       case source_spec
       when String
         pending = try_file(source_spec) or return
-        wall(%W(file #{pending.infile}))
+        msg = %W(file #{pending.infile})
       when Array
         pending = try_file(*source_spec) or return
-        wall(%W(file #{pending.infile} #{pending.offset_samples}s))
+        msg = %W(file #{pending.infile} #{pending.offset_samples}s)
       else
         pending = DTAS::Source::Cmd.new(source_spec["command"])
-        wall(%W(command #{pending.command_string}))
+        msg = %W(command #{pending.command_string})
+      end
+
+      unless @bypass.empty?
+        new_fmt = bypass_match!(@format.dup, pending.format)
+        if new_fmt != @format
+          stop_sinks # we may fail to start below
+          format_update!(new_fmt)
+        end
       end
 
+      # restart sinks iff we were idle
+      spawn_sinks(source_spec) or return
+
       dst = @sink_buf
       pending.dst_assoc(dst)
       pending.spawn(@format, @rg, out: dst.wr, in: "/dev/null")
       @current = pending
       @srv.wait_ctl(dst, :wait_readable)
+      wall(msg)
     else
       player_idle
     end
   end
 
+  def format_update!(fmt)
+    ary = fmt.to_hash.inject(%w(format)) { |m,(k,v)| v ? m << "#{k}=#{v}" : m }
+    @format = fmt
+    __wall(ary.join(' ')) # do not escape '='
+  end
+
   def player_idle
     stop_sinks if @sink_buf.inflight == 0
     @tl.reset unless @paused
@@ -457,4 +479,11 @@ class DTAS::Player # :nodoc:
     @sink_buf.close!
     @state_file.dump(self, true) if @state_file
   end
+
+  def bypass_match!(dst_fmt, src_fmt)
+    @bypass.each do |k|
+      dst_fmt.__send__("#{k}=", src_fmt.__send__(k))
+    end
+    dst_fmt
+  end
 end

data/lib/dtas/player/client_handler.rb

@@ -295,6 +295,7 @@ module DTAS::Player::ClientHandler # :nodoc:
     end
     tmp["current_inflight"] = @sink_buf.inflight
     tmp["format"] = @format.to_hash.delete_if { |_,v| v.nil? }
+    tmp["bypass"] = @bypass.sort!
     tmp["paused"] = @paused
     rg = @rg.to_hsh
     tmp["rg"] = rg unless rg.empty?
@@ -350,6 +351,16 @@ module DTAS::Player::ClientHandler # :nodoc:
     @paused ? do_play : do_pause
   end
 
+  def seek_internal(cur, offset)
+    if cur.requeued
+      @queue[0][1] = offset
+    else
+      @queue.unshift([ cur.infile, offset ])
+      cur.requeued = true
+      __buf_reset(cur.dst) # trigger EPIPE
+    end
+  end
+
   def do_seek(io, offset)
     if @current
       if @current.respond_to?(:infile)
@@ -363,13 +374,7 @@ module DTAS::Player::ClientHandler # :nodoc:
         rescue ArgumentError
           return io.emit("ERR bad time format")
         end
-        if @current.requeued
-          @queue[0][1] = offset
-        else
-          @queue.unshift([ @current.infile, offset ])
-          @current.requeued = true
-          __buf_reset(@current.dst) # trigger EPIPE
-        end
+        seek_internal(@current, offset)
       else
         return io.emit("ERR unseekable")
       end
@@ -402,20 +407,28 @@ module DTAS::Player::ClientHandler # :nodoc:
         new_fmt.valid_type?(v) or return io.emit("ERR invalid file type")
         new_fmt.type = v
       when "channels", "bits", "rate"
-        rv = set_uint(io, kv, v, false) { |u| new_fmt.__send__("#{k}=", u) }
-        rv == true or return rv
+        case v
+        when "bypass"
+          @bypass << k unless @bypass.include?(k)
+        else
+          rv = set_uint(io, kv, v, false) { |u| new_fmt.__send__("#{k}=", u) }
+          rv == true or return rv
+          @bypass.delete(k)
+        end
       when "endian"
         new_fmt.valid_endian?(v) or return io.emit("ERR invalid endian")
         new_fmt.endian = v
       end
     end
 
+    bypass_match!(new_fmt, @current.format) if @current
+
     if new_fmt != @format
       restart_pipeline # calls __current_requeue
 
       # we must assign this after __current_requeue since __current_requeue
       # relies on the old @format for calculation
-      @format = new_fmt
+      format_update!(new_fmt)
     end
     io.emit("OK")
   end
@@ -576,6 +589,9 @@ module DTAS::Player::ClientHandler # :nodoc:
       offset = msg.shift # may be nil
       if @tl.go_to(track_id.to_i, offset)
         _tl_skip
+        if !(@current || @queue[0] || @paused)
+          next_source(_next)
+        end
         io.emit("OK")
       else
         io.emit("MISSING")
@@ -589,11 +605,71 @@ module DTAS::Player::ClientHandler # :nodoc:
     when "next"
       _tl_skip
       io.emit("OK")
-    when "previous"
+    when "prev"
       @tl.previous!
       _tl_skip
       io.emit("OK")
     end
   end
+
+  def __bp_prev_next(io, msg, cur, bp)
+    case type = msg[1]
+    when nil, "track"
+      bp.keep_if { |ci| ci.track? }
+    when "pregap"
+      bp.keep_if { |ci| ci.pregap? }
+    when "subindex" # any subindex
+      bp.keep_if { |ci| ci.subindex? }
+    when /\A\d+\z/ # exact subindex match
+      si = type.to_i
+      bp.keep_if { |ci| ci.index == si }
+    when "any" # anything goes
+    else
+      return io.emit("INVALID TYPE")
+    end
+    fmt = cur.format
+    case msg[0]
+    when "next"
+      ds = __current_decoded_samples
+      bp.each do |ci|
+        next if ci.offset_samples(fmt) < ds
+        seek_internal(cur, ci.offset)
+        return io.emit("OK")
+      end
+      # go to the next (real) track if not found
+      __current_drop
+    when "prev"
+      os = cur.offset_samples # where we currently started
+      bp.reverse_each do |ci|
+        next if ci.offset_samples(fmt) >= os
+        seek_internal(cur, ci.offset)
+        return io.emit("OK")
+      end
+      # offset may be nil/zero if we couldn't find a previous breakpoint
+      seek_internal(cur, '0')
+    end
+    io.emit("OK")
+  end
+
+  def cue_handler(io, msg)
+    cur = @current
+    if cur.respond_to?(:cuebreakpoints)
+      bp = cur.cuebreakpoints
+      case msg[0]
+      when nil
+        tmp = { "infile" => cur.infile, "cue" => bp.map { |ci| ci.to_hash } }
+        io.emit(tmp.to_yaml)
+      when "next", "prev"
+        return __bp_prev_next(io, msg, cur, bp)
+      when "goto"
+        index = msg[1] or return io.emit("NOINDEX")
+        ci = bp[index.to_i] or return io.emit("BADINDEX")
+        seek_internal(cur, ci.offset)
+        return io.emit("OK")
+      end
+    else
+      io.emit("NOCUE")
+    end
+  end
 end
 # :startdoc:

data/lib/dtas/source/file.rb

@@ -5,6 +5,7 @@ require_relative '../source'
 require_relative '../command'
 require_relative '../format'
 require_relative '../process'
+require_relative '../cue_index'
 
 module DTAS::Source::File # :nodoc:
   attr_reader :infile
@@ -33,6 +34,7 @@ module DTAS::Source::File # :nodoc:
     @offset = offset
     @comments = nil
     @samples = nil
+    @cuebp = nil
     @rg = nil
   end
 
@@ -90,4 +92,31 @@ module DTAS::Source::File # :nodoc:
     defaults = source_defaults # see dtas/source/{av,sox}.rb
     to_source_cat.delete_if { |k,v| v == defaults[k] }
   end
+
+  def cuebreakpoints
+    rv = @cuebp and return rv
+    rv = []
+    begin
+      str = qx(@env, %W(metaflac --export-cuesheet-to=- #@infile))
+    rescue
+      return rv
+    end
+    str.scan(/^    INDEX (\d+) (\S+)/) do |m|
+      index = m[0]
+      time = m[1].dup
+      case time
+      when /\A\d+\z/
+        time << "s" # sample count (flac 1.3.0)
+      else # HH:MM:SS:FF
+        # FF/75 CDDA frames per second, convert to fractional seconds
+        time.sub!(/:(\d+)\z/, "")
+        frames = $1.to_f
+        if frames > 0
+          time = sprintf("#{time}.%0.6g", frames / 75.0)
+        end
+      end
+      rv << DTAS::CueIndex.new(index, time)
+    end
+    @cuebp = rv
+  end
 end

data/test/test_format.rb

@@ -12,6 +12,11 @@ class TestFormat < Testcase
     assert_equal({}, hash)
   end
 
+  def test_equal
+    fmt = DTAS::Format.new
+    assert_equal fmt, fmt.dup
+  end
+
   def test_nonstandard
     fmt = DTAS::Format.new
     fmt.type = "s16"

data/test/test_source_sox.rb

@@ -111,4 +111,47 @@ class TestSource < Testcase
       tmp.unlink
     end
   end
+
+  def test_flac_cuesheet_cdda
+    return if `which metaflac`.strip.size == 0
+    tmp = Tempfile.new(%W(tmp .flac))
+    x(%W(sox -n -r44100 -b16 -c2 #{tmp.path} synth 5 pluck vol -1dB))
+    cue = Tempfile.new(%W(tmp .cue))
+    cue.puts %Q(FILE "ignored.flac" FLAC)
+    cue.puts "  TRACK 01 AUDIO"
+    cue.puts "    INDEX 01 00:00:00"
+    cue.puts "  TRACK 02 AUDIO"
+    cue.puts "    INDEX 01 00:01:40"
+    cue.puts "  TRACK 03 AUDIO"
+    cue.puts "    INDEX 01 00:03:00"
+    cue.flush
+    x(%W(metaflac --import-cuesheet-from=#{cue.path} #{tmp.path}))
+    source = DTAS::Source::Sox.new.try(tmp.path)
+    offsets = source.cuebreakpoints.map(&:offset)
+    assert_equal %w(00:00 00:01.0.533333 00:03), offsets
+    source.cuebreakpoints.all?(&:track?)
+  end
+
+  def test_flac_cuesheet_48
+    return if `which metaflac`.strip.size == 0
+    ver = `flac --version`.split(/ /)[1].strip
+    ver.to_f >= 1.3 or return # flac 1.3.0 fixed non-44.1k rate support
+
+    tmp = Tempfile.new(%W(tmp .flac))
+    x(%W(sox -n -r48000 -c2 -b24 #{tmp.path} synth 5 pluck vol -1dB))
+    cue = Tempfile.new(%W(tmp .cue))
+    cue.puts %Q(FILE "ignored.flac" FLAC)
+    cue.puts "  TRACK 01 AUDIO"
+    cue.puts "    INDEX 01 00:00:00"
+    cue.puts "  TRACK 02 AUDIO"
+    cue.puts "    INDEX 01 00:01:00"
+    cue.puts "  TRACK 03 AUDIO"
+    cue.puts "    INDEX 01 00:03:00"
+    cue.flush
+    x(%W(metaflac --import-cuesheet-from=#{cue.path} #{tmp.path}))
+    source = DTAS::Source::Sox.new.try(tmp.path)
+    offsets = source.cuebreakpoints.map(&:offset)
+    assert_equal %w(0s 48000s 144000s), offsets
+    source.cuebreakpoints.all?(&:track?)
+  end
 end

metadata

@@ -1,50 +1,23 @@
 --- !ruby/object:Gem::Specification
 name: dtas
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
-- Eric Wong
+- dtas hackers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-22 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: hoe
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.6'
-description: '["Free Software command-line tools for audio playback, mastering, and\nwhatever
-  else related to audio.  dtas follows the worse-is-better\nphilosophy and acts as
-  duct tape to combine existing command-line tools\nfor flexibility and ease-of-development.  dtas
-  is currently implemented\nin Ruby (and some embedded shell), but may use other languages
-  in the\nfuture."]'
-email:
-- e@80x24.org
+date: 2013-09-30 00:00:00.000000000 Z
+dependencies: []
+description: |-
+  Free Software command-line tools for audio playback, mastering, and
+  whatever else related to audio.  dtas follows the worse-is-better
+  philosophy and acts as duct tape to combine existing command-line tools
+  for flexibility and ease-of-development.  dtas is currently implemented
+  in Ruby (and some embedded shell), but may use other languages in the
+  future.
+email: e@80x24.org
 executables:
 - dtas-console
 - dtas-ctl
@@ -58,21 +31,7 @@ executables:
 - dtas-tl
 - dtas-xdelay
 extensions: []
-extra_rdoc_files:
-- Documentation/dtas-console.txt
-- Documentation/dtas-ctl.txt
-- Documentation/dtas-cueedit.txt
-- Documentation/dtas-enq.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
+extra_rdoc_files: []
 files:
 - .gitignore
 - COPYING
@@ -92,10 +51,12 @@ files:
 - Documentation/dtas-splitfx.txt
 - Documentation/dtas-tl.txt
 - Documentation/dtas-xdelay.txt
+- GIT-VERSION-FILE
 - GIT-VERSION-GEN
 - GNUmakefile
 - HACKING
 - INSTALL
+- NEWS
 - README
 - Rakefile
 - TODO
@@ -112,6 +73,7 @@ files:
 - bin/dtas-xdelay
 - dtas-linux.gemspec
 - dtas-mpris.gemspec
+- dtas.gemspec
 - examples/README
 - examples/splitfx.sample.yml
 - lib/dtas.rb
@@ -120,6 +82,7 @@ files:
 - lib/dtas/buffer/splice.rb
 - lib/dtas/command.rb
 - lib/dtas/compat_onenine.rb
+- lib/dtas/cue_index.rb
 - lib/dtas/disclaimer.rb
 - lib/dtas/edit_client.rb
 - lib/dtas/format.rb
@@ -150,8 +113,21 @@ files:
 - lib/dtas/unix_client.rb
 - lib/dtas/unix_server.rb
 - lib/dtas/util.rb
+- lib/dtas/version.rb
 - lib/dtas/writable_iter.rb
 - lib/dtas/xs.rb
+- man/dtas-console.1
+- man/dtas-ctl.1
+- man/dtas-enq.1
+- man/dtas-msinkctl.1
+- man/dtas-player.1
+- man/dtas-player_protocol.7
+- man/dtas-player_sink_examples.7
+- man/dtas-sinkedit.1
+- man/dtas-sourceedit.1
+- man/dtas-splitfx.1
+- man/dtas-tl.1
+- man/dtas-xdelay.1
 - perl/dtas-graph
 - setup.rb
 - test/covshow.rb
@@ -176,29 +152,12 @@ files:
 - test/test_tracklist.rb
 - test/test_unixserver.rb
 - test/test_util.rb
-- NEWS
-- lib/dtas/version.rb
-- man/dtas-console.1
-- man/dtas-ctl.1
-- man/dtas-enq.1
-- man/dtas-msinkctl.1
-- man/dtas-player.1
-- man/dtas-player_protocol.7
-- man/dtas-player_sink_examples.7
-- man/dtas-sinkedit.1
-- man/dtas-sourceedit.1
-- man/dtas-splitfx.1
-- man/dtas-tl.1
-- man/dtas-xdelay.1
-- .gemtest
 homepage: http://dtas.80x24.org/
 licenses:
 - GPLv3+
 metadata: {}
 post_install_message: 
-rdoc_options:
-- --main
-- README
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -212,28 +171,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: dtas
+rubyforge_project: 
 rubygems_version: 2.1.3
 signing_key: 
 specification_version: 4
-summary: dtas
-test_files:
-- test/test_util.rb
-- test/test_process.rb
-- test/test_sink_tee_integration.rb
-- test/test_unixserver.rb
-- test/test_tracklist.rb
-- test/test_splitfx.rb
-- test/test_source_av.rb
-- test/test_source_sox.rb
-- test/test_player.rb
-- test/test_format_change.rb
-- test/test_env.rb
-- test/test_rg_integration.rb
-- test/test_buffer.rb
-- test/test_sink_pipe_size.rb
-- test/test_format.rb
-- test/test_player_integration.rb
-- test/test_player_client_handler.rb
-- test/test_rg_state.rb
-- test/test_sink.rb
+summary: duct tape audio suite for *nix
+test_files: []