dtas 0.0.0 → 0.1.I

data/lib/dtas.rb

@@ -4,4 +4,4 @@
 module DTAS # :nodoc:
 end
 
-require 'dtas/compat_onenine'
+require_relative 'dtas/compat_onenine'

data/lib/dtas/command.rb

@@ -28,11 +28,6 @@ module DTAS::Command # :nodoc:
     end
   end
 
-  def kill(sig = :TERM)
-    # always kill the pgroup since we run subcommands in their own shell
-    Process.kill(sig, -@pid)
-  end
-
   def on_death(status)
     @pid = nil
   end

data/lib/dtas/compat_onenine.rb

@@ -5,13 +5,13 @@
 # Make Ruby 1.9.3 look like Ruby 2.0.0 to us
 # This exists for Debian wheezy users using the stock Ruby 1.9.3 install.
 # We'll drop this interface when Debian wheezy (7.0) becomes unsupported.
-class String
+class String # :nodoc:
   def b # :nodoc:
     dup.force_encoding(Encoding::BINARY)
   end
 end unless String.method_defined?(:b)
 
-def IO
+def IO # :nodoc:
   def self.pipe # :nodoc:
     super.map! { |io| io.close_on_exec = true; io }
   end

data/lib/dtas/disclaimer.rb

@@ -2,17 +2,18 @@
 # :enddoc:
 # Copyright (C) 2013, Eric Wong <normalperson@yhbt.net>
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+DTAS_PROGNAME = File.basename($0)
 DTAS_DISCLAIMER = <<EOF
 # WARNING!
 #
-# Ignorant or improper use of #$0 may lead to
+# Ignorant or improper use of #{DTAS_PROGNAME} may lead to
 # data loss, hearing loss, and damage to audio equipment.
 #
 # Please read and understand the documentation of all commands you
 # attempt to configure.
 #
-# #$0 will never prevent you from doing stupid things.
+# #{DTAS_PROGNAME} will never prevent you from doing stupid things.
 #
-# There is no warranty, the developers of #$0
+# There is no warranty, the developers of #{DTAS_PROGNAME}
 # are not responsible for your actions.
 EOF

data/lib/dtas/edit_client.rb

