3.9.5 gamma

Author: quippy-git

README.md

@@ -1,4 +1,4 @@
-# JavaMod V3.9.4.1
+# JavaMod V3.9.5
 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), ...
@@ -64,6 +64,8 @@ JavaMod incorporates modified versions of the following libraries:
 * With KDE:
   * JDialogs, when set visible, will not come to front
 * Tray Icon: mouse wheel (volume control) & keyboard shortcuts do not work
+  because of Java TrayIcon using xembed instead of SNI, TrayIcon events like
+  mouse clicks are not reaching the application. There is no suitable workaround 
 
 ## Planned:
 * finish loading of OMPT extended instrument / song data / mixer data
@@ -78,6 +80,46 @@ JavaMod incorporates modified versions of the following libraries:
   * MO3 support
   * read from 7z archives
 
+## New in Version 3.9.5
+* NEW: Audio CD rips with CloneCD create an image file ending with IMG. That is
+       in fact a wave file without riff header. So now we support IMG-files as
+       such: 44.100 16Bit Stereo. You can now play IMG files or CloneCD CUE
+       sheets directly with JavaMod
+* NEW: One PT2 quirk is that with arpeggios the base note is not recalculated
+       which leads to finetune not being considered if the instrument changed.
+       That must be a bug as note 2 and 3 consider the current finetune set
+* NEW: for the pattern display I used JButtons and was setting a text with
+       brackets and used HTML styling for the coloring. That way I could not use
+       solid blocks like '\u2588'. Furthermore using HTML styles is very slow,
+       because of needed interpretation. Now we draw those meters by hand. 
+* FIX: massive code cleanup
+* FIX: Midiplayback: set correct "end of track" messages and delete incorrect
+       ones
+* FIX: if clicking on the tray icon, javamod should come to front
+* FIX: X-MAS decoration: setting spaces while already enabled drawing did not
+       work. Semaphore "inDraw" was never reset to false.
+* FIX: X_MAS decoration: possible race condition while creating window and
+       content fixed.
+* FIX: Icy-Streams use upper and lower case for tags - so normalize to lower
+       case for all tags. Otherwise tags are not found (like Icy-MetaInt)
+* FIX: Encoding for HTTP headers in ICY-Streams is ISO-8859-1 - but headers need
+       re-encoding to UTF-8 afterwards
+* FIX: setTempo (F00) with protracker means "stop the mod"
+* FIX: Multichannel ProTracker generics use XM_AMIGA_TABLE. However, must on the
+       other hand behave like ProTracker - so according finetune check what
+       table is used
+* FIX: Loading of ProTracker mods being too short, sample position calculation
+       included sample header bytes (30 bytes per sample) - which is too much.
+       Furthermore, we should not read that last pattern reaching into the
+       sample data.
+* FIX: if a ProTracker mod contains notes exceeding the ProTracker limits we
+       now switch to XM_AMIGA_TABLE but stay in ProTracker effect interpretation
+* FIX: URLs of windows net drives are no URIs (file:////servername/folder/) and
+       normalizing those leads to a wrong path (file:/servername/folder/)
+* FIX: With XMs it is possible to have 16 bit samples with one additional byte
+       saved. As we are loading an amount of samples and not bytes, we read one
+       byte less. We now seek to the end of bytes after each sample read.
+
 ## 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. 

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

@@ -59,7 +59,7 @@ public XmasConfigPanel(final int myDesiredFPS)
 	{
 		super();
 		loadBulbs();
-		screenFPS = myDesiredFPS;
+		screenFPS = (myDesiredFPS>60)?60:myDesiredFPS; // Screens with 144MHz refresh rate is far too much here - so limit to 60FPS maximum refresh rate
 		screens = getScreens();
 		initialize();
 	}

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

@@ -22,7 +22,6 @@
 package de.quippy.javamod.main.gui;
 
 import java.awt.Color;
-import java.awt.Dimension;
 import java.awt.GraphicsConfiguration;
 import java.awt.GraphicsDevice;
 import java.awt.Rectangle;
@@ -58,17 +57,19 @@ public class XmasScreenConfigPanel extends JPanel
 
 	private static final String PROPERTY_XMAS_ENABLED = "javamod.xmas.enabled.";
 	private static final String PROPERTY_XMAS_WITHSPACE = "javamod.xmas.withspace.";
+	private static final String PROPERTY_XMAS_ALWAYSONTOP = "javamod.xmas.alwaysontop.";
 	private static final String PROPERTY_XMAS_FLICKERTYPE = "javamod.xmas.flickertype.";
 	private static final String PROPERTY_XMAS_UPDATEFPS = "javamod.xmas.updatefps.";
 
 	private JCheckBox xmasEnabledCheckBox = null;
+	private JCheckBox alwaysOnTopCheckBox = null;
 	private JCheckBox withSpaceCheckBox = null;
 	private JLabel flickerTypeLabel = null;
 	private JLabel updateFPSLabel = null;
 	private JComboBox<String> flickerTypeSelector = null;
 	private JSlider updateFPSSelector = null;
 
-	private JWindow transparentJFrame = null;
+	private JWindow transparentWindow = null;
 	private XmasDecorationPanel xmasDecorationPanel = null;
 
 	private final int screenFPS;
@@ -93,11 +94,12 @@ private void initialize()
     	setName("Xmas Screen Config for Screen");
 		setLayout(new java.awt.GridBagLayout());
 		add(getXmasEnabledCheckBox(),	Helpers.getGridBagConstraint(0, 0, 1, 3, java.awt.GridBagConstraints.NONE, java.awt.GridBagConstraints.WEST, 0.0, 0.0));
-		add(getWithSpaceCheckBox(),		Helpers.getGridBagConstraint(0, 1, 1, 1, java.awt.GridBagConstraints.NONE, java.awt.GridBagConstraints.WEST, 0.0, 0.0));
-		add(getFlickerTypeLabel(),		Helpers.getGridBagConstraint(1, 1, 1, 1, java.awt.GridBagConstraints.NONE, java.awt.GridBagConstraints.WEST, 0.0, 0.0));
-		add(getFlickerTypeSelector(),	Helpers.getGridBagConstraint(2, 1, 1, 1, java.awt.GridBagConstraints.NONE, java.awt.GridBagConstraints.WEST, 0.0, 0.0));
-		add(getUpdateFPSLabel(),		Helpers.getGridBagConstraint(0, 2, 1, 1, java.awt.GridBagConstraints.NONE, java.awt.GridBagConstraints.WEST, 0.0, 0.0));
-		add(getUpdateFPSSelector(),		Helpers.getGridBagConstraint(1, 2, 1, 2, java.awt.GridBagConstraints.HORIZONTAL, java.awt.GridBagConstraints.WEST, 1.0, 0.0));
+		add(getAlwaysOnTopBox(),		Helpers.getGridBagConstraint(0, 1, 1, 1, java.awt.GridBagConstraints.NONE, java.awt.GridBagConstraints.WEST, 0.0, 0.0));
+		add(getWithSpaceCheckBox(),		Helpers.getGridBagConstraint(0, 2, 1, 1, java.awt.GridBagConstraints.NONE, java.awt.GridBagConstraints.WEST, 0.0, 0.0));
+		add(getFlickerTypeLabel(),		Helpers.getGridBagConstraint(1, 2, 1, 1, java.awt.GridBagConstraints.NONE, java.awt.GridBagConstraints.WEST, 0.0, 0.0));
+		add(getFlickerTypeSelector(),	Helpers.getGridBagConstraint(2, 2, 1, 1, java.awt.GridBagConstraints.NONE, java.awt.GridBagConstraints.WEST, 0.0, 0.0));
+		add(getUpdateFPSLabel(),		Helpers.getGridBagConstraint(0, 3, 1, 1, java.awt.GridBagConstraints.NONE, java.awt.GridBagConstraints.WEST, 0.0, 0.0));
+		add(getUpdateFPSSelector(),		Helpers.getGridBagConstraint(1, 3, 1, 2, java.awt.GridBagConstraints.HORIZONTAL, java.awt.GridBagConstraints.WEST, 1.0, 0.0));
     }
 	private JCheckBox getXmasEnabledCheckBox()
 	{
@@ -124,13 +126,38 @@ public void itemStateChanged(final ItemEvent e)
 		}
 		return xmasEnabledCheckBox;
 	}
