From: Eric Wong <e@80x24.org>
To: <dtas-all@nongnu.org>
Cc: e@80x24.org
Subject: [PATCH 4/5] dtas-console: avoid crashing on failed cue seeks
Date: Sat, 17 Jan 2015 11:49:21 +0000 [thread overview]
Message-ID: <1421495362-31430-5-git-send-email-e@80x24.org> (raw)
In-Reply-To: <1421495362-31430-1-git-send-email-e@80x24.org>
Attempting to perform operations on a file which which cannot
handle it should not cause dtas-console to die with a backtrace
---
bin/dtas-console | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/bin/dtas-console b/bin/dtas-console
index ee0c126..2ed2f0b 100755
--- a/bin/dtas-console
+++ b/bin/dtas-console
@@ -104,6 +104,10 @@ def rg_string(rg, current)
rv
end
+def may_fail(res, events)
+ events << res if res != "OK"
+end
+
enc_locale = Encoding.find("locale")
$stdout.set_encoding(enc_locale)
enc_opts = { undef: :replace, invalid: :replace, replace: '?' }
@@ -202,8 +206,8 @@ begin
when "f" then c.req_ok("rg fallback_gain-=1")
when ">" then c.req_ok("tl next")
when "<" then c.req_ok("tl prev")
- when "!" then c.req_ok("cue prev")
- when "@" then c.req_ok("cue next")
+ when "!" then may_fail(c.req("cue prev"), events)
+ when "@" then may_fail(c.req("cue next"), events)
when " "
c.req("play_pause")
when "r" # cycle through replaygain modes
--
EW
next prev parent reply other threads:[~2015-01-17 11:49 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-17 11:49 [PATCH 0/5] misc updates, major sourceedit feature! Eric Wong
2015-01-17 11:49 ` [PATCH 1/5] partstats: use Etc.nprocessors on Ruby 2.2+ Eric Wong
2015-01-17 11:49 ` [PATCH 2/5] splitfx: remove unnecessary assignment Eric Wong
2015-01-17 11:49 ` [PATCH 3/5] player: enqueued commands cannot use bypass Eric Wong
2015-01-17 11:49 ` Eric Wong [this message]
2015-01-17 11:49 ` [PATCH 5/5] dtas-sourceedit: update player as user saves in the editor Eric Wong
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=1421495362-31430-5-git-send-email-e@80x24.org \
--to=e@80x24.org \
--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).