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=-4.0 required=3.0 tests=AWL,BAYES_00, RCVD_IN_DNSWL_BLOCKED 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 7FB1F1FDEB for ; Tue, 6 Jan 2015 10:01:56 +0000 (UTC) Received: from localhost ([::1]:35628 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y8QxX-0005aN-O5 for dtas-all@80x24.org; Tue, 06 Jan 2015 05:01:55 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37355) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y8QxV-0005aH-BG for dtas-all@nongnu.org; Tue, 06 Jan 2015 05:01:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y8QxQ-0001Im-AX for dtas-all@nongnu.org; Tue, 06 Jan 2015 05:01:53 -0500 Received: from dcvr.yhbt.net ([64.71.152.64]:58849) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y8QxQ-0001If-5W for dtas-all@nongnu.org; Tue, 06 Jan 2015 05:01:48 -0500 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 3BECA1FDE7 for ; Tue, 6 Jan 2015 10:01:46 +0000 (UTC) From: Eric Wong To: Subject: [PATCH] player: enqueued commands cannot use bypass Date: Tue, 6 Jan 2015 10:01:46 +0000 Message-Id: <1420538506-31430-1-git-send-email-e@80x24.org> X-Mailer: git-send-email 2.2.1.202.g55b961f 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 We cannot specify an audio format for bypass mode, so inherit the last one we used and hope it works. --- lib/dtas/player.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/dtas/player.rb b/lib/dtas/player.rb index ea48926..002decf 100644 --- a/lib/dtas/player.rb +++ b/lib/dtas/player.rb @@ -400,7 +400,7 @@ class DTAS::Player # :nodoc: msg = %W(command #{pending.command_string}) end - unless @bypass.empty? + if ! @bypass.empty? && pending.respond_to?(:format) new_fmt = bypass_match!(@format.dup, pending.format) if new_fmt != @format stop_sinks # we may fail to start below -- EW