--- uae/src/od-pOS/sound.c	2018/04/24 16:40:30	1.1
+++ uae/src/od-pOS/sound.c	2018/04/24 16:59:12	1.1.1.3
@@ -12,11 +12,11 @@
 #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"
 
 #include <pDOS/Lock.h>
 #include <pDOS/Files.h>
@@ -125,9 +125,11 @@ int init_sound (void)
     AudioMap.bam_Length                  = sndbufsize;
     AudioMap.bam_Sample                  = (void*)sndbuffer;
 
-    sample_evtime = (long)maxhpos * maxvpos * 50 / rate;
+    scaled_sample_evtime = (unsigned long)maxhpos * maxvpos * vblank_hz * CYCLE_UNIT / rate;
+    scaled_sample_evtime_ok = 1;
+
     init_sound_table8 ();
-    eventtab[ev_sample].handler = sample8_handler;
+    sample_handler = sample8_handler;
 
     fprintf(stderr, "Sound driver found and configured for %d bits "
                     "at %d Hz, buffer is %d bytes (%s)\n",