From d008e5271eafe044233db6d158bf91c9efa39331 Mon Sep 17 00:00:00 2001
From: XANTRONIX Development
Date: Wed, 2 Feb 2022 13:51:34 -0500
Subject: Channel count first seems...nicer, somehow.

---
 include/xas/audio.h | 10 +++++-----
 include/xas/mixer.h |  4 ++--
 include/xas/riff.h  |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'include')

diff --git a/include/xas/audio.h b/include/xas/audio.h
index 9c40dd8..8d4469d 100644
--- a/include/xas/audio.h
+++ b/include/xas/audio.h
@@ -33,9 +33,9 @@ typedef void (*xas_audio_cleanup)(void *ctx,
 struct _xas_audio_stream {
     enum xas_audio_stream_type type;
 
-    size_t sample_size,
-           sample_rate,
-           channels;
+    size_t channels,
+           sample_size,
+           sample_rate;
 
     size_t buffer_size,
            buffer_count;
@@ -54,17 +54,17 @@ struct _xas_audio_stream {
 xas_audio_stream *xas_audio_stream_new_sink(xas_audio_drain drain,
                                                 xas_audio_cleanup cleanup,
                                                 void *ctx,
+                                                size_t channels,
                                                 size_t sample_size,
                                                 size_t sample_rate,
-                                                size_t channels,
                                                 size_t buffer_size);
 
 xas_audio_stream *xas_audio_stream_new_source(xas_audio_fill fill,
                                                   xas_audio_cleanup cleanup,
                                                   void *ctx,
+                                                  size_t channels,
                                                   size_t sample_size,
                                                   size_t sample_rate,
-                                                  size_t channels,
                                                   size_t buffer_size);
 
 void xas_audio_stream_destroy(xas_audio_stream *stream);
diff --git a/include/xas/mixer.h b/include/xas/mixer.h
index 9fd77cb..73fd363 100644
--- a/include/xas/mixer.h
+++ b/include/xas/mixer.h
@@ -25,9 +25,9 @@ typedef struct _xas_mixer {
     size_t buffer_size;
 } xas_mixer;
 
-xas_mixer *xas_mixer_new(size_t sample_size,
+xas_mixer *xas_mixer_new(size_t channels,
+                             size_t sample_size,
                              size_t sample_rate,
-                             size_t channels,
                              size_t buffer_size);
 
 void xas_mixer_destroy(xas_mixer *mixer);
diff --git a/include/xas/riff.h b/include/xas/riff.h
index ca78af1..f78e9e9 100644
--- a/include/xas/riff.h
+++ b/include/xas/riff.h
@@ -50,9 +50,9 @@ typedef struct _xas_riff xas_riff;
 #pragma pack(pop)
 
 xas_audio_stream *xas_riff_new_file(const char *path,
+                                        size_t channels,
                                         size_t sample_size,
                                         size_t sample_rate,
-                                        size_t channels,
                                         int flags);
 
 xas_audio_stream *xas_riff_open_file(const char *path, int flags);
-- 
cgit v1.2.3