+	private JCheckBox getAlwaysOnTopBox()
+	{
+		if (alwaysOnTopCheckBox == null)
+		{
+			alwaysOnTopCheckBox = new javax.swing.JCheckBox();
+			alwaysOnTopCheckBox.setName("alwaysOnTopCheckBox");
+			alwaysOnTopCheckBox.setText("always on top");
+			alwaysOnTopCheckBox.setFont(Helpers.getDialogFont());
+			alwaysOnTopCheckBox.setSelected(isWithSpaceEnabled());
+			alwaysOnTopCheckBox.addItemListener(new ItemListener()
+			{
+				@Override
+				public void itemStateChanged(final ItemEvent e)
+				{
+					if (e.getStateChange()==ItemEvent.SELECTED || e.getStateChange()==ItemEvent.DESELECTED)
+					{
+						final boolean isOnTop = getAlwaysOnTopBox().isSelected();
+						getTransparentJWindow().setAlwaysOnTop(isOnTop);
+						if (isOnTop) getTransparentJWindow().toFront();
+					}
+				}
+			});
+		}
+		return alwaysOnTopCheckBox;
+	}
 	private JCheckBox getWithSpaceCheckBox()
 	{
 		if (withSpaceCheckBox == null)
 		{
 			withSpaceCheckBox = new javax.swing.JCheckBox();
 			withSpaceCheckBox.setName("withSpaceCheckBox");
-			withSpaceCheckBox.setText("with Space");
+			withSpaceCheckBox.setText("with space");
 			withSpaceCheckBox.setFont(Helpers.getDialogFont());
 			withSpaceCheckBox.setSelected(isWithSpaceEnabled());
 			withSpaceCheckBox.addItemListener(new ItemListener()
@@ -235,23 +262,29 @@ private JWindow getTransparentJWindow()
 		// But whatever the difference of a JWindow to a Window is, a Window
 		// does not work with the OpenGL render pipeline.
 		// On Linux / KDE the OpenGL pipeline reduces flicker, however the
-		// Window inherits the alpha value of the underlying window...
-		if (transparentJFrame == null)
+		// Window inherits the alpha value of the underlying window..
+		// A JFrame is possibly like using a sledgehammer to crack a nut - and
+		// will create an icon in the taskbar at Linux
+		if (transparentWindow == null)
 		{
-			transparentJFrame = new JWindow();
-			transparentJFrame.setAlwaysOnTop(true);
+			transparentWindow = new JWindow();
 
 			final GraphicsConfiguration gc = screen.getDefaultConfiguration();
 			final Rectangle bounds = gc.getBounds();
 			bounds.height = defaultScreenHeight;
-			transparentJFrame.setBounds(bounds);
+			transparentWindow.setBounds(bounds);
+			transparentWindow.setAlwaysOnTop(true);
+			transparentWindow.toFront(); // just in case...
+			//transparentWindow.setUndecorated(true); - JFrame needs this
+			transparentWindow.setFocusable(false);
+			transparentWindow.setFocusableWindowState(false);
+			transparentWindow.setBackground(new Color(0, true));
 
-			transparentJFrame.setBackground(new Color(0, true));
-			transparentJFrame.setContentPane(getXmasDecorationPanel());
-			transparentJFrame.setFocusable(false);
-			transparentJFrame.setFocusableWindowState(false);
+			final XmasDecorationPanel xmasDecorationPanel = getXmasDecorationPanel();
+			xmasDecorationPanel.setSize(transparentWindow.getSize());
+			transparentWindow.setContentPane(xmasDecorationPanel);
 		}
-		return transparentJFrame;
+		return transparentWindow;
 	}
 	private XmasDecorationPanel getXmasDecorationPanel()
 	{
@@ -261,8 +294,6 @@ private XmasDecorationPanel getXmasDecorationPanel()
 			xmasDecorationPanel.setBorder(BorderFactory.createEmptyBorder());
 			xmasDecorationPanel.setOpaque(false);
 			xmasDecorationPanel.setBackground(new Color(0, true));
-			final Dimension d = getTransparentJWindow().getSize();
-			xmasDecorationPanel.setSize(d);
 		}
 		return xmasDecorationPanel;
 	}
@@ -274,6 +305,14 @@ private void setXmasEnabled(final boolean xmasEnabled)
 	{
 		getXmasEnabledCheckBox().setSelected(xmasEnabled);
 	}
+	private boolean isAlwaysOnTopEnabled()
+	{
+		return getAlwaysOnTopBox().isSelected();
+	}
+	private void setAlwaysOnTopEnabled(final boolean alwaysOnTopEnabled)
+	{
+		getAlwaysOnTopBox().setSelected(alwaysOnTopEnabled);
+	}
 	private boolean isWithSpaceEnabled()
 	{
 		return getWithSpaceCheckBox().isSelected();
@@ -309,12 +348,14 @@ public void readProperties(final Properties props, final int forScreen)
 		setFlickerType(Integer.parseInt(props.getProperty(PROPERTY_XMAS_FLICKERTYPE+index, "4")));
 		setUpdateFPS(Integer.parseInt(props.getProperty(PROPERTY_XMAS_UPDATEFPS+index, "2")));
 		setWithSpaceEnabled(Boolean.parseBoolean(props.getProperty(PROPERTY_XMAS_WITHSPACE+index, "FALSE")));
+		setAlwaysOnTopEnabled(Boolean.parseBoolean(props.getProperty(PROPERTY_XMAS_ALWAYSONTOP+index, "TRUE")));
 		setXmasEnabled(Boolean.parseBoolean(props.getProperty(PROPERTY_XMAS_ENABLED+index, "FALSE")));
 	}
 	public void writeProperties(final Properties props, final int forScreen)
 	{
 		final String index = Integer.toString(forScreen);
 		props.setProperty(PROPERTY_XMAS_ENABLED+index, Boolean.toString(isXmasEnabled()));
+		props.setProperty(PROPERTY_XMAS_ALWAYSONTOP+index, Boolean.toString(isAlwaysOnTopEnabled()));
 		props.setProperty(PROPERTY_XMAS_WITHSPACE+index, Boolean.toString(isWithSpaceEnabled()));
 		props.setProperty(PROPERTY_XMAS_FLICKERTYPE+index, Integer.toString(getFlickerType()));
 		props.setProperty(PROPERTY_XMAS_UPDATEFPS+index, Integer.toString(getUpdateFPS()));

source/de/quippy/javamod/multimedia/midi/MidiContainer.java

@@ -27,11 +27,16 @@
 import java.util.ArrayList;
 import java.util.Properties;
 
+import javax.sound.midi.InvalidMidiDataException;
+import javax.sound.midi.MetaMessage;
 import javax.sound.midi.MidiDevice;
 import javax.sound.midi.MidiDevice.Info;
+import javax.sound.midi.MidiEvent;
+import javax.sound.midi.MidiMessage;
 import javax.sound.midi.MidiSystem;
 import javax.sound.midi.MidiUnavailableException;
 import javax.sound.midi.Sequence;
+import javax.sound.midi.Track;
 import javax.sound.sampled.AudioSystem;
 import javax.sound.sampled.Line;
 import javax.sound.sampled.TargetDataLine;
@@ -172,26 +177,78 @@ public MultimediaContainer getInstance(final URL midiFileUrl)
 		if (!MultimediaContainerManager.isHeadlessMode()) ((MidiInfoPanel)getInfoPanel()).fillInfoPanelWith(currentSequence, getSongName());
 		return result;
 	}
+	/**
+	 * Some midi files have "EndOfTrack" messages that are far beyond the
+	 * last valid midi message - which results in long silence.
+	 * We try to correct that by simply setting a new "TrackEnd" at the
+	 * highest tick count of the last event before an EndOfTrack message
+	 * plus the amount of ticks for a whole frame.
+	 * All existing EndOfTrack messages are deleted.
+	 * @since 28.11.2025
+	 * @param currentSequence
+	 */
+	private Sequence setCorrectEndingMessage(Sequence currentSequence)
+	{
+		try
+		{
+			long highestTick = 0;
+			for (Track track : currentSequence.getTracks())
+			{
+				int lastIndex = track.size()-1;
+				if (lastIndex<0) continue;
+				
+				MidiEvent lastTrackEvent = track.get(lastIndex);
+				if (lastTrackEvent==null) continue;
+				
+				MidiMessage midiMessage = lastTrackEvent.getMessage();
+				// if MetaMessage.ImmutableEndOfTrack would not be a private static class,
+				// this check would be much easier!
+				if (midiMessage!=null && midiMessage instanceof MetaMessage)
+				{
+					byte [] message = ((MetaMessage)midiMessage).getMessage();
+					if (message!=null && message.length>2 && message[0]==-1 && message[1]==0x2F)
+					{
+						track.remove(lastTrackEvent);
+						if (lastIndex>0) lastTrackEvent = track.get(lastIndex-1);
+					}
+				}
+				final long lastTick = lastTrackEvent.getTick();
+				if (lastTick > highestTick) highestTick = lastTick;
+			}
+			highestTick += currentSequence.getResolution();
+			final MidiMessage endOfTrack = new MetaMessage(0x2F, null, 0);
+			for (Track track : currentSequence.getTracks())
+			{
+				track.add(new MidiEvent(endOfTrack, highestTick));
+			}
+		}
+		catch (InvalidMidiDataException ex)
+		{
+			// Ignore
+		}
+		return currentSequence;
+	}
 	/**
 	 * @since 12.02.2011
 	 * @param midiFileUrl
 	 * @return
 	 */
 	private Sequence getSequenceFromURL(final URL midiFileUrl)
 	{
+		Sequence result = null;
 		try
 		{
 			final String fileName = midiFileUrl.getPath();
 			final String extension = fileName.substring(fileName.lastIndexOf('.')+1).toLowerCase();
 			if (extension.equals("rmi"))
-				return RMIFile.open(midiFileUrl);
+				result =  RMIFile.open(midiFileUrl);
 			else
 			{
 				FileOrPackedInputStream input = null;
 				try
 				{
 					input = new FileOrPackedInputStream(midiFileUrl);
-					return MidiSystem.getSequence(input);
+					result =  MidiSystem.getSequence(input);
 				}
 				finally
 				{
@@ -203,6 +260,7 @@ private Sequence getSequenceFromURL(final URL midiFileUrl)
 		{
 			throw new RuntimeException(ex);
 		}
+		return setCorrectEndingMessage(result);
 	}
 	private boolean getCapture()
 	{