Updated Jace emulator to allow HD images as well as 800kb floppy images

This commit is contained in:
Brendan Robert 2020-01-01 18:56:30 -06:00
parent 030049b986
commit 19c68edadb
5 changed files with 17 additions and 5 deletions

View File

@ -1 +1,4 @@
/*~ /*~
/nb-configuration.xml
/OutlawEditor.iml
/.idea/

View File

@ -1379,4 +1379,9 @@ public class MOS65C02 extends CPU {
default: default:
} }
} }
@Override
public void reconfigure() {
// Currently do nothing
}
} }

View File

@ -152,11 +152,15 @@ public class Speaker extends SoundGeneratorDevice {
@Override @Override
public boolean suspend() { public boolean suspend() {
boolean result = super.suspend(); boolean result = super.suspend();
playbackTimer.cancel(); if (playbackTimer != null) {
playbackTimer.cancel();
}
speakerBit = false; speakerBit = false;
sdl = null; sdl = null;
computer.getMotherboard().cancelSpeedRequest(this); if (computer.getMotherboard() != null) {
computer.mixer.returnLine(this); computer.getMotherboard().cancelSpeedRequest(this);
computer.mixer.returnLine(this);
}
return result; return result;
} }

View File

@ -101,7 +101,7 @@ public abstract class Card extends Device {
@Override @Override
public void reconfigure() { public void reconfigure() {
super.reconfigure(); //super.reconfigure();
boolean restart = suspend(); boolean restart = suspend();
unregisterListeners(); unregisterListeners();
if (restart) { if (restart) {

View File

@ -71,7 +71,7 @@ public class LawlessImageTool implements MediaConsumer {
@Override @Override
public boolean isAccepted(MediaEntry e, MediaEntry.MediaFile f) { public boolean isAccepted(MediaEntry e, MediaEntry.MediaFile f) {
return e.type == DiskType.FLOPPY800; return e.type == DiskType.FLOPPY800 || e.type == DiskType.LARGE;
} }
@Override @Override