- Made some more code cleanups and (small) performance improvements.

- Fixed Sarkhan Vol and Ajani Goldmane token controllership issues. Also fixed Ajani Goldmane?\127 lifegain after a different player takes control of it.
- Memnarch's first ability will put the Artifact type at the beginning of the type text (so "Artifact Planeswalker - Ajani" instead of "Planeswalker - Ajani Artifact").
- Planeswalkers with the same "subtype" should get destroyed correctly now if there are two or more in play, even if one of them got "Memnarched" into an artifact.

src/javazoom/jl/converter/RiffFile.java

@@ -34,7 +34,7 @@ import java.io.RandomAccessFile;
  */
 public class RiffFile
 {
-   class RiffChunkHeader
+   static class RiffChunkHeader
    {
      	public int    ckID = 0;       // Four-character chunk ID
     	public int    ckSize = 0;     // Length of data in chunk

src/javazoom/jl/converter/WaveFile.java

@@ -32,7 +32,7 @@ public class WaveFile extends RiffFile
 {
     public static final int 	MAX_WAVE_CHANNELS = 2;
     
-	class WaveFormat_ChunkData
+	static class WaveFormat_ChunkData
 	{
    	   public short         wFormatTag = 0;       // Format category (PCM=1)
    	   public short         nChannels = 0;        // Number of channels (mono=1, stereo=2)
@@ -88,7 +88,7 @@ public class WaveFile extends RiffFile
    		}
 	}
 
-	public class WaveFileSample
+	public static class WaveFileSample
 	{
    		public short[] 				chan;
 		

src/javazoom/jl/converter/jlc.java

@@ -30,7 +30,7 @@ package javazoom.jl.converter;
 
 import java.io.PrintWriter;
 
-import javazoom.jl.decoder.Crc16;
+//import javazoom.jl.decoder.Crc16;
 import javazoom.jl.decoder.JavaLayerException;
 import javazoom.jl.decoder.OutputChannels;
 

src/javazoom/jl/decoder/LayerIIIDecoder.java

@@ -41,7 +41,7 @@ package javazoom.jl.decoder;
  */
 final class LayerIIIDecoder implements FrameDecoder
 {
-	final double d43 = (4.0/3.0);
+	final static double d43 = (4.0/3.0);
 	
 	public int[]				scalefac_buffer;
 
@@ -2407,7 +2407,7 @@ final class LayerIIIDecoder implements FrameDecoder
 	/*                         END OF INV_MDCT                     */
 	/***************************************************************/
 
-	class Sftable
+	static class Sftable
 	{
 		public int[]	 l;
 		public int[]	 s;

src/javazoom/jl/player/advanced/AdvancedPlayer.java

@@ -43,7 +43,7 @@ public class AdvancedPlayer
 	/** The AudioDevice the audio samples are written to. */
 	private AudioDevice audio;
 	/** Has the player been closed? */
-	private boolean closed = false;
+	//private boolean closed = false;
 	/** Has the player played back all frames from the stream? */
 	
 	//private boolean complete = false;
@@ -124,7 +124,7 @@ public class AdvancedPlayer
 		AudioDevice out = audio;
 		if (out != null)
 		{
-			closed = true;
+			//closed = true;
 			audio = null;
 			// this may fail, so ensure object state is set up before
 			// calling this method.

src/javazoom/jl/player/advanced/jlap.java

@@ -100,7 +100,7 @@ public class jlap
     return player;
   }
 
-  public class InfoListener extends PlaybackListener
+  public static class InfoListener extends PlaybackListener
   {
     public void playbackStarted(PlaybackEvent evt)
     {