From 4329eb5c37d411ef5a6d93ad369c8ef4233a38cc Mon Sep 17 00:00:00 2001 From: Stephen Anthony Date: Sun, 1 Jul 2018 21:43:22 -0230 Subject: [PATCH] Add missing file in VS project, and fix minor compile warnings. --- src/emucore/EmulationTiming.cxx | 10 +++++----- src/windows/Stella.vcxproj | 2 ++ src/windows/Stella.vcxproj.filters | 6 ++++++ 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/emucore/EmulationTiming.cxx b/src/emucore/EmulationTiming.cxx index a02aa8539..b9651f46f 100644 --- a/src/emucore/EmulationTiming.cxx +++ b/src/emucore/EmulationTiming.cxx @@ -176,12 +176,12 @@ void EmulationTiming::recalculate() switch (myConsoleTiming) { case ConsoleTiming::ntsc: - myAudioSampleRate = round(mySpeedFactor * 262 * 76 * 60) / 38; + myAudioSampleRate = uInt32(round(mySpeedFactor * 262 * 76 * 60) / 38); break; case ConsoleTiming::pal: case ConsoleTiming::secam: - myCyclesPerSecond = round(mySpeedFactor * 312 * 76 * 50) / 38; + myCyclesPerSecond = uInt32(round(mySpeedFactor * 312 * 76 * 50) / 38); break; default: @@ -191,9 +191,9 @@ void EmulationTiming::recalculate() myCyclesPerSecond = myAudioSampleRate * 38; myCyclesPerFrame = 76 * myLinesPerFrame; - myMaxCyclesPerTimeslice = round(mySpeedFactor * myCyclesPerFrame * 2); - myMinCyclesPerTimeslice = round(mySpeedFactor * myCyclesPerFrame / 2); - myAudioFragmentSize = round(mySpeedFactor * AUDIO_HALF_FRAMES_PER_FRAGMENT * myLinesPerFrame); + myMaxCyclesPerTimeslice = uInt32(round(mySpeedFactor * myCyclesPerFrame * 2)); + myMinCyclesPerTimeslice = uInt32(round(mySpeedFactor * myCyclesPerFrame / 2)); + myAudioFragmentSize = uInt32(round(mySpeedFactor * AUDIO_HALF_FRAMES_PER_FRAGMENT * myLinesPerFrame)); myPrebufferFragmentCount = discreteDivCeil( myPlaybackPeriod * myAudioSampleRate, diff --git a/src/windows/Stella.vcxproj b/src/windows/Stella.vcxproj index 9de68a454..4e76487cd 100644 --- a/src/windows/Stella.vcxproj +++ b/src/windows/Stella.vcxproj @@ -229,6 +229,7 @@ + @@ -520,6 +521,7 @@ + diff --git a/src/windows/Stella.vcxproj.filters b/src/windows/Stella.vcxproj.filters index 4c27c863a..ccfb0362c 100644 --- a/src/windows/Stella.vcxproj.filters +++ b/src/windows/Stella.vcxproj.filters @@ -930,6 +930,9 @@ Source Files\emucore + + Source Files + @@ -1901,6 +1904,9 @@ Header Files\emucore + + Header Files +