empathicqubit/AppleWin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix code due to changes in recent merge from upstream.

Browse source 
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
This commit is contained in:
Andrea Odetti 2018-03-03 18:08:31 +00:00
parent 5efc8ca461
commit b29b69647d
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
source/frontends/qapple/qapple.cpp
View file

@ -86,6 +86,13 @@ namespace
g_fh = NULL;
}
qint64 emulatorTimeInMS()
{
const double timeInSeconds = g_nCumulativeCycles / g_fCurrentCLK6502;
const qint64 timeInMS = timeInSeconds * 1000;
return timeInMS;
}
}
void FrameDrawDiskLEDS(HDC)
@ -197,7 +204,7 @@ void QApple::closeEvent(QCloseEvent *)
void QApple::on_timer()
{
const qint64 target = myElapsedTimer.elapsed();
const qint64 current = CpuGetEmulationTime_ms() - myCpuTimeReference;
const qint64 current = emulatorTimeInMS() - myCpuTimeReference;
const qint64 elapsed = target - current;
if (elapsed <= 0)
{
@ -245,7 +252,7 @@ void QApple::stopTimer()
void QApple::restartTimeCounters()
{
myElapsedTimer.start();
myCpuTimeReference = CpuGetEmulationTime_ms();
myCpuTimeReference = emulatorTimeInMS();
}
void QApple::on_actionStart_triggered()

4
source/linux/data.cpp
View file

@ -198,7 +198,9 @@ void LoadConfiguration(void)
#endif
REGLOAD(TEXT(REGVALUE_EMULATION_SPEED) ,&g_dwSpeed);
REGLOAD(TEXT(REGVALUE_ENHANCE_DISK_SPEED), &enhancedisk);
DWORD dwEnhanceDisk;
REGLOAD(TEXT(REGVALUE_ENHANCE_DISK_SPEED), &dwEnhanceDisk);
Disk_SetEnhanceDisk(dwEnhanceDisk ? true : false);
#if 0
Config_Load_Video();