diff mbox series

[v2,16/17] audio/audio_template: substitute sw->hw with hw

Message ID 20230206185237.8358-16-vr_qemu@t-online.de
State New
Headers show
Series audio: improve callback interface for audio frontends | expand

Commit Message

Volker Rümelin Feb. 6, 2023, 6:52 p.m. UTC 
Substitute sw->hw with hw in the audio_pcm_sw_alloc_resources_*
functions.

Acked-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: Volker Rümelin <vr_qemu@t-online.de>
---
 audio/audio_template.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Marc-André Lureau Feb. 22, 2023, 10:50 a.m. UTC | #1 
On Mon, Feb 6, 2023 at 10:53 PM Volker Rümelin <vr_qemu@t-online.de> wrote:
>
> Substitute sw->hw with hw in the audio_pcm_sw_alloc_resources_*
> functions.
>
> Acked-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
> Signed-off-by: Volker Rümelin <vr_qemu@t-online.de>

Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>



> ---
>  audio/audio_template.h | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/audio/audio_template.h b/audio/audio_template.h
> index 0d8aab6fad..7e116426c7 100644
> --- a/audio/audio_template.h
> +++ b/audio/audio_template.h
> @@ -107,6 +107,7 @@ static void glue (audio_pcm_sw_free_resources_, TYPE) (SW *sw)
>
>  static int glue (audio_pcm_sw_alloc_resources_, TYPE) (SW *sw)
>  {
> +    HW *hw = sw->hw;
>      int samples;
>
>      if (!glue(audio_get_pdo_, TYPE)(sw->s->dev)->mixing_engine) {
> @@ -125,7 +126,6 @@ static int glue (audio_pcm_sw_alloc_resources_, TYPE) (SW *sw)
>      }
>
>      if (samples == 0) {
> -        HW *hw = sw->hw;
>          size_t f_fe_min;
>
>          /* f_fe_min = ceil(1 [frames] * f_be [Hz] / size_be [frames]) */
> @@ -149,9 +149,9 @@ static int glue (audio_pcm_sw_alloc_resources_, TYPE) (SW *sw)
>      sw->resample_buf.pos = 0;
>
>  #ifdef DAC
> -    sw->rate = st_rate_start (sw->info.freq, sw->hw->info.freq);
> +    sw->rate = st_rate_start(sw->info.freq, hw->info.freq);
>  #else
> -    sw->rate = st_rate_start (sw->hw->info.freq, sw->info.freq);
> +    sw->rate = st_rate_start(hw->info.freq, sw->info.freq);
>  #endif
>
>      return 0;
> --
> 2.35.3
>


--
Marc-André Lureau
diff mbox series

Patch

diff --git a/audio/audio_template.h b/audio/audio_template.h
index 0d8aab6fad..7e116426c7 100644
--- a/audio/audio_template.h
+++ b/audio/audio_template.h
@@ -107,6 +107,7 @@  static void glue (audio_pcm_sw_free_resources_, TYPE) (SW *sw)
 
 static int glue (audio_pcm_sw_alloc_resources_, TYPE) (SW *sw)
 {
+    HW *hw = sw->hw;
     int samples;
 
     if (!glue(audio_get_pdo_, TYPE)(sw->s->dev)->mixing_engine) {
@@ -125,7 +126,6 @@  static int glue (audio_pcm_sw_alloc_resources_, TYPE) (SW *sw)
     }
 
     if (samples == 0) {
-        HW *hw = sw->hw;
         size_t f_fe_min;
 
         /* f_fe_min = ceil(1 [frames] * f_be [Hz] / size_be [frames]) */
@@ -149,9 +149,9 @@  static int glue (audio_pcm_sw_alloc_resources_, TYPE) (SW *sw)
     sw->resample_buf.pos = 0;
 
 #ifdef DAC
-    sw->rate = st_rate_start (sw->info.freq, sw->hw->info.freq);
+    sw->rate = st_rate_start(sw->info.freq, hw->info.freq);
 #else
-    sw->rate = st_rate_start (sw->hw->info.freq, sw->info.freq);
+    sw->rate = st_rate_start(hw->info.freq, sw->info.freq);
 #endif
 
     return 0;