3.3 BugFix 22.06.2022

Author: quippy-git

.classpath

@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="source"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre-1.8.0"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre-17">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

.settings/org.eclipse.jdt.core.prefs

@@ -1,9 +1,9 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=optimize out
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=17
 org.eclipse.jdt.core.compiler.debug.lineNumber=do not generate
 org.eclipse.jdt.core.compiler.debug.localVariable=do not generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=do not generate
@@ -12,4 +12,4 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=17

README.md

@@ -1,12 +1,8 @@
-# JavaMod V3.2
-Development version: 3.3
-
-Code Compliance Level: JDK 1.8
-Build with openJDK 1.8 update 311
-However: run with modern Java (openJDK >11, 64BIT) to gain full
-speed - 200+ NNAs are no problem then
-Heap Size with JDK8 (default of 256M) not sufficient with bigger mods. Either
-set -Xmx1024m parameter or use newer JDK 
+# JavaMod V3.3
+Development version: 3.4
+
+Code Compliance Level: JDK 17
+Build with openJDK 17.0.2
 
 ## Supported file types:
 * Mods (NST, MOD, WOW, XM, STM, S3M, IT, PowerPacker)
@@ -37,6 +33,7 @@ JavaMod incorporates modified versions of the following libraries.
   is not an option. Lazy loading does not help as the available MidiDevices 
   must be present when creating the config drop down list for selection.
 * Clean up effects - some are for IT only, some for XM only (copy&paste...)
+  (Mostly done, still needs QS)
 * On Linux gapless audio streams do not work if SourceLine Buffers drain out
 * Tray Icon: mouse wheel (volume control) & keyboard shortcuts do not work
 
@@ -47,6 +44,17 @@ JavaMod incorporates modified versions of the following libraries.
 * read 7z archives
 * maybe: follow song with mod files (pattern display)
 
+## New in Version 3.3
+* IMPORTANT: as JDK 8 LTS support will be over in two years (security) and
+       normal support is already over, JavaMod is now using JDK 17 (LTS).
+       As the compile level changed, you *must* use JDK 17 to run JavaMod!
+* NEW: Replaced Wide Stereo with a real virtual surround
+* FIX: Legacy ModPlug Tracker (1.17RC2 and lower) files have correct
+       volume now. I did things too easy!
+* FIX: iconify and deIconify fixed so that with tray icon entry in task bar
+       is gone
+* FIX: MP3: added "Info" tag to "Xing" tag to read as CBR
+
 ## New in Version 3.2
 * FIX: Sustain-Loop and normal Loop not correctly differed in
        BasicModMixer::fitIntoLoops. Resulted in a Devision by Zero, if
@@ -163,8 +171,8 @@ JavaMod incorporates modified versions of the following libraries.
 * The OPL3 support was already implemented - but as pure beta yet not activated,
   Release because:
 * fixed: nasty NullPointerException when pattern, sample and instrument dialog
-  have never been opened yet and switching back from other media file than mod.
-  They get initialized than to get the loaded information data, but the 
+  have never been opened yet and switching back from other media file then mod.
+  They get initialized then to get the loaded information data, but the 
   ModInfoPanel is not yet added to its JFrame so: no RootPane at that moment.
 
 ## New in Version 2.7
@@ -213,7 +221,7 @@ JavaMod incorporates modified versions of the following libraries.
 ## New in Version 2.6
 * fixed icon size in tray icon
 * save selected SA-Meter visual style 
-* fixed a playback issue if hardware buffers are smaller than the mixing buffer
+* fixed a playback issue if hardware buffers are smaller then the mixing buffer
 * fixed (hopefully) swing gui errors from playlist
 * fix for KDE Bugs in Drag&Drop with wrongly encoded URLs
 * fix with GaplessAudioStream - it's now really gapless. 

source/de/quippy/javamod/main/gui/MainForm.java