@@ -0,0 +1,48 @@
+# -*- encoding: binary -*-
+# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net>
+# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+require 'tempfile'
+require 'yaml'
+require_relative 'unix_client'
+require_relative 'disclaimer'
+
+# common code between dtas-sourceedit and dtas-sinkedit
+module DTAS::EditClient # :nodoc:
+  def editor
+    %w(VISUAL EDITOR).each do |key|
+      v = ENV[key] or next
+      v.empty? and next
+      return v
+    end
+    "vi"
+  end
+
+  def client_socket
+    DTAS::UNIXClient.new
+  rescue
+    e = "DTAS_PLAYER_SOCK=#{DTAS::UNIXClient.default_path}"
+    abort "dtas-player not running on #{e}"
+  end
+
+  def tmpyaml
+    tmp = Tempfile.new(%W(#{File.basename($0)} .yml))
+    tmp.sync = true
+    tmp.binmode
+    tmp
+  end
+
+  def update_cmd_env(cmd, orig, updated)
+    if env = updated["env"]
+      env.each do |k,v|
+        cmd << (v.nil? ? "env##{k}" : "env.#{k}=#{v}")
+      end
+    end
+
+    # remove deleted env
+    if orig_env = orig["env"]
+      env ||= {}
+      deleted_keys = orig_env.keys - env.keys
+      deleted_keys.each { |k| cmd << "env##{k}" }
+    end
+  end
+end

data/lib/dtas/format.rb

@@ -64,7 +64,7 @@ class DTAS::Format # :nodoc:
   end
 
   def inspect
-    "<#{self.class}(#{xs(to_sox_arg)})>"
+    "<#{self.class}(#{Shellwords.join(to_sox_arg)})>"
   end
 
   def to_hsh
@@ -75,13 +75,6 @@ class DTAS::Format # :nodoc:
     ivars_to_hash(SIVS)
   end
 
-  def from_file(path)
-    @channels = qx(%W(soxi -c #{path})).to_i
-    @type = qx(%W(soxi -t #{path})).strip
-    @rate = qx(%W(soxi -r #{path})).to_i
-    # we don't need to care for bits, do we?
-  end
-
   # for the _decoded_ output
   def bits_per_sample
     return @bits if @bits
@@ -120,7 +113,7 @@ class DTAS::Format # :nodoc:
   end
 
   def valid_type?(type)
-    !!(type =~ %r{\A[us](?:8|16|24|32)\z} || type =~ %r{\Af?:(32|64)})
+    !!(type =~ %r{\A[us](?:8|16|24|32)\z} || type =~ %r{\Af(?:32|64)\z})
   end
 
   def valid_endian?(endian)

data/lib/dtas/player.rb

@@ -5,7 +5,10 @@ require 'yaml'
 require 'shellwords'
 require_relative '../dtas'
 require_relative 'source'
-require_relative 'source/command'
+require_relative 'source/sox'
+require_relative 'source/av'
+require_relative 'source/ff'
+require_relative 'source/cmd'
 require_relative 'sink'
 require_relative 'unix_server'
 require_relative 'buffer'
@@ -24,11 +27,9 @@ class DTAS::Player # :nodoc:
     @state_file = nil
     @socket = nil
     @srv = nil
-    @queue = [] # sources
+    @queue = [] # files for sources, or commands
     @paused = false
     @format = DTAS::Format.new
-    @srccmd = nil
-    @srcenv = {}
 
     @sinks = {} # { user-defined name => sink }
     @targets = [] # order matters
@@ -38,6 +39,16 @@ class DTAS::Player # :nodoc:
     @sink_buf = DTAS::Buffer.new
     @current = nil
     @watchers = {}
+    @source_map = {
+      "sox" => DTAS::Source::Sox.new,
+      "av" => DTAS::Source::Av.new,
+      "ff" => DTAS::Source::Ff.new,
+    }
+    source_map_reload
+  end
+
+  def source_map_reload
+    @sources = @source_map.values.sort_by { |src| src.tryorder }
   end
 
   def echo(msg)
@@ -57,13 +68,16 @@ class DTAS::Player # :nodoc:
     $stdout.write(msg << "\n")
   end
 
+  # used for state file
   def to_hsh
     rv = {}
     rv["socket"] = @socket
     rv["paused"] = @paused if @paused
-    src = rv["source"] = {}
-    src["command"] = @srccmd if @srccmd
-    src["env"] = @srcenv if @srcenv.size > 0
+    src_map = rv["source"] = {}
+    @source_map.each do |name, src|
+      src_hsh = src.to_state_hash
+      src_map[name] = src_hsh unless src_hsh.empty?
+    end
 
     # Arrays
     rv["queue"] = @queue
@@ -106,8 +120,22 @@ class DTAS::Player # :nodoc:
         instance_variable_set("@#{k}", v)
       end
       if v = hash["source"]
-        @srccmd = v["command"]
-        e = v["env"] and @srcenv = e
+        # compatibility with 0.0.0, which was sox-only
+        # we'll drop this after 1.0.0, or when we support a source decoder
+        # named "command" or "env" :P
+        sox_cmd, sox_env = v["command"], v["env"]
+        if sox_cmd || sox_env
+          sox = @source_map["sox"]
+          sox.command = sox_cmd if sox_cmd
+          sox.env = sox_env if sox_env
+        end
+
+        # new style: name = "av" or "sox" or whatever else we may support
+        @source_map.each do |name, src|
+          src_hsh = v[name] or next
+          src.load!(src_hsh)
+        end
+        source_map_reload
       end
 
       if v = hash["format"]
@@ -233,19 +261,16 @@ class DTAS::Player # :nodoc:
       warn("#{sink.name} died unexpectedly: #{status.inspect}")
       deleted.each { |t| drop_target(t) }
       __current_drop unless @targets[0]
+      return # sink stays dead if it died unexpectedly
     end
 
     return unless sink.active
 
-    if @queue[0] && !@paused
+    if (@current || @queue[0]) && !@paused
       # we get here if source/sinks are all killed in restart_pipeline
       __sink_activate(sink)
-      next_source(@queue.shift)
-    elsif sink.respawn
-      __sink_activate(sink) if @current
+      next_source(@queue.shift) unless @current
     end
-  ensure
-    sink.respawn = false
   end
 
   # returns a wait_ctl arg for self
@@ -298,6 +323,21 @@ class DTAS::Player # :nodoc:
     end
   end
 
+  def try_file(*args)
+    @sources.each do |src|
+      rv = src.try(*args) and return rv
+    end
+
+    # keep going down the list until we find something
+    while source_spec = @queue.shift
+      @sources.each do |src|
+        rv = src.try(*source_spec) and return rv
+      end
+    end
+    echo "idle"
+    nil
+  end
+
   def next_source(source_spec)
     @current = nil
     if source_spec
@@ -306,24 +346,20 @@ class DTAS::Player # :nodoc:
 
       case source_spec
       when String
-        @current = DTAS::Source.new(source_spec)
-        echo(%W(file #{@current.infile}))
+        pending = try_file(source_spec) or return
+        echo(%W(file #{pending.infile}))
       when Array
-        @current = DTAS::Source.new(*source_spec)
-        echo(%W(file #{@current.infile} #{@current.offset_samples}s))
+        pending = try_file(*source_spec) or return
+        echo(%W(file #{pending.infile} #{pending.offset_samples}s))
       else
-        @current = DTAS::Source::Command.new(source_spec["command"])
-        echo(%W(command #{@current.command_string}))
-      end
-
-      if DTAS::Source === @current
-        @current.command = @srccmd if @srccmd
-        @current.env = @srcenv.dup unless @srcenv.empty?
+        pending = DTAS::Source::Cmd.new(source_spec["command"])
+        echo(%W(command #{pending.command_string}))
       end
 
       dst = @sink_buf
-      @current.dst_assoc(dst)
-      @current.spawn(@format, @rg, out: dst.wr, in: "/dev/null")
+      pending.dst_assoc(dst)
+      pending.spawn(@format, @rg, out: dst.wr, in: "/dev/null")
+      @current = pending
       @srv.wait_ctl(dst, :wait_readable)
     else
       stop_sinks if @sink_buf.inflight == 0

data/lib/dtas/player/client_handler.rb

@@ -91,7 +91,9 @@ module DTAS::Player::ClientHandler # :nodoc:
         # do not reactivate it until we've reaped it
         if sink.pid
           drop_sink(sink)
-          sink.respawn = true
+
+          # we must restart @current if there's a moment we're target-less:
+          __current_requeue unless @targets[0]
         else
           __sink_activate(sink)
         end
@@ -105,6 +107,10 @@ module DTAS::Player::ClientHandler # :nodoc:
     @srv.wait_ctl(@sink_buf, :wait_readable)
   end
 
+  def __sink_snapshot(sink)
+    [ sink.command, sink.env, sink.pipe_size ].inspect
+  end
+
   # returns a wait_ctl arg
   def sink_handler(io, msg)
     name = msg[1]
@@ -124,6 +130,7 @@ module DTAS::Player::ClientHandler # :nodoc:
 
       sink.name = name
       active_before = sink.active
+      before = __sink_snapshot(sink)
 
       # multiple changes may be made at once
       msg[2..-1].each do |kv|
@@ -142,7 +149,7 @@ module DTAS::Player::ClientHandler # :nodoc:
           rv = set_bool(io, kv, v) { |b| sink.__send__("#{k}=", b) }
           rv == true or return rv
         when "pipe_size"
-          rv = set_uint(io, kv, v, true) { |u| sink.__send__("#{k}=", u) }
+          rv = set_uint(io, kv, v, false) { |u| sink.pipe_size = u }
           rv == true or return rv
         when "command" # nothing to validate, this could be "rm -rf /" :>
           sink.command = v.empty? ? DTAS::Sink::SINK_DEFAULTS["command"] : v
@@ -150,11 +157,13 @@ module DTAS::Player::ClientHandler # :nodoc:
       end
 
       @sinks[name] = new_sink if new_sink # no errors? it's a new sink!
+      after = __sink_snapshot(sink)
 
       # start or stop a sink if its active= flag changed.  Additionally,
       # account for a crashed-but-marked-active sink.  The user may have
       # fixed the command to not crash it.
-      if (active_before != sink.active) || (sink.active && !sink.pid)
+      if (active_before != sink.active) ||
+         (sink.active && (!sink.pid || before != after))
         __sink_switch(sink)
       end
       io.emit("OK")
@@ -190,7 +199,7 @@ module DTAS::Player::ClientHandler # :nodoc:
   end
 
   def __current_requeue
-    return unless @current && @current.pid
+    return unless @current
 
     # no need to requeue if we're already due to die
     return if @current.requeued
@@ -204,7 +213,7 @@ module DTAS::Player::ClientHandler # :nodoc:
       # this offset in the @current.format (not player @format)
       @queue.unshift([ @current.infile, "#{__current_decoded_samples}s" ])
     else
-      # DTAS::Source::Command (hash), just rerun it
+      # DTAS::Source::Cmd (hash), just rerun it
       @queue.unshift(@current.to_hsh)
     end
     # We also want to hard drop the buffer so we do not get repeated audio.
@@ -299,7 +308,7 @@ module DTAS::Player::ClientHandler # :nodoc:
     io.emit(tmp.to_yaml)
   end
 
-  def __buf_reset(buf)
+  def __buf_reset(buf) # buf is always @sink_buf for now
     @srv.wait_ctl(buf, :ignore)
     buf.buf_reset
     @srv.wait_ctl(buf, :wait_readable)
@@ -332,7 +341,7 @@ module DTAS::Player::ClientHandler # :nodoc:
   def do_play
     # no echo, next_source will echo on new track
     @paused = false
-    return if @current && @current.pid
+    return if @current
     next_source(@queue.shift)
   end
 
@@ -341,7 +350,7 @@ module DTAS::Player::ClientHandler # :nodoc:
   end
 
   def do_seek(io, offset)
-    if @current && @current.pid
+    if @current
       if @current.respond_to?(:infile)
         begin
           if offset.sub!(/\A\+/, '')
@@ -375,7 +384,6 @@ module DTAS::Player::ClientHandler # :nodoc:
   def restart_pipeline
     return if @paused
     __current_requeue
-    @sinks.each_value { |sink| sink.respawn = sink.active }
     @targets.each { |t| drop_target(t) }.clear
   end
 
@@ -421,28 +429,39 @@ module DTAS::Player::ClientHandler # :nodoc:
   end
 
   def source_handler(io, msg)
-    case msg.shift
+    map = @source_map
+    op = msg.shift
+    if op == "ls"
+      s = map.keys.sort { |a,b| map[a].tryorder <=> map[b].tryorder }
+      return io.emit(s.join(' '))
+    end
+
+    name = msg.shift
+    src = map[name] or return io.emit("ERR non-existent source name")
+    case op
     when "cat"
-      io.emit({
-        "command" => @srccmd || DTAS::Source::SOURCE_DEFAULTS["command"],
-        "env" => @srcenv,
-      }.to_yaml)
+      io.emit(src.to_source_cat.to_yaml)
     when "ed"
-      before = [ @srccmd, @srcenv ].inspect
+      before = src.to_state_hash
+      sd = src.source_defaults
       msg.each do |kv|
         k, v = kv.split(/=/, 2)
         case k
         when "command"
-          @srccmd = v.empty? ? nil : v
+          src.command = v.empty? ? sd[k] : v
         when %r{\Aenv\.([^=]+)\z}
-          @srcenv[$1] = v
+          src.env[$1] = v
         when %r{\Aenv#([^=]+)\z}
           v == nil or return io.emit("ERR unset env has no value")
-          @srcenv.delete($1)
+          src.env.delete($1)
+        when "tryorder"
+          rv = set_int(io, kv, v, true) { |i| src.tryorder = i || sd[k] }
+          rv == true or return rv
+          source_map_reload
         end
       end
-      after = [ @srccmd, @srcenv ].inspect
-      __current_requeue if before != after
+      after = src.to_state_hash
+      __current_requeue if before != after && @current.class == before.class
       io.emit("OK")
     else
       io.emit("ERR unknown source op")