--- hatari/src/includes/audio.h	2019/04/01 07:09:16	1.1.1.1
+++ hatari/src/includes/audio.h	2019/04/01 07:14:44	1.1.1.7
@@ -1,42 +1,33 @@
 /*
-  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
+
+/* 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_HOLD,
-  RAMP_UP,
-  RAMP_DOWN
-};
-#define  RAMP_UP_VOLUME_LEVEL  0.20f    /* (1.0f/5.f) */
-#define  RAMP_DOWN_VOLUME_LEVEL  0.20f  /* (1.0f/5.f) */
-
-
-extern int SoundPlayBackFrequencies[];
-extern int SoundPlayBackFreqFrameLengths[][2];
-extern BOOL bDisableDirectSound;
-extern BOOL bDirectSoundWorking;
+extern const int SoundPlayBackFrequencies[];
+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 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 */