diff options
| author | bjarni <bjarni@openttd.org> | 2005-10-10 15:22:47 +0000 |
|---|---|---|
| committer | bjarni <bjarni@openttd.org> | 2005-10-10 15:22:47 +0000 |
| commit | 6fb7381efa6a0e48c1bc1c8a49b7b70edf2b5bcf (patch) | |
| tree | 87786e8499bd48abfb4d61f0e024c6bb3ef02959 | |
| parent | 76db75d81a10d7e96c9360a2b66c23310ab7e7e5 (diff) | |
| download | openttd-6fb7381efa6a0e48c1bc1c8a49b7b70edf2b5bcf.tar.xz | |
(svn r3029) -Change: [OSX] removed the buggy java midi player, which was rendered obsolite by r3022
| -rw-r--r-- | Makefile | 7 | ||||
| -rw-r--r-- | os/macosx/OpenTTDMidi.java | 55 |
2 files changed, 1 insertions, 61 deletions
@@ -494,11 +494,8 @@ STRGEN_FLAGS= 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 @@ $(OSX): $(TTD) $(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/ diff --git a/os/macosx/OpenTTDMidi.java b/os/macosx/OpenTTDMidi.java deleted file mode 100644 index fc4e0b5b8..000000000 --- a/os/macosx/OpenTTDMidi.java +++ /dev/null @@ -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); - } - } -} |