--- uae/src/od-amiga/sound.c	2018/04/24 16:42:52	1.1.1.2
+++ uae/src/od-amiga/sound.c	2018/04/24 17:09:58	1.1.1.4
@@ -16,6 +16,7 @@
 #include "config.h"
 #include "options.h"
 #include "memory.h"
+#include "events.h"
 #include "custom.h"
 #include "audio.h"
 #include "gensound.h"
@@ -302,9 +303,6 @@ int init_sound (void)
 	effect.eff.ahieci_Pad=0;
 
 	AHI_SetEffect(&effect,actrl);
-#elif defined(FRAME_RATE_HACK)
-/* reduce vsynctime a bit to give the sound emulation more room to breathe.*/
-    vsynctime = vsynctime * 9 / 10;
 #endif /* !AHI_DMA_MODE && ! FRAME_RATE_HACK */
     } else {
         buffers[0] = (void*)AllocMem(sndbufsize,MEMF_CHIP|MEMF_CLEAR);
@@ -317,8 +315,10 @@ int init_sound (void)
     oldledstate = cia->ciapra & (1<<CIAB_LED);
     cia->ciapra |= (1<<CIAB_LED);
 
-    sample_evtime = (long)maxhpos * maxvpos * 50 / rate;
-    if (ahiopen) { 
+    scaled_sample_evtime = (unsigned long)maxhpos * maxvpos * vblank_hz * CYCLE_UNIT / rate;
+    scaled_sample_evtime_ok = 1;
+
+    if (ahiopen) {
     	if(currprefs.sound_bits == 16) {
 	   init_sound_table16 ();
 	   sample_handler = currprefs.stereo ? sample16s_handler