svp minor adjustments, copyright

[picodrive.git] / Pico / PicoFrameHints.c

diff --git a/Pico/PicoFrameHints.c b/Pico/PicoFrameHints.c
index c14040a..755ab3d 100644 (file)
--- a/Pico/PicoFrameHints.c
+++ b/Pico/PicoFrameHints.c
@@ -1,3 +1,6 @@
+// common code for Pico.c and cd/Pico.c
+// (c) Copyright 2007, Grazvydas "notaz" Ignotas
+
 #define CYCLES_M68K_LINE     488 // suitable for both PAL/NTSC
 #define CYCLES_M68K_VINT_LAG  68
 #define CYCLES_M68K_ASD      148
@@ -54,10 +57,20 @@
 static int PicoFrameHints(void)
 {
   struct PicoVideo *pv=&Pico.video;
-  int lines,y,lines_vis = 224,total_z80 = 0,z80CycleAim = 0,line_sample;
-  int skip=PicoSkipFrame || (PicoOpt&0x10);
+  int lines, y, lines_vis = 224, total_z80 = 0, z80CycleAim = 0, line_sample, skip;
   int hint; // Hint counter
 
+  if ((PicoOpt&0x10) && !PicoSkipFrame) {
+    // draw a frame just after vblank in alternative render mode
+    // yes, this will cause 1 frame lag, but this is inaccurate mode anyway.
+    PicoFrameFull();
+#ifdef DRAW_FINISH_FUNC
+    DRAW_FINISH_FUNC();
+#endif
+    skip = 1;
+  }
+  else skip=PicoSkipFrame;
+
   if (Pico.m.pal) {
     //cycles_68k = (int) ((double) OSC_PAL  /  7 / 50 / 312 + 0.4); // should compile to a constant (488)
     //cycles_z80 = (int) ((double) OSC_PAL  / 15 / 50 / 312 + 0.4); // 228
@@ -120,7 +133,7 @@ static int PicoFrameHints(void)
       PicoLine(y);
 
     if(PicoOpt&1)
-      sound_timers_and_dac(y);
+      Psnd_timers_and_dac(y);
 
 #ifndef PICO_CD
     // get samples from sound chips
@@ -136,9 +149,16 @@ static int PicoFrameHints(void)
 
 #ifdef PICO_CD
     update_chips();
+#else
+    if (PicoLineHook) PicoLineHook(1);
 #endif
   }
 
+#ifdef DRAW_FINISH_FUNC
+  if (!skip)
+    DRAW_FINISH_FUNC();
+#endif
+
   // V-int line (224 or 240)
   Pico.m.scanline=(short)y;
 
@@ -177,7 +197,7 @@ static int PicoFrameHints(void)
     z80_int();
 
   if (PicoOpt&1)
-    sound_timers_and_dac(y);
+    Psnd_timers_and_dac(y);
 
   // get samples from sound chips
 #ifndef PICO_CD
@@ -192,7 +212,9 @@ static int PicoFrameHints(void)
     CYCLES_Z80_LINE - CYCLES_Z80_ASD, CYCLES_S68K_LINE - CYCLES_S68K_ASD);
 
 #ifdef PICO_CD
-    update_chips();
+  update_chips();
+#else
+  if (PicoLineHook) PicoLineHook(1);
 #endif
 
   // PAL line count might actually be 313 according to Steve Snake, but that would complicate things.
@@ -208,7 +230,7 @@ static int PicoFrameHints(void)
 #endif
 
     if(PicoOpt&1)
-      sound_timers_and_dac(y);
+      Psnd_timers_and_dac(y);
 
     // Run scanline:
     if (Pico.m.dma_xfers) SekCyclesBurn(CheckDMA());
@@ -216,13 +238,11 @@ static int PicoFrameHints(void)
 
 #ifdef PICO_CD
     update_chips();
+#else
+    if (PicoLineHook) PicoLineHook(1);
 #endif
   }
 
-  // draw a frame just after vblank in alternative render mode
-  if (!PicoSkipFrame && (PicoOpt&0x10))
-    PicoFrameFull();
-
   return 0;
 }