From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS22989 208.118.235.0/24 X-Spam-Status: No, score=-2.1 required=3.0 tests=AWL,BAYES_00 shortcircuit=no autolearn=unavailable version=3.3.2 X-Original-To: dtas-all@80x24.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id 604ED1F40E for ; Wed, 28 Jan 2015 10:02:51 +0000 (UTC) Received: from localhost ([::1]:52225 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YGPSU-0003Id-Qt for dtas-all@80x24.org; Wed, 28 Jan 2015 05:02:50 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40172) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YGPSS-0003IY-N4 for dtas-all@nongnu.org; Wed, 28 Jan 2015 05:02:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YGPSO-0001w0-Nc for dtas-all@nongnu.org; Wed, 28 Jan 2015 05:02:48 -0500 Received: from dcvr.yhbt.net ([64.71.152.64]:49391) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YGPSO-0001vv-I4 for dtas-all@nongnu.org; Wed, 28 Jan 2015 05:02:44 -0500 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 9B7D71F40E; Wed, 28 Jan 2015 10:02:42 +0000 (UTC) Date: Wed, 28 Jan 2015 10:02:42 +0000 From: Eric Wong To: dtas-all@nongnu.org Subject: [PATCH] player: fix queue skipping on player errors Message-ID: <20150128100242.GA15050@dcvr.yhbt.net> References: <20150128074833.GA29912@dcvr.yhbt.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20150128074833.GA29912@dcvr.yhbt.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 64.71.152.64 X-BeenThere: dtas-all@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dtas-all-bounces+dtas-all=80x24.org@nongnu.org Sender: dtas-all-bounces+dtas-all=80x24.org@nongnu.org Oops, introduced in the previous commit: commit 37eae22446feb5a805d9cd59f6ad54362829189f (player: support the "trim" parameter) --- lib/dtas/player.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/dtas/player.rb b/lib/dtas/player.rb index 2920dcd..ea04dca 100644 --- a/lib/dtas/player.rb +++ b/lib/dtas/player.rb @@ -378,8 +378,9 @@ class DTAS::Player # :nodoc: # keep going down the list until we find something while source_spec = @queue.shift + path, off = source_spec @sources.each do |src| - rv = src.try(file, offset, @trim) and return rv + rv = src.try(path, off, @trim) and return rv end end -- EW