diff --git a/src/common/mainSDL.cxx b/src/common/mainSDL.cxx index 83ae115ca..44a37504b 100644 --- a/src/common/mainSDL.cxx +++ b/src/common/mainSDL.cxx @@ -164,10 +164,12 @@ int main(int argc, char* argv[]) #endif } +#if 0 // Swallow any spurious events in the queue // These are normally caused by joystick/mouse jitter SDL_Event event; while(SDL_PollEvent(&event)) /* swallow event */ ; +#endif // Start the main loop, and don't exit until the user issues a QUIT command theOSystem->logMessage("Starting main loop ...", 2); diff --git a/src/common/tv_filters/NTSCFilter.cxx b/src/common/tv_filters/NTSCFilter.cxx index 1bc15407b..71290d409 100644 --- a/src/common/tv_filters/NTSCFilter.cxx +++ b/src/common/tv_filters/NTSCFilter.cxx @@ -22,9 +22,6 @@ #include "NTSCFilter.hxx" -#define SCALE_FROM_100(x) ((x/50.0)-1.0) -#define SCALE_TO_100(x) (uInt32)(50*(x+1.0)) - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - NTSCFilter::NTSCFilter() : mySetup(atari_ntsc_composite), diff --git a/src/common/tv_filters/NTSCFilter.hxx b/src/common/tv_filters/NTSCFilter.hxx index a74e67e37..0855d97b4 100644 --- a/src/common/tv_filters/NTSCFilter.hxx +++ b/src/common/tv_filters/NTSCFilter.hxx @@ -26,6 +26,9 @@ class Settings; #include "bspf.hxx" #include "atari_ntsc.h" +#define SCALE_FROM_100(x) ((x/50.0)-1.0) +#define SCALE_TO_100(x) (uInt32)(50*(x+1.0)) + /** This class is based on the Blargg NTSC filter code from Atari800, and is derived from 'filter_ntsc.(h|c)'. Original code based on diff --git a/src/windows/Stella.vcxproj b/src/windows/Stella.vcxproj index dd91bc47d..a86084db4 100644 --- a/src/windows/Stella.vcxproj +++ b/src/windows/Stella.vcxproj @@ -120,9 +120,6 @@ EditAndContinue - SDL.lib -SDLmain.lib - %(AdditionalOptions) SDL2.lib;SDL2main.lib;SDL2main.lib;%(AdditionalDependencies) $(OutDir)Stella.exe true @@ -152,9 +149,6 @@ SDLmain.lib ProgramDatabase - SDL.lib -SDLmain.lib - %(AdditionalOptions) SDL2.lib;SDL2main.lib;SDL2main.lib;%(AdditionalDependencies) $(OutDir)Stella.exe true