From patchwork Sun Oct 24 08:31:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Hofman X-Patchwork-Id: 12580095 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A2C95C433EF for ; Sun, 24 Oct 2021 08:33:06 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 150F160F4F for ; Sun, 24 Oct 2021 08:33:04 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 150F160F4F Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ivitera.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=alsa-project.org Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 9A2871662; Sun, 24 Oct 2021 10:32:12 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 9A2871662 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1635064382; bh=UOB5yj5+/U2kDusxmo4YqOcuGUJHpbmQOW/oHsurAtY=; h=From:To:Subject:Date:Cc:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=J4yTnBqfTgM8F7XG5R+iIFnfJePlvACR2ZvClBX3dgaR61na0wzEVH8I7WP38XpU+ fJDf6i/rGb1fSInSIuqYYDxaQzGvot+X6rKffP5dwdTtTKndn8/Y/Di+cbGeS3COT3 O3/lU8+i3U4//IkTao+gloUG9f0s6mQT0GRQa2GU= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 146DDF80269; Sun, 24 Oct 2021 10:32:12 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 9520EF802E7; Sun, 24 Oct 2021 10:32:10 +0200 (CEST) Received: from cable.insite.cz (cable.insite.cz [84.242.75.189]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id D1723F80166 for ; Sun, 24 Oct 2021 10:32:03 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz D1723F80166 Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key) header.d=ivitera.com header.i=@ivitera.com header.b="EmHVtcPt"; dkim=pass (1024-bit key) header.d=ivitera.com header.i=@ivitera.com header.b="ndno4+GU" Received: from localhost (localhost [127.0.0.1]) by cable.insite.cz (Postfix) with ESMTP id 48127A1A3D405; Sun, 24 Oct 2021 10:32:02 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=ivitera.com; s=mail; t=1635064322; bh=UOB5yj5+/U2kDusxmo4YqOcuGUJHpbmQOW/oHsurAtY=; h=From:To:Cc:Subject:Date:From; b=EmHVtcPttCU10ovJjduS9xUQFz035VYlFtQLkMlvQfqfGaA3EBep5jfW6EThyCFH2 dKScOXKHcCUvkMpxifInU9roCB4qv2KFV6UGkkD9ANaLDXbDUHhFdeogXQpPVp2O8s 3B1hE4SjLQ3+6AqeTnX0wxXKq/3TL+pzLLDmUQW8= Received: from cable.insite.cz ([84.242.75.189]) by localhost (server.insite.cz [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id KvguibhTrETL; Sun, 24 Oct 2021 10:31:56 +0200 (CEST) Received: from precision.doma (ip28.insite.cz [81.0.237.28]) (Authenticated sender: pavel) by cable.insite.cz (Postfix) with ESMTPSA id 9D706A1A3D403; Sun, 24 Oct 2021 10:31:56 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=ivitera.com; s=mail; t=1635064316; bh=UOB5yj5+/U2kDusxmo4YqOcuGUJHpbmQOW/oHsurAtY=; h=From:To:Cc:Subject:Date:From; b=ndno4+GUrL/SZRMHHFI9GLX2oOPA4SVpT1OkXnRR0eZ3/NRws5qHoIu5CGM9QGzAh NpJ6OsSB9Z6KAc6fUa6G7vK5ej6oL97w4TMDXbXwPRiWXdfCqJtyNUYamsy+D6/GsP TtmS0/vRhVOXkX/orkvgetFXTdEuXRKLsN7Z++wA= From: Pavel Hofman To: alsa-devel@alsa-project.org Subject: [PATCH 1/2] alsaloop: Renamed field capt_pitch to ctl_pitch Date: Sun, 24 Oct 2021 10:31:54 +0200 Message-Id: <20211024083156.4743-1-pavel.hofman@ivitera.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Cc: Pavel Hofman X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 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" Renaming capt_pitch to ctl_pitch to respect the naming style of snd_ctl_elem_value_t fields in loopback_handle. Also making the variable name suitable for planned support of playback pitch. Signed-off-by: Pavel Hofman --- alsaloop/alsaloop.h | 2 +- alsaloop/pcmjob.c | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/alsaloop/alsaloop.h b/alsaloop/alsaloop.h index 7a98ef3..a5539ef 100644 --- a/alsaloop/alsaloop.h +++ b/alsaloop/alsaloop.h @@ -122,7 +122,7 @@ struct loopback_handle { unsigned int ctl_pollfd_count; snd_ctl_elem_value_t *ctl_notify; snd_ctl_elem_value_t *ctl_rate_shift; - snd_ctl_elem_value_t *capt_pitch; + snd_ctl_elem_value_t *ctl_pitch; snd_ctl_elem_value_t *ctl_active; snd_ctl_elem_value_t *ctl_format; snd_ctl_elem_value_t *ctl_rate; diff --git a/alsaloop/pcmjob.c b/alsaloop/pcmjob.c index 13fa595..7b47c40 100644 --- a/alsaloop/pcmjob.c +++ b/alsaloop/pcmjob.c @@ -1063,9 +1063,9 @@ static int set_rate_shift(struct loopback_handle *lhandle, double pitch) if (lhandle->ctl_rate_shift) { snd_ctl_elem_value_set_integer(lhandle->ctl_rate_shift, 0, pitch * 100000); err = snd_ctl_elem_write(lhandle->ctl, lhandle->ctl_rate_shift); - } else if (lhandle->capt_pitch) { - snd_ctl_elem_value_set_integer(lhandle->capt_pitch, 0, (1 / pitch) * 1000000); - err = snd_ctl_elem_write(lhandle->ctl, lhandle->capt_pitch); + } else if (lhandle->ctl_pitch) { + snd_ctl_elem_value_set_integer(lhandle->ctl_pitch, 0, (1 / pitch) * 1000000); + err = snd_ctl_elem_write(lhandle->ctl, lhandle->ctl_pitch); } else { return 0; } @@ -1252,7 +1252,7 @@ static int openctl(struct loopback_handle *lhandle, int device, int subdevice) openctl_elem(lhandle, device, subdevice, "PCM Rate Shift 100000", &lhandle->ctl_rate_shift); openctl_elem(lhandle, device, subdevice, "Capture Pitch 1000000", - &lhandle->capt_pitch); + &lhandle->ctl_pitch); set_rate_shift(lhandle, 1); openctl_elem(lhandle, device, subdevice, "PCM Slave Active", &lhandle->ctl_active); @@ -1338,9 +1338,9 @@ static int closeit(struct loopback_handle *lhandle) if (lhandle->ctl_rate_shift) snd_ctl_elem_value_free(lhandle->ctl_rate_shift); lhandle->ctl_rate_shift = NULL; - if (lhandle->capt_pitch) - snd_ctl_elem_value_free(lhandle->capt_pitch); - lhandle->capt_pitch = NULL; + if (lhandle->ctl_pitch) + snd_ctl_elem_value_free(lhandle->ctl_pitch); + lhandle->ctl_pitch = NULL; if (lhandle->ctl) err = snd_ctl_close(lhandle->ctl); lhandle->ctl = NULL; @@ -1386,7 +1386,7 @@ int pcmjob_init(struct loopback *loop) snprintf(id, sizeof(id), "%s/%s", loop->play->id, loop->capt->id); id[sizeof(id)-1] = '\0'; loop->id = strdup(id); - if (loop->sync == SYNC_TYPE_AUTO && (loop->capt->ctl_rate_shift || loop->capt->capt_pitch)) + if (loop->sync == SYNC_TYPE_AUTO && (loop->capt->ctl_rate_shift || loop->capt->ctl_pitch)) loop->sync = SYNC_TYPE_CAPTRATESHIFT; if (loop->sync == SYNC_TYPE_AUTO && loop->play->ctl_rate_shift) loop->sync = SYNC_TYPE_PLAYRATESHIFT;