From patchwork Sun Apr 17 13:21:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Clemens Ladisch X-Patchwork-Id: 8862811 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D0AD99F1C1 for ; Sun, 17 Apr 2016 13:22:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D95E5201B4 for ; Sun, 17 Apr 2016 13:21:59 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 4643C201BC for ; Sun, 17 Apr 2016 13:21:58 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id DF9462604BE; Sun, 17 Apr 2016 15:21:56 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 2082F2616EF; Sun, 17 Apr 2016 15:21:49 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id C83C7261734; Sun, 17 Apr 2016 15:21:47 +0200 (CEST) Received: from dehamd003.servertools24.de (dehamd003.servertools24.de [31.47.254.18]) by alsa0.perex.cz (Postfix) with ESMTP id BA9002604BE for ; Sun, 17 Apr 2016 15:21:40 +0200 (CEST) Received: from [192.168.42.12] (tmo-099-127.customers.d1-online.com [80.187.99.127]) by dehamd003.servertools24.de (Postfix) with ESMTPSA id 9E412F52005C; Sun, 17 Apr 2016 15:21:39 +0200 (CEST) To: Takashi Iwai References: <570AA980.3070802@ladisch.de> From: Clemens Ladisch Message-ID: <57138DC5.9050200@ladisch.de> Date: Sun, 17 Apr 2016 15:21:09 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.7.2 MIME-Version: 1.0 In-Reply-To: X-PPP-Message-ID: <20160417132140.135705.25286@dehamd003.servertools24.de> X-PPP-Vhost: ladisch.de Cc: alsa-devel@alsa-project.org, Ricard Wanderlof , Martin Tarenskeen Subject: [alsa-devel] [PATCH v2 1/2] amidi: ignore not only Active Sensing but also Clock bytes X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP By default, amidi ignores Active Sensing messages because they are sent by many devices in the background and would only interfere with the actual messages that amidi is supposed to capture. However, there are also devices that send Clock messages with the same problem, so it is a better idea to filter them out, too. Reported-by: Martin Tarenskeen Signed-off-by: Clemens Ladisch --- amidi/amidi.1 | 19 ++++++++++++++----- amidi/amidi.c | 13 +++++++++++-- 2 files changed, 25 insertions(+), 7 deletions(-) v2: separate option for clock messages diff --git a/amidi/amidi.1 b/amidi/amidi.1 index 1b4cfb1..86beb27 100644 --- a/amidi/amidi.1 +++ b/amidi/amidi.1 @@ -1,4 +1,4 @@ -.TH AMIDI 1 "26 Jun 2006" +.TH AMIDI 1 "16 Apr 2016" .SH NAME amidi \- read from and write to ALSA RawMIDI ports @@ -80,9 +80,11 @@ to record a Standard MIDI (.mid) file, use .B arecordmidi(1). .B amidi -will filter out any Active Sensing bytes (FEh), unless the +will filter out any Active Sensing and Clock bytes (FEh, F8h), unless the .I \-a -option has been given. +or +.I \-c +options have been given. .TP .I \-S, \-\-send\-hex="..." @@ -91,9 +93,11 @@ Sends the bytes specified as hexadecimal numbers to the MIDI port. .TP .I \-d, \-\-dump Prints data received from the MIDI port as hexadecimal bytes. -Active Sensing bytes (FEh) will not be shown, unless the +Active Sensing and Clock bytes (FEh, F8h) will not be shown, unless the .I \-a -option has been given. +or +.I \-c +options have been given. This option is useful for debugging. @@ -111,6 +115,11 @@ to stop receiving data. Does not ignore Active Sensing bytes (FEh) when saving or printing received MIDI commands. +.TP +.I \-c, \-\-clock +Does not ignore Clock bytes (F8h) when saving or printing received +MIDI commands. + .SH EXAMPLES .TP diff --git a/amidi/amidi.c b/amidi/amidi.c index cedf18c..58ac814 100644 --- a/amidi/amidi.c +++ b/amidi/amidi.c @@ -77,7 +77,8 @@ static void usage(void) "-d, --dump print received data as hexadecimal bytes\n" "-t, --timeout=seconds exits when no data has been received\n" " for the specified duration\n" - "-a, --active-sensing don't ignore active sensing bytes\n"); + "-a, --active-sensing include active sensing bytes\n" + "-c, --clock include clock bytes\n"); } static void version(void) @@ -419,10 +420,12 @@ int main(int argc, char *argv[]) {"dump", 0, NULL, 'd'}, {"timeout", 1, NULL, 't'}, {"active-sensing", 0, NULL, 'a'}, + {"clock", 0, NULL, 'c'}, { } }; int c, err, ok = 0; int ignore_active_sensing = 1; + int ignore_clock = 1; int do_send_hex = 0; while ((c = getopt_long(argc, argv, short_options, @@ -463,6 +466,9 @@ int main(int argc, char *argv[]) case 'a': ignore_active_sensing = 0; break; + case 'c': + ignore_clock = 0; + break; default: error("Try `amidi --help' for more information."); return 1; @@ -589,7 +595,10 @@ int main(int argc, char *argv[]) } length = 0; for (i = 0; i < err; ++i) - if (!ignore_active_sensing || buf[i] != 0xfe) + if ((buf[i] != MIDI_CMD_COMMON_CLOCK && + buf[i] != MIDI_CMD_COMMON_SENSING) || + (buf[i] == MIDI_CMD_COMMON_CLOCK && !ignore_clock) || + (buf[i] == MIDI_CMD_COMMON_SENSING && !ignore_active_sensing)) buf[length++] = buf[i]; if (length == 0) continue;