Remove: [OSX] Old QuickTime music driver.

4 files changed, 1 insertions, 395 deletions

diff --git a/config.lib b/config.lib
index 5226d84af..6b7ee8de7 100644
--- a/config.lib
+++ b/config.lib
@@ -1592,12 +1592,6 @@ make_cflags_and_ldflags() {
 		# Add macports include dir which is not always set a default system dir. This avoids zillions of bogus warnings.
 		CFLAGS="$CFLAGS -isystem/opt/local/include"
 
-		if [ "$enable_dedicated" = "0" ] && ([ "$cpu_type" = "32" ] || [ "$enable_universal" != "0" ]); then
-			LIBS="$LIBS -framework QuickTime"
-		else
-			CFLAGS="$CFLAGS -DNO_QUICKTIME"
-		fi
-
 		if [ "$enable_universal" = "0" ]; then
 			# Universal builds set this elsewhere
 			CFLAGS="$OSX_SYSROOT $CFLAGS"
@@ -3326,8 +3320,7 @@ generate_src_osx() {
 				CFLAGS="-isysroot $osx_sdk_path $CFLAGS_orig"
 				LDFLAGS="-Wl,-syslibroot,$osx_sdk_path $LDFLAGS_orig"
 			fi
-			CFLAGS="$CFLAGS -D_SQ64 -DNO_QUICKTIME"
-			LIBS="`echo $LIBS | sed 's/-framework QuickTime//'`"
+			CFLAGS="$CFLAGS -D_SQ64"
 		fi
 
 		case $type in
diff --git a/source.list b/source.list
index 0143bd952..ce3c50729 100644
--- a/source.list
+++ b/source.list
@@ -415,7 +415,6 @@ zoom_type.h
 	music/extmidi.h
 	music/fluidsynth.h
 	music/os2_m.h
-	music/qtmidi.h
 	os/macosx/macos.h
 	os/macosx/osx_stdafx.h
 	os/macosx/splash.h
@@ -1163,11 +1162,6 @@ sound/null_s.cpp
 # OSX Files
 	os/macosx/macos.mm
 
-	#if DEDICATED
-	#else
-		music/qtmidi.cpp
-	#end
-
 	#if COCOA
 		video/cocoa/cocoa_v.mm
 		video/cocoa/event.mm
diff --git a/src/music/qtmidi.cpp b/src/music/qtmidi.cpp
deleted file mode 100644
index eea1e3084..000000000
--- a/src/music/qtmidi.cpp
+++ /dev/null
@@ -1,344 +0,0 @@
-/*
- * This file is part of OpenTTD.
- * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
- * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * @file qtmidi.cpp
- * @brief MIDI music player for MacOS X using QuickTime.
- *
- * This music player should work in all MacOS X releases starting from 10.0,
- * as QuickTime is an integral part of the system since the old days of the
- * Motorola 68k-based Macintoshes. The only extra dependency apart from
- * QuickTime itself is Carbon, which is included since 10.0 as well.
- *
- * QuickTime gets fooled with the MIDI files from Transport Tycoon Deluxe
- * because of the @c .gm suffix. To force QuickTime to load the MIDI files
- * without the need of dealing with the individual QuickTime components
- * needed to play music (data source, MIDI parser, note allocators,
- * synthesizers and the like) some Carbon functions are used to set the file
- * type as seen by QuickTime, using @c FSpSetFInfo() (which modifies the
- * file's resource fork).
- */
-
-
-#ifndef NO_QUICKTIME
-
-#include "../stdafx.h"
-#include "qtmidi.h"
-#include "midifile.hpp"
-#include "../debug.h"
-#include "../base_media_base.h"
-
-#define Rect  OTTD_Rect
-#define Point OTTD_Point
-#define WindowClass OTTD_WindowClass
-#include <QuickTime/QuickTime.h>
-#undef Rect
-#undef Point
-#undef WindowClass
-
-#include "../safeguards.h"
-
-static FMusicDriver_QtMidi iFMusicDriver_QtMidi;
-
-
-static const uint MIDI_TYPE = 'Midi'; ///< OSType code for MIDI songs.
-
-
-/**
- * Sets the @c OSType of a given file to @c 'Midi', but only if it's not
- * already set.
- *
- * @param *ref A @c FSSpec structure referencing a file.
- */
-static void SetMIDITypeIfNeeded(const FSRef *ref)
-{
-	FSCatalogInfo catalogInfo;
-
-	assert(ref);
-
-	if (noErr != FSGetCatalogInfo(ref, kFSCatInfoNodeFlags | kFSCatInfoFinderInfo, &catalogInfo, nullptr, nullptr, nullptr)) return;
-	if (!(catalogInfo.nodeFlags & kFSNodeIsDirectoryMask)) {
-		FileInfo * const info = (FileInfo *) catalogInfo.finderInfo;
-		if (info->fileType != MIDI_TYPE && !(info->finderFlags & kIsAlias)) {
-			OSErr e;
-			info->fileType = MIDI_TYPE;
-			e = FSSetCatalogInfo(ref, kFSCatInfoFinderInfo, &catalogInfo);
-			if (e == noErr) {
-				DEBUG(driver, 3, "qtmidi: changed filetype to 'Midi'");
-			} else {
-				DEBUG(driver, 0, "qtmidi: changing filetype to 'Midi' failed - error %d", e);
-			}
-		}
-	}
-}
-
-
-/**
- * Loads a MIDI file and returns it as a QuickTime Movie structure.
- *
- * @param *path String with the path of an existing MIDI file.
- * @param *moov Pointer to a @c Movie where the result will be stored.
- * @return Whether the file was loaded and the @c Movie successfully created.
- */
-static bool LoadMovieForMIDIFile(const char *path, Movie *moov)
-{
-	int fd;
-	int ret;
-	char magic[4];
-	FSRef fsref;
-	FSSpec fsspec;
-	short refnum = 0;
-	short resid  = 0;
-
-	assert(path != nullptr);
-	assert(moov != nullptr);
-
-	DEBUG(driver, 2, "qtmidi: start loading '%s'...", path);
-
-	/*
-	 * XXX Manual check for MIDI header ('MThd'), as I don't know how to make
-	 * QuickTime load MIDI files without a .mid suffix without knowing it's
-	 * a MIDI file and setting the OSType of the file to the 'Midi' value.
-	 * Perhaps ugly, but it seems that it does the Right Thing(tm).
-	 */
-	fd = open(path, O_RDONLY, 0);
-	if (fd == -1) return false;
-	ret = read(fd, magic, 4);
-	close(fd);
-	if (ret < 4) return false;
-
-	DEBUG(driver, 3, "qtmidi: header is '%.4s'", magic);
-	if (magic[0] != 'M' || magic[1] != 'T' || magic[2] != 'h' || magic[3] != 'd') {
-		return false;
-	}
-
-	if (noErr != FSPathMakeRef((const UInt8 *) path, &fsref, nullptr)) return false;
-	SetMIDITypeIfNeeded(&fsref);
-
-	if (noErr != FSGetCatalogInfo(&fsref, kFSCatInfoNone, nullptr, nullptr, &fsspec, nullptr)) return false;
-	if (OpenMovieFile(&fsspec, &refnum, fsRdPerm) != noErr) return false;
-	DEBUG(driver, 3, "qtmidi: '%s' successfully opened", path);
-
-	if (noErr != NewMovieFromFile(moov, refnum, &resid, nullptr,
-				newMovieActive | newMovieDontAskUnresolvedDataRefs, nullptr)) {
-		CloseMovieFile(refnum);
-		return false;
-	}
-	DEBUG(driver, 3, "qtmidi: movie container created");
-
-	CloseMovieFile(refnum);
-	return true;
-}
-
-
-/**
- * Flag which has the @c true value when QuickTime is available and
- * initialized.
- */
-static bool _quicktime_started = false;
-
-
-/**
- * Initialize QuickTime if needed. This function sets the
- * #_quicktime_started flag to @c true if QuickTime is present in the system
- * and it was initialized properly.
- */
-static void InitQuickTimeIfNeeded()
-{
-	OSStatus dummy;
-
-	if (_quicktime_started) return;
-
-	DEBUG(driver, 2, "qtmidi: initializing Quicktime");
-	/* Be polite: check whether QuickTime is available and initialize it. */
-	_quicktime_started =
-		(noErr == Gestalt(gestaltQuickTime, &dummy)) &&
-		(noErr == EnterMovies());
-	if (!_quicktime_started) DEBUG(driver, 0, "qtmidi: Quicktime initialization failed!");
-}
-
-
-/** Possible states of the QuickTime music driver. */
-enum QTStates {
-	QT_STATE_IDLE, ///< No file loaded.
-	QT_STATE_PLAY, ///< File loaded, playing.
-	QT_STATE_STOP, ///< File loaded, stopped.
-};
-
-
-static Movie _quicktime_movie;                  ///< Current QuickTime @c Movie.
-static byte  _quicktime_volume = 127;           ///< Current volume.
-static int   _quicktime_state  = QT_STATE_IDLE; ///< Current player state.
-
-
-/**
- * Maps OpenTTD volume to QuickTime notion of volume.
- */
-#define VOLUME  ((short)((0x00FF & _quicktime_volume) << 1))
-
-
-/**
- * Initialized the MIDI player, including QuickTime initialization.
- *
- * @todo Give better error messages by inspecting error codes returned by
- * @c Gestalt() and @c EnterMovies(). Needs changes in
- * #InitQuickTimeIfNeeded.
- */
-const char *MusicDriver_QtMidi::Start(const char * const *parm)
-{
-	InitQuickTimeIfNeeded();
-	return (_quicktime_started) ? nullptr : "can't initialize QuickTime";
-}
-
-
-/**
- * Checks whether the player is active.
- *
- * This function is called at regular intervals from OpenTTD's main loop, so
- * we call @c MoviesTask() from here to let QuickTime do its work.
- */
-bool MusicDriver_QtMidi::IsSongPlaying()
-{
-	if (!_quicktime_started) return true;
-
-	switch (_quicktime_state) {
-		case QT_STATE_IDLE:
-		case QT_STATE_STOP:
-			/* Do nothing. */
-			break;
-
-		case QT_STATE_PLAY:
-			MoviesTask(_quicktime_movie, 0);
-			/* Check whether movie ended. */
-			if (IsMovieDone(_quicktime_movie) ||
-					(GetMovieTime(_quicktime_movie, nullptr) >=
-					 GetMovieDuration(_quicktime_movie))) {
-				_quicktime_state = QT_STATE_STOP;
-			}
-	}
-
-	return _quicktime_state == QT_STATE_PLAY;
-}
-
-
-/**
- * Stops the MIDI player.
- *
- * Stops playing and frees any used resources before returning. As it
- * deinitilizes QuickTime, the #_quicktime_started flag is set to @c false.
- */
-void MusicDriver_QtMidi::Stop()
-{
-	if (!_quicktime_started) return;
-
-	DEBUG(driver, 2, "qtmidi: stopping driver...");
-	switch (_quicktime_state) {
-		case QT_STATE_IDLE:
-			DEBUG(driver, 3, "qtmidi: stopping not needed, already idle");
-			/* Do nothing. */
-			break;
-
-		case QT_STATE_PLAY:
-			StopSong();
-			FALLTHROUGH;
-
-		case QT_STATE_STOP:
-			DisposeMovie(_quicktime_movie);
-	}
-
-	ExitMovies();
-	_quicktime_started = false;
-}
-
-
-/**
- * Starts playing a new song.
- *
- * @param filename Path to a MIDI file.
- */
-void MusicDriver_QtMidi::PlaySong(const MusicSongInfo &song)
-{
-	if (!_quicktime_started) return;
-
-	std::string filename = MidiFile::GetSMFFile(song);
-	if (filename.empty()) return;
-
-	DEBUG(driver, 2, "qtmidi: trying to play '%s'", filename.c_str());
-	switch (_quicktime_state) {
-		case QT_STATE_PLAY:
-			StopSong();
-			DEBUG(driver, 3, "qtmidi: previous tune stopped");
-			FALLTHROUGH;
-
-		case QT_STATE_STOP:
-			DisposeMovie(_quicktime_movie);
-			DEBUG(driver, 3, "qtmidi: previous tune disposed");
-			_quicktime_state = QT_STATE_IDLE;
-			FALLTHROUGH;
-
-		case QT_STATE_IDLE:
-			LoadMovieForMIDIFile(filename.c_str(), &_quicktime_movie);
-			SetMovieVolume(_quicktime_movie, VOLUME);
-			StartMovie(_quicktime_movie);
-			_quicktime_state = QT_STATE_PLAY;
-	}
-	DEBUG(driver, 3, "qtmidi: playing '%s'", filename.c_str());
-}
-
-
-/**
- * Stops playing the current song, if the player is active.
- */
-void MusicDriver_QtMidi::StopSong()
-{
-	if (!_quicktime_started) return;
-
-	switch (_quicktime_state) {
-		case QT_STATE_IDLE:
-			FALLTHROUGH;
-
-		case QT_STATE_STOP:
-			DEBUG(driver, 3, "qtmidi: stop requested, but already idle");
-			/* Do nothing. */
-			break;
-
-		case QT_STATE_PLAY:
-			StopMovie(_quicktime_movie);
-			_quicktime_state = QT_STATE_STOP;
-			DEBUG(driver, 3, "qtmidi: player stopped");
-	}
-}
-
-
-/**
- * Changes the playing volume of the MIDI player.
- *
- * As QuickTime controls volume in a per-movie basis, the desired volume is
- * stored in #_quicktime_volume, and the volume is set here using the
- * #VOLUME macro, @b and when loading new song in #PlaySong.
- *
- * @param vol The desired volume, range of the value is @c 0-127
- */
-void MusicDriver_QtMidi::SetVolume(byte vol)
-{
-	if (!_quicktime_started) return;
-
-	_quicktime_volume = vol;
-
-	DEBUG(driver, 2, "qtmidi: set volume to %u (%hi)", vol, VOLUME);
-	switch (_quicktime_state) {
-		case QT_STATE_IDLE:
-			/* Do nothing. */
-			break;
-
-		case QT_STATE_PLAY:
-		case QT_STATE_STOP:
-			SetMovieVolume(_quicktime_movie, VOLUME);
-	}
-}
-
-#endif /* NO_QUICKTIME */
diff --git a/src/music/qtmidi.h b/src/music/qtmidi.h
deleted file mode 100644
index d6ed5304a..000000000
--- a/src/music/qtmidi.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * This file is part of OpenTTD.
- * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
- * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/** @file qtmidi.h Base of music playback via the QuickTime driver. */
-
-#ifndef MUSIC_MACOSX_QUICKTIME_H
-#define MUSIC_MACOSX_QUICKTIME_H
-
-#include "music_driver.hpp"
-
-class MusicDriver_QtMidi : public MusicDriver {
-public:
-	const char *Start(const char * const *param) override;
-
-	void Stop() override;
-
-	void PlaySong(const MusicSongInfo &song) override;
-
-	void StopSong() override;
-
-	bool IsSongPlaying() override;
-
-	void SetVolume(byte vol) override;
-	const char *GetName() const override { return "qt"; }
-};
-
-class FMusicDriver_QtMidi : public DriverFactoryBase {
-public:
-	FMusicDriver_QtMidi() : DriverFactoryBase(Driver::DT_MUSIC, 5, "qt", "QuickTime MIDI Driver") {}
-	Driver *CreateInstance() const override { return new MusicDriver_QtMidi(); }
-};
-
-#endif /* MUSIC_MACOSX_QUICKTIME_H */