From 44248402de9050418c78fc994fc433cb1a6372ae Mon Sep 17 00:00:00 2001
From: Eric Wong <e@80x24.org>
Date: Mon, 4 Jan 2016 10:11:58 +0000
Subject: console: try harder to show rate

Try to take advantage of bypass being enabled for sample rate,
then show the raw sample offset if we cannot get the rate.
---
 bin/dtas-console | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'bin/dtas-console')

diff --git a/bin/dtas-console b/bin/dtas-console
index 298a809..5765cbd 100755
--- a/bin/dtas-console
+++ b/bin/dtas-console
@@ -149,17 +149,17 @@ begin
         fmt = "(#{fmt} > #{fmt})"
       end
     elsif cur['paused'] && infile = cur['current_paused']
-      fmt = '(paused)'
+      fmt = "[paused] (#{fmt_to_s(pfmt)})"
       paused = true
       infile = infile['command'] if Hash === infile
       if Array === infile
         infile, elapsed = infile
         elapsed = elapsed.to_i
         samples = rate = 0
-        begin
-          rate = qx(%W(soxi -r #{infile})).to_i
-        rescue => e
-          warn "#{e.message} (#{e.class})"
+        if (bypass = cur['bypass']) && bypass.include?('rate')
+          rate = pfmt['rate'].to_f
+        else
+          rate = qx(%W(soxi -r #{infile}), err: DTAS.null).to_i rescue 0
         end
         elapsed /= rate.to_f if rate != 0
       end
@@ -176,7 +176,11 @@ begin
       total = " [#{Time.at(samples / rate).strftime(tfmt)}]" if samples != 0
       Curses.setpos(lineno += 1, 0)
       Curses.clrtoeol
-      Curses.addstr("#{Time.at(elapsed).strftime(tfmt)}#{total} #{fmt}")
+      if rate != 0
+        Curses.addstr("#{Time.at(elapsed).strftime(tfmt)}#{total} #{fmt}")
+      else
+        Curses.addstr("#{elapsed} samples #{total} #{fmt}")
+      end
     else
       Curses.setpos(lineno += 1, 0)
       Curses.clrtoeol
-- 
cgit v1.2.3-24-ge0c7