dtas 0.0.0 → 0.1.I

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a1e4e92e52c071f8b53fbf9d05c32a276ec9a83
-  data.tar.gz: d5ab2c9d24f71ae9bd61e2c1b3b4b0ef4fb379ca
+  metadata.gz: e1f118957182ff09d25d1da7f0ae4fda9c867e21
+  data.tar.gz: a42b9ef9d642cd13bb32a24cf2571a315acb8842
 SHA512:
-  metadata.gz: ec862253ef20e2ff0ca445d3795dad21cf1c800312f44443bbce66ea5ff5c51ebc43273db8d51141974b432b76b3a34316140e250b43a179e6d6f5bdcdfdf030
-  data.tar.gz: ff364dc679cb1e7ea780316588d3af8f098ffe31b132eab165dae446059827f14ee8fda195d725bd2814049116ebe590662bcbb443cf8521fe69070ad1658179
+  metadata.gz: 2becf89b867d7183a554c00eed34cf1a8a5f468b051173e072894072b3711fb4c5df40cb2d551c7bf07501fe55e82ac2a3922f93a286ab889fb7cdb853c78974
+  data.tar.gz: 6898c1eb14d91ea620f306abec3620c42258ec3d964d40fdd382ec74590cc81b955012047dd8748d88989b9e62a25de3d35f71c175a0ae7985f9aeb084c084ee

data/.gitignore

@@ -7,3 +7,4 @@
 *.log
 /man
 *.gem
+*.gz

data/Documentation/dtas-console.txt

@@ -29,6 +29,9 @@ Key bindings are inspired partially by mplayer(1)
 - SPACE - toggle play/pause state of the playback
 - 'p'/'P' - decrease/increase timer resolution
 - BACKSPACE - seek to the beginning of the track
+- 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
 
 # ENVIRONMENT
@@ -36,6 +39,18 @@ Key bindings are inspired partially by mplayer(1)
 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.
+
 # SEE ALSO
 
 dtas-player(1), dtas-player_protocol(7), dtas-ctl(1), dtas-sinkedit(1),

data/Documentation/dtas-player_protocol.txt

@@ -8,7 +8,7 @@ dtas-player_protocol - protocol for controling dtas-player
 # DESCRIPTION
 
 This gives a specification of the dtas-player protocol over a local Unix
