--- uae/src/sd-solaris/sound.c	2018/04/24 16:40:11	1.1.1.1
+++ uae/src/sd-solaris/sound.c	2018/04/24 17:16:55	1.1.1.6
@@ -1,22 +1,21 @@
- /* 
+ /*
   * UAE - The Un*x Amiga Emulator
-  * 
+  *
   * Support for Solaris sound
-  * 
+  *
   * Copyright 1996, 1997 Manfred Thole
   */
 
 #include "sysconfig.h"
 #include "sysdeps.h"
 
-#include "config.h"
 #include "options.h"
 #include "memory.h"
+#include "events.h"
 #include "custom.h"
 #include "audio.h"
 #include "gensound.h"
 #include "sounddep/sound.h"
-#include "events.h"
 
 #if !defined HAVE_SYS_AUDIOIO_H
 
@@ -81,15 +80,14 @@ int init_sound (void)
 	fprintf(stderr, "Can't use sample rate %d with %d bits, %s!\n", rate, dspbits, (dspbits ==8) ? "ulaw" : "linear");
 	return 0;
     }
-    sample_evtime = (long)maxhpos * maxvpos * 50 / rate;
+    obtained_freq = rate;
 
     init_sound_table16 ();
 
-    if (dspbits == 8) {
-	eventtab[ev_sample].handler = sample_ulaw_handler;
-    } else {
-	eventtab[ev_sample].handler = sample16_handler;
-    }
+    if (dspbits == 8)
+	sample_handler = sample_ulaw_handler;
+    else
+	sample_handler = sample16_handler;
 
     sndbufpt = sndbuffer;
     sound_available = 1;