qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [PATCH 09/15] audio: revert tests for pcm_ops table


From: Gerd Hoffmann
Subject: Re: [PATCH 09/15] audio: revert tests for pcm_ops table
Date: Thu, 13 Jan 2022 10:43:40 +0100

On Thu, Jan 06, 2022 at 10:23:26AM +0100, Volker Rümelin wrote:
> From: Volker Rümelin <vr_qemu@t-online.de>
> 
> With previous commit every audio backend has a pcm_ops function
> table. It's no longer necessary to test if the table is
> available. This reverts commit cbaf25d1f5: "audio: fix
> wavcapture segfault"

You can just "git revert cbaf25d1f5" then, and append the reason
why you are reverting the commit to the commit message.

> 
> Signed-off-by: Volker Rümelin <vr_qemu@t-online.de>
> ---
>  audio/audio.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/audio/audio.c b/audio/audio.c
> index 55f885f8e9..c420a8bd1c 100644
> --- a/audio/audio.c
> +++ b/audio/audio.c
> @@ -612,7 +612,7 @@ static size_t audio_pcm_sw_read(SWVoiceIn *sw, void *buf, 
> size_t size)
>          total += isamp;
>      }
>  
> -    if (hw->pcm_ops && !hw->pcm_ops->volume_in) {
> +    if (!hw->pcm_ops->volume_in) {
>          mixeng_volume (sw->buf, ret, &sw->vol);
>      }
>  
> @@ -718,7 +718,7 @@ static size_t audio_pcm_sw_write(SWVoiceOut *sw, void 
> *buf, size_t size)
>      if (swlim) {
>          sw->conv (sw->buf, buf, swlim);
>  
> -        if (sw->hw->pcm_ops && !sw->hw->pcm_ops->volume_out) {
> +        if (!sw->hw->pcm_ops->volume_out) {
>              mixeng_volume (sw->buf, swlim, &sw->vol);
>          }
>      }
> -- 
> 2.31.1
> 

-- 




reply via email to

[Prev in Thread] Current Thread [Next in Thread]