-SOCK_SEQPACKET or SOCK_DGRAM socket.  The dtas-player protocol should NOT be
+SOCK_SEQPACKET socket.  The dtas-player protocol should NOT be
 considered stable at this point and compatibility will break.
 
 Inspiration is taken from MPRIS and MPRIS 2.0 specifications (e.g.
@@ -33,6 +33,7 @@ dtas-sinkedit(1), and dtas-enq(1) also implement this protocol.
 - ENVVALUE - must be a suitable environment variable (setenv(3))
 - COMMAND, this may be quoted string passed to sh -c "",
            variable/argument expansion will be performed by the shell
+- SOURCENAME - "sox" or "av", more backends may be supported in the future
 - FILENAME - an expanded pathname relative to / is recommended since
              dtas-player and the client may run in different directories
 
@@ -167,14 +168,15 @@ For little-endian machines, $ECAFMT defaults to: -fs32_le,2,44100
     + nonblock=BOOLEAN - drop audio data to avoid holding back other sinks
     + pipe_size=UNSIGNED - set the size of the pipe for the sink (Linux-only)
 
-* source cat - dump the current source command and env in YAML
+* source SOURCENAME cat - dump the current source command and env in YAML
 
-* source ed SOURCEARGS - edit the source (decoder) command and environment.
+* source ed SOURCENAME SOURCEARGS - edit the source parameters.
   This changes here will immediately restart the source process.
   See the code for dtas-sourceedit(1) for an example of using this.
     + command=COMMAND - change the command-line used to decode audio
     + env.ENVNAME=ENVVALUE - set ENVNAME to ENVVALUE for the source process
     + env#ENVNAME - unset ENVNAME in the source process (only)
+    + tryorder=INTEGER - lower values are tried first
 
 * watch - adds the client to the passive watch list for notifications.
   It is recommended clients issue no further commands and open

data/Documentation/dtas-sourceedit.txt

@@ -3,23 +3,30 @@
 
 # NAME
 
-dtas-sourceedit - edit the command and environment of the decoder
+dtas-sourceedit - edit parameters of a source decoder
 
 # SYNOPSYS
 
-dtas-sourceedit
+dtas-sourceedit {sox | av | ff}
 
 # DESCRIPTION
 
-dtas-sourceedit spawns an editor to allow editing of a sink as a YAML file.
-See dtas-player_protocol(7) for details on SINKARGS.
+dtas-sourceedit spawns an editor to allow editing of a source as a YAML file.
+See dtas-player_protocol(7) for details on SOURCEARGS.
 
 # EXAMPLES
 
-Invoking dtas-sourceedit will spawn your favorite text editor on a
-given SINKNAME:
+Invoking dtas-sourceedit will spawn your favorite text editor on "sox":
 
-	$ dtas-sourceedit
+	$ dtas-sourceedit sox
+
+To change the way dtas-player calls avconv (part of libav):
+
+	$ dtas-sourceedit av
+
+To change the way dtas-player calls ffmpeg (lightly-tested):
+
+	$ dtas-sourceedit ff
 
 # ENVIRONMENT
 

data/GIT-VERSION-GEN

@@ -3,7 +3,7 @@
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 CONSTANT = "DTAS::VERSION"
 RVF = "lib/dtas/version.rb"
-DEF_VER = "v0.0.0"
+DEF_VER = "v0.1.I"
 vn = DEF_VER
 
 # First see if there is a version file (included in release tarballs),
@@ -22,9 +22,9 @@ if File.exist?(".git")
 end
 
 vn = vn.sub!(/\Av/, "")
-new_ruby_version = "#{CONSTANT} = '#{vn}'\n"
+new_ruby_version = "#{CONSTANT} = '#{vn}' # :nodoc:\n"
 cur_ruby_version = File.read(RVF) rescue nil
 if new_ruby_version != cur_ruby_version
-  File.open(RVF, "w") { |fp| fp.write("# :enddoc:\n#{new_ruby_version}") }
+  File.open(RVF, "w") { |fp| fp.write(new_ruby_version) }
 end
 puts vn if $0 == __FILE__

data/INSTALL

@@ -40,10 +40,10 @@ Debian users can install sox, mp3gain, and flac dependencies easily:
 
   Grab the latest tarball from our HTTP site:
 
-  http://dtas.80x24.org/2013/dtas-0.0.0.tar.gz
+  http://dtas.80x24.org/2013/dtas-0.1.I.tar.gz
 
-  $ tar zxvf dtas-0.0.0.tar.gz
-  $ cd dtas-0.0.0
+  $ tar zxvf dtas-0.1.I.tar.gz
+  $ cd dtas-0.1.I
   $ ruby setup.rb
 
   GNU/Linux users may optionally install "io_splice" and

data/README

@@ -40,17 +40,18 @@ Users of dtas-player will also be interested in the following scripts:
 * dtas-xdelay - alternative sink for dtas-player
 
 All scripts have some documentation in the Documentation/ directory or
-manpages distributed with the gem.  dtas exposes no public APIs outside
-of command-line and YAML text.  dtas is aimed at users familiar with the
-*nix command-line and editing text files.  Familiarity with the Ruby
-programming language is absolutely NOT required.
+manpages distributed with the gem.  Documentation is also available on
+http://dtas.80x24.org/$COMMAND.txt in plain-text form.
+
+dtas exposes no public APIs outside of command-line and YAML text.  dtas is
+aimed at users familiar with the *nix command-line and editing text files.
+Familiarity with the Ruby programming language is absolutely NOT required.
 
 Coming:
 
 * MPRIS/MPRIS 2.0 bridge for partial dtas-player control
 * tracklist support in dtas-player (maybe?)
 * whatever command-line tools come to mind...
-* native ffmpeg/avconv/gst support in dtas-player
 * better error handling, many bugfixes, etc...
 * better documentation
 

data/Rakefile

@@ -59,9 +59,20 @@ h = Hoe.spec('dtas') do |p|
 end
 
 task :rsync_docs do
-  dest = "80x24.org:/srv/dtas/"
-  system("rsync --chmod=Fugo=r --files-from=.rsync_doc -av ./ #{dest}")
-  system("rsync --chmod=Fugo=r -av ./Documentation/*.txt #{dest}")
+  dest = ENV["RSYNC_DEST"] || "80x24.org:/srv/dtas/"
+  top = %w(INSTALL NEWS README COPYING)
+  files = []
+  Dir['Documentation/*.txt'].to_a.concat(top).each do |txt|
+    gz = "#{txt}.gz"
+    tmp = "#{gz}.#$$"
+    sh("gzip -9 < #{txt} > #{tmp}")
+    st = File.stat(txt)
+    File.utime(st.atime, st.mtime, tmp) # make nginx gzip_static happy
+    File.rename(tmp, gz)
+    files << txt
+    files << gz
+  end
+  sh("rsync --chmod=Fugo=r -av #{files.join(' ')} #{dest}")
 end
 
 task :coverage do
@@ -81,8 +92,7 @@ task tarball: "pkg/#{base}" do
   Dir.chdir("pkg") do
     tgz = "#{base}.tar.gz"
     tmp = "#{tmp}.#$$"
-    cmd = "tar cf - #{base} | gzip -9 > #{tmp}"
-    system(cmd) or abort "#{cmd}: #$?"
+    sh "tar cf - #{base} | gzip -9 > #{tmp}"
     File.rename(tmp, tgz)
   end
 end
@@ -90,8 +100,7 @@ end
 task dist: [ :tarball, :package ] do
   Dir.chdir("pkg") do
     %w(dtas-linux dtas-mpris).each do |gem|
-      cmd = "gem build ../#{gem}.gemspec"
-      system(cmd) or abort "#{cmd}: #$?"
+      sh "gem build ../#{gem}.gemspec"
     end
   end
 end

data/bin/dtas-console

@@ -5,6 +5,7 @@
 #
 # Note: no idea what I'm doing, especially w.r.t. curses
 require 'dtas/unix_client'
+require 'dtas/rg_state'
 require 'curses'
 require 'yaml'
 
@@ -14,6 +15,14 @@ c = DTAS::UNIXClient.new
 cur = YAML.load(c.req('current'))
 readable = [ w, $stdin ]
 
+# current rg mode
+rg_mode = DTAS::RGState::RG_MODE.keys.unshift("off")
+if (rg = cur["rg"]) && (rg = rg["mode"])
+  rg_mode_i = rg_mode.index(cur["rg"]["mode"])
+else
+  rg_mode_i = 0
+end
+
 def update_tfmt(prec)
   prec == 0 ? '%H:%M:%S' : "%H:%M:%S.%#{prec}N"
 end
@@ -69,6 +78,24 @@ def show_events(lineno, screen, events)
   end
 end
 
+def fmt_to_s(f)
+  r = [ f['rate'], f['channels'], f['type'], f['bits'] ]
+  r.compact!
+  r.join(',')
+end
+
+def rg_string(rg, current)
+  rv = "rg mode=#{rg['mode']||'off'}"
+  defaults = DTAS::RGState::RG_DEFAULT
+  # don't show things that are too rare
+  %w(preamp fallback_gain).each do |param|
+    val = rg[param] || defaults[param]
+    rv << " #{param}=#{val}"
+  end
+  env = current && current["env"] and rv << " / RGFX='#{env['RGFX']}'"
+  rv
+end
+
 begin
   Curses.init_screen
   Curses.nonl
@@ -79,6 +106,7 @@ begin
   screen.keypad(true)
   loop do
     lineno = -1
+    pfmt = cur['format']
     if current = cur['current']
       Curses.setpos(lineno += 1, 0)
       Curses.clrtoeol
@@ -89,13 +117,16 @@ begin
         rate = current_format['rate'].to_f
         elapsed += nr / rate
         total = " [#{Time.at(current['samples'] / rate).strftime(tfmt)}]"
+        fmt = "(#{fmt_to_s(current_format)} > #{fmt_to_s(pfmt)})"
       else
         total = ""
+        fmt = fmt_to_s(pfmt)
+        fmt = "(#{fmt} > #{fmt})"
       end
 
       Curses.setpos(lineno += 1, 0)
       Curses.clrtoeol
-      Curses.addstr("#{Time.at(elapsed).strftime(tfmt)}#{total}")
+      Curses.addstr("#{Time.at(elapsed).strftime(tfmt)}#{total} #{fmt}")
     else
       Curses.setpos(lineno += 1, 0)
       Curses.clrtoeol
@@ -104,6 +135,11 @@ begin
       Curses.clrtoeol
     end
 
+    rgs = rg_string(cur["rg"] || {}, current)
+    Curses.setpos(lineno += 1, 0)
+    Curses.clrtoeol
+    Curses.addstr(rgs)
+
     show_events(lineno, screen, events)
 
     Curses.refresh # draw and wait
@@ -119,8 +155,8 @@ begin
       when $stdin
         # keybindings taken from mplayer / vi
         case key = Curses.getch
-        when "j" then c.req_ok("seek +5")
-        when "k" then c.req_ok("seek -5")
+        when "j" then c.req_ok("seek -5")
+        when "k" then c.req_ok("seek +5")
         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")
@@ -129,8 +165,17 @@ begin
         # yes, some of us have long audio files
         when Curses::KEY_PPAGE then c.req_ok("seek +600")
         when Curses::KEY_NPAGE then c.req_ok("seek -600")
+        when "9" then c.req_ok("rg preamp-=1")
+        when "0" then c.req_ok("rg preamp+=1")
+        when "F" then c.req_ok("rg fallback_gain+=1")
+        when "f" then c.req_ok("rg fallback_gain-=1")
         when " "
           c.req("play_pause")
+        when "r" # cycle through replaygain modes
+          rg_mode_i >= 1 and c.req_ok("rg mode=#{rg_mode[rg_mode_i -= 1]}")
+        when "R"
+          rg_mode_i < (rg_mode.size - 1) and
+            c.req_ok("rg mode=#{rg_mode[rg_mode_i += 1]}")
         when "p" # lower precision of time display
           if prec_nr >= 1
             prec_nr -= 1

data/bin/dtas-cueedit

@@ -5,7 +5,7 @@
 require 'tempfile'
 require 'shellwords'
 usage = "Usage: #$0 FILENAME"
-editor = ENV["VISUAL"] || ENV["EDITOR"]
+editor = ENV["VISUAL"] || ENV["EDITOR"] || "vi"
 ARGV.size > 0 or abort usage
 
 def err_msg(cmd, status)

data/bin/dtas-sinkedit

@@ -2,20 +2,16 @@
 # -*- encoding: binary -*-
 # Copyright (C) 2013, Eric Wong <normalperson@yhbt.net>
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
-require 'dtas/unix_client'
-require 'dtas/disclaimer'
-require 'tempfile'
-require 'yaml'
-editor = ENV["VISUAL"] || ENV["EDITOR"]
-c = DTAS::UNIXClient.new
-usage = "#$0 SINKNAME"
+require 'dtas/edit_client'
+include DTAS::EditClient
+c = client_socket
+sinks = c.req('sink ls') || "(unknown)"
+usage = "Usage: #{DTAS_PROGNAME} SINKNAME\n" \
+        "available SINKNAME values: #{sinks}"
 ARGV.size == 1 or abort usage
 name = ARGV[0]
 
-tmp = Tempfile.new(%w(dtas-sinkedit .yml))
-tmp.sync = true
-tmp.binmode
-
+tmp = tmpyaml
 buf = c.req(%W(sink cat #{name}))
 abort(buf) if buf =~ /\AERR/
 orig = YAML.load(buf)
@@ -27,32 +23,20 @@ tmp.rewind
 sink = YAML.load(tmp.read)
 
 cmd = %W(sink ed #{name})
-if env = sink["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
+update_cmd_env(cmd, orig, sink)
 
+# both of these default to false
 %w(nonblock active).each do |field|
-  if sink.key?(field)
-    cmd << "#{field}=#{sink[field] ? 'true' : 'false'}"
-  end
+  cmd << "#{field}=#{sink[field] ? 'true' : 'false'}"
 end
 
 %w(prio pipe_size).each do |field|
   value = sink[field] and cmd << "#{field}=#{value}"
 end
 
+# nil OK
 %w(command).each do |field|
-  value = sink[field]
-  cmd << "#{field}=#{value}"
+  cmd << "#{field}=#{sink[field]}"
 end
 
 c.req_ok(cmd)

data/bin/dtas-sourceedit

@@ -2,21 +2,17 @@
 # -*- 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 'dtas/unix_client'
-require 'dtas/disclaimer'
-editor = ENV["VISUAL"] || ENV["EDITOR"]
-c = DTAS::UNIXClient.new
-usage = $0
-ARGV.size == 0 or abort usage
-name = ARGV[0]
+require 'dtas/edit_client'
+include DTAS::EditClient
+c = client_socket
+sources = c.req('source ls') || "(unknown)"
+usage = "Usage: #{DTAS_PROGNAME} SOURCENAME\n" \
+        "available SOURCENAME values: #{sources}"
+ARGV.size <= 1 or abort usage
+name = ARGV[0] || "sox"
 
-tmp = Tempfile.new(%w(dtas-sourceedit .yml))
-tmp.sync = true
-tmp.binmode
-
-buf = c.req(%W(source cat))
+tmp = tmpyaml
+buf = c.req(%W(source cat #{name}))
 abort(buf) if buf =~ /\AERR/
 orig = YAML.load(buf)
 
@@ -26,23 +22,12 @@ system(cmd) or abort "#{cmd} failed: #$?"
 tmp.rewind
 source = YAML.load(tmp.read)
 
-cmd = %W(source ed)
-if env = source["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
+cmd = %W(source ed #{name})
+update_cmd_env(cmd, orig, source)
 
-%w(command).each do |field|
-  value = source[field]
-  cmd << "#{field}=#{value}"
+# nil OK
+%w(tryorder command).each do |field|
+  cmd << "#{field}=#{source[field]}"
 end
 
 c.req_ok(cmd)