empathicqubit/Mesen-X
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed warnings

Browse source
This commit is contained in:
Souryo 2016-06-26 16:00:16 -04:00
parent ed3b5422fe
commit acc2d7eee9
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Core/Movie.cpp
View file

@ -231,7 +231,7 @@ bool Movie::Save()
header.Region = (uint32_t)Console::GetNesModel();
header.ConsoleType = (uint32_t)EmulationSettings::GetConsoleType();
header.ExpansionDevice = (uint32_t)EmulationSettings::GetExpansionDevice();
header.OverclockRate = EmulationSettings::GetOverclockRate();
header.OverclockRate = (uint32_t)EmulationSettings::GetOverclockRate();
header.OverclockAdjustApu = EmulationSettings::GetOverclockAdjustApu();
for(int port = 0; port < 4; port++) {
header.ControllerTypes[port] = (uint32_t)EmulationSettings::GetControllerType(port);

10
Core/NsfMapper.cpp
View file

@ -58,8 +58,8 @@ void NsfMapper::InitMapper(RomData& romData)
}
_songNumber = _nsfHeader.StartingSong - 1;
_ntscSpeed = _nsfHeader.PlaySpeedNtsc * (CPU::ClockRateNtsc / 1000000.0);
_palSpeed = _nsfHeader.PlaySpeedPal * (CPU::ClockRatePal / 1000000.0);
_ntscSpeed = (uint16_t)(_nsfHeader.PlaySpeedNtsc * (CPU::ClockRateNtsc / 1000000.0));
_palSpeed = (uint16_t)(_nsfHeader.PlaySpeedPal * (CPU::ClockRatePal / 1000000.0));
if(_nsfHeader.SoundChips & NsfSoundChips::MMC5) {
AddRegisterRange(0x5000, 0x5015, MemoryOperation::Write); //Registers
@ -346,7 +346,7 @@ void NsfMapper::InternalSelectTrack(uint8_t trackNumber, bool requestReset)
//Set track length/fade counters (NSFe)
if(_nsfHeader.TrackLength[trackNumber] >= 0) {
_trackEndCounter = (double)_nsfHeader.TrackLength[trackNumber] / 1000.0 * GetClockRate();
_trackEndCounter = (int32_t)((double)_nsfHeader.TrackLength[trackNumber] / 1000.0 * GetClockRate());
_allowSilenceDetection = false;
} else if(_nsfHeader.TotalSongs > 1) {
//Only apply a maximum duration to multi-track NSFs
@ -356,13 +356,13 @@ void NsfMapper::InternalSelectTrack(uint8_t trackNumber, bool requestReset)
_allowSilenceDetection = true;
}
if(_nsfHeader.TrackFade[trackNumber] >= 0) {
_trackFadeCounter = (double)_nsfHeader.TrackFade[trackNumber] / 1000.0 * GetClockRate();
_trackFadeCounter = (int32_t)((double)_nsfHeader.TrackFade[trackNumber] / 1000.0 * GetClockRate());
} else {
//Default to 1 sec fade if none is specified (negative number)
_trackFadeCounter = GetClockRate();
}
_silenceDetectDelay = (double)EmulationSettings::GetNsfAutoDetectSilenceDelay() / 1000.0 * GetClockRate();
_silenceDetectDelay = (uint32_t)((double)EmulationSettings::GetNsfAutoDetectSilenceDelay() / 1000.0 * GetClockRate());
_fadeLength = _trackFadeCounter;
TriggerIrq(NsfIrqType::Init);

2
Core/SoundMixer.cpp
View file

@ -136,7 +136,7 @@ void SoundMixer::UpdateRates(bool forceUpdate)
{
uint32_t newRate = CPU::GetClockRate(_model);
if(!EmulationSettings::GetOverclockAdjustApu()) {
newRate *= (double)EmulationSettings::GetOverclockRate(false, true) / 100;
newRate = (uint32_t)(newRate * (double)EmulationSettings::GetOverclockRate(false, true) / 100);
}
if(_clockRate != newRate || forceUpdate) {