--- uae/src/include/audio.h	2018/04/24 16:40:12	1.1
+++ uae/src/include/audio.h	2018/04/24 17:18:46	1.1.1.10
@@ -6,30 +6,51 @@
   * Copyright 1995, 1996, 1997 Bernd Schmidt
   */
 
-extern struct audio_channel_data {
-    uaecptr lc, pt;
-    int state, wper, wlen;
-    int current_sample;
-    int vol;
-    int *voltbl;
-    unsigned long adk_mask;
-    unsigned char dmaen, intreq2, data_written;
-    uae_u16 dat, nextdat, per, len;    
-} audio_channel[4];
-
-#ifndef DONT_WANT_SOUND
-extern void aud0_handler(void);
-extern void aud1_handler(void);
-extern void aud2_handler(void);
-extern void aud3_handler(void);
-#endif
-
-extern void AUDxDAT(int nr, uae_u16 value);
-extern void AUDxVOL(int nr, uae_u16 value);
-extern void AUDxPER(int nr, uae_u16 value);
-extern void AUDxLCH(int nr, uae_u16 value);
-extern void AUDxLCL(int nr, uae_u16 value);
-extern void AUDxLEN(int nr, uae_u16 value);
+#define PERIOD_MAX ULONG_MAX
 
+extern void AUDxDAT (int nr, uae_u16 value);
+extern void AUDxVOL (int nr, uae_u16 value);
+extern void AUDxPER (int nr, uae_u16 value);
+extern void AUDxLCH (int nr, uae_u16 value);
+extern void AUDxLCL (int nr, uae_u16 value);
+extern void AUDxLEN (int nr, uae_u16 value);
+
+extern int init_audio (void);
+extern void ahi_install (void);
 extern void audio_reset (void);
-extern void dump_audio_bench (void);
+extern void update_audio (void);
+extern void schedule_audio (void);
+extern void audio_evhandler (void);
+extern void audio_hsync (int);
+extern void update_adkmasks (void);
+extern void update_sound (unsigned int freq);
+extern void led_filter_audio (void);
+
+/* Must match the stereomode array in cfgfile.c.  */
+enum {
+    SND_MONO, SND_STEREO, SND_NONE
+};
+
+STATIC_INLINE int get_audio_nativechannels (void)
+{
+    int ch[] = { 1, 2, 0 };
+    return ch[currprefs.sound_stereo];
+}
+
+STATIC_INLINE int get_audio_amigachannels (void)
+{
+    int ch[] = { 1, 2, 0 };
+    return ch[currprefs.sound_stereo];
+}
+
+STATIC_INLINE int get_audio_ismono (void)
+{
+    if (currprefs.sound_stereo == 0)
+	return 1;
+    return 0;
+}
+
+#define SOUND_MAX_DELAY_BUFFER 1024
+#define SOUND_MAX_LOG_DELAY 10
+#define MIXED_STEREO_MAX 16
+#define MIXED_STEREO_SCALE 32