--- hatari/src/includes/audio.h	2019/04/01 07:09:16	1.1
+++ hatari/src/includes/audio.h	2019/04/01 07:10:34	1.1.1.4
@@ -1,22 +1,26 @@
 /*
-  Hatari
+  Hatari - audio.h
+
+  This file is distributed under the GNU Public License, version 2 or at
+  your option any later version. Read the file gpl.txt for details.
 */
 
-// Frequency index
-enum {
+#ifndef HATARI_AUDIO_H
+#define HATARI_AUDIO_H
+
+#include <SDL_types.h>
+
+/* Frequency index */
+enum
+{
   FREQ_11Khz,
   FREQ_22Khz,
   FREQ_44Khz
 };
 
-// Odd/Even frame count
-enum {
-  FRAME_ODD,
-  FRAME_EVEN
-};
-
-// Ramp settings to fade sound in/out
-enum {
+/* Ramp settings to fade sound in/out */
+enum
+{
   RAMP_HOLD,
   RAMP_UP,
   RAMP_DOWN
@@ -26,17 +30,19 @@ enum {
 
 
 extern int SoundPlayBackFrequencies[];
-extern int SoundPlayBackFreqFrameLengths[][2];
-extern BOOL bDisableDirectSound;
-extern BOOL bDirectSoundWorking;
+extern BOOL bDisableSound;
+extern BOOL bSoundWorking;
 extern int OutputAudioFreqIndex;
+extern int SoundBufferSize;
+extern int CompleteSndBufIdx;
+
+extern void Audio_Init(void);
+extern void Audio_UnInit(void);
+extern void Audio_Lock(void);
+extern void Audio_Unlock(void);
+extern void Audio_FreeSoundBuffer(void);
+extern void Audio_SetOutputAudioFreq(int Frequency);
+extern void Audio_EnableAudio(BOOL bEnable);
+extern void Audio_WriteSamplesIntoBuffer(Sint8 *pSamples,int Index, int Length, int RampSetting, Sint8 *pDestBuffer);
 
-extern void DAudio_Init(void);
-extern void DAudio_UnInit(void);
-extern BOOL DAudio_CreateSoundBuffer(void);
-extern void DAudio_FreeSoundBuffer(void);
-extern void DAudio_ReCreateDirectSoundBuffer(void);
-extern void DAudio_SetOutputAudioFreq(int Frequency);
-extern void DAudio_ResetBuffer(void);
-extern void DAudio_StopBuffer(void);
-extern void DAudio_WriteSamplesIntoBuffer(char *pSamples,int Index,int Length,int RampSetting);
+#endif  /* HATARI_AUDIO_H */