Version 1.0.7 - changes by Nick

- fixed disk emulation bug (sense write protect entered write mode)
- now honour diskWritable parameter (but writing is not implemented)
- support meta tag for volume number in disk filename eg: Vol2_Meta_DV2.dsk
- added isPaddleEnabled parameter
- exposed setPaddleEnabled(boolean value), setPaddleInverted(boolean value)
- paddle values are now 255 at startup (ie. correct if disabled/not present)
- minor AppleSpeaker fix (SourceDataLine.class) thanks to William Halliburton

Source/AppleDisplay.java

@@ -459,8 +459,8 @@ private void refreshDisplay() {
 		boolean isDoubleTextMode = ((graphicsMode & EmAppleII.GR_80CHAR) == EmAppleII.GR_80CHAR);
 		boolean isDoubleGraphicsMode = ((graphicsMode & (EmAppleII.GR_80CHAR | EmAppleII.GR_DHIRES)) == (EmAppleII.GR_80CHAR | EmAppleII.GR_DHIRES));
 
-		int baseAddressText = isPage2 ? apple.MEM_MAIN_RAM2 : apple.MEM_MAIN_TEXT;
-		int baseAddressHires = isPage2 ? apple.MEM_MAIN_RAM3 : apple.MEM_MAIN_HIRES;
+		int baseAddressText = isPage2 ? EmAppleII.MEM_MAIN_RAM2 : EmAppleII.MEM_MAIN_TEXT;
+		int baseAddressHires = isPage2 ? EmAppleII.MEM_MAIN_RAM3 : EmAppleII.MEM_MAIN_HIRES;
 
 		// Set char map
 		if (isCharsetUpdateRequested) {
@@ -769,7 +769,7 @@ private final void renderTextCharacter(int destOffset, int sourceOffset) {
 	}
 	private void renderText(int baseAddress, boolean isMixedMode) {
 		int screenCharY, screenCharYStart = isMixedMode ? 20 : 0;
-		int displayOffset, sourceOffset;
+		int displayOffset;
 		int address, addressEnd, addressStart;
 
 		displayOffset = screenCharYStart * DISPLAY_CHAR_SIZE_Y * DISPLAY_SIZE_X;
@@ -820,7 +820,7 @@ private final void renderDoubleTextCharacter(int destOffset, int sourceOffset) {
 	}
 	private void renderDoubleText(int baseAddress, boolean isMixedMode) {
 		int screenCharY, screenCharYStart = isMixedMode ? 20 : 0;
-		int displayOffset, sourceOffset;
+		int displayOffset;
 		int address, addressEnd, addressStart;
 
 		displayOffset = screenCharYStart * DISPLAY_CHAR_SIZE_Y * DISPLAY_SIZE_X;
@@ -873,7 +873,7 @@ private final void renderLoresBlock(int destOffset, int colorTop, int colorBotto
 	}
 	private void renderLores(int baseAddress, boolean isMixedMode) {
 		int screenCharY, screenCharYEnd = isMixedMode ? 20 : 24;
-		int displayOffset, sourceOffset;
+		int displayOffset;
 		int address, addressEnd, addressStart;
 
 		displayOffset = 0;
@@ -904,7 +904,7 @@ private void renderLores(int baseAddress, boolean isMixedMode) {
 	 */
 	private void renderDoubleLores(int baseAddress, boolean isMixedMode) {
 		int screenCharY, screenCharYEnd = isMixedMode ? 20 : 24;
-		int displayOffset, sourceOffset;
+		int displayOffset;
 		int address, addressEnd, addressStart;
 
 		displayOffset = 0;
@@ -998,7 +998,7 @@ private final void calcNextHiresWords(int address) {
 	}
 	private void renderHires(int baseAddress, boolean isMixedMode) {
 		int screenCharY, screenCharYEnd = isMixedMode ? 20 : 24;
-		int displayOffset, sourceOffset;
+		int displayOffset;
 		int address, addressEnd, addressStart;
 
 		displayOffset = 0;
@@ -1089,7 +1089,7 @@ private final void calcNextDoubleHiresWords(int address) {
 	}	
 	private void renderDoubleHires(int baseAddress, boolean isMixedMode) {
 		int screenCharY, screenCharYEnd = isMixedMode ? 20 : 24;
-		int displayOffset, sourceOffset;
+		int displayOffset;
 		int address, addressEnd, addressStart;
 
 		displayOffset = 0;