--- uae/src/sd-file/sound.c	2018/04/24 16:40:30	1.1
+++ uae/src/sd-file/sound.c	2018/04/24 17:17:20	1.1.1.4
@@ -1,22 +1,20 @@
- /* 
+ /*
   * UAE - The Un*x Amiga Emulator
-  * 
+  *
   * Support for Linux/USS sound
-  * 
+  *
   * Copyright 1997 Bernd Schmidt
   */
 
 #include "sysconfig.h"
 #include "sysdeps.h"
 
-#include "config.h"
 #include "options.h"
 #include "memory.h"
 #include "custom.h"
 #include "audio.h"
 #include "gensound.h"
 #include "sounddep/sound.h"
-#include "events.h"
 
 #include <sys/ioctl.h>
 #include <sys/soundcard.h>
@@ -44,10 +42,10 @@ void close_sound(void)
     int t;
     uae_u32 v;
     char buf[4];
-    
+
     if (!have_sound)
 	return;
-    
+
     t = 0;
     v = sndbuf_written;
     buf[t] = v & 255;
@@ -120,14 +118,14 @@ int init_sound (void)
     buf[t+3] = (v>>24) & 255;
     write (sound_fd, buf, 44);
 
-    sample_evtime = (long)maxhpos * maxvpos * 50 / currprefs.sound_freq;
+    obtained_freq = currprefs.sound_freq;
 
     if (currprefs.sound_bits == 16) {
 	init_sound_table16 ();
-	eventtab[ev_sample].handler = currprefs.stereo ? sample16s_handler : sample16_handler;
+	sample_handler = currprefs.stereo ? sample16s_handler : sample16_handler;
     } else {
 	init_sound_table8 ();
-	eventtab[ev_sample].handler = currprefs.stereo ? sample8s_handler : sample8_handler;
+	sample_handler = currprefs.stereo ? sample8s_handler : sample8_handler;
     }
     sound_available = 1;
     sndbufsize = 44100;