audio: move decoder context from sh_audio into new struct

Move all state that basically changes during decoding or is needed in
order to manage decoding itself into a new struct (dec_audio).

sh_audio (defined in stheader.h) is supposed to be the audio stream
header. This should reflect the file headers for the stream. Putting the
decoder context there is strange design, to say the least.

1 files changed, 6 insertions, 5 deletions

diff --git a/audio/decode/ad.h b/audio/decode/ad.h
index 6c76e8dfd0..ed9f4fff75 100644
--- a/audio/decode/ad.h
+++ b/audio/decode/ad.h
@@ -25,6 +25,7 @@
 
 #include "audio/format.h"
 #include "audio/audio.h"
+#include "dec_audio.h"
 
 struct mp_decoder_list;
 
@@ -32,11 +33,11 @@ struct mp_decoder_list;
 struct ad_functions {
     const char *name;
     void (*add_decoders)(struct mp_decoder_list *list);
-    int (*preinit)(sh_audio_t *sh);
-    int (*init)(sh_audio_t *sh, const char *decoder);
-    void (*uninit)(sh_audio_t *sh);
-    int (*control)(sh_audio_t *sh, int cmd, void *arg);
-    int (*decode_audio)(sh_audio_t *sh, struct mp_audio *buffer, int maxlen);
+    int (*preinit)(struct dec_audio *da);
+    int (*init)(struct dec_audio *da, const char *decoder);
+    void (*uninit)(struct dec_audio *da);
+    int (*control)(struct dec_audio *da, int cmd, void *arg);
+    int (*decode_audio)(struct dec_audio *da, struct mp_audio *buffer, int maxlen);
 };
 
 enum ad_ctrl {