@@ -674,7 +674,7 @@ public void windowClosing(java.awt.event.WindowEvent e)
 			@Override
 			public void windowIconified(WindowEvent e)
 			{
-				if (useSystemTray) doIconify();
+				doIconify();
 			}
 			/**
 			 * @param e
@@ -684,7 +684,7 @@ public void windowIconified(WindowEvent e)
 			@Override
 			public void windowDeiconified(WindowEvent e)
 			{
-				if (useSystemTray) doDeIconify();
+				doDeIconify();
 				toFront(); // MakeMainWindowVisible does this also, if other child windows are open and gain focus
 			}
 		});
@@ -1450,12 +1450,15 @@ public void actionPerformed(ActionEvent e)
 	 */
 	private void doIconify()
 	{
-		if (useSystemTray && (getExtendedState() & ICONIFIED)==0)
+		if (useSystemTray)
 		{
+			// no check, if iconified, as that *will* be true already!
+			// remember visiable state of all windows
 			windowsVisibleState = new boolean[windows.size()];
 			for (int x=0; x<windows.size(); x++)
 				windowsVisibleState[x] = windows.get(x).isVisible();
 			dispose();
+			setVisible(false);
 		}
 	}
 	/**
@@ -1469,7 +1472,7 @@ private void doIconify()
 	 */
 	private void doDeIconify()
 	{
-		if ((getExtendedState() & ICONIFIED)!=0)
+		if (useSystemTray && (getExtendedState() & ICONIFIED)!=0)
 		{
 			setVisible(true);
 			setExtendedState(getExtendedState() & ~ICONIFIED); // JFrame.setState is obsolete!!

source/de/quippy/javamod/main/gui/playlist/PlayListGUI.java

@@ -942,8 +942,8 @@ private int getFirstVisableIndex()
 			{
 				try
 				{
-					final Rectangle2D r1 = getPlaylistTextArea().modelToView(element.getStartOffset());
-					final Rectangle2D r2 = getPlaylistTextArea().modelToView(element.getEndOffset()-1);
+					final Rectangle2D r1 = getPlaylistTextArea().modelToView2D(element.getStartOffset());
+					final Rectangle2D r2 = getPlaylistTextArea().modelToView2D(element.getEndOffset()-1);
 					final Rectangle r = new Rectangle((int)r1.getX(), (int)r1.getY(), (int)(r2.getX()-r1.getX()), (int)r1.getHeight());
 					final Rectangle intersect = r.intersection(getPlaylistTextArea().getVisibleRect());
 					if (!intersect.isEmpty() && intersect.height==r.height) return i;
@@ -963,7 +963,7 @@ private int getFirstVisableIndex()
 	 */
 	private int getSelectedIndexFromPoint(Point position, boolean returnNearest)
 	{
-		final int modelPos = getPlaylistTextArea().viewToModel(position);
+		final int modelPos = getPlaylistTextArea().viewToModel2D(position);
 
 		final HTMLDocument doc = (HTMLDocument)getPlaylistTextArea().getDocument();
 		final Element table = (doc!=null)?doc.getElement("TABLE"):null;
@@ -975,8 +975,8 @@ private int getSelectedIndexFromPoint(Point position, boolean returnNearest)
 			final Element selectedElement = table.getElement(index);
 			try
 			{
-				final Rectangle2D r1 = getPlaylistTextArea().modelToView(selectedElement.getStartOffset());
-				final Rectangle2D r2 = getPlaylistTextArea().modelToView(selectedElement.getEndOffset()-1);
+				final Rectangle2D r1 = getPlaylistTextArea().modelToView2D(selectedElement.getStartOffset());
+				final Rectangle2D r2 = getPlaylistTextArea().modelToView2D(selectedElement.getEndOffset()-1);
 				final Rectangle r = new Rectangle((int)r1.getX(), (int)r1.getY(), (int)(r2.getX()-r1.getX()), (int)r1.getHeight());
 				if (!returnNearest && !r.contains(position)) 
 					return -1;
@@ -1010,8 +1010,8 @@ private void doMakeIndexVisible(PlayListEntry entry)
 				{
 					try
 					{
-						final Rectangle2D r1 = getPlaylistTextArea().modelToView(element.getStartOffset());
-						final Rectangle2D r2 = getPlaylistTextArea().modelToView(element.getEndOffset()-1);
+						final Rectangle2D r1 = getPlaylistTextArea().modelToView2D(element.getStartOffset());
+						final Rectangle2D r2 = getPlaylistTextArea().modelToView2D(element.getEndOffset()-1);
 
 						if (r1!=null && r2!=null)
 						{

source/de/quippy/javamod/mixer/dsp/AudioProcessor.java

@@ -8,7 +8,7 @@
  * signal processing call backs doing their things and will return a 
  * byte array of sampledata coresponding to the audio format provided 
  *
- * Depending on the frames per second this data is than send split into
+ * Depending on the frames per second this data is then send split into
  * left and right channel to all callbacks who whant to be informed.
  * 
  * Created on 29.09.2007 by Daniel Becker