reorganize overclocking variabls from r3120 to be in the core emulator instead of all jumbled up among modules

trunk/src/drivers/win/main.cpp

@@ -147,12 +147,6 @@ int genie = 0;
 int pal_emulation = 0;
 int pal_setting_specified = 0;
 int dendy = 0;
-// overclock the console by adding dummy scanlines to PPU loop
-// disables DMC DMA and WaveHi filling for these dummies
-// doesn't work with new PPU
-bool overclocked = 0;
-// 7-bit samples have priority over overclocking
-bool skip_7bit_overclocking = 1;
 bool swapDuty = 0; // some Famicom and NES clones had duty cycle bits swapped
 int ntsccol = 0, ntsctint, ntschue;
 std::string BaseDirectory;

trunk/src/drivers/win/main.h

@@ -57,11 +57,7 @@ extern int EnableBackgroundInput;
 extern int AFon;
 extern int AFoff;
 extern int AutoFireOffset;
-extern int normalscanlines;
+
-extern int extrascanlines;
-extern int totalscanlines;
-extern bool overclocked;
-extern bool skip_7bit_overclocking;
 
 extern int vmod;
 

trunk/src/drivers/win/timing.cpp

@@ -2,6 +2,7 @@
 #include "main.h"
 #include "gui.h"
 #include "resource.h"
+#include "fceu.h"
 
 char str[5];
 extern int newppu;

trunk/src/fceu.cpp

@@ -53,6 +53,19 @@ extern void ResetDebugStatisticsCounters();
 extern void SetMainWindowText();
 extern bool isTaseditorRecording();
 
+//-----------
+//overclocking-related
+// overclock the console by adding dummy scanlines to PPU loop
+// disables DMC DMA and WaveHi filling for these dummies
+// doesn't work with new PPU
+bool overclocked = 0;
+// 7-bit samples have priority over overclocking
+bool skip_7bit_overclocking = 1;
+int normalscanlines;
+int extrascanlines = 0;
+int totalscanlines;
+//------------
+
 extern int32 fps_scale;
 extern int32 fps_scale_unpaused;
 extern int32 fps_scale_frameadvance;

trunk/src/fceu.h

@@ -7,6 +7,13 @@ extern int fceuindbg;
 extern int newppu;
 void ResetGameLoaded(void);
 
+//overclocking-related
+extern bool overclocked;
+extern bool skip_7bit_overclocking;
+extern int normalscanlines;
+extern int extrascanlines;
+extern int totalscanlines;
+
 extern bool AutoResumePlay;
 extern char romNameWhenClosingEmulator[];
 

trunk/src/ppu.cpp

@@ -343,9 +343,6 @@ static int maxsprites = 8;
 
 //scanline is equal to the current visible scanline we're on.
 int scanline;
-int normalscanlines;
-int extrascanlines = 0;
-int totalscanlines;
 int g_rasterpos;
 static uint32 scanlines_per_frame;
 

trunk/src/ppu.h

@@ -21,7 +21,6 @@ uint8* FCEUPPU_GetCHR(uint32 vadr, uint32 refreshaddr);
 void ppu_getScroll(int &xpos, int &ypos);
 
 
-
 #ifdef _MSC_VER
 #define FASTCALL __fastcall
 #else
@@ -36,8 +35,6 @@ void FFCEUX_PPUWrite_Default(uint32 A, uint8 V);
 
 extern int g_rasterpos;
 extern uint8 PPU[4];
-extern bool overclocked;
-extern bool skip_7bit_overclocking;
 extern bool DMC_7bit;
 
 enum PPUPHASE {