(svn r3029) -Change: [OSX] removed the buggy java midi player, which was rendered obsolite by r3022
authorbjarni
Mon, 10 Oct 2005 15:22:47 +0000
changeset 2503 a5d95bb8523a
parent 2502 a77b8b2f173c
child 2504 5ae89f643cdc
(svn r3029) -Change: [OSX] removed the buggy java midi player, which was rendered obsolite by r3022
Makefile
os/macosx/OpenTTDMidi.java
--- a/Makefile	Mon Oct 10 10:36:37 2005 +0000
+++ b/Makefile	Mon Oct 10 15:22:47 2005 +0000
@@ -494,11 +494,8 @@
 endif
 
 
-# MIDI setup
+# OSX path setup
 ifdef OSX
-ifndef MIDI
-MIDI:=$(OSXAPP)/Contents/MacOS/track_starter
-endif
 ifndef SECOND_DATA_PATH
 SECOND_DATA_PATH:="$(OSXAPP)/Contents/Data/"
 endif
@@ -804,8 +801,6 @@
 	$(Q)cp os/macosx/openttd.icns "$(OSXAPP)"/Contents/Resources/openttd.icns
 	$(Q)os/macosx/plistgen.sh "$(OSXAPP)" "$(REV)"
 	$(Q)cp os/macosx/track_starter "$(OSXAPP)"/Contents/MacOS
-	$(Q)ls os/macosx | grep -q "\.class" || \
-	       javac os/macosx/OpenTTDMidi.java
 	$(Q)cp os/macosx/OpenTTDMidi.class "$(OSXAPP)"/Contents/MacOS
 	$(Q)cp data/* "$(OSXAPP)"/Contents/Data/
 	$(Q)cp lang/*.lng "$(OSXAPP)"/Contents/Lang/
--- a/os/macosx/OpenTTDMidi.java	Mon Oct 10 10:36:37 2005 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-//
-//  OpenTTDMidi.java
-//  OpenTTDMidi
-//
-//  Created by Joshua King on Sun Apr 25 2004.
-//  Copyright (c) 2004 __MyCompanyName__. All rights reserved.
-//
-import java.io.*;
-import java.util.*;
-import javax.sound.midi.*;
-
-public class OpenTTDMidi {
-
-    public static void main (String args[]) {
-        // Currently command line is the MIDI file
-		if (args.length == 1) {
-			Sequencer s2 = null;
-			
-			try {
-				s2 = MidiSystem.getSequencer();
-				s2.open();
-			} catch (MidiUnavailableException mue) {
-				System.exit(1);
-			}
-			
-			Sequence s = null;
-			
-			try {
-				s = MidiSystem.getSequence(new File(args[0]));
-			} catch (InvalidMidiDataException imde) {
-				System.exit(2);
-			} catch (IOException ioe) {
-				System.exit(3);
-			}
-			
-			try {
-				s2.setSequence(s);
-				s2.setMicrosecondPosition(0);
-				s2.start();
-				for (long l = 0; l < (s.getMicrosecondLength() / 1000000); l++) {
-					try {
-						//System.out.print(".");
-						Thread.currentThread().sleep(1000);
-					} catch (InterruptedException ie) {}
-				}
-				System.out.println();
-			} catch (InvalidMidiDataException imde) {
-			}
-			
-			s2.stop();
-			s2.close();
-			System.exit(0);
-		}	
-    }
-}