V3.9.4.1 HotFix

README.md

@@ -1,6 +1,4 @@
-V3.9.4
-
-# JavaMod V3.9.4
+# JavaMod V3.9.4.1
 JavaMod - a java based multimedia player for Protracker, Fast Tracker, 
 Impulse Tracker, Scream Tracker and other mod files plus
 SID, MP3, WAV, OGG, APE, FLAC, MIDI, AdLib ROL-Files (OPL), ...
@@ -33,7 +31,7 @@ with minor version number updates to have you participate in these changes!
 * https://github.com/quippy-git/javamod
 
 ## Supported file types:
-* Mods (FAR, NST, MOD, MTM, STK, WOW, XM, STM, S3M, IT, PowerPacker)
+* Mods (STK, NST, MOD, WOW, XM, FAR, MTM, STM, STS, STX, S3M, IT, MPTM, PowerPacker)
 * OPL2/3 (ROL, LAA, CMF, DRO, SCI)
 * WAV, AU, AIFF
 * MIDI (MID, RMF, RMI) with SF2 soundfont files
@@ -80,6 +78,10 @@ JavaMod incorporates modified versions of the following libraries:
   * MO3 support
   * read from 7z archives
 
+## New in Version 3.9.4.1 HotFix
+* FIX: IT MidiMacros are dismissed as of version recognition. However, that was
+       wrongly implemented and now MidiMacros are mostly always deleted. 
+
 ## New in Version 3.9.4
 * NEW: Supporting STX (ScreamTracker Music Interface Kit)
 * NEW: moved all STM, S3M, IT, ModPlug specific coding into ScreamTrackerMixer

source/de/quippy/javamod/multimedia/mod/loader/tracker/ImpulseTrackerMod.java

@@ -511,7 +511,7 @@ protected void loadModFileInternal(final ModfileInputStream inputStream) throws
 		// Hence to be sure, we check that both values are below 2.14.
 		// Note that all ModPlug Tracker alpha versions do not support filters yet. Earlier alphas identify as cwtv=2.02, cmwt=2.00, but later alpha versions identify as IT 2.14.
 		// Apart from that, there's an unknown XM conversion tool declaring a lower compatible version, which naturally also does not support filters, so it's okay that it is caught here.
-		if ((version<0x0214 && cmwt<0x214) || (lastSavedWithVersion!=0 && lastSavedWithVersion<0x10000A6))
+		if ((version<0x0214 && cmwt<0x214) || (lastSavedWithVersion>0 && lastSavedWithVersion<0x10000A6))
 			midiMacros.clearZxxMacros();
 
 		boolean isBeRoTracker = false;

source/de/quippy/javamod/multimedia/mod/mixer/ScreamTrackerMixer.java

@@ -474,7 +474,7 @@ protected int getFineSlideValue(final int effectOp)
 		{
 			if (!isIT || y==0) return x; 
 		}
-		// Having OP with x and y set (like 15 or 84) is not supported and does nothing
+		// Having OP with x and y set (like 15 or 84) is not supported with IT and does nothing
 		return 0;
 	}
 	/**
@@ -792,6 +792,7 @@ protected void doRowEffects(final ChannelMemory aktMemo)
 			case 0x09:			// Tremor
 				if (aktMemo.assignedEffektParam!=0)
 				{
+					aktMemo.currentInstrumentVolume = aktMemo.currentVolume;
 					aktMemo.tremorOntimeSet = (aktMemo.assignedEffektParam>>4);
 					aktMemo.tremorOfftimeSet = (aktMemo.assignedEffektParam&0xF);
 					if ((mod.getSongFlags() & ModConstants.SONG_ITOLDEFFECTS)!=0)
@@ -800,7 +801,6 @@ protected void doRowEffects(final ChannelMemory aktMemo)
 						aktMemo.tremorOfftimeSet++;
 					}
 				}
-				aktMemo.currentInstrumentVolume = aktMemo.currentVolume;
 				if (aktMemo.tremorOntimeSet==0) aktMemo.tremorOntimeSet=1;
 				if (aktMemo.tremorOfftimeSet==0) aktMemo.tremorOfftimeSet=1;
 				doTremorEffekt(aktMemo);

source/de/quippy/javamod/system/Helpers.java

@@ -88,7 +88,7 @@ private Helpers()
 	}
 
 	/** Version Information */
-	public static final String VERSION = "V3.9.4";
+	public static final String VERSION = "V3.9.4.1";
 	public static final String PROGRAM = "Java Mod Player";
 	public static final String FULLVERSION = PROGRAM+' '+VERSION;
 	public static final String COPYRIGHT = "© by Daniel Becker since 2006";