From: Eric Wong <e@yhbt.net>
To: dtas-all@nongnu.org
Subject: [PATCH] player: fix +/- directional seeks while paused
Date: Mon, 25 May 2020 09:10:46 +0000 [thread overview]
Message-ID: <20200525091046.8361-1-e@yhbt.net> (raw)
Using relative seek (Up/Dn/PgUp/PgDn) with dtas-console while
dtas-player is paused was causing non-sensical/confusing results
on unpause.
So clamp the minimum seek time to 0s the same way we clamp
during playback.
---
lib/dtas/player/client_handler.rb | 36 +++++++++++++++++++------------
1 file changed, 22 insertions(+), 14 deletions(-)
diff --git a/lib/dtas/player/client_handler.rb b/lib/dtas/player/client_handler.rb
index 6535f04..cf5442d 100644
--- a/lib/dtas/player/client_handler.rb
+++ b/lib/dtas/player/client_handler.rb
@@ -197,19 +197,20 @@ def __goto_offset_samples(offset)
end
end
+ def __offset_to_i(offset, src)
+ # either "999s" for 999 samples or HH:MM:SS for time
+ offset.sub!(/s\z/, '') ? offset.to_i : src.format.hhmmss_to_samples(offset)
+ end
+
def __offset_to_samples(offset)
- offset.sub!(/s\z/, '') and return offset.to_i
- @current.format.hhmmss_to_samples(offset)
+ __offset_to_i(offset, @current)
end
# returns seek offset as an Integer in sample count
- def __seek_offset_adj(dir, offset)
- if offset.sub!(/s\z/, '')
- offset = offset.to_i
- else # time
- offset = @current.format.hhmmss_to_samples(offset)
- end
- n = __current_decoded_samples + (dir * offset)
+ def __seek_offset_adj(dir, offset,
+ src = @current,
+ current_decoded_samples = __current_decoded_samples)
+ n = current_decoded_samples + (dir * __offset_to_i(offset, src))
n = 0 if n < 0
"#{n}s"
end
@@ -391,15 +392,17 @@ def seek_internal(cur, offset)
end
end
+ def __offset_direction(offset)
+ offset.sub!(/\A\+/, '') ? 1 : (offset.sub!(/\A-/, '') ? -1 : nil)
+ end
+
def dpc_seek(io, msg)
offset = msg[0] or return io.emit('ERR usage: seek OFFSET')
if @current
if @current.respond_to?(:infile)
begin
- if offset.sub!(/\A\+/, '')
- offset = __seek_offset_adj(1, offset)
- elsif offset.sub!(/\A-/, '')
- offset = __seek_offset_adj(-1, offset)
+ if direction = __offset_direction(offset)
+ offset = __seek_offset_adj(direction, offset)
# else: pass to sox directly
end
rescue ArgumentError
@@ -413,7 +416,12 @@ def dpc_seek(io, msg)
case file = @queue[0]
when String
@queue[0] = [ file, offset ]
- when Array
+ when Array # offset already stored, adjust
+ if direction = __offset_direction(offset)
+ tmp = try_file(*file)
+ cur_off = __offset_to_i(file[1].dup, tmp)
+ offset = __seek_offset_adj(direction, offset, tmp, cur_off)
+ end
file[1] = offset
else
return io.emit("ERR unseekable")
reply other threads:[~2020-05-25 9:10 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://80x24.org/dtas/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200525091046.8361-1-e@yhbt.net \
--to=e@yhbt.net \
--cc=dtas-all@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/dtas.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).