Swap the rate and info parameters of the audio_rate_get_bytes()
function to align the parameter order with the rest of the
audio_rate_*() functions.

Signed-off-by: Volker Rümelin <vr_qemu@t-online.de>
---
 audio/audio.c      | 2 +-
 audio/audio_int.h  | 2 +-
 audio/dbusaudio.c  | 4 ++--
 audio/noaudio.c    | 4 ++--
 audio/spiceaudio.c | 2 +-
 audio/wavaudio.c   | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/audio/audio.c b/audio/audio.c
index 557538a7b7..233a86c440 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -2275,7 +2275,7 @@ void audio_rate_add_bytes(RateCtl *rate, size_t bytes_used)
     rate->bytes_sent += bytes_used;
 }
 
-size_t audio_rate_get_bytes(struct audio_pcm_info *info, RateCtl *rate,
+size_t audio_rate_get_bytes(RateCtl *rate, struct audio_pcm_info *info,
                             size_t bytes_avail)
 {
     size_t bytes;
diff --git a/audio/audio_int.h b/audio/audio_int.h
index 97e20e8429..e87ce014a0 100644
--- a/audio/audio_int.h
+++ b/audio/audio_int.h
@@ -265,7 +265,7 @@ typedef struct RateCtl {
 void audio_rate_start(RateCtl *rate);
 size_t audio_rate_peek_bytes(RateCtl *rate, struct audio_pcm_info *info);
 void audio_rate_add_bytes(RateCtl *rate, size_t bytes_used);
-size_t audio_rate_get_bytes(struct audio_pcm_info *info, RateCtl *rate,
+size_t audio_rate_get_bytes(RateCtl *rate, struct audio_pcm_info *info,
                             size_t bytes_avail);
 
 static inline size_t audio_ring_dist(size_t dst, size_t src, size_t len)
diff --git a/audio/dbusaudio.c b/audio/dbusaudio.c
index a3d656d3b0..722df0355e 100644
--- a/audio/dbusaudio.c
+++ b/audio/dbusaudio.c
@@ -82,7 +82,7 @@ static void *dbus_get_buffer_out(HWVoiceOut *hw, size_t *size)
     }
 
     *size = MIN(vo->buf_size - vo->buf_pos, *size);
-    *size = audio_rate_get_bytes(&hw->info, &vo->rate, *size);
+    *size = audio_rate_get_bytes(&vo->rate, &hw->info, *size);
 
     return vo->buf + vo->buf_pos;
 
@@ -343,7 +343,7 @@ dbus_read(HWVoiceIn *hw, void *buf, size_t size)
 
     trace_dbus_audio_read(size);
 
-    /* size = audio_rate_get_bytes(&hw->info, &vo->rate, size); */
+    /* size = audio_rate_get_bytes(&vo->rate, &hw->info, size); */
 
     g_hash_table_iter_init(&iter, da->in_listeners);
     while (g_hash_table_iter_next(&iter, NULL, (void **)&listener)) {
diff --git a/audio/noaudio.c b/audio/noaudio.c
index 84a6bfbb1c..4fdee5adec 100644
--- a/audio/noaudio.c
+++ b/audio/noaudio.c
@@ -44,7 +44,7 @@ typedef struct NoVoiceIn {
 static size_t no_write(HWVoiceOut *hw, void *buf, size_t len)
 {
     NoVoiceOut *no = (NoVoiceOut *) hw;
-    return audio_rate_get_bytes(&hw->info, &no->rate, len);
+    return audio_rate_get_bytes(&no->rate, &hw->info, len);
 }
 
 static int no_init_out(HWVoiceOut *hw, struct audsettings *as, void *drv_opaque)
@@ -89,7 +89,7 @@ static void no_fini_in (HWVoiceIn *hw)
 static size_t no_read(HWVoiceIn *hw, void *buf, size_t size)
 {
     NoVoiceIn *no = (NoVoiceIn *) hw;
-    int64_t bytes = audio_rate_get_bytes(&hw->info, &no->rate, size);
+    int64_t bytes = audio_rate_get_bytes(&no->rate, &hw->info, size);
 
     audio_pcm_info_clear_buf(&hw->info, buf, bytes / hw->info.bytes_per_frame);
     return bytes;
diff --git a/audio/spiceaudio.c b/audio/spiceaudio.c
index f52f3a8bbb..d17ef1a25e 100644
--- a/audio/spiceaudio.c
+++ b/audio/spiceaudio.c
@@ -239,7 +239,7 @@ static void line_in_fini (HWVoiceIn *hw)
 static size_t line_in_read(HWVoiceIn *hw, void *buf, size_t len)
 {
     SpiceVoiceIn *in = container_of (hw, SpiceVoiceIn, hw);
-    uint64_t to_read = audio_rate_get_bytes(&hw->info, &in->rate, len) >> 2;
+    uint64_t to_read = audio_rate_get_bytes(&in->rate, &hw->info, len) >> 2;
     size_t ready = spice_server_record_get_samples(&in->sin, buf, to_read);
 
     /*
diff --git a/audio/wavaudio.c b/audio/wavaudio.c
index ac666335c7..3e1d84db83 100644
--- a/audio/wavaudio.c
+++ b/audio/wavaudio.c
@@ -42,7 +42,7 @@ typedef struct WAVVoiceOut {
 static size_t wav_write_out(HWVoiceOut *hw, void *buf, size_t len)
 {
     WAVVoiceOut *wav = (WAVVoiceOut *) hw;
-    int64_t bytes = audio_rate_get_bytes(&hw->info, &wav->rate, len);
+    int64_t bytes = audio_rate_get_bytes(&wav->rate, &hw->info, len);
     assert(bytes % hw->info.bytes_per_frame == 0);
 
     if (bytes && fwrite(buf, bytes, 1, wav->f) != 1) {
-- 
2.35.3

On Fri, Sep 23, 2022 at 10:58 PM Volker Rümelin <vr_qemu@t-online.de> wrote:

> Swap the rate and info parameters of the audio_rate_get_bytes()
> function to align the parameter order with the rest of the
> audio_rate_*() functions.
>
> Signed-off-by: Volker Rümelin <vr_qemu@t-online.de>
>

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



> ---
>  audio/audio.c      | 2 +-
>  audio/audio_int.h  | 2 +-
>  audio/dbusaudio.c  | 4 ++--
>  audio/noaudio.c    | 4 ++--
>  audio/spiceaudio.c | 2 +-
>  audio/wavaudio.c   | 2 +-
>  6 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/audio/audio.c b/audio/audio.c
> index 557538a7b7..233a86c440 100644
> --- a/audio/audio.c
> +++ b/audio/audio.c
> @@ -2275,7 +2275,7 @@ void audio_rate_add_bytes(RateCtl *rate, size_t
> bytes_used)
>      rate->bytes_sent += bytes_used;
>  }
>
> -size_t audio_rate_get_bytes(struct audio_pcm_info *info, RateCtl *rate,
> +size_t audio_rate_get_bytes(RateCtl *rate, struct audio_pcm_info *info,
>                              size_t bytes_avail)
>  {
>      size_t bytes;
> diff --git a/audio/audio_int.h b/audio/audio_int.h
> index 97e20e8429..e87ce014a0 100644
> --- a/audio/audio_int.h
> +++ b/audio/audio_int.h
> @@ -265,7 +265,7 @@ typedef struct RateCtl {
>  void audio_rate_start(RateCtl *rate);
>  size_t audio_rate_peek_bytes(RateCtl *rate, struct audio_pcm_info *info);
>  void audio_rate_add_bytes(RateCtl *rate, size_t bytes_used);
> -size_t audio_rate_get_bytes(struct audio_pcm_info *info, RateCtl *rate,
> +size_t audio_rate_get_bytes(RateCtl *rate, struct audio_pcm_info *info,
>                              size_t bytes_avail);
>
>  static inline size_t audio_ring_dist(size_t dst, size_t src, size_t len)
> diff --git a/audio/dbusaudio.c b/audio/dbusaudio.c
> index a3d656d3b0..722df0355e 100644
> --- a/audio/dbusaudio.c
> +++ b/audio/dbusaudio.c
> @@ -82,7 +82,7 @@ static void *dbus_get_buffer_out(HWVoiceOut *hw, size_t
> *size)
>      }
>
>      *size = MIN(vo->buf_size - vo->buf_pos, *size);
> -    *size = audio_rate_get_bytes(&hw->info, &vo->rate, *size);
> +    *size = audio_rate_get_bytes(&vo->rate, &hw->info, *size);
>
>      return vo->buf + vo->buf_pos;
>
> @@ -343,7 +343,7 @@ dbus_read(HWVoiceIn *hw, void *buf, size_t size)
>
>      trace_dbus_audio_read(size);
>
> -    /* size = audio_rate_get_bytes(&hw->info, &vo->rate, size); */
> +    /* size = audio_rate_get_bytes(&vo->rate, &hw->info, size); */
>
>      g_hash_table_iter_init(&iter, da->in_listeners);
>      while (g_hash_table_iter_next(&iter, NULL, (void **)&listener)) {
> diff --git a/audio/noaudio.c b/audio/noaudio.c
> index 84a6bfbb1c..4fdee5adec 100644
> --- a/audio/noaudio.c
> +++ b/audio/noaudio.c
> @@ -44,7 +44,7 @@ typedef struct NoVoiceIn {
>  static size_t no_write(HWVoiceOut *hw, void *buf, size_t len)
>  {
>      NoVoiceOut *no = (NoVoiceOut *) hw;
> -    return audio_rate_get_bytes(&hw->info, &no->rate, len);
> +    return audio_rate_get_bytes(&no->rate, &hw->info, len);
>  }
>
>  static int no_init_out(HWVoiceOut *hw, struct audsettings *as, void
> *drv_opaque)
> @@ -89,7 +89,7 @@ static void no_fini_in (HWVoiceIn *hw)
>  static size_t no_read(HWVoiceIn *hw, void *buf, size_t size)
>  {
>      NoVoiceIn *no = (NoVoiceIn *) hw;
> -    int64_t bytes = audio_rate_get_bytes(&hw->info, &no->rate, size);
> +    int64_t bytes = audio_rate_get_bytes(&no->rate, &hw->info, size);
>
>      audio_pcm_info_clear_buf(&hw->info, buf, bytes /
> hw->info.bytes_per_frame);
>      return bytes;
> diff --git a/audio/spiceaudio.c b/audio/spiceaudio.c
> index f52f3a8bbb..d17ef1a25e 100644
> --- a/audio/spiceaudio.c
> +++ b/audio/spiceaudio.c
> @@ -239,7 +239,7 @@ static void line_in_fini (HWVoiceIn *hw)
>  static size_t line_in_read(HWVoiceIn *hw, void *buf, size_t len)
>  {
>      SpiceVoiceIn *in = container_of (hw, SpiceVoiceIn, hw);
> -    uint64_t to_read = audio_rate_get_bytes(&hw->info, &in->rate, len) >>
> 2;
> +    uint64_t to_read = audio_rate_get_bytes(&in->rate, &hw->info, len) >>
> 2;
>      size_t ready = spice_server_record_get_samples(&in->sin, buf,
> to_read);
>
>      /*
> diff --git a/audio/wavaudio.c b/audio/wavaudio.c
> index ac666335c7..3e1d84db83 100644
> --- a/audio/wavaudio.c
> +++ b/audio/wavaudio.c
> @@ -42,7 +42,7 @@ typedef struct WAVVoiceOut {
>  static size_t wav_write_out(HWVoiceOut *hw, void *buf, size_t len)
>  {
>      WAVVoiceOut *wav = (WAVVoiceOut *) hw;
> -    int64_t bytes = audio_rate_get_bytes(&hw->info, &wav->rate, len);
> +    int64_t bytes = audio_rate_get_bytes(&wav->rate, &hw->info, len);
>      assert(bytes % hw->info.bytes_per_frame == 0);
>
>      if (bytes && fwrite(buf, bytes, 1, wav->f) != 1) {
> --
> 2.35.3
>
>
>

-- 
Marc-André Lureau