Visualization Experiment: Test out projectM

This was just an experiment, and was hashed in to test it out. It does
not look like it would be a very efficient thing to ship this in the
main app at all, especially since the collection of presets is so dang
huge. It was also never meant to replace the existing visualizations,
but instead as another option. One of the things from this branch will
make it into the final: Optional nullability of the Visualization
Manager parameters, since technically they're both checked on call.

Signed-off-by: Christopher Snowhill <kode54@gmail.com>

.gitignore

@@ -53,4 +53,8 @@ Xcode-config/SENTRY_SETTINGS.xcconfig
 /ThirdParty/vorbis/lib/libvorbisfile.3.dylib
 /ThirdParty/vorbis/lib/libvorbis.0.dylib
 /ThirdParty/soxr/lib/libsoxr.0.dylib
-/ThirdParty/WavPack/lib/libwavpack.a
+/ThirdParty/libprojectM/lib/libprojectM-4.4.dylib
+/ThirdParty/libprojectM/lib/libprojectM-4-playlist.4.dylib
+/ThirdParty/libprojectM/lib/libboost_system.dylib
+/ThirdParty/libprojectM/lib/libboost_atomic.dylib
+/ThirdParty/libprojectM/lib/libboost_filesystem.dylib

.gitmodules

@@ -19,3 +19,9 @@
 [submodule "Frameworks/libsidplayfp/sidplayfp"]
 	path = Frameworks/libsidplayfp/sidplayfp
 	url = https://github.com/kode54/libsidplayfp.git
+[submodule "ThirdParty/libprojectM/subprojects/presets-milkdrop-texture-pack"]
+	path = ThirdParty/libprojectM/subprojects/presets-milkdrop-texture-pack
+	url = https://github.com/projectM-visualizer/presets-milkdrop-texture-pack.git
+[submodule "ThirdParty/libprojectM/subprojects/presets/presets-cream-of-the-crop"]
+	path = ThirdParty/libprojectM/subprojects/presets/presets-cream-of-the-crop
+	url = https://github.com/projectM-visualizer/presets-cream-of-the-crop.git

Application/AppController.h

@@ -67,6 +67,11 @@
 - (IBAction)delEntries:(id)sender;
 - (IBAction)savePlaylist:(id)sender;
 
+- (IBAction)openLiberapayPage:(id)sender;
+- (IBAction)openPaypalPage:(id)sender;
+- (IBAction)openKofiPage:(id)sender;
+- (IBAction)openPatreonPage:(id)sender;
+
 - (IBAction)privacyPolicy:(id)sender;
 
 - (IBAction)feedback:(id)sender;
@@ -108,6 +113,8 @@
 - (IBAction)showRubberbandSettings:(id)sender;
 + (void)globalShowRubberbandSettings;
 
+- (IBAction)checkForUpdates:(id)sender;
+
 @property NSWindow *mainWindow;
 @property NSWindow *miniWindow;
 

Application/AppController.m

@@ -30,6 +30,8 @@
 #import <MASShortcut/Shortcut.h>
 #import <MASShortcut/MASDictionaryTransformer.h>
 
+#import <Sparkle/Sparkle.h>
+
 #import "PreferencesController.h"
 
 #import "FeedbackController.h"
@@ -42,6 +44,22 @@ BOOL kAppControllerShuttingDown = NO;
 
 static AppController *kAppController = nil;
 
+@interface SparkleBridge : NSObject
++ (SPUStandardUpdaterController *)sharedStandardUpdaterController;
+@end
+
+@implementation SparkleBridge
+
++ (SPUStandardUpdaterController *)sharedStandardUpdaterController {
+	static SPUStandardUpdaterController *sharedStandardUpdaterController_ = nil;
+	static dispatch_once_t onceToken;
+	dispatch_once(&onceToken, ^{
+		sharedStandardUpdaterController_ = [[SPUStandardUpdaterController alloc] initWithUpdaterDelegate: nil userDriverDelegate: nil];
+	});
+	return sharedStandardUpdaterController_;
+}
+@end
+
 @implementation AppController {
 	BOOL _isFullToolbarStyle;
 }
@@ -177,6 +195,12 @@ static BOOL consentLastEnabled = NO;
 	
 	[[NSUserDefaultsController sharedUserDefaultsController] addObserver:self forKeyPath:@"values.sentryConsented" options:(NSKeyValueObservingOptionInitial | NSKeyValueObservingOptionNew) context:kAppControllerContext];
 
+#ifdef DEBUG
+	// Prevent updates automatically in debug builds
+	[[[SparkleBridge sharedStandardUpdaterController] updater] setAutomaticallyChecksForUpdates:NO];
+#endif
+	[[[SparkleBridge sharedStandardUpdaterController] updater] setUpdateCheckInterval:3600];
+
 	[[totalTimeField cell] setBackgroundStyle:NSBackgroundStyleRaised];
 
 	[self.infoButton setToolTip:NSLocalizedString(@"InfoButtonTooltip", @"")];
@@ -210,15 +234,8 @@ static BOOL consentLastEnabled = NO;
 			[playlistLoader addDatabase];
 		} else if([[NSFileManager defaultManager] fileExistsAtPath:[basePath stringByAppendingPathComponent:newFilename]]) {
 			[playlistLoader addURL:[NSURL fileURLWithPath:[basePath stringByAppendingPathComponent:newFilename]]];
-		} else if([[NSFileManager defaultManager] fileExistsAtPath:[basePath stringByAppendingPathComponent:oldFilename]]){
-			/* Without the above check, it appears the code was retrieving a nil NSURL from the nonexistent path
-			 * Then adding it to the playlist and crashing further down the line
-			 * Nobody on a new setup should be seeing this open anything, so it should fall through to the
-			 * notice below.
-			 */
-			[playlistLoader addURL:[NSURL fileURLWithPath:[basePath stringByAppendingPathComponent:oldFilename]]];
 		} else {
-			ALog(@"No playlist found, leaving it empty.");
+			[playlistLoader addURL:[NSURL fileURLWithPath:[basePath stringByAppendingPathComponent:oldFilename]]];
 		}
 	}
 
@@ -600,6 +617,22 @@ static BOOL consentLastEnabled = NO;
 	[theApplication replyToOpenOrPrint:NSApplicationDelegateReplySuccess];
 }
 
+- (IBAction)openLiberapayPage:(id)sender {
+	[[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"https://liberapay.com/kode54"]];
+}
+
+- (IBAction)openPaypalPage:(id)sender {
+	[[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"https://www.paypal.com/paypalme/kode54"]];
+}
+
+- (IBAction)openKofiPage:(id)sender {
+	[[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"https://ko-fi.com/kode54"]];
+}
+
+- (IBAction)openPatreonPage:(id)sender {
+	[[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"https://www.patreon.com/kode54"]];
+}
+
 - (IBAction)privacyPolicy:(id)sender {
     [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:NSLocalizedString(@"PrivacyPolicyURL", @"Privacy policy URL from Iubenda.")]];
 }
@@ -631,9 +664,6 @@ static BOOL consentLastEnabled = NO;
 	NSNumber *fontSize = @(fFontSize);
 	[userDefaultsValuesDict setObject:fontSize forKey:@"fontSize"];
 
-	NSString *feedURLdefault = @"https://cogcdn.cog.losno.co/mercury.xml";
-	[userDefaultsValuesDict setObject:feedURLdefault forKey:@"SUFeedURL"];
-
 	[userDefaultsValuesDict setObject:@"enqueueAndPlay" forKey:@"openingFilesBehavior"];
 	[userDefaultsValuesDict setObject:@"enqueue" forKey:@"openingFilesAlteredBehavior"];
 
@@ -643,7 +673,7 @@ static BOOL consentLastEnabled = NO;
 
 	[userDefaultsValuesDict setObject:@(CogStatusStopped) forKey:@"lastPlaybackStatus"];
 
-	[userDefaultsValuesDict setObject:@"BASSMIDI" forKey:@"midiPlugin"];
+	[userDefaultsValuesDict setObject:@"dls appl" forKey:@"midiPlugin"];
 
 	[userDefaultsValuesDict setObject:@"default" forKey:@"midi.flavor"];
 
@@ -669,24 +699,12 @@ static BOOL consentLastEnabled = NO;
 	[userDefaultsValuesDict setObject:@(44100) forKey:@"synthSampleRate"];
 
 	[userDefaultsValuesDict setObject:@NO forKey:@"alwaysStopAfterCurrent"];
-	[userDefaultsValuesDict setObject:@NO forKey:@"selectionFollowsPlayback"];
+	[userDefaultsValuesDict setObject:@YES forKey:@"selectionFollowsPlayback"];
 
 	// Register and sync defaults
 	[[NSUserDefaults standardUserDefaults] registerDefaults:userDefaultsValuesDict];
 	[[NSUserDefaults standardUserDefaults] synchronize];
 
-	// And if the existing feed URL is broken due to my ineptitude with the above defaults, fix it
-	NSSet<NSString *> *brokenFeedURLs = [NSSet setWithObjects:
-	                                           @"https://kode54.net/cog/stable.xml",
-	                                           @"https://kode54.net/cog/mercury.xml"
-	                                           @"https://www.kode54.net/cog/mercury.xml",
-	                                           @"https://f.losno.co/cog/mercury.xml",
-	                                           nil];
-	NSString *feedURL = [[NSUserDefaults standardUserDefaults] stringForKey:@"SUFeedURL"];
-	if([brokenFeedURLs containsObject:feedURL]) {
-		[[NSUserDefaults standardUserDefaults] setValue:feedURLdefault forKey:@"SUFeedURL"];
-	}
-
 	NSString *oldMidiPlugin = [[NSUserDefaults standardUserDefaults] stringForKey:@"midi.plugin"];
 	if(oldMidiPlugin) {
 		[[NSUserDefaults standardUserDefaults] setValue:oldMidiPlugin forKey:@"midiPlugin"];
@@ -699,11 +717,6 @@ static BOOL consentLastEnabled = NO;
 	if([[[NSUserDefaults standardUserDefaults] stringForKey:@"midiPlugin"] isEqualToString:@"FluidSynth"]) {
 		[[NSUserDefaults standardUserDefaults] setValue:@"BASSMIDI" forKey:@"midiPlugin"];
 	}
-
-	NSString *midiPlugin = [[NSUserDefaults standardUserDefaults] stringForKey:@"midiPlugin"];
-	if([midiPlugin length] == 8 && [[midiPlugin substringFromIndex:4] isEqualToString:@"appl"]) {
-		[[NSUserDefaults standardUserDefaults] setObject:@"BASSMIDI" forKey:@"midiPlugin"];
-	}
 }
 
 MASShortcut *shortcutWithMigration(NSString *oldKeyCodePrefName,
@@ -974,6 +987,10 @@ static NSDictionary *shortcutDefaults = nil;
 	[kAppController showRubberbandSettings:kAppController];
 }
 
+- (IBAction)checkForUpdates:(id)sender {
+	[[SparkleBridge sharedStandardUpdaterController] checkForUpdates:[[NSApplication sharedApplication] delegate]];
+}
+
 - (void)selectTrack:(id)sender {
 	PlaylistEntry *pe = (PlaylistEntry *)sender;
 	@try {

Application/PlaybackController.m

@@ -120,17 +120,16 @@ NSString *CogPlaybackDidStopNotificiation = @"CogPlaybackDidStopNotificiation";
 
 - (void)initDefaults {
 	NSDictionary *defaultsDictionary = @{ @"volume": @(75.0),
-		                                  @"pitch": @(1.0),
-		                                  @"tempo": @(1.0),
-		                                  @"speedLock": @(YES),
+										  @"pitch": @(1.0),
+										  @"tempo": @(1.0),
+										  @"speedLock": @(YES),
 		                                  @"GraphicEQenable": @(NO),
 		                                  @"GraphicEQpreset": @(-1),
 		                                  @"GraphicEQtrackgenre": @(NO),
 		                                  @"volumeLimit": @(YES),
 		                                  @"enableHrtf": @(NO),
 		                                  @"enableHeadTracking": @(NO),
-		                                  @"enableHDCD": @(NO),
-		                                  @"rubberbandEngine": @"disabled",
+		                                  /*@"rubberbandEngine": @"faster",*/
 		                                  @"rubberbandTransients": @"crisp",
 		                                  @"rubberbandDetector": @"compound",
 		                                  @"rubberbandPhase": @"laminar",
@@ -357,12 +356,8 @@ NSDictionary *makeRGInfo(PlaylistEntry *pe) {
 }
 
 - (IBAction)prev:(id)sender {
-	double pos = [audioPlayer amountPlayed];
-
-	if(pos < 5.0) {
-		if([playlistController prev] == NO)
-			return;
-	}
+	if([playlistController prev] == NO)
+		return;
 
 	[self playEntry:[playlistController currentEntry]];
 }
@@ -379,11 +374,6 @@ NSDictionary *makeRGInfo(PlaylistEntry *pe) {
 }
 
 - (IBAction)seek:(id)sender {
-	if(![sender respondsToSelector:@selector(doubleValue)]) {
-		ALog(@"Someone sent [PlaybackController seek:] a non-seekbar object: %@", sender);
-		return;
-	}
-
 	double time = [sender doubleValue];
 
 	[audioPlayer performSelectorOnMainThread:@selector(seekToTimeBG:) withObjects:@(time), nil];

Audio/AudioPlayer.m

@@ -79,9 +79,7 @@
 	}
 	if(!output) {
 		output = [[OutputNode alloc] initWithController:self previous:nil];
-		if(![output setupWithInterval:resumeInterval]) {
-			return;
-		}
+		[output setupWithInterval:resumeInterval];
 	}
 	[output setVolume:volume];
 	@synchronized(chainQueue) {
@@ -196,28 +194,18 @@
 }
 
 - (void)seekToTime:(double)time {
-	[output fadeOutBackground];
-	[output setVolume:volume];
-
-	[output seek:time];
-	[bufferChain seek:time];
-
 	CogStatus status = (CogStatus)currentPlaybackStatus;
-	BOOL paused = status == CogStatusPaused;
+	NSURL *url;
 	id userInfo;
+	NSDictionary *rgi;
 
 	@synchronized(chainQueue) {
+		url = [bufferChain streamURL];
 		userInfo = [bufferChain userInfo];
+		rgi = [bufferChain rgInfo];
 	}
 
-	if(paused) {
-		[self setPlaybackStatus:CogStatusPaused waitUntilDone:YES];
-		if(time > 0.0) {
-			[self updatePosition:userInfo];
-		}
-	} else {
-		[output fadeIn];
-	}
+	[self play:url withUserInfo:userInfo withRGInfo:rgi startPaused:(status == CogStatusPaused) andSeekTo:time andResumeInterval:YES];
 }
 
 - (void)setVolume:(double)v {
@@ -704,7 +692,7 @@
 		while(atomic_load_explicit(&refCount, memory_order_relaxed) != 0) {
 			[semaphore signal]; // Gotta poke this periodically
 			if(mainThread)
-				[[NSRunLoop currentRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:0.01]];
+				[[NSRunLoop currentRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:0.001]];
 			else
 				usleep(500);
 		}

Audio/Chain/BufferChain.m

@@ -52,14 +52,10 @@
 }
 
 - (BOOL)open:(NSURL *)url withOutputFormat:(AudioStreamBasicDescription)outputFormat withUserInfo:(id)userInfo withRGInfo:(NSDictionary *)rgi {
-	if(!url) {
-		DLog(@"Player attempted to play invalid file...");
-		return NO;
-	}
 	[self setStreamURL:url];
 	[self setUserInfo:userInfo];
 
-	if(![self buildChain]) {
+	if (![self buildChain]) {
 		DLog(@"Couldn't build processing chain...");
 		return NO;
 	}

Audio/Chain/ChunkList.h

@@ -42,7 +42,6 @@ NS_ASSUME_NONNULL_BEGIN
 	BOOL observersRegistered;
 	BOOL halveDSDVolume;
 	
-	BOOL enableHDCD;
 	void *hdcd_decoder;
 
 	BOOL formatRead;

Audio/Chain/ChunkList.m

@@ -408,10 +408,8 @@ static void convert_be_to_le(uint8_t *buffer, size_t bitsPerSample, size_t bytes
 - (void)addObservers {
 	if(!observersRegistered) {
 		halveDSDVolume = NO;
-		enableHDCD = NO;
 
 		[[NSUserDefaultsController sharedUserDefaultsController] addObserver:self forKeyPath:@"values.halveDSDVolume" options:(NSKeyValueObservingOptionInitial | NSKeyValueObservingOptionNew) context:kChunkListContext];
-		[[NSUserDefaultsController sharedUserDefaultsController] addObserver:self forKeyPath:@"values.enableHDCD" options:(NSKeyValueObservingOptionInitial | NSKeyValueObservingOptionNew) context:kChunkListContext];
 
 		observersRegistered = YES;
 	}
@@ -420,7 +418,6 @@ static void convert_be_to_le(uint8_t *buffer, size_t bitsPerSample, size_t bytes
 - (void)removeObservers {
 	if(observersRegistered) {
 		[[NSUserDefaultsController sharedUserDefaultsController] removeObserver:self forKeyPath:@"values.halveDSDVolume" context:kChunkListContext];
-		[[NSUserDefaultsController sharedUserDefaultsController] removeObserver:self forKeyPath:@"values.enableHDCD" context:kChunkListContext];
 
 		observersRegistered = NO;
 	}
@@ -459,8 +456,6 @@ static void convert_be_to_le(uint8_t *buffer, size_t bitsPerSample, size_t bytes
 	
 	if([keyPath isEqualToString:@"values.halveDSDVolume"]) {
 		halveDSDVolume = [[[NSUserDefaultsController sharedUserDefaultsController] defaults] boolForKey:@"halveDSDVolume"];
-	} else if([keyPath isEqualToString:@"values.enableHDCD"]) {
-		enableHDCD = [[[NSUserDefaultsController sharedUserDefaultsController] defaults] boolForKey:@"enableHDCD"];
 	}
 }
 
@@ -698,7 +693,6 @@ static void convert_be_to_le(uint8_t *buffer, size_t bitsPerSample, size_t bytes
 		   inputFormat.mChannelsPerFrame == 2 &&
 		   inputFormat.mSampleRate == 44100) {
 			// possibly HDCD, run through decoder
-			[self addObservers];
 			if(hdcd_decoder) {
 				free(hdcd_decoder);
 				hdcd_decoder = NULL;
@@ -837,42 +831,28 @@ static void convert_be_to_le(uint8_t *buffer, size_t bitsPerSample, size_t bytes
 		if(hdcd_decoder) { // implied bits per sample is 16, produces 32 bit int scale
 			samplesRead = bytesReadFromInput / 2;
 			const size_t buffer_adder = (inputBuffer == &tempData[0]) ? buffer_adder_base : 0;
-			if(isUnsigned) {
-				if(!inputChanged) {
-					memcpy(&tempData[buffer_adder], inputBuffer, samplesRead * 2);
-					inputBuffer = &tempData[buffer_adder];
-					inputChanged = YES;
-				}
+			if(isUnsigned)
 				convert_u16_to_s16((int16_t *)inputBuffer, samplesRead);
-				isUnsigned = NO;
-			}
-			const size_t buffer_adder2 = (inputBuffer == &tempData[0]) ? buffer_adder_base : 0;
-			convert_s16_to_hdcd_input((int32_t *)(&tempData[buffer_adder2]), (int16_t *)inputBuffer, samplesRead);
-			hdcd_process_stereo((hdcd_state_stereo_t *)hdcd_decoder, (int32_t *)(&tempData[buffer_adder2]), (int)(samplesRead / 2));
+			convert_s16_to_hdcd_input((int32_t *)(&tempData[buffer_adder]), (int16_t *)inputBuffer, samplesRead);
+			hdcd_process_stereo((hdcd_state_stereo_t *)hdcd_decoder, (int32_t *)(&tempData[buffer_adder]), (int)(samplesRead / 2));
 			if(((hdcd_state_stereo_t *)hdcd_decoder)->channel[0].sustain &&
 			   ((hdcd_state_stereo_t *)hdcd_decoder)->channel[1].sustain) {
 				hdcdSustained = YES;
 			}
-			if(enableHDCD) {
-				gain = 2.0;
-				bitsPerSample = 32;
-				bytesReadFromInput = samplesRead * 4;
-				isUnsigned = NO;
-				inputBuffer = &tempData[buffer_adder2];
-				inputChanged = YES;
-			} else {
-				// Discard the output of the decoder and process again
-				goto process16bit;
-			}
+			gain = 2.0;
+			bitsPerSample = 32;
+			bytesReadFromInput = samplesRead * 4;
+			isUnsigned = NO;
+			inputBuffer = &tempData[buffer_adder];
+			inputChanged = YES;
 		} else if(bitsPerSample <= 16) {
-		process16bit:
 			samplesRead = bytesReadFromInput / 2;
 			const size_t buffer_adder = (inputBuffer == &tempData[0]) ? buffer_adder_base : 0;
 			if(isUnsigned) {
 				if(!inputChanged) {
 					memcpy(&tempData[buffer_adder], inputBuffer, samplesRead * 2);
 					inputBuffer = &tempData[buffer_adder];
-					//inputChanged = YES;
+					inputChanged = YES;
 				}
 				convert_u16_to_s16((int16_t *)inputBuffer, samplesRead);
 			}
@@ -912,10 +892,10 @@ static void convert_be_to_le(uint8_t *buffer, size_t bitsPerSample, size_t bytes
 			vDSP_vflt32((const int *)inputBuffer, 1, (float *)(&tempData[buffer_adder]), 1, samplesRead);
 			float scale = (1ULL << 31) / gain;
 			vDSP_vsdiv((const float *)(&tempData[buffer_adder]), 1, &scale, (float *)(&tempData[buffer_adder]), 1, samplesRead);
-			//bitsPerSample = 32;
+			bitsPerSample = 32;
 			bytesReadFromInput = samplesRead * sizeof(float);
-			//isUnsigned = NO;
-			//isFloat = YES;
+			isUnsigned = NO;
+			isFloat = YES;
 			inputBuffer = &tempData[buffer_adder];
 		}
 

Audio/Chain/ConverterNode.h

@@ -45,8 +45,6 @@
 
 	double sampleRatio;
 
-	BOOL observersAdded;
-
 	float volumeScale;
 
 	void *floatBuffer;

Audio/Chain/ConverterNode.m

@@ -66,6 +66,8 @@ static void *kConverterNodeContext = &kConverterNodeContext;
 		extrapolateBuffer = NULL;
 		extrapolateBufferSize = 0;
 
+		[[NSUserDefaultsController sharedUserDefaultsController] addObserver:self forKeyPath:@"values.volumeScaling" options:0 context:kConverterNodeContext];
+
 #ifdef LOG_CHAINS
 		[self initLogFiles];
 #endif
@@ -74,20 +76,6 @@ static void *kConverterNodeContext = &kConverterNodeContext;
 	return self;
 }
 
-- (void)addObservers {
-	if(!observersAdded) {
-		[[NSUserDefaultsController sharedUserDefaultsController] addObserver:self forKeyPath:@"values.volumeScaling" options:(NSKeyValueObservingOptionInitial|NSKeyValueObservingOptionNew) context:kConverterNodeContext];
-		observersAdded = YES;
-	}
-}
-
-- (void)removeObservers {
-	if(observersAdded) {
-		[[NSUserDefaultsController sharedUserDefaultsController] removeObserver:self forKeyPath:@"values.volumeScaling" context:kConverterNodeContext];
-		observersAdded = NO;
-	}
-}
-
 void scale_by_volume(float *buffer, size_t count, float volume) {
 	if(volume != 1.0) {
 		size_t unaligned = (uintptr_t)buffer & 15;
@@ -281,7 +269,6 @@ void scale_by_volume(float *buffer, size_t count, float volume) {
 		size_t inputSamples = ioNumberPackets / floatFormat.mBytesPerPacket;
 		ioNumberPackets = (UInt32)inputSamples;
 		ioNumberPackets = (UInt32)ceil((float)ioNumberPackets * sampleRatio);
-		ioNumberPackets += soxr_delay(soxr);
 		ioNumberPackets = (ioNumberPackets + 255) & ~255;
 
 		size_t newSize = ioNumberPackets * floatFormat.mBytesPerPacket;
@@ -298,6 +285,7 @@ void scale_by_volume(float *buffer, size_t count, float volume) {
 		size_t outputDone = 0;
 
 		if(!skipResampler) {
+			ioNumberPackets += soxr_delay(soxr);
 			soxr_process(soxr, (float *)(((uint8_t *)inputBuffer) + inpOffset), inputSamples, &inputDone, floatBuffer, ioNumberPackets, &outputDone);
 
 			if(latencyEatenPost) {
@@ -346,7 +334,6 @@ void scale_by_volume(float *buffer, size_t count, float volume) {
 		if(nodeChannelConfig) {
 			[chunk setChannelConfig:nodeChannelConfig];
 		}
-		[self addObservers];
 		scale_by_volume(floatBuffer, ioNumberPackets / sizeof(float), volumeScale);
 		[chunk setStreamTimestamp:streamTimestamp];
 		[chunk setStreamTimeRatio:streamTimeRatio];
@@ -501,7 +488,7 @@ static float db_to_scale(float db) {
 - (void)dealloc {
 	DLog(@"Converter dealloc");
 
-	[self removeObservers];
+	[[NSUserDefaultsController sharedUserDefaultsController] removeObserver:self forKeyPath:@"values.volumeScaling" context:kConverterNodeContext];
 
 	paused = NO;
 	[self cleanUp];

Audio/Chain/DSP/DSPEqualizerNode.m

@@ -146,6 +146,7 @@ static OSStatus eqRenderCallback(void *inRefCon, AudioUnitRenderActionFlags *ioA
 - (BOOL)fullInit {
 	if(enableEqualizer) {
 		AudioComponentDescription desc;
+		NSError *err;
 
 		desc.componentType = kAudioUnitType_Effect;
 		desc.componentSubType = kAudioUnitSubType_GraphicEQ;
@@ -160,8 +161,8 @@ static OSStatus eqRenderCallback(void *inRefCon, AudioUnitRenderActionFlags *ioA
 			return NO;
 		}
 
-		OSStatus status = AudioComponentInstanceNew(comp, &_eq);
-		if(status != noErr) {
+		OSStatus _err = AudioComponentInstanceNew(comp, &_eq);
+		if(err) {
 			return NO;
 		}
 
@@ -208,8 +209,8 @@ static OSStatus eqRenderCallback(void *inRefCon, AudioUnitRenderActionFlags *ioA
 
 		AudioUnitReset(_eq, kAudioUnitScope_Global, 0);
 
-		status = AudioUnitInitialize(_eq);
-		if(status != noErr) {
+		_err = AudioUnitInitialize(_eq);
+		if(_err != noErr) {
 			return NO;
 		}
 

Audio/Chain/DSP/DSPHRTFNode.m

@@ -19,7 +19,7 @@
 
 #include <AvailabilityMacros.h>
 
-#if defined(MAC_OS_VERSION_14_0) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_VERSION_14_0
+#if defined(MAC_OS_X_VERSION_14_0) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_14_0
 #define MOTION_MANAGER 1
 #endif
 
@@ -27,7 +27,6 @@ static void * kDSPHRTFNodeContext = &kDSPHRTFNodeContext;
 
 static NSString *CogPlaybackDidResetHeadTracking = @"CogPlaybackDigResetHeadTracking";
 
-#ifdef MOTION_MANAGER
 static simd_float4x4 convertMatrix(CMRotationMatrix r) {
 	simd_float4x4 matrix = {
 		simd_make_float4(r.m33, -r.m31, r.m32, 0.0f),
@@ -38,9 +37,10 @@ static simd_float4x4 convertMatrix(CMRotationMatrix r) {
 	return matrix;
 }
 
+#ifdef MOTION_MANAGER
 static NSLock *motionManagerLock = nil;
 API_AVAILABLE(macos(14.0)) static CMHeadphoneMotionManager *motionManager = nil;
-static DSPHRTFNode __weak *registeredMotionListener = nil;
+static DSPHRTFNode  *registeredMotionListener = nil;
 #endif
 
 static void registerMotionListener(DSPHRTFNode *listener) {
@@ -55,8 +55,7 @@ static void registerMotionListener(DSPHRTFNode *listener) {
 			[motionManager startDeviceMotionUpdatesToQueue:[NSOperationQueue mainQueue] withHandler:^(CMDeviceMotion * _Nullable motion, NSError * _Nullable error) {
 				if(motion) {
 					[motionManagerLock lock];
-					if(registeredMotionListener)
-						[registeredMotionListener reportMotion:convertMatrix(motion.attitude.rotationMatrix)];
+					[registeredMotionListener reportMotion:convertMatrix(motion.attitude.rotationMatrix)];
 					[motionManagerLock unlock];
 				}
 			}];

Audio/Chain/DSP/DSPRubberbandNode.m

@@ -363,7 +363,6 @@ static void * kDSPRubberbandNodeContext = &kDSPRubberbandNodeContext;
 
 - (void)setEndOfStream:(BOOL)e {
 	if(endOfStream && !e) {
-		while(processEntered);
 		[self fullShutdown];
 	}
 	[super setEndOfStream:e];

Audio/Chain/DSP/Downmix.m

@@ -157,8 +157,6 @@ static void downmix_to_mono(const float *inBuffer, int channels, uint32_t config
 	}
 	cblas_scopy((int)count, inBuffer, 2, outBuffer, 1);
 	vDSP_vadd(outBuffer, 1, inBuffer + 1, 2, outBuffer, 1, count);
-	const float scale = 0.5f;
-	vDSP_vsmul(outBuffer, 1, &scale, outBuffer, 1, count);
 }
 
 static void upmix(const float *inBuffer, int inchannels, uint32_t inconfig, float *outBuffer, int outchannels, uint32_t outconfig, size_t count) {

Audio/Chain/OutputNode.h

@@ -39,12 +39,14 @@
 - (BOOL)selectNextBuffer;
 - (void)endOfInputPlayed;
 
+- (BOOL)endOfStream;
+
 - (BOOL)chainQueueHasTracks;
 
 - (double)secondsBuffered;
 
-- (BOOL)setup;
-- (BOOL)setupWithInterval:(BOOL)resumeInterval;
+- (void)setup;
+- (void)setupWithInterval:(BOOL)resumeInterval;
 - (void)process;
 - (void)close;
 - (void)seek:(double)time;

Audio/Chain/OutputNode.m

@@ -33,11 +33,11 @@
 	VisualizationNode *visualizationNode;
 }
 
-- (BOOL)setup {
-	return [self setupWithInterval:NO];
+- (void)setup {
+	[self setupWithInterval:NO];
 }
 
-- (BOOL)setupWithInterval:(BOOL)resumeInterval {
+- (void)setupWithInterval:(BOOL)resumeInterval {
 	if(!resumeInterval) {
 		amountPlayed = 0.0;
 		amountPlayedInterval = 0.0;
@@ -49,26 +49,23 @@
 
 	output = [[OutputCoreAudio alloc] initWithController:self];
 
-	if(![output setup]) {
-		output = nil;
-		return NO;
-	}
+	[output setup];
 
 	if(!DSPsLaunched) {
 		rubberbandNode = [[DSPRubberbandNode alloc] initWithController:self previous:nil latency:0.1];
-		if(!rubberbandNode) return NO;
+		if(!rubberbandNode) return;
 		fsurroundNode = [[DSPFSurroundNode alloc] initWithController:self previous:rubberbandNode latency:0.03];
-		if(!fsurroundNode) return NO;
+		if(!fsurroundNode) return;
 		equalizerNode = [[DSPEqualizerNode alloc] initWithController:self previous:fsurroundNode latency:0.03];
-		if(!equalizerNode) return NO;
+		if(!equalizerNode) return;
 		hrtfNode = [[DSPHRTFNode alloc] initWithController:self previous:equalizerNode latency:0.03];
-		if(!hrtfNode) return NO;
+		if(!hrtfNode) return;
 		downmixNode = [[DSPDownmixNode alloc] initWithController:self previous:hrtfNode latency:0.03];
-		if(!downmixNode) return NO;
+		if(!downmixNode) return;
 
 		// Approximately double the chunk size for Vis at 44100Hz
 		visualizationNode = [[VisualizationNode alloc] initWithController:self previous:downmixNode latency:8192.0 / 44100.0];
-		if(!visualizationNode) return NO;
+		if(!visualizationNode) return;
 
 		[self setPreviousNode:visualizationNode];
 
@@ -78,8 +75,6 @@
 
 		previousInput = nil;
 	}
-
-	return YES;
 }
 
 - (void)seek:(double)time {
@@ -181,9 +176,7 @@
 	Node *finalNode = nil;
 	if(rubberbandNode) {
 		finalNode = [[controller bufferChain] finalNode];
-		if(finalNode) {
-			[rubberbandNode setPreviousNode:finalNode];
-		}
+		[rubberbandNode setPreviousNode:finalNode];
 	}
 
 	return !!finalNode;
@@ -191,11 +184,9 @@
 
 - (void)reconnectInputAndReplumb {
 	Node *finalNode = nil;
-	if(DSPsLaunched) {
+	if(rubberbandNode) {
 		finalNode = [[controller bufferChain] finalNode];
-		if(finalNode) {
-			[rubberbandNode setPreviousNode:finalNode];
-		}
+		[rubberbandNode setPreviousNode:finalNode];
 	}
 
 	NSArray *DSPs = [self DSPs];

Audio/CogAudio.xcodeproj/project.pbxproj

@@ -101,8 +101,6 @@
 		83A349752D5C50A10096D530 /* DSPHRTFNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 83A349742D5C50A10096D530 /* DSPHRTFNode.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		83A349772D5C50B20096D530 /* DSPHRTFNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 83A349762D5C50B20096D530 /* DSPHRTFNode.m */; };
 		83B74281289E027F005AAC28 /* CogAudio-Bridging-Header.h in Headers */ = {isa = PBXBuildFile; fileRef = 83B74280289E027F005AAC28 /* CogAudio-Bridging-Header.h */; };
-		83CB56652E06464D003DD379 /* NSDictionary+Optional.h in Headers */ = {isa = PBXBuildFile; fileRef = 83CB56632E06464D003DD379 /* NSDictionary+Optional.h */; };
-		83CB56662E06464D003DD379 /* NSDictionary+Optional.m in Sources */ = {isa = PBXBuildFile; fileRef = 83CB56642E06464D003DD379 /* NSDictionary+Optional.m */; };
 		83F843202D5C6272008C123B /* HeadphoneFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = 83F8431E2D5C6272008C123B /* HeadphoneFilter.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		83F843212D5C6272008C123B /* HeadphoneFilter.mm in Sources */ = {isa = PBXBuildFile; fileRef = 83F8431F2D5C6272008C123B /* HeadphoneFilter.mm */; };
 		83F843232D5C66DA008C123B /* DSPEqualizerNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 83F843222D5C66DA008C123B /* DSPEqualizerNode.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -214,8 +212,8 @@
 		839065F22853338700636FBB /* dsd2float.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dsd2float.h; sourceTree = "<group>"; };
 		839366651815923C006DD712 /* CogPluginMulti.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CogPluginMulti.h; sourceTree = "<group>"; };
 		839366661815923C006DD712 /* CogPluginMulti.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CogPluginMulti.m; sourceTree = "<group>"; };
-		8399CF2A27B5D1D4008751F1 /* NSDictionary+Merge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSDictionary+Merge.h"; path = "../Utils/NSDictionary+Merge.h"; sourceTree = SOURCE_ROOT; };
-		8399CF2B27B5D1D4008751F1 /* NSDictionary+Merge.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSDictionary+Merge.m"; path = "../Utils/NSDictionary+Merge.m"; sourceTree = SOURCE_ROOT; };
+		8399CF2A27B5D1D4008751F1 /* NSDictionary+Merge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSDictionary+Merge.h"; path = "../../Utils/NSDictionary+Merge.h"; sourceTree = "<group>"; };
+		8399CF2B27B5D1D4008751F1 /* NSDictionary+Merge.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSDictionary+Merge.m"; path = "../../Utils/NSDictionary+Merge.m"; sourceTree = "<group>"; };
 		839E56E12879450300DFB5F4 /* HrtfData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HrtfData.h; sourceTree = "<group>"; };
 		839E56E22879450300DFB5F4 /* Endianness.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Endianness.h; sourceTree = "<group>"; };
 		839E56E32879450300DFB5F4 /* HrtfData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HrtfData.cpp; sourceTree = "<group>"; };
@@ -233,8 +231,6 @@
 		83A349742D5C50A10096D530 /* DSPHRTFNode.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DSPHRTFNode.h; sourceTree = "<group>"; };
 		83A349762D5C50B20096D530 /* DSPHRTFNode.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DSPHRTFNode.m; sourceTree = "<group>"; };
 		83B74280289E027F005AAC28 /* CogAudio-Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CogAudio-Bridging-Header.h"; sourceTree = "<group>"; };
-		83CB56632E06464D003DD379 /* NSDictionary+Optional.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "NSDictionary+Optional.h"; path = "../Utils/NSDictionary+Optional.h"; sourceTree = SOURCE_ROOT; };
-		83CB56642E06464D003DD379 /* NSDictionary+Optional.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = "NSDictionary+Optional.m"; path = "../Utils/NSDictionary+Optional.m"; sourceTree = SOURCE_ROOT; };
 		83F8431E2D5C6272008C123B /* HeadphoneFilter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HeadphoneFilter.h; sourceTree = "<group>"; };
 		83F8431F2D5C6272008C123B /* HeadphoneFilter.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = HeadphoneFilter.mm; sourceTree = "<group>"; };
 		83F843222D5C66DA008C123B /* DSPEqualizerNode.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DSPEqualizerNode.h; sourceTree = "<group>"; };
@@ -431,8 +427,6 @@
 		17D21CDC0B8BE5B400D1EBDE /* Utils */ = {
 			isa = PBXGroup;
 			children = (
-				83CB56632E06464D003DD379 /* NSDictionary+Optional.h */,
-				83CB56642E06464D003DD379 /* NSDictionary+Optional.m */,
 				839065F22853338700636FBB /* dsd2float.h */,
 				8328995527CB51B700D7F028 /* SHA256Digest.h */,
 				8328995627CB51B700D7F028 /* SHA256Digest.m */,
@@ -617,7 +611,6 @@
 				83A3496D2D5C40490096D530 /* DSPFSurroundNode.h in Headers */,
 				83A3496B2D5C3F430096D530 /* DSPRubberbandNode.h in Headers */,
 				17D21CA50B8BE4BA00D1EBDE /* InputNode.h in Headers */,
-				83CB56652E06464D003DD379 /* NSDictionary+Optional.h in Headers */,
 				833738EA2D5EA52500278628 /* DSPDownmixNode.h in Headers */,
 				83F843232D5C66DA008C123B /* DSPEqualizerNode.h in Headers */,
 				834A41A9287A90AB00EB9D9B /* freesurround_decoder.h in Headers */,
@@ -694,9 +687,15 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
 				LastUpgradeCheck = 1620;
+				TargetAttributes = {
+					8DC2EF4F0486A6940098B216 = {
+						LastSwiftMigration = 1330;
+						ProvisioningStyle = Manual;
+					};
+				};
 			};
 			buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "CogAudio" */;
-			compatibilityVersion = "Xcode 12.0";
+			compatibilityVersion = "Xcode 3.2";
 			developmentRegion = en;
 			hasScannedForEncodings = 1;
 			knownRegions = (
@@ -766,7 +765,6 @@
 				8EC122600B993BD500C5B3AD /* ConverterNode.m in Sources */,
 				835DD2672ACAF1D90057E319 /* OutputCoreAudio.m in Sources */,
 				83A349722D5C41810096D530 /* FSurroundFilter.mm in Sources */,
-				83CB56662E06464D003DD379 /* NSDictionary+Optional.m in Sources */,
 				8E8D3D300CBAEE6E00135C1B /* AudioContainer.m in Sources */,
 				B0575F300D687A4000411D77 /* Helper.m in Sources */,
 				835DD2742ACAF5AD0057E319 /* lpc.c in Sources */,
@@ -783,7 +781,6 @@
 			buildSettings = {
 				CLANG_CXX_LANGUAGE_STANDARD = "c++17";
 				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_IDENTITY = "";
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
 				DEAD_CODE_STRIPPING = YES;
@@ -825,7 +822,6 @@
 			buildSettings = {
 				CLANG_CXX_LANGUAGE_STANDARD = "c++17";
 				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_IDENTITY = "";
 				COMBINE_HIDPI_IMAGES = YES;
 				DEAD_CODE_STRIPPING = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -885,6 +881,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
 				DEAD_CODE_STRIPPING = YES;
+				DEFINES_MODULE = YES;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
@@ -937,6 +934,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				DEFINES_MODULE = YES;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_NO_COMMON_BLOCKS = YES;

Audio/CogAudio.xcodeproj/xcshareddata/xcschemes/CogAudio.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1640"
+   LastUpgradeVersion = "1620"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Audio/Output/OutputCoreAudio.h

@@ -28,6 +28,9 @@ using std::atomic_long;
 #import <CogAudio/HeadphoneFilter.h>
 
 //#define OUTPUT_LOG
+#ifdef OUTPUT_LOG
+#import <stdio.h>
+#endif
 
 @class OutputNode;
 
@@ -99,7 +102,7 @@ using std::atomic_long;
 	ChunkList *outputBuffer;
 
 #ifdef OUTPUT_LOG
-	NSFileHandle *_logFile;
+	FILE *_logFile;
 #endif
 }
 

Audio/Output/OutputCoreAudio.m

@@ -19,10 +19,6 @@
 
 #import <CogAudio/VisualizationController.h>
 
-#ifdef OUTPUT_LOG
-#import <NSFileHandle+CreateFile.h>
-#endif
-
 extern void scale_by_volume(float *buffer, size_t count, float volume);
 
 static NSString *CogPlaybackDidBeginNotificiation = @"CogPlaybackDidBeginNotificiation";
@@ -31,19 +27,23 @@ static BOOL fadeAudio(const float *inSamples, float *outSamples, size_t channels
 	float _fadeLevel = *fadeLevel;
 	BOOL towardZero = fadeStep < 0.0;
 	BOOL stopping = NO;
-	size_t maxCount = (size_t)floor(fabs(fadeTarget - _fadeLevel) / fabs(fadeStep));
-	if(maxCount) {
-		size_t countToDo = MIN(count, maxCount);
-		for(size_t i = 0; i < channels; ++i) {
-			_fadeLevel = *fadeLevel;
-			vDSP_vrampmuladd(&inSamples[i], channels, &_fadeLevel, &fadeStep, &outSamples[i], channels, countToDo);
+	for(size_t i = 0; i < count; ++i) {
+		for(size_t j = 0; j < channels; ++j) {
+			outSamples[j] += inSamples[j] * _fadeLevel;
 		}
-	}
-	if(maxCount <= count) {
-		if(!towardZero && maxCount < count) {
-			vDSP_vadd(&inSamples[maxCount * channels], 1, &outSamples[maxCount * channels], 1, &outSamples[maxCount * channels], 1, (count - maxCount) * channels);
+		inSamples += channels;
+		outSamples += channels;
+		_fadeLevel += fadeStep;
+		if(towardZero && _fadeLevel <= fadeTarget) {
+			_fadeLevel = fadeTarget;
+			fadeStep = 0.0;
+			stopping = YES;
+			break;
+		} else if(!towardZero && _fadeLevel >= fadeTarget) {
+			_fadeLevel = fadeTarget;
+			fadeStep = 0.0;
+			stopping = YES;
 		}
-		stopping = YES;
 	}
 	*fadeLevel = _fadeLevel;
 	return stopping;
@@ -146,7 +146,7 @@ static void *kOutputCoreAudioContext = &kOutputCoreAudioContext;
 
 #ifdef OUTPUT_LOG
 		NSString *logName = [NSTemporaryDirectory() stringByAppendingPathComponent:@"CogAudioLog.raw"];
-		_logFile = [NSFileHandle fileHandleForWritingAtPath:logName createFile:YES];
+		_logFile = fopen([logName UTF8String], "wb");
 #endif
 	}
 
@@ -223,12 +223,8 @@ current_device_listener(AudioObjectID inObjectID, UInt32 inNumberAddresses, cons
 	while(!stopping) {
 		@autoreleasepool {
 			if(outputdevicechanged) {
-				if([self updateDeviceFormat]) {
-					outputdevicechanged = NO;
-				} else {
-					usleep(2000);
-					continue;
-				}
+				[self updateDeviceFormat];
+				outputdevicechanged = NO;
 			}
 
 			if([outputController shouldReset]) {
@@ -351,9 +347,17 @@ current_device_listener(AudioObjectID inObjectID, UInt32 inNumberAddresses, cons
 			AudioObjectAddPropertyListener(kAudioObjectSystemObject, &theAddress, default_device_changed, (__bridge void *_Nullable)(self));
 			defaultdevicelistenerapplied = YES;
 		}
+	} else {
+		err = noErr;
 	}
 
-	return noErr;
+	if(err != noErr) {
+		DLog(@"No output device with ID %d could be found.", deviceID);
+
+		return err;
+	}
+
+	return err;
 }
 
 - (BOOL)setOutputDeviceWithDeviceDict:(NSDictionary *)deviceDict {
@@ -407,18 +411,15 @@ current_device_listener(AudioObjectID inObjectID, UInt32 inNumberAddresses, cons
 		.mElement = kAudioObjectPropertyElementMaster
 	};
 
-	OSStatus status = AudioObjectGetPropertyDataSize(kAudioObjectSystemObject, &theAddress, 0, NULL, &propsize);
-	if(status != noErr) return;
+	__Verify_noErr(AudioObjectGetPropertyDataSize(kAudioObjectSystemObject, &theAddress, 0, NULL, &propsize));
 	UInt32 nDevices = propsize / (UInt32)sizeof(AudioDeviceID);
 	AudioDeviceID *devids = (AudioDeviceID *)malloc(propsize);
-	status = AudioObjectGetPropertyData(kAudioObjectSystemObject, &theAddress, 0, NULL, &propsize, devids);
-	if(status != noErr) return;
+	__Verify_noErr(AudioObjectGetPropertyData(kAudioObjectSystemObject, &theAddress, 0, NULL, &propsize, devids));
 
 	theAddress.mSelector = kAudioHardwarePropertyDefaultOutputDevice;
 	AudioDeviceID systemDefault;
 	propsize = sizeof(systemDefault);
-	status = AudioObjectGetPropertyData(kAudioObjectSystemObject, &theAddress, 0, NULL, &propsize, &systemDefault);
-	if(status != noErr) return;
+	__Verify_noErr(AudioObjectGetPropertyData(kAudioObjectSystemObject, &theAddress, 0, NULL, &propsize, &systemDefault));
 
 	theAddress.mScope = kAudioDevicePropertyScopeOutput;
 
@@ -426,23 +427,17 @@ current_device_listener(AudioObjectID inObjectID, UInt32 inNumberAddresses, cons
 		UInt32 isAlive = 0;
 		propsize = sizeof(isAlive);
 		theAddress.mSelector = kAudioDevicePropertyDeviceIsAlive;
-		status = AudioObjectGetPropertyData(devids[i], &theAddress, 0, NULL, &propsize, &isAlive);
-		if(status != noErr) return;
+		__Verify_noErr(AudioObjectGetPropertyData(devids[i], &theAddress, 0, NULL, &propsize, &isAlive));
 		if(!isAlive) continue;
 
 		CFStringRef name = NULL;
 		propsize = sizeof(name);
 		theAddress.mSelector = kAudioDevicePropertyDeviceNameCFString;
-		status = AudioObjectGetPropertyData(devids[i], &theAddress, 0, NULL, &propsize, &name);
-		if(status != noErr) return;
+		__Verify_noErr(AudioObjectGetPropertyData(devids[i], &theAddress, 0, NULL, &propsize, &name));
 
 		propsize = 0;
 		theAddress.mSelector = kAudioDevicePropertyStreamConfiguration;
-		status = AudioObjectGetPropertyDataSize(devids[i], &theAddress, 0, NULL, &propsize);
-		if(status != noErr) {
-			if(name) CFRelease(name);
-			return;
-		}
+		__Verify_noErr(AudioObjectGetPropertyDataSize(devids[i], &theAddress, 0, NULL, &propsize));
 
 		if(propsize < sizeof(UInt32)) {
 			if(name) CFRelease(name);
@@ -450,15 +445,7 @@ current_device_listener(AudioObjectID inObjectID, UInt32 inNumberAddresses, cons
 		}
 
 		AudioBufferList *bufferList = (AudioBufferList *)malloc(propsize);
-		if(!bufferList) {
-			if(name) CFRelease(name);
-			return;
-		}
-		status = AudioObjectGetPropertyData(devids[i], &theAddress, 0, NULL, &propsize, bufferList);
-		if(status != noErr) {
-			if(name) CFRelease(name);
-			return;
-		}
+		__Verify_noErr(AudioObjectGetPropertyData(devids[i], &theAddress, 0, NULL, &propsize, bufferList));
 		UInt32 bufferCount = bufferList->mNumberBuffers;
 		free(bufferList);
 
@@ -475,7 +462,7 @@ current_device_listener(AudioObjectID inObjectID, UInt32 inNumberAddresses, cons
 			  systemDefault,
 			  &stop);
 
-		if(name) CFRelease(name);
+		CFRelease(name);
 
 		if(stop) {
 			break;
@@ -487,9 +474,6 @@ current_device_listener(AudioObjectID inObjectID, UInt32 inNumberAddresses, cons
 
 - (BOOL)updateDeviceFormat {
 	AVAudioFormat *format = _au.outputBusses[0].format;
-	if(!format) {
-		return NO;
-	}
 
 	if(!_deviceFormat || ![_deviceFormat isEqual:format]) {
 		NSError *err;
@@ -637,7 +621,9 @@ current_device_listener(AudioObjectID inObjectID, UInt32 inNumberAddresses, cons
 
 	AudioChunk *chunk = [self renderInput:512];
 	size_t frameCount = 0;
-	if(chunk && (frameCount = [chunk frameCount])) {
+	if(chunk) {
+		frameCount = [chunk frameCount];
+
 		[outputLock lock];
 		[outputBuffer addChunk:chunk];
 		[outputLock unlock];
@@ -662,7 +648,7 @@ current_device_listener(AudioObjectID inObjectID, UInt32 inNumberAddresses, cons
 	__block NSMutableArray *faders = self->fadedBuffers;
 
 #ifdef OUTPUT_LOG
-	__block NSFileHandle *logFile = _logFile;
+	__block FILE *logFile = _logFile;
 #endif
 
 	_au.outputProvider = ^AUAudioUnitStatus(AudioUnitRenderActionFlags *_Nonnull actionFlags, const AudioTimeStamp *_Nonnull timestamp, AUAudioFrameCount frameCount, NSInteger inputBusNumber, AudioBufferList *_Nonnull inputData) {
@@ -729,6 +715,17 @@ current_device_listener(AudioObjectID inObjectID, UInt32 inNumberAddresses, cons
 			}
 
 			double secondsRendered = (double)renderedSamples / format->mSampleRate;
+			float volumeScale = 1.0;
+			double sustained;
+			sustained = _self->secondsHdcdSustained;
+			if(sustained > 0) {
+				if(sustained < secondsRendered) {
+					_self->secondsHdcdSustained = 0.0;
+				} else {
+					_self->secondsHdcdSustained = sustained - secondsRendered;
+					volumeScale = 0.5;
+				}
+			}
 
 			[fadersLock lock];
 			for(size_t i = 0; i < [faders count];) {
@@ -742,14 +739,9 @@ current_device_listener(AudioObjectID inObjectID, UInt32 inNumberAddresses, cons
 			}
 			[fadersLock unlock];
 
-			scale_by_volume(outSamples, frameCount * channels, _self->volume);
+			scale_by_volume(outSamples, frameCount * channels, volumeScale * _self->volume);
 
 			[_self updateLatency:secondsRendered];
-
-#ifdef OUTPUT_LOG
-			NSData *outData = [NSData dataWithBytes:outSamples length:frameCount * format->mBytesPerPacket];
-			[logFile writeData:outData];
-#endif
 		}
 
 #ifdef _DEBUG
@@ -821,9 +813,7 @@ current_device_listener(AudioObjectID inObjectID, UInt32 inNumberAddresses, cons
 
 		[_au allocateRenderResourcesAndReturnError:&err];
 
-		if(![self updateDeviceFormat]) {
-			return NO;
-		}
+		[self updateDeviceFormat];
 
 		visController = [VisualizationController sharedController];
 
@@ -934,7 +924,7 @@ current_device_listener(AudioObjectID inObjectID, UInt32 inNumberAddresses, cons
 		}
 #ifdef OUTPUT_LOG
 		if(_logFile) {
-			[_logFile closeFile];
+			fclose(_logFile);
 			_logFile = NULL;
 		}
 #endif
@@ -1000,7 +990,6 @@ current_device_listener(AudioObjectID inObjectID, UInt32 inNumberAddresses, cons
 	[fadedBuffers addObject:buffer];
 	[fadedBuffersLock unlock];
 	[outputLock unlock];
-	cutOffInput = NO;
 }
 
 - (void)fadeIn {
@@ -1009,6 +998,7 @@ current_device_listener(AudioObjectID inObjectID, UInt32 inNumberAddresses, cons
 	fadeStep = ((fadeTarget - fadeLevel) / deviceFormat.mSampleRate) * (1000.0f / 125.0f);
 	fading = YES;
 	faded = NO;
+	cutOffInput = NO;
 }
 
 @end

Audio/ThirdParty/deadbeef/fft_accelerate.c

@@ -24,28 +24,17 @@
 #include "fft.h"
 #include <Accelerate/Accelerate.h>
 
-// Some newer spectrum calculation methodology, adapted but not copied wholesale
-// Mostly about a dozen or two lines of Cocoa and vDSP code
+static int _fft_size;
+static float *_input_real;
+static float *_input_imaginary;
+static float *_output_real;
+static float *_output_imaginary;
+static float *_hamming;
+static float *_sq_mags;
 
-// AudioSpectrum: A sample app using Audio Unit and vDSP
-// By Keijiro Takahashi, 2013, 2014
-// https://github.com/keijiro/AudioSpectrum
-
-struct SpectrumData
-{
-	unsigned long length;
-	Float32 data[0];
-};
-
-static int _fft_size = 0;
-static vDSP_DFT_Setup _dftSetup = NULL;
-static DSPSplitComplex _dftBuffer = {0};
-static Float32 *_window = NULL;
-
-static struct SpectrumData *_rawSpectrum = NULL;
+static vDSP_DFT_Setup _dft_setup;
 
 // Apparently _mm_malloc is Intel-only on newer macOS targets, so use supported posix_memalign
-// malloc() is allegedly aligned on macOS, but I don't know for sure
 static void *_memalign_calloc(size_t count, size_t size, size_t align) {
 	size *= count;
 	void *ret = NULL;
@@ -61,79 +50,57 @@ _init_buffers(int fft_size) {
 	if(fft_size != _fft_size) {
 		fft_free();
 
-		_dftSetup = vDSP_DFT_zrop_CreateSetup(NULL, fft_size * 2, vDSP_DFT_FORWARD);
-		if(!_dftSetup) return;
+		_input_real = _memalign_calloc(fft_size * 2, sizeof(float), 16);
+		_input_imaginary = _memalign_calloc(fft_size * 2, sizeof(float), 16);
+		_hamming = _memalign_calloc(fft_size * 2, sizeof(float), 16);
+		_sq_mags = _memalign_calloc(fft_size, sizeof(float), 16);
+		_output_real = _memalign_calloc(fft_size * 2 + 1, sizeof(float), 16);
+		_output_imaginary = _memalign_calloc(fft_size * 2 + 1, sizeof(float), 16);
 
-		_dftBuffer.realp = _memalign_calloc(fft_size, sizeof(Float32), 16);
-		_dftBuffer.imagp = _memalign_calloc(fft_size, sizeof(Float32), 16);
-		if(!_dftBuffer.realp || !_dftBuffer.imagp) return;
-
-		_window = _memalign_calloc(fft_size * 2, sizeof(Float32), 16);
-		if(!_window) return;
-		vDSP_blkman_window(_window, fft_size * 2, 0);
-
-		Float32 normFactor = 2.0f / (fft_size * 2);
-		vDSP_vsmul(_window, 1, &normFactor, _window, 1, fft_size * 2);
-
-		_rawSpectrum = (struct SpectrumData *) _memalign_calloc(sizeof(struct SpectrumData) + sizeof(Float32) * fft_size, 1, 16);
-		if(!_rawSpectrum) return;
-		_rawSpectrum->length = fft_size;
+		_dft_setup = vDSP_DFT_zop_CreateSetup(NULL, fft_size * 2, FFT_FORWARD);
+		vDSP_hamm_window(_hamming, fft_size * 2, 0);
 
 		_fft_size = fft_size;
 	}
 }
 
 void fft_calculate(const float *data, float *freq, int fft_size) {
-	if(!freq || !fft_size) return;
+	int dft_size = fft_size * 2;
+
 	_init_buffers(fft_size);
-	if(!_fft_size || !data) {
-		// Decibels
-		float kZeroLevel = -128.0;
-		vDSP_vfill(&kZeroLevel, freq, 1, fft_size);
-		return;
-	}
 
-	// Split the waveform
-	DSPSplitComplex dest = { _dftBuffer.realp, _dftBuffer.imagp };
-	vDSP_ctoz((const DSPComplex*)data, 2, &dest, 1, fft_size);
+	vDSP_vmul(data, 1, _hamming, 1, _input_real, 1, dft_size);
 
-	// Apply the window function
-	vDSP_vmul(_dftBuffer.realp, 1, _window, 2, _dftBuffer.realp, 1, fft_size);
-	vDSP_vmul(_dftBuffer.imagp, 1, _window + 1, 2, _dftBuffer.imagp, 1, fft_size);
+	vDSP_DFT_Execute(_dft_setup, _input_real, _input_imaginary, _output_real, _output_imaginary);
 
-	// DFT
-	vDSP_DFT_Execute(_dftSetup, _dftBuffer.realp, _dftBuffer.imagp, _dftBuffer.realp, _dftBuffer.imagp);
+	DSPSplitComplex split_complex = {
+		.realp = _output_real,
+		.imagp = _output_imaginary
+	};
+	vDSP_zvmags(&split_complex, 1, _sq_mags, 1, fft_size);
 
-	// Zero out the Nyquist value
-	_dftBuffer.imagp[0] = 0.0;
+	int sq_count = fft_size;
+	vvsqrtf(_sq_mags, _sq_mags, &sq_count);
 
-	// Calculate power spectrum
-	Float32 *rawSpectrum = _rawSpectrum->data;
-	vDSP_zvmags(&_dftBuffer, 1, rawSpectrum, 1, fft_size);
-
-	// Add -128dB offset to avoid log(0)
-	float kZeroOffset = 1.5849e-13;
-	vDSP_vsadd(rawSpectrum, 1, &kZeroOffset, rawSpectrum, 1, fft_size);
-
-	// Convert power to decibel
-	float kZeroDB = 0.70710678118f; // 1/sqrt(2)
-	vDSP_vdbcon(rawSpectrum, 1, &kZeroDB, rawSpectrum, 1, fft_size, 0);
-
-	cblas_scopy(fft_size, rawSpectrum, 1, freq, 1);
+	float mult = 2.f / fft_size;
+	vDSP_vsmul(_sq_mags, 1, &mult, freq, 1, fft_size);
 }
 
-void __attribute__((destructor)) fft_free(void) {
-	free(_dftBuffer.realp);
-	free(_dftBuffer.imagp);
-	free(_window);
-	free(_rawSpectrum);
-	if(_dftSetup != NULL) {
-		vDSP_DFT_DestroySetup(_dftSetup);
+void fft_free(void) {
+	free(_input_real);
+	free(_input_imaginary);
+	free(_hamming);
+	free(_sq_mags);
+	free(_output_real);
+	free(_output_imaginary);
+	if(_dft_setup != NULL) {
+		vDSP_DFT_DestroySetup(_dft_setup);
 	}
-	_dftBuffer.realp = NULL;
-	_dftBuffer.imagp = NULL;
-	_window = NULL;
-	_rawSpectrum = NULL;
-	_dftSetup = NULL;
-	_fft_size = 0;
+	_input_real = NULL;
+	_input_imaginary = NULL;
+	_hamming = NULL;
+	_sq_mags = NULL;
+	_dft_setup = NULL;
+	_output_real = NULL;
+	_output_imaginary = NULL;
 }

Audio/ThirdParty/hdcd/hdcd_decode2.c

@@ -1044,8 +1044,8 @@ static int hdcd_envelope(int32_t *samples, int count, int stride, int gain, int
 
     /* hold a steady level */
     if (gain == 0x800000) {
-        /*if (count > 0)
-            samples += count * stride;*/
+        if (count > 0)
+            samples += count * stride;
     } else {
         while (--count >= 0) {
             APPLY_GAIN(*samples, gain);

Audio/ThirdParty/lvqcl/lpc.c

@@ -139,7 +139,7 @@ static void vorbis_lpc_predict(float *coeff, float *prime, int m, float *data, l
 }
 
 void lpc_extrapolate2(float *const data, const size_t data_len, const int nch, const int lpc_order, const size_t extra_bkwd, const size_t extra_fwd, void **extrapolate_buffer, size_t *extrapolate_buffer_size) {
-	//const size_t max_to_prime = (data_len < lpc_order) ? data_len : lpc_order;
+	const size_t max_to_prime = (data_len < lpc_order) ? data_len : lpc_order;
 	const size_t min_data_len = (data_len < lpc_order) ? lpc_order : data_len;
 
 	const size_t tdata_size = sizeof(float) * (extra_bkwd + min_data_len + extra_fwd);
@@ -153,16 +153,14 @@ void lpc_extrapolate2(float *const data, const size_t data_len, const int nch, c
 	if(new_size > *extrapolate_buffer_size) {
 		*extrapolate_buffer = realloc(*extrapolate_buffer, new_size);
 		*extrapolate_buffer_size = new_size;
-		if(!*extrapolate_buffer) return;
 	}
 
-	double *aut = (double *)(*extrapolate_buffer);
-	double *lpc = (double *)(*extrapolate_buffer + aut_size);
+	float *tdata = (float *)(*extrapolate_buffer); // for 1 channel only
 
-	float *tdata = (float *)(*extrapolate_buffer + aut_size + lpc_size); // for 1 channel only
-
-	float *lpci = (float *)(*extrapolate_buffer + aut_size + lpc_size + tdata_size);
-	float *work = (float *)(*extrapolate_buffer + aut_size + lpc_size + tdata_size + lpci_size);
+	double *aut = (double *)(*extrapolate_buffer + tdata_size);
+	double *lpc = (double *)(*extrapolate_buffer + tdata_size + aut_size);
+	float *lpci = (float *)(*extrapolate_buffer + tdata_size + aut_size + lpc_size);
+	float *work = (float *)(*extrapolate_buffer + tdata_size + aut_size + lpc_size + lpci_size);
 
 	for(int c = 0; c < nch; c++) {
 		if(extra_bkwd) {

Audio/ThirdParty/lvqcl/util.h

@@ -44,7 +44,6 @@ static void samples_len(unsigned* r1, unsigned* r2, unsigned N, unsigned M)
 {
     if (r1 == 0 || r2 == 0) return;
     unsigned v = local_gcd(*r1, *r2);        // v = 300
-	if (v == 0) return;
     *r1 /= v; *r2 /= v;                        // r1 = 147; r2 = 160  == 1/300th of second
     unsigned n = (v + N-1) / N;                // n = 300/20 = 15 times
     unsigned z = max(*r1, *r2);        // z = 160

Audio/Visualization/VisualizationController.m

@@ -130,9 +130,10 @@ static VisualizationController *_sharedController = nil;
 
 	@synchronized(self) {
 		if(!sampleRate) {
-			free(visAudioTemp);
-			if(outPCM) bzero(outPCM, 4096 * sizeof(float));
-			if(outFFT) bzero(outFFT, 2048 * sizeof(float));
+			bzero(outPCM, 4096 * sizeof(float));
+			if(outFFT) {
+				bzero(outFFT, 2048 * sizeof(float));
+			}
 			return;
 		}
 		int latencySamples = (int)(sampleRate * (self->latency + latency)) + 2048;

Base.lproj/MainMenu.xib

@@ -1531,6 +1531,11 @@
                                     <action selector="showWindow:" target="Hd4-Wy-Rfl" id="xfd-8T-SL4"/>
                                 </connections>
                             </menuItem>
+                            <menuItem title="Check for Updates..." id="302">
+                                <connections>
+                                    <action selector="checkForUpdates:" target="226" id="jEY-i9-qwZ"/>
+                                </connections>
+                            </menuItem>
                             <menuItem isSeparatorItem="YES" id="1100">
                                 <modifierMask key="keyEquivalentModifierMask" command="YES"/>
                             </menuItem>
@@ -1541,6 +1546,45 @@
                                 </connections>
                             </menuItem>
                             <menuItem isSeparatorItem="YES" id="0ig-xg-gkg"/>
+                            <menuItem title="Donate" id="751">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <menu key="submenu" title="Donate" id="kue-p2-G0Y">
+                                    <items>
+                                        <menuItem title="LiberaPay" id="nyW-nI-abw">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="openLiberapayPage:" target="226" id="pS6-Hj-tIm"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem isSeparatorItem="YES" id="Mbf-yW-WGC"/>
+                                        <menuItem title="One time" enabled="NO" id="wLp-NA-5u2">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                        </menuItem>
+                                        <menuItem title="PayPal" id="xcs-tx-Viz">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="openPaypalPage:" target="226" id="oxr-P1-35O"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem isSeparatorItem="YES" id="txC-Jd-Gez"/>
+                                        <menuItem title="Recurring" enabled="NO" id="iRb-7e-iMC">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                        </menuItem>
+                                        <menuItem title="Ko-fi" id="CVM-rp-UJe">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="openKofiPage:" target="226" id="gax-6q-SuW"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Patreon" id="NXj-oA-q3F">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="openPatreonPage:" target="226" id="LFz-4J-b6o"/>
+                                            </connections>
+                                        </menuItem>
+                                    </items>
+                                </menu>
+                            </menuItem>
                             <menuItem title="Send Feedback..." id="303">
                                 <connections>
                                     <action selector="feedback:" target="226" id="GSH-G5-qM1"/>

Base.lproj/SpectrumWindow.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22113.1" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="23504" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22113.1"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="23504"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>

Cog.entitlements

@@ -2,10 +2,13 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>com.apple.security.temporary-exception.mach-lookup.global-name</key>
+	<array>
+		<string>$(PRODUCT_BUNDLE_IDENTIFIER)-spks</string>
+		<string>$(PRODUCT_BUNDLE_IDENTIFIER)-spki</string>
+	</array>
 	<key>com.apple.security.app-sandbox</key>
 	<true/>
-	<key>com.apple.security.cs.disable-library-validation</key>
-	<true/>
 	<key>com.apple.security.cs.allow-jit</key>
 	<true/>
 	<key>com.apple.security.files.user-selected.read-write</key>

Cog.xcodeproj/project.pbxproj

@@ -97,6 +97,8 @@
 		830C37A127B95E3000E02BB0 /* Equalizer.xib in Resources */ = {isa = PBXBuildFile; fileRef = 830C379F27B95E3000E02BB0 /* Equalizer.xib */; };
 		830C37A527B95EB300E02BB0 /* EqualizerWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 830C37A427B95EB300E02BB0 /* EqualizerWindowController.m */; };
 		830C37FC27B9956C00E02BB0 /* analyzer.c in Sources */ = {isa = PBXBuildFile; fileRef = 830C37F227B9956C00E02BB0 /* analyzer.c */; };
+		830EDD1B2D813DEA00988EA8 /* libprojectM-4.4.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 83E9EEBA2D80634600F1D22D /* libprojectM-4.4.dylib */; };
+		830EDD1C2D813DF600988EA8 /* libprojectM-4-playlist.4.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 83E9EEB92D80634600F1D22D /* libprojectM-4-playlist.4.dylib */; };
 		831B99BF27C23E88005A969B /* Cog.sdef in Resources */ = {isa = PBXBuildFile; fileRef = 831B99BE27C23E88005A969B /* Cog.sdef */; };
 		83256B68286661FC0036D9C0 /* libmpg123.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 83256B672866617F0036D9C0 /* libmpg123.0.dylib */; };
 		83256B69286661FC0036D9C0 /* libmpg123.0.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 83256B672866617F0036D9C0 /* libmpg123.0.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
@@ -136,6 +138,7 @@
 		836FB5A718206F2500B3AD2D /* Hively.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 836FB5471820538800B3AD2D /* Hively.bundle */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
 		8370D73D277419F700245CE0 /* SQLiteStore.m in Sources */ = {isa = PBXBuildFile; fileRef = 8370D73C277419F700245CE0 /* SQLiteStore.m */; };
 		8370D73F2775AE1300245CE0 /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 8370D73E2775AE1300245CE0 /* libsqlite3.tbd */; };
+		8372C93D27C7895300E250C9 /* MAD.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8372C93027C785BE00E250C9 /* MAD.bundle */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		8377C66327B8CF6300E8BC0F /* SpectrumViewSK.m in Sources */ = {isa = PBXBuildFile; fileRef = 8377C66127B8CF6300E8BC0F /* SpectrumViewSK.m */; };
 		8377C6B927B900F000E8BC0F /* SpectrumItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 8377C6B827B900F000E8BC0F /* SpectrumItem.m */; };
 		837DC92B285B05710005C58A /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 837DC92A285B05710005C58A /* CoreData.framework */; };
@@ -150,6 +153,8 @@
 		838A33832D06CF4100D0D770 /* SpectrumViewCG.m in Sources */ = {isa = PBXBuildFile; fileRef = 838A33802D06CF4100D0D770 /* SpectrumViewCG.m */; };
 		838A33842D06CF4100D0D770 /* SpectrumWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 838A33822D06CF4100D0D770 /* SpectrumWindowController.m */; };
 		838A33872D06CFCA00D0D770 /* SpeedButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 838A33862D06CFCA00D0D770 /* SpeedButton.m */; };
+		838F851E256B4E5E00C3E614 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 838F851D256B4E5E00C3E614 /* Sparkle.framework */; };
+		838F851F256B4E8B00C3E614 /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 838F851D256B4E5E00C3E614 /* Sparkle.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		83922FBA286B1AA900A0B039 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 83922FB6286B1AA900A0B039 /* WebKit.framework */; };
 		839614A2286ED97200D3EEDB /* AboutWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 839614A0286ED97200D3EEDB /* AboutWindowController.xib */; };
 		839614AD286EDA5C00D3EEDB /* SpectrumWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 839614AB286EDA5C00D3EEDB /* SpectrumWindow.xib */; };
@@ -169,7 +174,6 @@
 		83B61E2429A8296500CD0580 /* LyricsWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 83B61E2229A8296500CD0580 /* LyricsWindow.xib */; };
 		83B61E2829A82A0200CD0580 /* LyricsWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 83B61E2729A82A0200CD0580 /* LyricsWindowController.m */; };
 		83B72E3B279045B7006007A3 /* libfdk-aac.2.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 83B72E2A279044F6006007A3 /* libfdk-aac.2.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
-		83B73B652D8FD75A00A57F08 /* minimp3.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 83B73B602D8FC05A00A57F08 /* minimp3.bundle */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		83BC5AB220E4C87100631CD4 /* DualWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 83BC5AB020E4C87100631CD4 /* DualWindow.m */; };
 		83BC5ABF20E4CE7A00631CD4 /* InfoInspector.xib in Resources */ = {isa = PBXBuildFile; fileRef = 17D1B0D00F6320EA00694C57 /* InfoInspector.xib */; };
 		83BC5AC020E4CE7D00631CD4 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 17342A980D5FD20B00E8D854 /* MainMenu.xib */; };
@@ -178,8 +182,18 @@
 		83BC5AC320E4CE8D00631CD4 /* SpotlightPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = 178456C00F6320B5007E8021 /* SpotlightPanel.xib */; };
 		83BC5AC420E4CE9000631CD4 /* Feedback.xib in Resources */ = {isa = PBXBuildFile; fileRef = 17D1B1DA0F6330D400694C57 /* Feedback.xib */; };
 		83BCB8DE17FC971300760340 /* FFMPEG.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = B09E94350D747F7B0064F138 /* FFMPEG.bundle */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
-		83CB565E2E064607003DD379 /* NSDictionary+Optional.m in Sources */ = {isa = PBXBuildFile; fileRef = 83CB565D2E064607003DD379 /* NSDictionary+Optional.m */; };
 		83D0380F24A40DFB004CF90F /* CogAssets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 83D0380E24A40DF2004CF90F /* CogAssets.xcassets */; };
+		83E9A0D02D804A1800F1D22D /* ProjectMView.m in Sources */ = {isa = PBXBuildFile; fileRef = 83E9A0CF2D804A1800F1D22D /* ProjectMView.m */; };
+		83E9EEB32D805C5300F1D22D /* textures in Copy Files */ = {isa = PBXBuildFile; fileRef = 83E9EEB22D805C5300F1D22D /* textures */; };
+		83E9EEB52D805C7B00F1D22D /* presets in Copy Files */ = {isa = PBXBuildFile; fileRef = 83E9EEB42D805C7B00F1D22D /* presets */; };
+		83E9EEBB2D80634600F1D22D /* libboost_atomic.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 83E9EEB62D80634600F1D22D /* libboost_atomic.dylib */; };
+		83E9EEBC2D80634600F1D22D /* libboost_system.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 83E9EEB82D80634600F1D22D /* libboost_system.dylib */; };
+		83E9EEBE2D80634600F1D22D /* libboost_filesystem.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 83E9EEB72D80634600F1D22D /* libboost_filesystem.dylib */; };
+		83E9EEC02D80639E00F1D22D /* libprojectM-4.4.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 83E9EEBA2D80634600F1D22D /* libprojectM-4.4.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
+		83E9EEC12D8063A100F1D22D /* libboost_system.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 83E9EEB82D80634600F1D22D /* libboost_system.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
+		83E9EEC22D8063A400F1D22D /* libboost_atomic.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 83E9EEB62D80634600F1D22D /* libboost_atomic.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
+		83E9EEC32D8063A700F1D22D /* libboost_filesystem.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 83E9EEB72D80634600F1D22D /* libboost_filesystem.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
+		83E9EEC42D8063AD00F1D22D /* libprojectM-4-playlist.4.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 83E9EEB92D80634600F1D22D /* libprojectM-4-playlist.4.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
 		83F9D8071A884C54007ABEC2 /* SilenceDecoder.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 83F9D7F61A884B46007ABEC2 /* SilenceDecoder.bundle */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		83F9FFEF2D6EB75B00026576 /* Sentry in Frameworks */ = {isa = PBXBuildFile; productRef = 83F9FFEE2D6EB75B00026576 /* Sentry */; };
 		8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
@@ -512,6 +526,20 @@
 			remoteGlobalIDString = 836FB52C1820538700B3AD2D;
 			remoteInfo = Hively;
 		};
+		8372C92F27C785BE00E250C9 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 8372C92A27C785BD00E250C9 /* MAD.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 8372C92327C785BD00E250C9;
+			remoteInfo = MAD;
+		};
+		8372C93B27C7893100E250C9 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 8372C92A27C785BD00E250C9 /* MAD.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = 8372C92227C785BD00E250C9;
+			remoteInfo = MAD;
+		};
 		8375B36117FFEF010092A79F /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 8359FF2C17FEF35C0060F3ED /* ArchiveSource.xcodeproj */;
@@ -533,20 +561,6 @@
 			remoteGlobalIDString = 83B06686180D5668008E3612;
 			remoteInfo = MIDI;
 		};
-		83B73B5F2D8FC05A00A57F08 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 8372C92A27C785BD00E250C9 /* minimp3.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 8372C92327C785BD00E250C9;
-			remoteInfo = minimp3;
-		};
-		83B73B632D8FD74000A57F08 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 8372C92A27C785BD00E250C9 /* minimp3.xcodeproj */;
-			proxyType = 1;
-			remoteGlobalIDString = 8372C92227C785BD00E250C9;
-			remoteInfo = minimp3;
-		};
 		83BB13C120E4E38E00723731 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 836F6B2518BDB80D0095E648 /* vgmstream.xcodeproj */;
@@ -668,6 +682,8 @@
 			dstPath = "";
 			dstSubfolderSpec = 7;
 			files = (
+				83E9EEB52D805C7B00F1D22D /* presets in Copy Files */,
+				83E9EEB32D805C5300F1D22D /* textures in Copy Files */,
 				ED69CA3B25BE2A390090B90D /* Preferences.preferencePane in Copy Files */,
 			);
 			name = "Copy Files";
@@ -679,8 +695,8 @@
 			dstPath = "";
 			dstSubfolderSpec = 13;
 			files = (
-				83B73B652D8FD75A00A57F08 /* minimp3.bundle in CopyFiles */,
 				8327DBA9293CAD2400CD0580 /* Organya.bundle in CopyFiles */,
+				8372C93D27C7895300E250C9 /* MAD.bundle in CopyFiles */,
 				83489C6B2782F78700BDCEA2 /* libvgmPlayer.bundle in CopyFiles */,
 				834D794020E4EFEF00C4A5CC /* VorbisPlugin.bundle in CopyFiles */,
 				834D793F20E4EFEA00C4A5CC /* OpusPlugin.bundle in CopyFiles */,
@@ -716,6 +732,11 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
+				83E9EEC32D8063A700F1D22D /* libboost_filesystem.dylib in CopyFiles */,
+				83E9EEC22D8063A400F1D22D /* libboost_atomic.dylib in CopyFiles */,
+				83E9EEC12D8063A100F1D22D /* libboost_system.dylib in CopyFiles */,
+				83E9EEC42D8063AD00F1D22D /* libprojectM-4-playlist.4.dylib in CopyFiles */,
+				83E9EEC02D80639E00F1D22D /* libprojectM-4.4.dylib in CopyFiles */,
 				836DF617298F6F1700CD0580 /* libsoxr.0.dylib in CopyFiles */,
 				836EF0E127BB98AB00BF35B2 /* libopusfile.0.dylib in CopyFiles */,
 				836EF0E027BB98A800BF35B2 /* libopus.0.dylib in CopyFiles */,
@@ -732,6 +753,7 @@
 				83B72E3B279045B7006007A3 /* libfdk-aac.2.dylib in CopyFiles */,
 				8305963C277F013200EBFAAE /* File_Extractor.framework in CopyFiles */,
 				ED69CBCA25BE32E80090B90D /* MASShortcut.framework in CopyFiles */,
+				838F851F256B4E8B00C3E614 /* Sparkle.framework in CopyFiles */,
 				17F561400C3BD4F30019975C /* CogAudio.framework in CopyFiles */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -956,7 +978,7 @@
 		8370D739277419D200245CE0 /* SQLiteStore.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SQLiteStore.h; sourceTree = "<group>"; };
 		8370D73C277419F700245CE0 /* SQLiteStore.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SQLiteStore.m; sourceTree = "<group>"; };
 		8370D73E2775AE1300245CE0 /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = usr/lib/libsqlite3.tbd; sourceTree = SDKROOT; };
-		8372C92A27C785BD00E250C9 /* minimp3.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = minimp3.xcodeproj; path = Plugins/minimp3/minimp3.xcodeproj; sourceTree = "<group>"; };
+		8372C92A27C785BD00E250C9 /* MAD.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = MAD.xcodeproj; path = Plugins/MAD/MAD.xcodeproj; sourceTree = "<group>"; };
 		8375B05117FFEA400092A79F /* OpusPlugin.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = OpusPlugin.xcodeproj; path = Plugins/Opus/OpusPlugin.xcodeproj; sourceTree = "<group>"; };
 		8377C66127B8CF6300E8BC0F /* SpectrumViewSK.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SpectrumViewSK.m; path = Visualization/SpectrumViewSK.m; sourceTree = "<group>"; };
 		8377C66227B8CF6300E8BC0F /* SpectrumViewSK.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SpectrumViewSK.h; path = Visualization/SpectrumViewSK.h; sourceTree = "<group>"; };
@@ -986,6 +1008,7 @@
 		838EE79E29A8556000CD0580 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/LyricsWindow.strings; sourceTree = "<group>"; };
 		838EE7A029A8556500CD0580 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/LyricsWindow.strings; sourceTree = "<group>"; };
 		838F84FF25687C5C00C3E614 /* Cog-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Cog-Bridging-Header.h"; sourceTree = "<group>"; };
+		838F851D256B4E5E00C3E614 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = ThirdParty/Frameworks/Sparkle.framework; sourceTree = "<group>"; };
 		83922FB6286B1AA900A0B039 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
 		839614A1286ED97200D3EEDB /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/AboutWindowController.xib; sourceTree = "<group>"; };
 		839614A4286ED98600D3EEDB /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/AboutWindowController.strings; sourceTree = "<group>"; };
@@ -1038,11 +1061,18 @@
 		83BC5AD820E4D0D900631CD4 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/SpotlightPanel.strings; sourceTree = "<group>"; };
 		83BC5ADA20E4D0E900631CD4 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Feedback.strings; sourceTree = "<group>"; };
 		83BC5ADC20E4D0EC00631CD4 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Feedback.strings; sourceTree = "<group>"; };
-		83CB565C2E064607003DD379 /* NSDictionary+Optional.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSDictionary+Optional.h"; sourceTree = "<group>"; };
-		83CB565D2E064607003DD379 /* NSDictionary+Optional.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSDictionary+Optional.m"; sourceTree = "<group>"; };
 		83D0380E24A40DF2004CF90F /* CogAssets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = CogAssets.xcassets; sourceTree = "<group>"; };
 		83D3C5FC201C674D005564CB /* AdPlug.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = AdPlug.xcodeproj; path = Plugins/AdPlug/AdPlug.xcodeproj; sourceTree = "<group>"; };
 		83E5EFAC1FFEF78100659F0F /* OpenMPT.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = OpenMPT.xcodeproj; path = Plugins/OpenMPT/OpenMPT.xcodeproj; sourceTree = "<group>"; };
+		83E9A0CE2D8049FA00F1D22D /* ProjectMView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ProjectMView.h; path = Visualization/ProjectMView.h; sourceTree = "<group>"; };
+		83E9A0CF2D804A1800F1D22D /* ProjectMView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = ProjectMView.m; path = Visualization/ProjectMView.m; sourceTree = "<group>"; };
+		83E9EEB22D805C5300F1D22D /* textures */ = {isa = PBXFileReference; lastKnownFileType = folder; name = textures; path = "ThirdParty/libprojectM/subprojects/presets-milkdrop-texture-pack/textures"; sourceTree = "<group>"; };
+		83E9EEB42D805C7B00F1D22D /* presets */ = {isa = PBXFileReference; lastKnownFileType = folder; name = presets; path = ThirdParty/libprojectM/subprojects/presets; sourceTree = "<group>"; };
+		83E9EEB62D80634600F1D22D /* libboost_atomic.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libboost_atomic.dylib; path = ThirdParty/libprojectM/lib/libboost_atomic.dylib; sourceTree = "<group>"; };
+		83E9EEB72D80634600F1D22D /* libboost_filesystem.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libboost_filesystem.dylib; path = ThirdParty/libprojectM/lib/libboost_filesystem.dylib; sourceTree = "<group>"; };
+		83E9EEB82D80634600F1D22D /* libboost_system.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libboost_system.dylib; path = ThirdParty/libprojectM/lib/libboost_system.dylib; sourceTree = "<group>"; };
+		83E9EEB92D80634600F1D22D /* libprojectM-4-playlist.4.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libprojectM-4-playlist.4.dylib"; path = "ThirdParty/libprojectM/lib/libprojectM-4-playlist.4.dylib"; sourceTree = "<group>"; };
+		83E9EEBA2D80634600F1D22D /* libprojectM-4.4.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libprojectM-4.4.dylib"; path = "ThirdParty/libprojectM/lib/libprojectM-4.4.dylib"; sourceTree = "<group>"; };
 		83F9D7F11A884B44007ABEC2 /* SilenceDecoder.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SilenceDecoder.xcodeproj; path = Plugins/SilenceDecoder/SilenceDecoder.xcodeproj; sourceTree = "<group>"; };
 		8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
 		8E07AB760AAC930B00A4B32F /* PreferencesController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PreferencesController.h; path = Preferences/PreferencesController.h; sourceTree = "<group>"; };
@@ -1079,6 +1109,11 @@
 				8355D6B8180613FB00D05687 /* Security.framework in Frameworks */,
 				8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */,
 				83256B68286661FC0036D9C0 /* libmpg123.0.dylib in Frameworks */,
+				830EDD1C2D813DF600988EA8 /* libprojectM-4-playlist.4.dylib in Frameworks */,
+				830EDD1B2D813DEA00988EA8 /* libprojectM-4.4.dylib in Frameworks */,
+				83E9EEBB2D80634600F1D22D /* libboost_atomic.dylib in Frameworks */,
+				83E9EEBC2D80634600F1D22D /* libboost_system.dylib in Frameworks */,
+				83E9EEBE2D80634600F1D22D /* libboost_filesystem.dylib in Frameworks */,
 				17BB5CED0B8A86010009ACB1 /* AudioToolbox.framework in Frameworks */,
 				835FAC7F27BCDF5B00BA8562 /* libavif.a in Frameworks */,
 				83922FBA286B1AA900A0B039 /* WebKit.framework in Frameworks */,
@@ -1087,6 +1122,7 @@
 				838A33742D06A9B100D0D770 /* librubberband.3.dylib in Frameworks */,
 				17BB5CF90B8A86350009ACB1 /* AudioUnit.framework in Frameworks */,
 				17BB5CFA0B8A86350009ACB1 /* CoreAudio.framework in Frameworks */,
+				838F851E256B4E5E00C3E614 /* Sparkle.framework in Frameworks */,
 				83F9FFEF2D6EB75B00026576 /* Sentry in Frameworks */,
 				17BB5CFB0B8A86350009ACB1 /* CoreAudioKit.framework in Frameworks */,
 				17BB5EA60B8A87850009ACB1 /* IOKit.framework in Frameworks */,
@@ -1132,6 +1168,7 @@
 			isa = PBXGroup;
 			children = (
 				ED69CBB825BE328C0090B90D /* MASShortcut.xcodeproj */,
+				838F851D256B4E5E00C3E614 /* Sparkle.framework */,
 				17F5612A0C3BD4DC0019975C /* CogAudio.xcodeproj */,
 				1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */,
 			);
@@ -1141,6 +1178,11 @@
 		1058C7A2FEA54F0111CA2CBB /* Other Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				83E9EEB62D80634600F1D22D /* libboost_atomic.dylib */,
+				83E9EEB72D80634600F1D22D /* libboost_filesystem.dylib */,
+				83E9EEB82D80634600F1D22D /* libboost_system.dylib */,
+				83E9EEB92D80634600F1D22D /* libprojectM-4-playlist.4.dylib */,
+				83E9EEBA2D80634600F1D22D /* libprojectM-4.4.dylib */,
 				838A33732D06A9B100D0D770 /* librubberband.3.dylib */,
 				836DF616298F6EC400CD0580 /* libsoxr.0.dylib */,
 				83256B672866617F0036D9C0 /* libmpg123.0.dylib */,
@@ -1211,8 +1253,6 @@
 		177EC0110B8BC2CF0000BC8C /* Utils */ = {
 			isa = PBXGroup;
 			children = (
-				83CB565C2E064607003DD379 /* NSDictionary+Optional.h */,
-				83CB565D2E064607003DD379 /* NSDictionary+Optional.m */,
 				834A42C4287B01B600EB9D9B /* AudioChunk.h */,
 				8384912518080F2D00E7332D /* Logging.h */,
 				07E18DF10D62B38400BB0E11 /* NSArray+ShuffleUtils.h */,
@@ -1275,7 +1315,7 @@
 				17C808830C3BD181005707C4 /* HTTPSource.xcodeproj */,
 				83489C4E2782F2DF00BDCEA2 /* libvgmPlayer.xcodeproj */,
 				8E8D40820CBB036600135C1B /* M3u.xcodeproj */,
-				8372C92A27C785BD00E250C9 /* minimp3.xcodeproj */,
+				8372C92A27C785BD00E250C9 /* MAD.xcodeproj */,
 				83B0669C180D5668008E3612 /* MIDI.xcodeproj */,
 				17C8089E0C3BD1AB005707C4 /* Musepack.xcodeproj */,
 				83E5EFAC1FFEF78100659F0F /* OpenMPT.xcodeproj */,
@@ -1467,6 +1507,8 @@
 		29B97314FDCFA39411CA2CEA /* Cog */ = {
 			isa = PBXGroup;
 			children = (
+				83E9EEB42D805C7B00F1D22D /* presets */,
+				83E9EEB22D805C5300F1D22D /* textures */,
 				0A1B412E286F6301008A6A44 /* Localizable.stringsdict */,
 				83D0380E24A40DF2004CF90F /* CogAssets.xcassets */,
 				83859520234FEB35004E9946 /* Cog.entitlements */,
@@ -1778,6 +1820,14 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
+		8372C92B27C785BD00E250C9 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				8372C93027C785BE00E250C9 /* MAD.bundle */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
 		8377C66027B8CF2300E8BC0F /* Visualization */ = {
 			isa = PBXGroup;
 			children = (
@@ -1791,6 +1841,8 @@
 				838A33812D06CF4100D0D770 /* SpectrumWindowController.h */,
 				838A33822D06CF4100D0D770 /* SpectrumWindowController.m */,
 				8377C66427B8CF7A00E8BC0F /* VisualizationController.h */,
+				83E9A0CE2D8049FA00F1D22D /* ProjectMView.h */,
+				83E9A0CF2D804A1800F1D22D /* ProjectMView.m */,
 			);
 			name = Visualization;
 			sourceTree = "<group>";
@@ -1821,14 +1873,6 @@
 			path = LyricsWindow;
 			sourceTree = "<group>";
 		};
-		83B73B5C2D8FC05A00A57F08 /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				83B73B602D8FC05A00A57F08 /* minimp3.bundle */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
 		83BB13AE20E4E38E00723731 /* Products */ = {
 			isa = PBXGroup;
 			children = (
@@ -1989,8 +2033,8 @@
 			buildRules = (
 			);
 			dependencies = (
-				83B73B642D8FD74000A57F08 /* PBXTargetDependency */,
 				8327DBA8293CAD0A00CD0580 /* PBXTargetDependency */,
+				8372C93C27C7893100E250C9 /* PBXTargetDependency */,
 				83489C6A2782F76900BDCEA2 /* PBXTargetDependency */,
 				ED69CBC625BE32B40090B90D /* PBXTargetDependency */,
 				834D793E20E4EFD200C4A5CC /* PBXTargetDependency */,
@@ -2038,9 +2082,16 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
 				LastUpgradeCheck = 1500;
+				TargetAttributes = {
+					8D1107260486CEB800E47090 = {
+						DevelopmentTeam = "";
+						LastSwiftMigration = 1220;
+						ProvisioningStyle = Automatic;
+					};
+				};
 			};
 			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "Cog" */;
-			compatibilityVersion = "Xcode 12.0";
+			compatibilityVersion = "Xcode 3.2";
 			developmentRegion = en;
 			hasScannedForEncodings = 1;
 			knownRegions = (
@@ -2128,6 +2179,10 @@
 					ProductGroup = 8E8D40830CBB036600135C1B /* Products */;
 					ProjectRef = 8E8D40820CBB036600135C1B /* M3u.xcodeproj */;
 				},
+				{
+					ProductGroup = 8372C92B27C785BD00E250C9 /* Products */;
+					ProjectRef = 8372C92A27C785BD00E250C9 /* MAD.xcodeproj */;
+				},
 				{
 					ProductGroup = ED69CBB925BE328C0090B90D /* Products */;
 					ProjectRef = ED69CBB825BE328C0090B90D /* MASShortcut.xcodeproj */;
@@ -2136,10 +2191,6 @@
 					ProductGroup = 83B0669D180D5668008E3612 /* Products */;
 					ProjectRef = 83B0669C180D5668008E3612 /* MIDI.xcodeproj */;
 				},
-				{
-					ProductGroup = 83B73B5C2D8FC05A00A57F08 /* Products */;
-					ProjectRef = 8372C92A27C785BD00E250C9 /* minimp3.xcodeproj */;
-				},
 				{
 					ProductGroup = 17C8089F0C3BD1AB005707C4 /* Products */;
 					ProjectRef = 17C8089E0C3BD1AB005707C4 /* Musepack.xcodeproj */;
@@ -2355,6 +2406,13 @@
 			remoteRef = 836FB5461820538800B3AD2D /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
+		8372C93027C785BE00E250C9 /* MAD.bundle */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.cfbundle;
+			path = MAD.bundle;
+			remoteRef = 8372C92F27C785BE00E250C9 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
 		83B066A1180D5669008E3612 /* MIDI.bundle */ = {
 			isa = PBXReferenceProxy;
 			fileType = wrapper.cfbundle;
@@ -2362,13 +2420,6 @@
 			remoteRef = 83B066A0180D5669008E3612 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		83B73B602D8FC05A00A57F08 /* minimp3.bundle */ = {
-			isa = PBXReferenceProxy;
-			fileType = wrapper.cfbundle;
-			path = minimp3.bundle;
-			remoteRef = 83B73B5F2D8FC05A00A57F08 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
 		83BB13C220E4E38E00723731 /* vgmstream.bundle */ = {
 			isa = PBXReferenceProxy;
 			fileType = wrapper.cfbundle;
@@ -2537,6 +2588,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				83E9A0D02D804A1800F1D22D /* ProjectMView.m in Sources */,
 				83A3B734283AE89000CC6593 /* ColorToValueTransformer.m in Sources */,
 				8D11072D0486CEB800E47090 /* main.m in Sources */,
 				8E75757109F31D5A0080F1EE /* DNDArrayController.m in Sources */,
@@ -2573,7 +2625,6 @@
 				839E876E2D5DA0AC00A13526 /* RubberbandEngineTransformer.m in Sources */,
 				838A33842D06CF4100D0D770 /* SpectrumWindowController.m in Sources */,
 				83B61E2829A82A0200CD0580 /* LyricsWindowController.m in Sources */,
-				83CB565E2E064607003DD379 /* NSDictionary+Optional.m in Sources */,
 				56462EB20D634206000AB68C /* SpotlightPlaylistController.m in Sources */,
 				07E18DF30D62B38400BB0E11 /* NSArray+ShuffleUtils.m in Sources */,
 				56C63D910D647DF300EAE25A /* NSComparisonPredicate+CogPredicate.m in Sources */,
@@ -2747,6 +2798,11 @@
 			name = Hively;
 			targetProxy = 836FB5A518206F1500B3AD2D /* PBXContainerItemProxy */;
 		};
+		8372C93C27C7893100E250C9 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = MAD;
+			targetProxy = 8372C93B27C7893100E250C9 /* PBXContainerItemProxy */;
+		};
 		8375B36217FFEF010092A79F /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			name = ArchiveSource;
@@ -2757,11 +2813,6 @@
 			name = MIDI;
 			targetProxy = 83B06702180D5776008E3612 /* PBXContainerItemProxy */;
 		};
-		83B73B642D8FD74000A57F08 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = minimp3;
-			targetProxy = 83B73B632D8FD74000A57F08 /* PBXContainerItemProxy */;
-		};
 		83BCB8D917FC96F800760340 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			name = HighlyComplete;
@@ -2939,13 +2990,20 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = "Cog color";
+				CODE_SIGN_ENTITLEMENTS = Cog.entitlements;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
+				ENABLE_HARDENED_RUNTIME = YES;
 				FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/ThirdParty/Frameworks";
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
-				HEADER_SEARCH_PATHS = ThirdParty/avif/include;
+				HEADER_SEARCH_PATHS = (
+					ThirdParty/avif/include,
+					ThirdParty/libprojectM/include,
+				);
 				IBC_COMPILER_USE_NIBKEYEDARCHIVER_FOR_MACOS = YES;
 				IBSC_COMPILER_USE_NIBKEYEDARCHIVER_FOR_MACOS = YES;
 				INFOPLIST_FILE = Info.plist;
@@ -2964,6 +3022,7 @@
 					"$(PROJECT_DIR)/ThirdParty/soxr/lib",
 					"$(PROJECT_DIR)",
 					"$(PROJECT_DIR)/ThirdParty/rubberband/lib",
+					"$(PROJECT_DIR)/ThirdParty/libprojectM/lib",
 				);
 				OTHER_CFLAGS = (
 					"-D__MACOSX__",
@@ -2983,6 +3042,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = org.cogx.cog;
 				PRODUCT_NAME = Cog;
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SDKROOT = macosx;
 				SWIFT_OBJC_BRIDGING_HEADER = "Cog-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -2996,10 +3056,17 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = "Cog color";
+				CODE_SIGN_ENTITLEMENTS = Cog.entitlements;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
+				ENABLE_HARDENED_RUNTIME = YES;
 				FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/ThirdParty/Frameworks";
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-				HEADER_SEARCH_PATHS = ThirdParty/avif/include;
+				HEADER_SEARCH_PATHS = (
+					ThirdParty/avif/include,
+					ThirdParty/libprojectM/include,
+				);
 				IBC_COMPILER_USE_NIBKEYEDARCHIVER_FOR_MACOS = YES;
 				IBSC_COMPILER_USE_NIBKEYEDARCHIVER_FOR_MACOS = YES;
 				INFOPLIST_FILE = Info.plist;
@@ -3018,6 +3085,7 @@
 					"$(PROJECT_DIR)/ThirdParty/soxr/lib",
 					"$(PROJECT_DIR)",
 					"$(PROJECT_DIR)/ThirdParty/rubberband/lib",
+					"$(PROJECT_DIR)/ThirdParty/libprojectM/lib",
 				);
 				OTHER_CFLAGS = (
 					"-D__MACOSX__",
@@ -3037,6 +3105,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = org.cogx.cog;
 				PRODUCT_NAME = Cog;
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SDKROOT = macosx;
 				SWIFT_OBJC_BRIDGING_HEADER = "Cog-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
@@ -3071,9 +3140,7 @@
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				CODE_SIGN_ENTITLEMENTS = Cog.entitlements;
 				COPY_PHASE_STRIP = NO;
-				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -3117,9 +3184,7 @@
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				CODE_SIGN_ENTITLEMENTS = Cog.entitlements;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;

Cog.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -6,10 +6,10 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/getsentry/sentry-cocoa.git",
       "state" : {
-        "revision" : "930b78a63f47549c81e6e63c9172584f7d3dfdd6",
-        "version" : "8.52.1"
+        "revision" : "21223d1c864db0561d91f48d80f269a363a1625d",
+        "version" : "8.47.0"
       }
     }
   ],
-  "version" : 3
+  "version" : 2
 }

Cog.xcodeproj/xcshareddata/xcschemes/Cog.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1640"
+   LastUpgradeVersion = "1620"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"

Feedback/FeedbackController.h

@@ -9,7 +9,7 @@
 #import "FeedbackSocket.h"
 #import <Cocoa/Cocoa.h>
 
-@interface FeedbackController : NSWindowController {
+@interface FeedbackController : NSWindowController <FeedbackSocketDelegate> {
 	IBOutlet NSTextField* nameView;
 	IBOutlet NSTextField* emailView;
 	IBOutlet NSTextView* messageView;

FileTree/FileTreeViewController.m

@@ -55,6 +55,7 @@
 	if(path) {
 		[panel setDirectoryURL:[NSURL fileURLWithPath:path]];
 	}
+	[panel setTitle:@"Open to choose tree path"];
 	NSInteger result = [panel runModal];
 	if(result == NSModalResponseOK) {
 		[[SandboxBroker sharedSandboxBroker] addFolderIfMissing:[panel URL]];

Frameworks/AdPlug/libAdPlug.xcodeproj/project.pbxproj

@@ -559,10 +559,15 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
 				LastUpgradeCheck = 1620;
-				ORGANIZATIONNAME = "";
+				ORGANIZATIONNAME = "Christopher Snowhill";
+				TargetAttributes = {
+					83D3C4D3201C654F005564CB = {
+						ProvisioningStyle = Manual;
+					};
+				};
 			};
 			buildConfigurationList = 83D3C4CE201C654F005564CB /* Build configuration list for PBXProject "libAdPlug" */;
-			compatibilityVersion = "Xcode 12.0";
+			compatibilityVersion = "Xcode 8.0";
 			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (

Frameworks/Dumb/Dumb.xcodeproj/project.pbxproj

@@ -486,6 +486,12 @@
 			isa = PBXProject;
 			attributes = {
 				LastUpgradeCheck = 0900;
+				TargetAttributes = {
+					8DC2EF4F0486A6940098B216 = {
+						DevelopmentTeam = "";
+						ProvisioningStyle = Automatic;
+					};
+				};
 			};
 			buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "Dumb" */;
 			compatibilityVersion = "Xcode 3.2";

Frameworks/File_Extractor/File_Extractor.xcodeproj/project.pbxproj

@@ -632,11 +632,17 @@
 			isa = PBXProject;
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
-				LastUpgradeCheck = 1640;
-				ORGANIZATIONNAME = "";
+				LastUpgradeCheck = 1620;
+				ORGANIZATIONNAME = "Christopher Snowhill";
+				TargetAttributes = {
+					8359FF3B17FEF39F0060F3ED = {
+						DevelopmentTeam = "";
+						ProvisioningStyle = Manual;
+					};
+				};
 			};
 			buildConfigurationList = 8359FF3617FEF39F0060F3ED /* Build configuration list for PBXProject "File_Extractor" */;
-			compatibilityVersion = "Xcode 12.0";
+			compatibilityVersion = "Xcode 3.2";
 			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (

Frameworks/File_Extractor/File_Extractor.xcodeproj/xcshareddata/xcschemes/File_Extractor.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1640"
+   LastUpgradeVersion = "1620"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Frameworks/GME/GME.xcodeproj/project.pbxproj

@@ -629,9 +629,15 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
 				LastUpgradeCheck = 1620;
+				TargetAttributes = {
+					8DC2EF4F0486A6940098B216 = {
+						DevelopmentTeam = "";
+						ProvisioningStyle = Manual;
+					};
+				};
 			};
 			buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "GME" */;
-			compatibilityVersion = "Xcode 12.0";
+			compatibilityVersion = "Xcode 3.2";
 			developmentRegion = en;
 			hasScannedForEncodings = 1;
 			knownRegions = (

Frameworks/GME/GME.xcodeproj/xcshareddata/xcschemes/GME Framework.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1640"
+   LastUpgradeVersion = "1620"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Frameworks/HighlyAdvanced/HighlyAdvanced.xcodeproj/project.pbxproj

@@ -250,10 +250,16 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
 				LastUpgradeCheck = 1620;
-				ORGANIZATIONNAME = "";
+				ORGANIZATIONNAME = "Christopher Snowhill";
+				TargetAttributes = {
+					8343793417F97BDB00584396 = {
+						DevelopmentTeam = "";
+						ProvisioningStyle = Manual;
+					};
+				};
 			};
 			buildConfigurationList = 8343792F17F97BDB00584396 /* Build configuration list for PBXProject "HighlyAdvanced" */;
-			compatibilityVersion = "Xcode 12.0";
+			compatibilityVersion = "Xcode 3.2";
 			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (

Frameworks/HighlyAdvanced/HighlyAdvanced.xcodeproj/xcshareddata/xcschemes/HighlyAdvanced.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1640"
+   LastUpgradeVersion = "1620"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Frameworks/HighlyExperimental/HighlyExperimental.xcodeproj/project.pbxproj

@@ -189,10 +189,16 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
 				LastUpgradeCheck = 1620;
-				ORGANIZATIONNAME = "";
+				ORGANIZATIONNAME = "Christopher Snowhill";
+				TargetAttributes = {
+					8360EF0F17F92C91005208A4 = {
+						DevelopmentTeam = "";
+						ProvisioningStyle = Manual;
+					};
+				};
 			};
 			buildConfigurationList = 8360EF0A17F92C91005208A4 /* Build configuration list for PBXProject "HighlyExperimental" */;
-			compatibilityVersion = "Xcode 12.0";
+			compatibilityVersion = "Xcode 3.2";
 			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (

Frameworks/HighlyExperimental/HighlyExperimental.xcodeproj/xcshareddata/xcschemes/HighlyExperimental.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1640"
+   LastUpgradeVersion = "1620"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Frameworks/HighlyQuixotic/HighlyQuixotic.xcodeproj/project.pbxproj

@@ -161,10 +161,16 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
 				LastUpgradeCheck = 1620;
-				ORGANIZATIONNAME = "";
+				ORGANIZATIONNAME = "Christopher Snowhill";
+				TargetAttributes = {
+					834378DD17F96E2600584396 = {
+						DevelopmentTeam = "";
+						ProvisioningStyle = Manual;
+					};
+				};
 			};
 			buildConfigurationList = 834378D817F96E2600584396 /* Build configuration list for PBXProject "HighlyQuixotic" */;
-			compatibilityVersion = "Xcode 12.0";
+			compatibilityVersion = "Xcode 3.2";
 			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (

Frameworks/HighlyQuixotic/HighlyQuixotic.xcodeproj/xcshareddata/xcschemes/HighlyQuixotic.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1640"
+   LastUpgradeVersion = "1620"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Frameworks/HighlyTheoretical/HighlyTheoretical.xcodeproj/project.pbxproj

@@ -203,10 +203,16 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
 				LastUpgradeCheck = 1620;
-				ORGANIZATIONNAME = "";
+				ORGANIZATIONNAME = "Christopher Snowhill";
+				TargetAttributes = {
+					8343786D17F9658E00584396 = {
+						DevelopmentTeam = "";
+						ProvisioningStyle = Manual;
+					};
+				};
 			};
 			buildConfigurationList = 8343786817F9658E00584396 /* Build configuration list for PBXProject "HighlyTheoretical" */;
-			compatibilityVersion = "Xcode 12.0";
+			compatibilityVersion = "Xcode 3.2";
 			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (

Frameworks/HighlyTheoretical/HighlyTheoretical.xcodeproj/xcshareddata/xcschemes/HighlyTheoretical.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1640"
+   LastUpgradeVersion = "1620"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Frameworks/HivelyPlayer/HivelyPlayer.xcodeproj/project.pbxproj

@@ -143,10 +143,16 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
 				LastUpgradeCheck = 1620;
-				ORGANIZATIONNAME = "";
+				ORGANIZATIONNAME = "Christopher Snowhill";
+				TargetAttributes = {
+					836FB555182053D700B3AD2D = {
+						DevelopmentTeam = "";
+						ProvisioningStyle = Manual;
+					};
+				};
 			};
 			buildConfigurationList = 836FB550182053D700B3AD2D /* Build configuration list for PBXProject "HivelyPlayer" */;
-			compatibilityVersion = "Xcode 12.0";
+			compatibilityVersion = "Xcode 3.2";
 			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (

Frameworks/HivelyPlayer/HivelyPlayer.xcodeproj/xcshareddata/xcschemes/HivelyPlayer.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1640"
+   LastUpgradeVersion = "1620"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Frameworks/MPCDec/MPCDec.xcodeproj/project.pbxproj

@@ -244,9 +244,15 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
 				LastUpgradeCheck = 1620;
+				TargetAttributes = {
+					8DC2EF4F0486A6940098B216 = {
+						DevelopmentTeam = "";
+						ProvisioningStyle = Manual;
+					};
+				};
 			};
 			buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "MPCDec" */;
-			compatibilityVersion = "Xcode 12.0";
+			compatibilityVersion = "Xcode 3.2";
 			developmentRegion = en;
 			hasScannedForEncodings = 1;
 			knownRegions = (

Frameworks/MPCDec/MPCDec.xcodeproj/xcshareddata/xcschemes/mpcdec Framework.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1640"
+   LastUpgradeVersion = "1620"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Frameworks/OpenMPT/OpenMPT/build/android_ndk/Android.mk

@@ -7,40 +7,40 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := openmpt
 
 ifeq ($(NDK_MAJOR),)
-LOCAL_CFLAGS   += -std=c18
+LOCAL_CFLAGS   += -std=c17
 LOCAL_CPPFLAGS += -std=c++17
 else
 ifeq ($(NDK_MAJOR),21)
 # clang 9
-LOCAL_CFLAGS   += -std=c18
+LOCAL_CFLAGS   += -std=c17
 LOCAL_CPPFLAGS += -std=c++17
 else ifeq ($(NDK_MAJOR),22)
 # clang 11
-LOCAL_CFLAGS   += -std=c18
+LOCAL_CFLAGS   += -std=c17
 LOCAL_CPPFLAGS += -std=c++20
 else ifeq ($(NDK_MAJOR),23)
 # clang 12
-LOCAL_CFLAGS   += -std=c18
+LOCAL_CFLAGS   += -std=c17
 LOCAL_CPPFLAGS += -std=c++20
 else ifeq ($(NDK_MAJOR),24)
 # clang 14
-LOCAL_CFLAGS   += -std=c18
+LOCAL_CFLAGS   += -std=c17
 LOCAL_CPPFLAGS += -std=c++20
 else ifeq ($(NDK_MAJOR),25)
 # clang 14
-LOCAL_CFLAGS   += -std=c18
+LOCAL_CFLAGS   += -std=c17
 LOCAL_CPPFLAGS += -std=c++20
 else ifeq ($(NDK_MAJOR),26)
 # clang 17
-LOCAL_CFLAGS   += -std=c18
+LOCAL_CFLAGS   += -std=c17
 LOCAL_CPPFLAGS += -std=c++20
 else ifeq ($(NDK_MAJOR),27)
 # clang 18
-LOCAL_CFLAGS   += -std=c23
-LOCAL_CPPFLAGS += -std=c++23
+LOCAL_CFLAGS   += -std=c17
+LOCAL_CPPFLAGS += -std=c++20
 else
-LOCAL_CFLAGS   += -std=c23
-LOCAL_CPPFLAGS += -std=c++23
+LOCAL_CFLAGS   += -std=c17
+LOCAL_CPPFLAGS += -std=c++20
 endif
 endif
 
@@ -124,6 +124,8 @@ endif
 LOCAL_SRC_FILES += \
 	common/ComponentManager.cpp \
 	common/Logging.cpp \
+	common/mptFileIO.cpp \
+	common/mptFileTemporary.cpp \
 	common/mptFileType.cpp \
 	common/mptPathString.cpp \
 	common/mptRandom.cpp \
@@ -144,7 +146,6 @@ LOCAL_SRC_FILES += \
 	soundlib/Dlsbank.cpp \
 	soundlib/Fastmix.cpp \
 	soundlib/InstrumentExtensions.cpp \
-	soundlib/InstrumentSynth.cpp \
 	soundlib/ITCompression.cpp \
 	soundlib/ITTools.cpp \
 	soundlib/Load_667.cpp \
@@ -152,28 +153,20 @@ LOCAL_SRC_FILES += \
 	soundlib/Load_amf.cpp \
 	soundlib/Load_ams.cpp \
 	soundlib/Load_c67.cpp \
-	soundlib/Load_cba.cpp \
 	soundlib/Load_dbm.cpp \
 	soundlib/Load_digi.cpp \
 	soundlib/Load_dmf.cpp \
 	soundlib/Load_dsm.cpp \
 	soundlib/Load_dsym.cpp \
 	soundlib/Load_dtm.cpp \
-	soundlib/Load_etx.cpp \
 	soundlib/Load_far.cpp \
-	soundlib/Load_fc.cpp \
 	soundlib/Load_fmt.cpp \
-	soundlib/Load_ftm.cpp \
 	soundlib/Load_gdm.cpp \
-	soundlib/Load_gmc.cpp \
 	soundlib/Load_gt2.cpp \
-	soundlib/Load_ice.cpp \
 	soundlib/Load_imf.cpp \
-	soundlib/Load_ims.cpp \
 	soundlib/Load_it.cpp \
 	soundlib/Load_itp.cpp \
 	soundlib/load_j2b.cpp \
-	soundlib/Load_kris.cpp \
 	soundlib/Load_mdl.cpp \
 	soundlib/Load_med.cpp \
 	soundlib/Load_mid.cpp \
@@ -185,26 +178,19 @@ LOCAL_SRC_FILES += \
 	soundlib/Load_okt.cpp \
 	soundlib/Load_plm.cpp \
 	soundlib/Load_psm.cpp \
-	soundlib/Load_pt36.cpp \
 	soundlib/Load_ptm.cpp \
-	soundlib/Load_puma.cpp \
-	soundlib/Load_rtm.cpp \
 	soundlib/Load_s3m.cpp \
 	soundlib/Load_sfx.cpp \
-	soundlib/Load_stk.cpp \
 	soundlib/Load_stm.cpp \
 	soundlib/Load_stp.cpp \
 	soundlib/Load_symmod.cpp \
-	soundlib/Load_tcb.cpp \
-	soundlib/Load_uax.cpp \
 	soundlib/Load_ult.cpp \
-	soundlib/Load_unic.cpp \
+	soundlib/Load_uax.cpp \
 	soundlib/Load_wav.cpp \
 	soundlib/Load_xm.cpp \
 	soundlib/Load_xmf.cpp \
 	soundlib/Message.cpp \
 	soundlib/MIDIEvents.cpp \
-	soundlib/MIDIMacroParser.cpp \
 	soundlib/MIDIMacros.cpp \
 	soundlib/MixerLoops.cpp \
 	soundlib/MixerSettings.cpp \
@@ -216,15 +202,12 @@ LOCAL_SRC_FILES += \
 	soundlib/ModSequence.cpp \
 	soundlib/modsmp_ctrl.cpp \
 	soundlib/mod_specifications.cpp \
-	soundlib/MODTools.cpp \
 	soundlib/MPEGFrame.cpp \
 	soundlib/OggStream.cpp \
 	soundlib/OPL.cpp \
 	soundlib/Paula.cpp \
 	soundlib/patternContainer.cpp \
 	soundlib/pattern.cpp \
-	soundlib/PlaybackTest.cpp \
-	soundlib/PlayState.cpp \
 	soundlib/RowVisitor.cpp \
 	soundlib/S3MTools.cpp \
 	soundlib/SampleFormats.cpp \

Frameworks/OpenMPT/OpenMPT/build/android_ndk/Application.mk

@@ -1,39 +1,39 @@
 
 ifeq ($(NDK_MAJOR),)
-APP_CFLAGS   := -std=c18
+APP_CFLAGS   := -std=c17
 APP_CPPFLAGS := -std=c++17 -fexceptions -frtti
 else
 ifeq ($(NDK_MAJOR),21)
 # clang 9
-APP_CFLAGS   := -std=c18
+APP_CFLAGS   := -std=c17
 APP_CPPFLAGS := -std=c++17 -fexceptions -frtti
 else ifeq ($(NDK_MAJOR),22)
 # clang 11
-APP_CFLAGS   := -std=c18
+APP_CFLAGS   := -std=c17
 APP_CPPFLAGS := -std=c++20 -fexceptions -frtti
 else ifeq ($(NDK_MAJOR),23)
 # clang 12
-APP_CFLAGS   := -std=c18
+APP_CFLAGS   := -std=c17
 APP_CPPFLAGS := -std=c++20 -fexceptions -frtti
 else ifeq ($(NDK_MAJOR),24)
 # clang 14
-APP_CFLAGS   := -std=c18
+APP_CFLAGS   := -std=c17
 APP_CPPFLAGS := -std=c++20 -fexceptions -frtti
 else ifeq ($(NDK_MAJOR),25)
 # clang 14
-APP_CFLAGS   := -std=c18
+APP_CFLAGS   := -std=c17
 APP_CPPFLAGS := -std=c++20 -fexceptions -frtti
 else ifeq ($(NDK_MAJOR),26)
 # clang 17
-APP_CFLAGS   := -std=c18
+APP_CFLAGS   := -std=c17
 APP_CPPFLAGS := -std=c++20 -fexceptions -frtti
 else ifeq ($(NDK_MAJOR),27)
 # clang 18
-APP_CFLAGS   := -std=c23
-APP_CPPFLAGS := -std=c++23 -fexceptions -frtti
+APP_CFLAGS   := -std=c17
+APP_CPPFLAGS := -std=c++20 -fexceptions -frtti
 else
-APP_CFLAGS   := -std=c23
-APP_CPPFLAGS := -std=c++23 -fexceptions -frtti
+APP_CFLAGS   := -std=c17
+APP_CPPFLAGS := -std=c++20 -fexceptions -frtti
 endif
 endif
 

Frameworks/OpenMPT/OpenMPT/build/dist.mk

@@ -1,4 +1,4 @@
 
-MPT_SVNVERSION=23497
-MPT_SVNURL=https://source.openmpt.org/svn/openmpt/tags/libopenmpt-0.8.1
-MPT_SVNDATE=2025-06-14T13:04:39.042416Z
+MPT_SVNVERSION=22826
+MPT_SVNURL=https://source.openmpt.org/svn/openmpt/tags/libopenmpt-0.7.13
+MPT_SVNDATE=2025-01-06T13:49:43.586768Z

Frameworks/OpenMPT/OpenMPT/build/djgpp/bin/dxe3gen

@@ -1,2 +0,0 @@
-#!/usr/bin/env bash
-exec i386-pc-msdosdjgpp-dxe3gen "$@"

Frameworks/OpenMPT/OpenMPT/build/djgpp/bin/dxe3gen.sh

@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-echo "$@"
-exec i386-pc-msdosdjgpp-dxe3gen "$@"

Frameworks/OpenMPT/OpenMPT/build/djgpp/bin/dxe3res

@@ -1,2 +0,0 @@
-#!/usr/bin/env bash
-exec i386-pc-msdosdjgpp-dxe3res "$@"

Frameworks/OpenMPT/OpenMPT/build/djgpp/bin/dxe3res.sh

@@ -1,2 +0,0 @@
-#!/usr/bin/env bash
-exec i386-pc-msdosdjgpp-dxe3res "$@"

Frameworks/OpenMPT/OpenMPT/build/download_externals.sh

@@ -12,9 +12,7 @@ function download () {
  MPT_GET_FILE_NAME="$1"
  MPT_GET_FILE_SIZE="$2"
  MPT_GET_FILE_CHECKSUM="$3"
- shift
- shift
- shift
+ MPT_GET_URLS="$4"
  echo "Checking '$MPT_GET_FILE_NAME' ..."
  if [ -f "$MPT_GET_FILE_NAME" ]; then
   FILE_SIZE=$(find "$MPT_GET_FILE_NAME" -printf '%s')
@@ -30,15 +28,10 @@ function download () {
    rm -f "$MPT_GET_FILE_NAME"
   fi
  fi
- while (( "$#" )); do
-  URL="$(echo ""$1"" | sed 's/ /%20/g')"
+ for URL in $MPT_GET_URLS; do
   if [ ! -f "$MPT_GET_FILE_NAME" ]; then
    echo "Downloading '$MPT_GET_FILE_NAME' from '$URL' ..."
-   if command -v curl &> /dev/null ; then
-    curl --location -o "$MPT_GET_FILE_NAME" "$URL" || true
-   elif command -v wget &> /dev/null ; then
-    wget -O "$MPT_GET_FILE_NAME" "$URL" || true
-   fi
+   curl -o "$MPT_GET_FILE_NAME" "$URL"
    echo "Verifying '$URL' ..."
    if [ -f "$MPT_GET_FILE_NAME" ]; then
     FILE_SIZE=$(find "$MPT_GET_FILE_NAME" -printf '%s')
@@ -55,7 +48,6 @@ function download () {
     fi
    fi
   fi
-  shift
  done
  if [ ! -f "$MPT_GET_FILE_NAME" ]; then
   echo "Failed to download '$MPT_GET_FILE_NAME'."
@@ -103,12 +95,11 @@ if [ ! -d "build/tools" ]; then
  mkdir build/tools
 fi
 
-# download
-cat build/download_externals.txt | (
- while IFS=$'\n' read -r URL; do
-  eval download $URL
- done
-)
+download "build/externals/allegro-4.2.3.1-hg.8+r8500.zip" 3872466 46cd8d4d7138b795dbc66994e953d0abc578c6d3c00615e3580237458529d33d7ad9d269a9778918d4b3719d75750d5cca74ff6bf38ad357a766472799ee9e7b "https://lib.openmpt.org/files/libopenmpt/contrib/allegro/allegro-4.2.3.1-hg.8+r8500.zip"
+download "build/externals/csdpmi7b.zip"                     71339 58c24691d27cead1cec92d334af551f37a3ba31de25a687d99399c28d822ec9f6ffccc9332bfce35e65dae4dd1210b54e54b223a4de17f5adcb11e2da004b834 "https://lib.openmpt.org/files/libopenmpt/contrib/djgpp/cwsdpmi/csdpmi7b.zip https://djgpp.mirror.garr.it/current/v2misc/csdpmi7b.zip"
+download "build/externals/csdpmi7s.zip"                     89872 ea5652d31850d8eb0d15a919de0b51849f58efea0d16ad2aa4687fac4abd223d0ca34a2d1b616b02fafe84651dbef3e506df9262cfb399eb6d9909bffc89bfd3 "https://lib.openmpt.org/files/libopenmpt/contrib/djgpp/cwsdpmi/csdpmi7s.zip https://djgpp.mirror.garr.it/current/v2misc/csdpmi7s.zip"
+download "build/externals/WA5.55_SDK.exe"                  336166 394375db8a16bf155b5de9376f6290488ab339e503dbdfdc4e2f5bede967799e625c559cca363bc988324f1a8e86e5fd28a9f697422abd7bb3dcde4a766607b5 "http://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe https://web.archive.org/web/20131217072017id_/http://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe"
+download "build/externals/xmp-sdk.zip"                     322903 67b96c6e6aa794e9de4f446d23f969e3591457196fd100c5475f5df52308de861a0c411db54fcb2bf46a12e9136ddda9d2974a5167432a979a701ef2c4679ef9 "https://www.un4seen.com/files/xmp-sdk.zip"
 
 unpack "include/allegro42" "build/externals/allegro-4.2.3.1-hg.8+r8500.zip" "."
 unpack "include/cwsdpmi"   "build/externals/csdpmi7b.zip"                   "."
@@ -117,6 +108,3 @@ unpack "include/xmplay"    "build/externals/xmp-sdk.zip"                    "."
 
 ln -s OUT.H include/winamp/Winamp/out.h
 
-mkdir -p build/tools/svn_apply_autoprops
-cp "build/externals/svn_apply_autoprops.py" "build/tools/svn_apply_autoprops/"
-chmod u+x "build/tools/svn_apply_autoprops/svn_apply_autoprops.py"

Frameworks/OpenMPT/OpenMPT/build/make/config-afl.mk

@@ -14,12 +14,9 @@ endif
 
 ifneq ($(STDCXX),)
 CXXFLAGS_STDCXX = -std=$(STDCXX) -fexceptions -frtti -pthread
-# We do not enable C++20 or C++23 for fuzzer builds, because it prevents
-# detecting shifting of signed values which changed from undefined to defined
-# behaviour in C++20 and C++23. As we still support C++17, we need to catch
-# these problem cases.
-#else ifeq ($(shell printf '\n' > bin/empty.cpp ; if $(CXX) -std=c++23 -c bin/empty.cpp -o bin/empty.out > /dev/null 2>&1 ; then echo 'c++23' ; fi ), c++23)
-#CXXFLAGS_STDCXX = -std=c++23 -fexceptions -frtti -pthread
+# We do not enable C++20 for fuzzer builds, because it prevents detecting
+# shifting of signed values which changed from undefined to defined behaviour
+# in C++20. As we still support C+ü+17, we need to catch these problem cases.
 #else ifeq ($(shell printf '\n' > bin/empty.cpp ; if $(CXX) -std=c++20 -c bin/empty.cpp -o bin/empty.out > /dev/null 2>&1 ; then echo 'c++20' ; fi ), c++20)
 #CXXFLAGS_STDCXX = -std=c++20 -fexceptions -frtti -pthread
 else
@@ -27,10 +24,6 @@ CXXFLAGS_STDCXX = -std=c++17 -fexceptions -frtti -pthread
 endif
 ifneq ($(STDC),)
 CFLAGS_STDC = -std=$(STDC) -pthread
-else ifeq ($(shell printf '\n' > bin/empty.c ; if $(CC) -std=c23 -c bin/empty.c -o bin/empty.out > /dev/null 2>&1 ; then echo 'c23' ; fi ), c23)
-CFLAGS_STDC = -std=c23 -pthread
-else ifeq ($(shell printf '\n' > bin/empty.c ; if $(CC) -std=c18 -c bin/empty.c -o bin/empty.out > /dev/null 2>&1 ; then echo 'c18' ; fi ), c18)
-CFLAGS_STDC = -std=c18 -pthread
 else ifeq ($(shell printf '\n' > bin/empty.c ; if $(CC) -std=c17 -c bin/empty.c -o bin/empty.out > /dev/null 2>&1 ; then echo 'c17' ; fi ), c17)
 CFLAGS_STDC = -std=c17 -pthread
 else

Frameworks/OpenMPT/OpenMPT/build/make/config-aocc.mk

@@ -12,12 +12,8 @@ ifeq ($(origin AR),default)
 AR  = $(TOOLCHAIN_PREFIX)ar$(TOOLCHAIN_SUFFIX)
 endif
 
-STDCXX?=c++20
-
 ifneq ($(STDCXX),)
 CXXFLAGS_STDCXX = -std=$(STDCXX) -fexceptions -frtti -pthread
-else ifeq ($(shell printf '\n' > bin/empty.cpp ; if $(CXX) -std=c++23 -c bin/empty.cpp -o bin/empty.out > /dev/null 2>&1 ; then echo 'c++23' ; fi ), c++23)
-CXXFLAGS_STDCXX = -std=c++23 -fexceptions -frtti -pthread
 else ifeq ($(shell printf '\n' > bin/empty.cpp ; if $(CXX) -std=c++20 -c bin/empty.cpp -o bin/empty.out > /dev/null 2>&1 ; then echo 'c++20' ; fi ), c++20)
 CXXFLAGS_STDCXX = -std=c++20 -fexceptions -frtti -pthread
 else
@@ -25,10 +21,6 @@ CXXFLAGS_STDCXX = -std=c++17 -fexceptions -frtti -pthread
 endif
 ifneq ($(STDC),)
 CFLAGS_STDC = -std=$(STDC) -pthread
-else ifeq ($(shell printf '\n' > bin/empty.c ; if $(CC) -std=c23 -c bin/empty.c -o bin/empty.out > /dev/null 2>&1 ; then echo 'c23' ; fi ), c23)
-CFLAGS_STDC = -std=c23 -pthread
-else ifeq ($(shell printf '\n' > bin/empty.c ; if $(CC) -std=c18 -c bin/empty.c -o bin/empty.out > /dev/null 2>&1 ; then echo 'c18' ; fi ), c18)
-CFLAGS_STDC = -std=c18 -pthread
 else ifeq ($(shell printf '\n' > bin/empty.c ; if $(CC) -std=c17 -c bin/empty.c -o bin/empty.out > /dev/null 2>&1 ; then echo 'c17' ; fi ), c17)
 CFLAGS_STDC = -std=c17 -pthread
 else

Frameworks/OpenMPT/OpenMPT/build/make/config-clang.mk

@@ -14,8 +14,6 @@ endif
 
 ifneq ($(STDCXX),)
 CXXFLAGS_STDCXX = -std=$(STDCXX) -fexceptions -frtti -pthread
-else ifeq ($(shell printf '\n' > bin/empty.cpp ; if $(CXX) -std=c++23 -c bin/empty.cpp -o bin/empty.out > /dev/null 2>&1 ; then echo 'c++23' ; fi ), c++23)
-CXXFLAGS_STDCXX = -std=c++23 -fexceptions -frtti -pthread
 else ifeq ($(shell printf '\n' > bin/empty.cpp ; if $(CXX) -std=c++20 -c bin/empty.cpp -o bin/empty.out > /dev/null 2>&1 ; then echo 'c++20' ; fi ), c++20)
 CXXFLAGS_STDCXX = -std=c++20 -fexceptions -frtti -pthread
 else
@@ -23,10 +21,6 @@ CXXFLAGS_STDCXX = -std=c++17 -fexceptions -frtti -pthread
 endif
 ifneq ($(STDC),)
 CFLAGS_STDC = -std=$(STDC) -pthread
-else ifeq ($(shell printf '\n' > bin/empty.c ; if $(CC) -std=c23 -c bin/empty.c -o bin/empty.out > /dev/null 2>&1 ; then echo 'c23' ; fi ), c23)
-CFLAGS_STDC = -std=c23 -pthread
-else ifeq ($(shell printf '\n' > bin/empty.c ; if $(CC) -std=c18 -c bin/empty.c -o bin/empty.out > /dev/null 2>&1 ; then echo 'c18' ; fi ), c18)
-CFLAGS_STDC = -std=c18 -pthread
 else ifeq ($(shell printf '\n' > bin/empty.c ; if $(CC) -std=c17 -c bin/empty.c -o bin/empty.out > /dev/null 2>&1 ; then echo 'c17' ; fi ), c17)
 CFLAGS_STDC = -std=c17 -pthread
 else
@@ -61,13 +55,11 @@ endif
 ifeq ($(CHECKED_ADDRESS),1)
 CXXFLAGS += -fsanitize=address
 CFLAGS   += -fsanitize=address
-NO_NO_UNDEFINED_LINKER_FLAG=1
 endif
 
 ifeq ($(CHECKED_UNDEFINED),1)
 CXXFLAGS += -fsanitize=undefined
 CFLAGS   += -fsanitize=undefined
-NO_NO_UNDEFINED_LINKER_FLAG=1
 endif
 
 include build/make/warnings-clang.mk

Frameworks/OpenMPT/OpenMPT/build/make/config-cygwin.mk

@@ -14,8 +14,6 @@ endif
 
 ifneq ($(STDCXX),)
 CXXFLAGS_STDCXX = -std=$(STDCXX) -fexceptions -frtti -pthread
-else ifeq ($(shell printf '\n' > bin/empty.cpp ; if $(CXX) -std=c++23 -c bin/empty.cpp -o bin/empty.out > /dev/null 2>&1 ; then echo 'c++23' ; fi ), c++23)
-CXXFLAGS_STDCXX = -std=c++23 -fexceptions -frtti -pthread
 else ifeq ($(shell printf '\n' > bin/empty.cpp ; if $(CXX) -std=c++20 -c bin/empty.cpp -o bin/empty.out > /dev/null 2>&1 ; then echo 'c++20' ; fi ), c++20)
 CXXFLAGS_STDCXX = -std=c++20 -fexceptions -frtti -pthread
 else
@@ -23,8 +21,6 @@ CXXFLAGS_STDCXX = -std=c++17 -fexceptions -frtti -pthread
 endif
 ifneq ($(STDC),)
 CFLAGS_STDC = -std=$(STDC) -pthread
-else ifeq ($(shell printf '\n' > bin/empty.c ; if $(CC) -std=c23 -c bin/empty.c -o bin/empty.out > /dev/null 2>&1 ; then echo 'c23' ; fi ), c23)
-CFLAGS_STDC = -std=c23 -pthread
 else ifeq ($(shell printf '\n' > bin/empty.c ; if $(CC) -std=c18 -c bin/empty.c -o bin/empty.out > /dev/null 2>&1 ; then echo 'c18' ; fi ), c18)
 CFLAGS_STDC = -std=c18 -pthread
 else ifeq ($(shell printf '\n' > bin/empty.c ; if $(CC) -std=c17 -c bin/empty.c -o bin/empty.out > /dev/null 2>&1 ; then echo 'c17' ; fi ), c17)

Frameworks/OpenMPT/OpenMPT/build/make/config-defaults.mk

@@ -49,13 +49,11 @@ else ifeq ($(HOST_FLAVOUR),OPENBSD)
 
 NO_PORTAUDIOCPP?=1
 NO_PULSEAUDIO?=1
-LDLIBS_PLATFORM=-lc++ -lc
 include build/make/config-clang.mk
 MPT_COMPILER_NOALLOCAH=1
 
 else ifeq ($(HOST_FLAVOUR),HAIKU)
 
-NO_PULSEAUDIO?=1
 # In Haiku x86 32bit (but not 64bit),
 # modern compilers need a -x86 suffix.
 UNAME_P:=$(shell uname -p)

Frameworks/OpenMPT/OpenMPT/build/make/config-djgpp.mk

@@ -12,15 +12,10 @@ ifeq ($(origin AR),default)
 AR  = i386-pc-msdosdjgpp-ar
 endif
 
-DXE3GEN = i386-pc-msdosdjgpp-dxe3gen
-DXE3RES = i386-pc-msdosdjgpp-dxe3res
-
 # Note that we are using GNU extensions instead of 100% standards-compliant
 # mode, because otherwise DJGPP-specific headers/functions are unavailable.
 ifneq ($(STDCXX),)
 CXXFLAGS_STDCXX = -std=$(STDCXX) -fexceptions -frtti -fpermissive
-else ifeq ($(shell printf '\n' > bin/empty.cpp ; if $(CXX) -std=gnu++23 -c bin/empty.cpp -o bin/empty.out > /dev/null 2>&1 ; then echo 'c++23' ; fi ), c++23)
-CXXFLAGS_STDCXX = -std=gnu++23 -fexceptions -frtti -fpermissive
 else ifeq ($(shell printf '\n' > bin/empty.cpp ; if $(CXX) -std=gnu++20 -c bin/empty.cpp -o bin/empty.out > /dev/null 2>&1 ; then echo 'c++20' ; fi ), c++20)
 CXXFLAGS_STDCXX = -std=gnu++20 -fexceptions -frtti -fpermissive
 else
@@ -28,21 +23,15 @@ CXXFLAGS_STDCXX = -std=gnu++17 -fexceptions -frtti -fpermissive
 endif
 ifneq ($(STDC),)
 CFLAGS_STDC = -std=$(STDC)
-else ifeq ($(shell printf '\n' > bin/empty.c ; if $(CC) -std=gnu23 -c bin/empty.c -o bin/empty.out > /dev/null 2>&1 ; then echo 'c23' ; fi ), c23)
-CFLAGS_STDC = -std=gnu23
-else ifeq ($(shell printf '\n' > bin/empty.c ; if $(CC) -std=gnu20 -c bin/empty.c -o bin/empty.out > /dev/null 2>&1 ; then echo 'c20' ; fi ), c20)
-CFLAGS_STDC = -std=gnu20
 else ifeq ($(shell printf '\n' > bin/empty.c ; if $(CC) -std=gnu17 -c bin/empty.c -o bin/empty.out > /dev/null 2>&1 ; then echo 'c17' ; fi ), c17)
 CFLAGS_STDC = -std=gnu17
 else
 CFLAGS_STDC = -std=gnu11
 endif
-CXXFLAGS += $(CXXFLAGS_STDCXX) 
-CFLAGS   += $(CFLAGS_STDC)
-OVERWRITE_CXXFLAGS += -fallow-store-data-races -fno-threadsafe-statics
-OVERWRITE_CFLAGS   += -fallow-store-data-races
+CXXFLAGS += $(CXXFLAGS_STDCXX) -fallow-store-data-races -fno-threadsafe-statics
+CFLAGS   += $(CFLAGS_STDC)     -fallow-store-data-races
 
-CPU?=generic/compatible
+CPU?=generic/common
 
 # Enable 128bit SSE registers.
 # This requires pure DOS with only CWSDPMI as DOS extender.
@@ -57,10 +46,7 @@ ifneq ($(SSE),0)
 	FPU_MMX    := -m80387 -mmmx -mfpmath=387
 	FPU_3DNOW  := -m80387 -mmmx -m3dnow -mfpmath=387
 	FPU_3DNOWA := -m80387 -mmmx -m3dnow -m3dnowa -mfpmath=387
-	FPU_3DSSE  := -m80387 -mmmx -m3dnow -m3dnowa -mfxsr -msse -mfpmath=sse,387
-	FPU_3DSSE2 := -m80387 -mmmx -m3dnow -m3dnowa -mfxsr -msse -msse2 -mfpmath=sse
-	FPU_3DSSE3 := -m80387 -mmmx -m3dnow -m3dnowa -mfxsr -msse -msse2 -msse3 -mfpmath=sse
-	FPU_3DSSE4 := -m80387 -mmmx -m3dnow -m3dnowa -mfxsr -msse -msse2 -msse3 -msse4a -mfpmath=sse
+	FPU_3DASSE := -m80387 -mmmx -m3dnow -m3dnowa -mfxsr -msse -mfpmath=sse,387
 	FPU_SSE    := -m80387 -mmmx -mfxsr -msse -mfpmath=sse,387
 	FPU_SSE2   := -m80387 -mmmx -mfxsr -msse -msse2 -mfpmath=sse
 	FPU_SSE3   := -m80387 -mmmx -mfxsr -msse -msse2 -msse3 -mfpmath=sse
@@ -76,10 +62,7 @@ else
 	FPU_MMX    := -m80387 -mmmx -mfpmath=387
 	FPU_3DNOW  := -m80387 -mmmx -m3dnow -mfpmath=387
 	FPU_3DNOWA := -m80387 -mmmx -m3dnow -m3dnowa -mfpmath=387
-	FPU_3DSSE  := -mno-sse -mno-fxsr -m80387 -mmmx -m3dnow -m3dnowa -mfpmath=387
-	FPU_3DSSE2 := -mno-sse2 -mno-sse -mno-fxsr -m80387 -mmmx -m3dnow -m3dnowa -mfpmath=387
-	FPU_3DSSE3 := -mno-sse3 -mno-sse2 -mno-sse -mno-fxsr -m80387 -mmmx -m3dnow -m3dnowa -mfpmath=387
-	FPU_3DSSE4 := -mno-sse4a -mno-sse3 -mno-sse2 -mno-sse -mno-fxsr -m80387 -mmmx -m3dnow -m3dnowa -mfpmath=387
+	FPU_3DASSE := -mno-sse -mno-fxsr -m80387 -mmmx -m3dnow -m3dnowa -mfpmath=387
 	FPU_SSE    := -mno-sse -mno-fxsr -m80387 -mmmx -mfpmath=387
 	FPU_SSE2   := -mno-sse2 -mno-sse -mno-fxsr -m80387 -mmmx -mfpmath=387
 	FPU_SSE3   := -mno-sse3 -mno-sse2 -mno-sse -mno-fxsr -m80387 -mmmx -mfpmath=387
@@ -90,56 +73,12 @@ else
 	FPU_SSSE4A := -mno-sse4a -mno-ssse3 -mno-sse3 -mno-sse2 -mno-sse -mno-fxsr -m80387 -mmmx -mfpmath=387
 endif
 
-
-
-ifeq ($(OPTIMIZE),default)
-
-OPT_UARCH_EMUL := -Os   # interpreter
-OPT_UARCH_CISC := -Os   # non-pipelined, scalar,       in-order,     optimize for size  i386       am386
-OPT_UARCH_PIPE := -Os   # pipelined,     scalar,       in-order,     optimize for size  i486       am486 cx486slc
-OPT_UARCH_SCAL := -O2   # pipelined,     super-scalar, in-order,     optimize for speed pentium          cx5x86
-OPT_UARCH_OOOE := -O2   # pipelined,     super-scalar, out-of-order, optimize for speed pentiumpro k5    cx6x86
-OPT_UARCH_COMP := -O2   # recompiler
-
-# vectorize for MMX/3DNOW (64bit wide) (unsupported by GCC)
-OPT_UARCH_EMUL_64 := -Os   # interpreter
-OPT_UARCH_CISC_64 := -Os   # non-pipelined, scalar,       in-order,     optimize for size
-OPT_UARCH_PIPE_64 := -Os   # pipelined,     scalar,       in-order,     optimize for size
-OPT_UARCH_SCAL_64 := -O2   # pipelined,     super-scalar, in-order,     optimize for speed pentium-mmx
-OPT_UARCH_OOOE_64 := -O2   # pipelined,     super-scalar, out-of-order, optimize for speed pentium2    k6 m2
-OPT_UARCH_COMP_64 := -O2   # recompiler
-
-# vectorize for SSE (128bit wide)
-ifeq ($(SSE),0)
-OPT_UARCH_EMUL_128 := -Os   # interpreter
-OPT_UARCH_CISC_128 := -Os   # non-pipelined, scalar,       in-order,     optimize for size
-OPT_UARCH_PIPE_128 := -Os   # pipelined,     scalar,       in-order,     optimize for size
-OPT_UARCH_SCAL_128 := -O2   # pipelined,     super-scalar, in-order,     optimize for speed
-OPT_UARCH_OOOE_128 := -O2   # pipelined,     super-scalar, out-of-order, optimize for speed
-OPT_UARCH_COMP_128 := -O2   # recompiler
-else
-OPT_UARCH_EMUL_128 := -O3   # interpreter
-OPT_UARCH_CISC_128 := -O3   # non-pipelined, scalar,       in-order,     optimize for size
-OPT_UARCH_PIPE_128 := -O3   # pipelined,     scalar,       in-order,     optimize for size
-OPT_UARCH_SCAL_128 := -O3   # pipelined,     super-scalar, in-order,     optimize for speed
-OPT_UARCH_OOOE_128 := -O3   # pipelined,     super-scalar, out-of-order, optimize for speed
-OPT_UARCH_COMP_128 := -O3   # recompiler
-endif
-
-else
-
-OPT_UARCH_EMUL := 
-OPT_UARCH_CISC := 
-OPT_UARCH_PIPE := 
-OPT_UARCH_SCAL := 
-OPT_UARCH_OOOE := 
-OPT_UARCH_COMP := 
-
-endif
+OPT_DEF  := -Os
+OPT_SIMD := -O3
 
 
 
-CACHE_386 :=64  # 0/32/64/128
+CACHE_386 :=64  # 0/64/128
 CACHE_486 :=128 # 0/64/128/256
 CACHE_S7  :=256 # 128/256/512
 CACHE_SS7 :=512 # 256/512/1024
@@ -158,6 +97,7 @@ CACHE_PENTIUMM   :=1024 # 1024/2048
 CACHE_ATOM       :=512  # 512
 
 
+CACHE_K63        :=256  # 128/256
 CACHE_ATHLON     :=512  # 512
 CACHE_ATHLONXP   :=256  # 256/512
 CACHE_ATHLON64   :=512  # 256/512/1024
@@ -170,234 +110,187 @@ CACHE_SEMPRON64  :=128  # 128/256/512
 
 TUNE_586    :=-mtune=pentium
 TUNE_586MMX :=-mtune=pentium-mmx
-TUNE_5863DN :=-mtune=k6-2
 TUNE_686    :=-mtune=pentiumpro
 TUNE_686MMX :=-mtune=pentium2
-TUNE_6863DN :=-mtune=athlon
 TUNE_686SSE :=-mtune=pentium3
 TUNE_686SSE2:=-mtune=pentium-m
 TUNE_686SSE3:=-mtune=pentium-m
 
 
 
-generic/early        := $(XXX) -march=i386        $(FPU_NONE)   -mtune=i386        $(OPT_UARCH_CISC)
+generic/early     := $(XXX) -march=i386        $(FPU_NONE)   -mtune=i386        $(OPT_DEF)
 
-generic/compatible   := $(XXX) -march=i386        $(FPU_387)    -mtune=pentium     $(OPT_UARCH_CISC)
-generic/common       := $(XXX) -march=i486        $(FPU_387)    -mtune=pentium     $(OPT_UARCH_CISC)
+generic/common    := $(XXX) -march=i386        $(FPU_387)    -mtune=pentium     $(OPT_DEF)
+generic/late      := $(XXX) -march=i686        $(FPU_SSSE3)  -mtune=generic     $(OPT_SIMD)
 
-generic/late         := $(XXX) -march=i686        $(FPU_SSE2)   -mtune=generic     $(OPT_UARCH_OOOE_128)
 
 
+generic/nofpu     := $(X__) -march=i386        $(FPU_NONE)   -mtune=i386        $(OPT_DEF)    # 386SX, 386DX, 486SX, Cyrix Cx486SLC..Cx486S, NexGen Nx586
 
-virtual/ibmulator    := $(___) -march=i386        $(FPU_NONE)   -mtune=i386        $(OPT_UARCH_EMUL)
+generic/386       := $(X__) -march=i386        $(FPU_387)    -mtune=i386        $(OPT_DEF)    # 386+387
 
-virtual/ao486        := $(___) -march=i486        $(FPU_NONE)   -mtune=i486        $(OPT_UARCH_PIPE)
+generic/486       := $(XX_) -march=i486        $(FPU_387)    -mtune=i486        $(OPT_DEF)    # 486DX, AMD Am5x86, Cyrix Cx4x86DX..6x86L, NexGen Nx586-PF
+generic/486-mmx   := $(___) -march=i486        $(FPU_MMX)    -mtune=winchip-c6  $(OPT_SIMD)   # IDT WinChip-C6, Rise mP6
+generic/486-3dnow := $(___) -march=i486        $(FPU_3DNOW)  -mtune=winchip2    $(OPT_SIMD)   # IDT WinChip-2
 
-virtual/bochs        := $(___) -march=i686        $(FPU_387)    -mtune=generic     $(OPT_UARCH_EMUL)
+generic/586       := $(XX_) -march=i586        $(FPU_387)    -mtune=pentium     $(OPT_DEF)    # Intel Pentium, AMD K5
+generic/586-mmx   := $(XX_) -march=pentium-mmx $(FPU_MMX)    -mtune=pentium-mmx $(OPT_SIMD)   # Intel Pentium-MMX, AMD K6
+generic/586-3dnow := $(XX_) -march=k6-2        $(FPU_3DNOW)  -mtune=k6-2        $(OPT_SIMD)   # AMD K6-2..K6-3
 
-virtual/qemu         := $(___) -march=i686        $(FPU_SSE2)   -mtune=generic     $(OPT_UARCH_COMP_128)
+generic/686       := $(___) -march=pentiumpro  $(FPU_387)    -mtune=pentiumpro  $(OPT_DEF)    # Intel Pentium-Pro
+generic/686-mmx   := $(XXX) -march=i686        $(FPU_MMX)    -mtune=pentium2    $(OPT_SIMD)   # Intel Pentium-2.., AMD Bulldozer.., VIA C3-Nehemiah.., Cyrix 6x86MX.., Transmeta Crusoe.., NSC Geode-GX1..
+generic/686-3dnow := $(___) -march=i686        $(FPU_3DNOW)  -mtune=c3          $(OPT_SIMD)   # VIA Cyrix-3..C3-Ezra
+generic/686-3dnowa:= $(XX_) -march=athlon      $(FPU_3DNOWA) -mtune=athlon      $(OPT_SIMD)   # AMD Athlon..K10
 
-virtual/varcem       := $(___) -march=i686        $(FPU_387)    -mtune=generic     $(OPT_UARCH_COMP)
-virtual/pcem         := $(___) -march=i686        $(FPU_3DNOW)  -mtune=generic     $(OPT_UARCH_COMP_64)
-virtual/86box        := $(___) -march=i686        $(FPU_3DNOW)  -mtune=generic     $(OPT_UARCH_COMP_64)
-virtual/pcbox        := $(___) -march=i686        $(FPU_SSE2)   -mtune=generic     $(OPT_UARCH_COMP_128)
 
-virtual/unipcemu     := $(___) -march=i386        $(FPU_NONE)   -mtune=i386        $(OPT_UARCH_EMUL)
+generic/sse       := $(X__) -march=i686        $(FPU_SSE)    -mtune=pentium3    $(OPT_SIMD)   # Intel Pentium-3.., AMD Athlon-XP.., VIA C3-Nehemiah.., Transmeta Efficeon.., DM&P Vortex86DX3..
+generic/sse2      := $(XX_) -march=i686        $(FPU_SSE2)   -mtune=generic     $(OPT_SIMD)   # Intel Pentium-4.., AMD Athlon-64.., VIA C7-Esther.., Transmeta Efficeon..
+generic/sse3      := $(___) -march=i686        $(FPU_SSE3)   -mtune=generic     $(OPT_SIMD)   # Intel Core.., AMD Athlon-64-X2.., VIA C7-Esther.., Transmeta Efficeon-88xx..
+generic/ssse3     := $(___) -march=i686        $(FPU_SSSE3)  -mtune=generic     $(OPT_SIMD)   # Intel Core-2.., AMD Bobcat.., Via Nano-1000..
+generic/sse4_1    := $(___) -march=i686        $(FPU_SSE4_1) -mtune=generic     $(OPT_SIMD)   # Intel Core-1st, AMD Bulldozer.., Via Nano-3000..
+generic/sse4_2    := $(___) -march=i686        $(FPU_SSE4_2) -mtune=generic     $(OPT_SIMD)   # Intel Core-1st, AMD Bulldozer.., Via Nano-C..
 
-virtual/dosbox       := $(___) -march=i486        $(FPU_387)    -mtune=i386        $(OPT_UARCH_EMUL)
-virtual/dosbox-svn   := $(___) -march=i486        $(FPU_387)    -mtune=i386        $(OPT_UARCH_EMUL)
-virtual/dosbox-ece   := $(___) -march=i486        $(FPU_387)    -mtune=i386        $(OPT_UARCH_EMUL)
-virtual/dosbox-sta   := $(___) -march=i486        $(FPU_387)    -mtune=i386        $(OPT_UARCH_COMP)
-virtual/dosbox-x     := $(___) -march=i686        $(FPU_SSE)    -mtune=generic     $(OPT_UARCH_EMUL_128)
 
 
+intel/i386        := $(XX_) -march=i386        $(FPU_NONE)   -mtune=i386        $(OPT_DEF)  --param l1-cache-size=0  --param l2-cache-size=$(CACHE_386)
+intel/i486sx      := $(___) -march=i486        $(FPU_NONE)   -mtune=i486        $(OPT_DEF)  --param l1-cache-size=6  --param l2-cache-size=$(CACHE_486)
+intel/i386+80287  := $(___) -march=i386        $(FPU_287)    -mtune=i386        $(OPT_DEF)  --param l1-cache-size=0  --param l2-cache-size=$(CACHE_386)
 
-generic/nofpu        := $(X__) -march=i386        $(FPU_NONE)   -mtune=i386        $(OPT_UARCH_CISC)       # 386SX, 386DX, 486SX, Cyrix Cx486SLC..Cx486S, NexGen Nx586
+intel/i386+80387  := $(XX_) -march=i386        $(FPU_387)    -mtune=i386        $(OPT_DEF)  --param l1-cache-size=0  --param l2-cache-size=$(CACHE_386)
+intel/i486dx      := $(XXX) -march=i486        $(FPU_387)    -mtune=i486        $(OPT_DEF)  --param l1-cache-size=6  --param l2-cache-size=$(CACHE_486)
+intel/pentium     := $(XXX) -march=pentium     $(FPU_387)    -mtune=pentium     $(OPT_DEF)  --param l1-cache-size=8  --param l2-cache-size=$(CACHE_S7)
+intel/pentium-mmx := $(XXX) -march=pentium-mmx $(FPU_MMX)    -mtune=pentium-mmx $(OPT_SIMD) --param l1-cache-size=16 --param l2-cache-size=$(CACHE_S7)
+intel/pentium-pro := $(___) -march=pentiumpro  $(FPU_387)    -mtune=pentiumpro  $(OPT_DEF)  --param l1-cache-size=8  --param l2-cache-size=$(CACHE_PENTIUMPRO)
+intel/pentium2    := $(___) -march=pentium2    $(FPU_MMX)    -mtune=pentium2    $(OPT_SIMD) --param l1-cache-size=16 --param l2-cache-size=$(CACHE_PENTIUM2)
+intel/pentium3    := $(___) -march=pentium3    $(FPU_SSE)    -mtune=pentium3    $(OPT_SIMD) --param l1-cache-size=16 --param l2-cache-size=$(CACHE_PENTIUM3)
+intel/pentium4    := $(___) -march=pentium4    $(FPU_SSE2)   -mtune=pentium4    $(OPT_SIMD) --param l1-cache-size=8  --param l2-cache-size=$(CACHE_PENTIUM4)
+intel/pentium4.1  := $(___) -march=prescott    $(FPU_SSE3)   -mtune=prescott    $(OPT_SIMD) --param l1-cache-size=8  --param l2-cache-size=$(CACHE_PENTIUM41)
+intel/core2       := $(___) -march=core2       $(FPU_SSSE3)  -mtune=core2       $(OPT_SIMD) --param l1-cache-size=32 --param l2-cache-size=$(CACHE_CORE2)
 
-generic/386          := $(X__) -march=i386        $(FPU_387)    -mtune=i386        $(OPT_UARCH_CISC)       # 386+387
+intel/celeron     := $(___) -march=pentium2    $(FPU_MMX)    -mtune=pentium2    $(OPT_SIMD) --param l1-cache-size=16 --param l2-cache-size=$(CACHE_CELERON)
+intel/pentium-m   := $(___) -march=pentium-m   $(FPU_SSE2)   -mtune=pentium-m   $(OPT_SIMD) --param l1-cache-size=16 --param l2-cache-size=$(CACHE_PENTIUMM)
+intel/core        := $(___) -march=pentium-m   $(FPU_SSE3)   -mtune=core2       $(OPT_SIMD) --param l1-cache-size=32 --param l2-cache-size=$(CACHE_CORE)
+intel/atom        := $(___) -march=bonnell     $(FPU_SSSE3)  -mtune=bonnell     $(OPT_SIMD) --param l1-cache-size=24 --param l2-cache-size=$(CACHE_ATOM)
 
-generic/486          := $(XX_) -march=i486        $(FPU_387)    -mtune=i486        $(OPT_UARCH_PIPE)       # 486DX, AMD Am5x86, Cyrix Cx4x86DX..6x86L, NexGen Nx586-PF
+intel/late        := $(XX_) -march=i686        $(FPU_SSSE3)  -mtune=intel       $(OPT_SIMD) 
 
-generic/586          := $(XXX) -march=i586        $(FPU_387)    -mtune=pentium     $(OPT_UARCH_SCAL)       # Intel Pentium, AMD K5
-generic/586-mmx      := $(XX_) -march=pentium-mmx $(FPU_MMX)    -mtune=pentium-mmx $(OPT_UARCH_SCAL_64)    # Intel Pentium-MMX, AMD K6, IDT WinChip-C6, Rise mP6
-generic/586-3dnow    := $(XX_) -march=k6-2        $(FPU_3DNOW)  -mtune=k6-2        $(OPT_UARCH_SCAL_64)    # AMD K6-2..K6-3+, IDT WinChip-2, VIA-C3-Samuel..VIA C3-Ezra
 
-generic/686          := $(___) -march=pentiumpro  $(FPU_387)    -mtune=pentiumpro  $(OPT_UARCH_OOOE)       # Intel Pentium-Pro
-generic/686-mmx      := $(XX_) -march=i686        $(FPU_MMX)    -mtune=pentium2    $(OPT_UARCH_OOOE_64)    # Intel Pentium-2.., AMD Bulldozer.., VIA C3-Nehemiah.., Cyrix 6x86MX.., Transmeta Crusoe.., NSC Geode-GX1..
-generic/686-3dnow    := $(___) -march=i686        $(FPU_3DNOW)  -mtune=athlon      $(OPT_UARCH_OOOE_64)    # VIA Cyrix-3-Joshua
-generic/686-3dnowa   := $(XX_) -march=athlon      $(FPU_3DNOWA) -mtune=athlon      $(OPT_UARCH_OOOE_64)    # AMD Athlon..K10
 
-generic/sse          := $(___) -march=i686        $(FPU_SSE)    -mtune=pentium3    $(OPT_UARCH_OOOE_128)   # Intel Pentium-3, AMD Athlon-XP, VIA C3-Nehemiah, DM&P Vortex86DX3..
+amd/am386         := $(___) -march=i386        $(FPU_NONE)   -mtune=i386        $(OPT_DEF)  --param l1-cache-size=0  --param l2-cache-size=$(CACHE_386)
+amd/am486sx       := $(___) -march=i486        $(FPU_NONE)   -mtune=i486        $(OPT_DEF)  --param l1-cache-size=6  --param l2-cache-size=$(CACHE_486)
 
-generic/sse2         := $(X__) -march=i686        $(FPU_SSE2)   -mtune=generic     $(OPT_UARCH_OOOE_128)   # Intel Pentium-4.., AMD Athlon-64.., VIA C7-Esther.., Transmeta Efficeon..
-generic/sse3         := $(___) -march=i686        $(FPU_SSE3)   -mtune=generic     $(OPT_UARCH_OOOE_128)   # Intel Core.., AMD Athlon-64-X2.., VIA C7-Esther.., Transmeta Efficeon-88xx..
-generic/ssse3        := $(___) -march=i686        $(FPU_SSSE3)  -mtune=generic     $(OPT_UARCH_OOOE_128)   # Intel Core-2.., AMD Bobcat.., Via Nano-1000..
-generic/sse4_1       := $(___) -march=i686        $(FPU_SSE4_1) -mtune=generic     $(OPT_UARCH_OOOE_128)   # Intel Core-1st, AMD Bulldozer.., Via Nano-3000..
-generic/sse4_2       := $(___) -march=i686        $(FPU_SSE4_2) -mtune=generic     $(OPT_UARCH_OOOE_128)   # Intel Core-1st, AMD Bulldozer.., Via Nano-C..
+amd/am386+80387   := $(___) -march=i386        $(FPU_387)    -mtune=i386        $(OPT_DEF)  --param l1-cache-size=0  --param l2-cache-size=$(CACHE_386)
+amd/am486dx       := $(___) -march=i486        $(FPU_387)    -mtune=i486        $(OPT_DEF)  --param l1-cache-size=6  --param l2-cache-size=$(CACHE_486)
+amd/am486dxe      := $(___) -march=i486        $(FPU_387)    -mtune=i486        $(OPT_DEF)  --param l1-cache-size=12 --param l2-cache-size=$(CACHE_486)
+amd/am5x86        := $(___) -march=i486        $(FPU_387)    -mtune=i486        $(OPT_DEF)  --param l1-cache-size=12 --param l2-cache-size=$(CACHE_486)
+amd/k5            := $(XXX) -march=i586        $(FPU_387)    -mtune=i586        $(OPT_DEF)  --param l1-cache-size=8  --param l2-cache-size=$(CACHE_S7)
+amd/k5-pentium    := $(XXX) -march=i586        $(FPU_387)    -mtune=pentium     $(OPT_DEF)  --param l1-cache-size=8  --param l2-cache-size=$(CACHE_S7)
+amd/k5-pentiumpro := $(XXX) -march=i586        $(FPU_387)    -mtune=pentiumpro  $(OPT_DEF)  --param l1-cache-size=8  --param l2-cache-size=$(CACHE_S7)
+amd/k5-pentium2   := $(XXX) -march=i586        $(FPU_387)    -mtune=pentium2    $(OPT_DEF)  --param l1-cache-size=8  --param l2-cache-size=$(CACHE_S7)
+amd/k5-k6         := $(XXX) -march=i586        $(FPU_387)    -mtune=k6          $(OPT_DEF)  --param l1-cache-size=8  --param l2-cache-size=$(CACHE_S7)
+amd/k6            := $(XXX) -march=k6          $(FPU_MMX)    -mtune=k6          $(OPT_SIMD) --param l1-cache-size=32 --param l2-cache-size=$(CACHE_S7)
+amd/k6-2          := $(XXX) -march=k6-2        $(FPU_3DNOW)  -mtune=k6-2        $(OPT_SIMD) --param l1-cache-size=32 --param l2-cache-size=$(CACHE_SS7)
+amd/k6-3          := $(___) -march=k6-3        $(FPU_3DNOW)  -mtune=k6-3        $(OPT_SIMD) --param l1-cache-size=32 --param l2-cache-size=$(CACHE_K63)
+amd/athlon        := $(XX_) -march=athlon      $(FPU_3DNOWA) -mtune=athlon      $(OPT_SIMD) --param l1-cache-size=64 --param l2-cache-size=$(CACHE_ATHLON)
+amd/athlon-xp     := $(XX_) -march=athlon-xp   $(FPU_3DASSE) -mtune=athlon-xp   $(OPT_SIMD) --param l1-cache-size=64 --param l2-cache-size=$(CACHE_ATHLONXP)
+amd/athlon64      := $(X__) -march=k8          $(FPU_SSE2)   -mtune=k8          $(OPT_SIMD) --param l1-cache-size=64 --param l2-cache-size=$(CACHE_ATHLON64)
+amd/athlon64-sse3 := $(___) -march=k8-sse3     $(FPU_SSE3)   -mtune=k8-sse3     $(OPT_SIMD) --param l1-cache-size=64 --param l2-cache-size=$(CACHE_ATHLON64)
+amd/k10           := $(___) -march=amdfam10    $(FPU_SSE4A)  -mtune=amdfam10    $(OPT_SIMD) --param l1-cache-size=64 --param l2-cache-size=512
 
+amd/duron         := $(XX_) -march=athlon      $(FPU_3DNOWA) -mtune=athlon      $(OPT_SIMD) --param l1-cache-size=64 --param l2-cache-size=$(CACHE_DURON)
+amd/duron-xp      := $(___) -march=athlon-xp   $(FPU_3DASSE) -mtune=athlon-xp   $(OPT_SIMD) --param l1-cache-size=64 --param l2-cache-size=$(CACHE_DURONXP)
+amd/sempron64     := $(___) -march=k8          $(FPU_SSE2)   -mtune=k8          $(OPT_SIMD) --param l1-cache-size=64 --param l2-cache-size=$(CACHE_SEMPRON64)
 
+amd/geode-gx      := $(___) -march=geode       $(FPU_3DNOW)  -mtune=geode       $(OPT_SIMD) --param l1-cache-size=16 --param l2-cache-size=0
+amd/geode-lx      := $(___) -march=geode       $(FPU_3DNOW)  -mtune=geode       $(OPT_SIMD) --param l1-cache-size=64 --param l2-cache-size=128
+amd/geode-nx      := $(___) -march=athlon-xp   $(FPU_3DASSE) -mtune=athlon-xp   $(OPT_SIMD) --param l1-cache-size=64 --param l2-cache-size=256
+amd/bobcat        := $(___) -march=btver1      $(FPU_SSSE4A) -mtune=btver1      $(OPT_SIMD) --param l1-cache-size=32 --param l2-cache-size=512
+amd/jaguar        := $(___) -march=btver2      $(FPU_SSSE4A) -mtune=btver2      $(OPT_SIMD) --param l1-cache-size=32 --param l2-cache-size=1024
 
-intel/i386           := $(X__) -march=i386        $(FPU_NONE)   -mtune=i386        $(OPT_UARCH_CISC)     --param l1-cache-size=0  --param l2-cache-size=$(CACHE_386)
-intel/i486sx         := $(___) -march=i486        $(FPU_NONE)   -mtune=i486        $(OPT_UARCH_PIPE)     --param l1-cache-size=6  --param l2-cache-size=$(CACHE_486)
-intel/i386+80287     := $(___) -march=i386        $(FPU_287)    -mtune=i386        $(OPT_UARCH_CISC)     --param l1-cache-size=0  --param l2-cache-size=$(CACHE_386)
+amd/late-3dnow    := $(XX_) -march=athlon-xp   $(FPU_3DASSE) -mtune=athlon-xp   $(OPT_SIMD) --param l1-cache-size=64 --param l2-cache-size=512
+amd/late          := $(XX_) -march=i686        $(FPU_SSSE4A) -mtune=generic     $(OPT_SIMD) 
 
-intel/i386+80387     := $(X__) -march=i386        $(FPU_387)    -mtune=i386        $(OPT_UARCH_CISC)     --param l1-cache-size=0  --param l2-cache-size=$(CACHE_386)
-intel/i486sx+i487sx  := $(___) -march=i486        $(FPU_387)    -mtune=i486        $(OPT_UARCH_PIPE)     --param l1-cache-size=6  --param l2-cache-size=$(CACHE_486)
-intel/i486dx         := $(XXX) -march=i486        $(FPU_387)    -mtune=i486        $(OPT_UARCH_PIPE)     --param l1-cache-size=6  --param l2-cache-size=$(CACHE_486)
-intel/pentium        := $(XXX) -march=pentium     $(FPU_387)    -mtune=pentium     $(OPT_UARCH_SCAL)     --param l1-cache-size=8  --param l2-cache-size=$(CACHE_S7)
-intel/pentium-mmx    := $(XXX) -march=pentium-mmx $(FPU_MMX)    -mtune=pentium-mmx $(OPT_UARCH_SCAL_64)  --param l1-cache-size=16 --param l2-cache-size=$(CACHE_S7)
-intel/pentium-pro    := $(___) -march=pentiumpro  $(FPU_387)    -mtune=pentiumpro  $(OPT_UARCH_OOOE)     --param l1-cache-size=8  --param l2-cache-size=$(CACHE_PENTIUMPRO)
-intel/pentium2       := $(XX_) -march=pentium2    $(FPU_MMX)    -mtune=pentium2    $(OPT_UARCH_OOOE_64)  --param l1-cache-size=16 --param l2-cache-size=$(CACHE_PENTIUM2)
-intel/pentium3       := $(X__) -march=pentium3    $(FPU_SSE)    -mtune=pentium3    $(OPT_UARCH_OOOE_128) --param l1-cache-size=16 --param l2-cache-size=$(CACHE_PENTIUM3)
-intel/pentium4       := $(XX_) -march=pentium4    $(FPU_SSE2)   -mtune=pentium4    $(OPT_UARCH_OOOE_128) --param l1-cache-size=8  --param l2-cache-size=$(CACHE_PENTIUM4)
-intel/pentium4.1     := $(___) -march=prescott    $(FPU_SSE3)   -mtune=prescott    $(OPT_UARCH_OOOE_128) --param l1-cache-size=8  --param l2-cache-size=$(CACHE_PENTIUM41)
-intel/core2          := $(___) -march=core2       $(FPU_SSSE3)  -mtune=core2       $(OPT_UARCH_OOOE_128) --param l1-cache-size=32 --param l2-cache-size=$(CACHE_CORE2)
 
-intel/celeron        := $(___) -march=pentium2    $(FPU_MMX)    -mtune=pentium2    $(OPT_UARCH_OOOE_64)  --param l1-cache-size=16 --param l2-cache-size=$(CACHE_CELERON)
-intel/pentium-m      := $(___) -march=pentium-m   $(FPU_SSE2)   -mtune=pentium-m   $(OPT_UARCH_OOOE_128) --param l1-cache-size=16 --param l2-cache-size=$(CACHE_PENTIUMM)
-intel/core           := $(___) -march=pentium-m   $(FPU_SSE3)   -mtune=core2       $(OPT_UARCH_OOOE_128) --param l1-cache-size=32 --param l2-cache-size=$(CACHE_CORE)
-intel/atom           := $(___) -march=bonnell     $(FPU_SSSE3)  -mtune=bonnell     $(OPT_UARCH_SCAL_128) --param l1-cache-size=24 --param l2-cache-size=$(CACHE_ATOM)
 
-intel/late           := $(XX_) -march=i686        $(FPU_SSSE3)  -mtune=intel       $(OPT_UARCH_OOOE_128)
+nexgen/nx586      := $(___) -march=i486        $(FPU_NONE)    $(TUNE_586)       $(OPT_DEF)  --param l1-cache-size=16 --param l2-cache-size=$(CACHE_486)
 
+nexgen/nx586pf    := $(___) -march=i486        $(FPU_387)     $(TUNE_586)       $(OPT_DEF)  --param l1-cache-size=16 --param l2-cache-size=$(CACHE_486)
 
 
-amd/am386            := $(___) -march=i386        $(FPU_NONE)   -mtune=i386        $(OPT_UARCH_CISC)     --param l1-cache-size=0  --param l2-cache-size=$(CACHE_386)
-amd/am486sx          := $(___) -march=i486        $(FPU_NONE)   -mtune=i486        $(OPT_UARCH_PIPE)     --param l1-cache-size=6  --param l2-cache-size=$(CACHE_486)
 
-amd/am386+80387      := $(___) -march=i386        $(FPU_387)    -mtune=i386        $(OPT_UARCH_CISC)     --param l1-cache-size=0  --param l2-cache-size=$(CACHE_386)
-amd/am486sx+am487sx  := $(___) -march=i486        $(FPU_387)    -mtune=i486        $(OPT_UARCH_PIPE)     --param l1-cache-size=6  --param l2-cache-size=$(CACHE_486)
-amd/am486dx          := $(XX_) -march=i486        $(FPU_387)    -mtune=i486        $(OPT_UARCH_PIPE)     --param l1-cache-size=6  --param l2-cache-size=$(CACHE_486)
-amd/am486dxe         := $(XX_) -march=i486        $(FPU_387)    -mtune=i486        $(OPT_UARCH_PIPE)     --param l1-cache-size=12 --param l2-cache-size=$(CACHE_486)
-amd/am5x86           := $(___) -march=i486        $(FPU_387)    -mtune=i486        $(OPT_UARCH_PIPE)     --param l1-cache-size=12 --param l2-cache-size=$(CACHE_486)
-amd/k5               := $(X__) -march=i586        $(FPU_387)    -mtune=i586        $(OPT_UARCH_OOOE)     --param l1-cache-size=8  --param l2-cache-size=$(CACHE_S7)
-amd/k6               := $(XX_) -march=k6          $(FPU_MMX)    -mtune=k6          $(OPT_UARCH_OOOE_64)  --param l1-cache-size=32 --param l2-cache-size=$(CACHE_S7)
-amd/k6-2             := $(XXX) -march=k6-2        $(FPU_3DNOW)  -mtune=k6-2        $(OPT_UARCH_OOOE_64)  --param l1-cache-size=32 --param l2-cache-size=$(CACHE_SS7)
-amd/k6-3             := $(___) -march=k6-3        $(FPU_3DNOW)  -mtune=k6-3        $(OPT_UARCH_OOOE_64)  --param l1-cache-size=32 --param l2-cache-size=256
-amd/k6-2+            := $(___) -march=k6-3        $(FPU_3DNOW)  -mtune=k6-3        $(OPT_UARCH_OOOE_64)  --param l1-cache-size=32 --param l2-cache-size=128
-amd/k6-3+            := $(___) -march=k6-3        $(FPU_3DNOW)  -mtune=k6-3        $(OPT_UARCH_OOOE_64)  --param l1-cache-size=32 --param l2-cache-size=256
-amd/athlon           := $(XX_) -march=athlon      $(FPU_3DNOWA) -mtune=athlon      $(OPT_UARCH_OOOE_64)  --param l1-cache-size=64 --param l2-cache-size=$(CACHE_ATHLON)
-amd/athlon-xp        := $(XXX) -march=athlon-xp   $(FPU_3DSSE)  -mtune=athlon-xp   $(OPT_UARCH_OOOE_128) --param l1-cache-size=64 --param l2-cache-size=$(CACHE_ATHLONXP)
-amd/athlon64         := $(X__) -march=k8          $(FPU_3DSSE2) -mtune=k8          $(OPT_UARCH_OOOE_128) --param l1-cache-size=64 --param l2-cache-size=$(CACHE_ATHLON64)
-amd/athlon64-sse3    := $(___) -march=k8-sse3     $(FPU_3DSSE3) -mtune=k8-sse3     $(OPT_UARCH_OOOE_128) --param l1-cache-size=64 --param l2-cache-size=$(CACHE_ATHLON64)
-amd/k10              := $(___) -march=amdfam10    $(FPU_3DSSE4) -mtune=amdfam10    $(OPT_UARCH_OOOE_128) --param l1-cache-size=64 --param l2-cache-size=512
+ibm/386slc        := $(___) -march=i386        $(FPU_NONE)   -mtune=i386        $(OPT_DEF)  --param l1-cache-size=6  --param l2-cache-size=$(CACHE_386)
+ibm/486slc        := $(___) -march=i486        $(FPU_NONE)   -mtune=i386        $(OPT_DEF)  --param l1-cache-size=12 --param l2-cache-size=$(CACHE_386)
+ibm/486bl         := $(___) -march=i486        $(FPU_NONE)   -mtune=i386        $(OPT_DEF)  --param l1-cache-size=12 --param l2-cache-size=$(CACHE_486)
 
-amd/duron            := $(X__) -march=athlon      $(FPU_3DNOWA) -mtune=athlon      $(OPT_UARCH_OOOE_64)  --param l1-cache-size=64 --param l2-cache-size=$(CACHE_DURON)
-amd/duron-xp         := $(___) -march=athlon-xp   $(FPU_3DSSE)  -mtune=athlon-xp   $(OPT_UARCH_OOOE_128) --param l1-cache-size=64 --param l2-cache-size=$(CACHE_DURONXP)
-amd/sempron64        := $(___) -march=k8          $(FPU_3DSSE2) -mtune=k8          $(OPT_UARCH_OOOE_128) --param l1-cache-size=64 --param l2-cache-size=$(CACHE_SEMPRON64)
 
-amd/geode-gx         := $(___) -march=geode       $(FPU_3DNOWA) -mtune=geode       $(OPT_UARCH_OOOE_64)  --param l1-cache-size=16 --param l2-cache-size=0
-amd/geode-lx         := $(___) -march=geode       $(FPU_3DNOWA) -mtune=geode       $(OPT_UARCH_OOOE_64)  --param l1-cache-size=64 --param l2-cache-size=128
-amd/geode-nx         := $(___) -march=athlon-xp   $(FPU_3DSSE)  -mtune=athlon-xp   $(OPT_UARCH_OOOE_128) --param l1-cache-size=64 --param l2-cache-size=256
-amd/bobcat           := $(X__) -march=btver1      $(FPU_SSSE4A) -mtune=btver1      $(OPT_UARCH_OOOE_128) --param l1-cache-size=32 --param l2-cache-size=512
-amd/jaguar           := $(___) -march=btver2      $(FPU_SSSE4A) -mtune=btver2      $(OPT_UARCH_OOOE_128) --param l1-cache-size=32 --param l2-cache-size=1024
 
-amd/late             := $(XX_) -march=i686        $(FPU_SSSE4A) -mtune=generic     $(OPT_UARCH_OOOE_128)
+cyrix/cx486slc    := $(___) -march=i486        $(FPU_NONE)   -mtune=i486        $(OPT_DEF)  --param l1-cache-size=1  --param l2-cache-size=$(CACHE_386)
+cyrix/cx486dlc    := $(___) -march=i486        $(FPU_NONE)   -mtune=i486        $(OPT_DEF)  --param l1-cache-size=1  --param l2-cache-size=$(CACHE_386)
+cyrix/cx4x86s     := $(___) -march=i486        $(FPU_NONE)   -mtune=i486        $(OPT_DEF)  --param l1-cache-size=2  --param l2-cache-size=$(CACHE_486)
 
+cyrix/cx4x86dx    := $(___) -march=i486        $(FPU_387)    -mtune=i486        $(OPT_DEF)  --param l1-cache-size=6  --param l2-cache-size=$(CACHE_486)
+cyrix/cx5x86      := $(___) -march=i486        $(FPU_387)    -mtune=i486        $(OPT_DEF)  --param l1-cache-size=12 --param l2-cache-size=$(CACHE_486)
+cyrix/6x86        := $(XXX) -march=i486        $(FPU_387)     $(TUNE_586)       $(OPT_DEF)  --param l1-cache-size=12 --param l2-cache-size=$(CACHE_S7)
+cyrix/6x86l       := $(___) -march=i486        $(FPU_387)     $(TUNE_586)       $(OPT_DEF)  --param l1-cache-size=12 --param l2-cache-size=$(CACHE_S7)
+cyrix/6x86mx      := $(___) -march=i686        $(FPU_MMX)     $(TUNE_686MMX)    $(OPT_SIMD) --param l1-cache-size=48 --param l2-cache-size=$(CACHE_SS7)
 
+cyrix/mediagx-gx  := $(___) -march=i486        $(FPU_387)    -mtune=i486        $(OPT_DEF)  --param l1-cache-size=9  --param l2-cache-size=0
+cyrix/mediagx-gxm := $(___) -march=i686        $(FPU_MMX)     $(TUNE_686MMX)    $(OPT_SIMD) --param l1-cache-size=9  --param l2-cache-size=0
 
-ct/38600             := $(___) -march=i386        $(FPU_NONE)   -mtune=i486        $(OPT_UARCH_PIPE)     --param l1-cache-size=0  --param l2-cache-size=$(CACHE_386)
-ct/38605             := $(___) -march=i386        $(FPU_NONE)   -mtune=i486        $(OPT_UARCH_PIPE)     --param l1-cache-size=1  --param l2-cache-size=$(CACHE_386)
 
 
+nsc/geode-gx1     := $(___) -march=i686        $(FPU_MMX)     $(TUNE_686MMX)    $(OPT_SIMD) --param l1-cache-size=9  --param l2-cache-size=0
+nsc/geode-gx2     := $(___) -march=geode       $(FPU_3DNOW)  -mtune=geode       $(OPT_SIMD) --param l1-cache-size=16 --param l2-cache-size=0
 
-nexgen/nx586         := $(___) -march=i486        $(FPU_NONE)   $(TUNE_586)        $(OPT_UARCH_OOOE)     --param l1-cache-size=16 --param l2-cache-size=$(CACHE_486)
 
-nexgen/nx586pf       := $(___) -march=i486        $(FPU_387)    $(TUNE_586)        $(OPT_UARCH_OOOE)     --param l1-cache-size=16 --param l2-cache-size=$(CACHE_486)
 
+idt/winchip-c6    := $(XX_) -march=winchip-c6  $(FPU_MMX)    -mtune=winchip-c6  $(OPT_SIMD) --param l1-cache-size=32 --param l2-cache-size=$(CACHE_S7)
+idt/winchip2      := $(XX_) -march=winchip2    $(FPU_3DNOW)  -mtune=winchip2    $(OPT_SIMD) --param l1-cache-size=32 --param l2-cache-size=$(CACHE_SS7)
 
 
-ibm/386slc           := $(___) -march=i386        $(FPU_NONE)   -mtune=i386        $(OPT_UARCH_CISC)     --param l1-cache-size=6  --param l2-cache-size=$(CACHE_386)
-ibm/486slc           := $(___) -march=i486        $(FPU_NONE)   -mtune=i386        $(OPT_UARCH_CISC)     --param l1-cache-size=12 --param l2-cache-size=$(CACHE_386)
-ibm/486bl            := $(___) -march=i486        $(FPU_NONE)   -mtune=i386        $(OPT_UARCH_CISC)     --param l1-cache-size=12 --param l2-cache-size=$(CACHE_486)
 
-ibm/386slc+fasmath   := $(___) -march=i386        $(FPU_387)    -mtune=i386        $(OPT_UARCH_CISC)     --param l1-cache-size=6  --param l2-cache-size=$(CACHE_386)
-ibm/486slc+fasmath   := $(___) -march=i486        $(FPU_387)    -mtune=i386        $(OPT_UARCH_CISC)     --param l1-cache-size=12 --param l2-cache-size=$(CACHE_386)
-ibm/486bl+fasmath    := $(___) -march=i486        $(FPU_387)    -mtune=i386        $(OPT_UARCH_CISC)     --param l1-cache-size=12 --param l2-cache-size=$(CACHE_486)
+via/cyrix3-joshua := $(XX_) -march=i686        $(FPU_3DNOW)   $(TUNE_686MMX)    $(OPT_SIMD) --param l1-cache-size=48 --param l2-cache-size=256
+via/cyrix3-samuel := $(___) -march=c3          $(FPU_3DNOW)  -mtune=c3          $(OPT_SIMD) --param l1-cache-size=64 --param l2-cache-size=0
+via/c3-samuel2    := $(___) -march=samuel-2    $(FPU_3DNOW)  -mtune=samuel-2    $(OPT_SIMD) --param l1-cache-size=64 --param l2-cache-size=64
+via/c3-ezra       := $(___) -march=samuel-2    $(FPU_3DNOW)  -mtune=samuel-2    $(OPT_SIMD) --param l1-cache-size=64 --param l2-cache-size=64
+via/c3-nehemiah   := $(XX_) -march=nehemiah    $(FPU_SSE)    -mtune=nehemiah    $(OPT_SIMD) --param l1-cache-size=64 --param l2-cache-size=64
+via/c7-esther     := $(XX_) -march=esther      $(FPU_SSE3)   -mtune=esther      $(OPT_SIMD) --param l1-cache-size=64 --param l2-cache-size=128
 
+via/late          := $(XX_) -march=i686        $(FPU_SSE3)   -mtune=esther      $(OPT_SIMD) 
 
 
-cyrix/cx486slc       := $(___) -march=i486        $(FPU_NONE)   -mtune=i486        $(OPT_UARCH_PIPE)     --param l1-cache-size=1  --param l2-cache-size=$(CACHE_386)
-cyrix/cx486dlc       := $(___) -march=i486        $(FPU_NONE)   -mtune=i486        $(OPT_UARCH_PIPE)     --param l1-cache-size=1  --param l2-cache-size=$(CACHE_386)
-cyrix/cx4x86s        := $(___) -march=i486        $(FPU_NONE)   -mtune=i486        $(OPT_UARCH_PIPE)     --param l1-cache-size=2  --param l2-cache-size=$(CACHE_486)
 
-cyrix/cx486slc+80387 := $(___) -march=i486        $(FPU_387)    -mtune=i486        $(OPT_UARCH_PIPE)     --param l1-cache-size=1  --param l2-cache-size=$(CACHE_386)
-cyrix/cx486dlc+80387 := $(___) -march=i486        $(FPU_387)    -mtune=i486        $(OPT_UARCH_PIPE)     --param l1-cache-size=1  --param l2-cache-size=$(CACHE_386)
-cyrix/cx4x86s+cx487s := $(___) -march=i486        $(FPU_387)    -mtune=i486        $(OPT_UARCH_PIPE)     --param l1-cache-size=2  --param l2-cache-size=$(CACHE_486)
-cyrix/cx4x86dx       := $(___) -march=i486        $(FPU_387)    -mtune=i486        $(OPT_UARCH_PIPE)     --param l1-cache-size=6  --param l2-cache-size=$(CACHE_486)
-cyrix/cx5x86         := $(___) -march=i486        $(FPU_387)    -mtune=i486        $(OPT_UARCH_SCAL)     --param l1-cache-size=12 --param l2-cache-size=$(CACHE_486)
-cyrix/6x86           := $(XXX) -march=i486        $(FPU_387)    $(TUNE_586)        $(OPT_UARCH_OOOE)     --param l1-cache-size=12 --param l2-cache-size=$(CACHE_S7)
-cyrix/6x86l          := $(___) -march=i486        $(FPU_387)    $(TUNE_586)        $(OPT_UARCH_OOOE)     --param l1-cache-size=12 --param l2-cache-size=$(CACHE_S7)
-cyrix/6x86mx         := $(XX_) -march=i686        $(FPU_MMX)    $(TUNE_686MMX)     $(OPT_UARCH_OOOE_64)  --param l1-cache-size=48 --param l2-cache-size=$(CACHE_SS7)
+umc/u5s           := $(___) -march=i486        $(FPU_NONE)   -mtune=i486        $(OPT_DEF)  --param l1-cache-size=6  --param l2-cache-size=$(CACHE_486)
+umc/u5d           := $(___) -march=i486        $(FPU_387)    -mtune=i486        $(OPT_DEF)  --param l1-cache-size=6  --param l2-cache-size=$(CACHE_486)
 
-cyrix/mediagx-gx     := $(___) -march=i486        $(FPU_387)    -mtune=i486        $(OPT_UARCH_SCAL)     --param l1-cache-size=9  --param l2-cache-size=0
-cyrix/mediagx-gxm    := $(___) -march=i686        $(FPU_MMX)    $(TUNE_686MMX)     $(OPT_UARCH_SCAL_64)  --param l1-cache-size=9  --param l2-cache-size=0
 
 
+transmeta/crusoe  := $(___) -march=i686        $(FPU_MMX)     $(TUNE_686MMX)    $(OPT_SIMD) --param l1-cache-size=64 --param l2-cache-size=256
+transmeta/efficeon:= $(___) -march=i686        $(FPU_SSE2)    $(TUNE_686SSE2)   $(OPT_SIMD) --param l1-cache-size=64 --param l2-cache-size=1024
+transmeta/tm8800  := $(___) -march=i686        $(FPU_SSE3)    $(TUNE_686SSE3)   $(OPT_SIMD) --param l1-cache-size=64 --param l2-cache-size=1024
 
-nsc/geode-gx1        := $(___) -march=i686        $(FPU_MMX)    $(TUNE_686MMX)     $(OPT_UARCH_SCAL_64)  --param l1-cache-size=9  --param l2-cache-size=0
-nsc/geode-gx2        := $(___) -march=geode       $(FPU_3DNOWA) -mtune=geode       $(OPT_UARCH_OOOE_64)  --param l1-cache-size=16 --param l2-cache-size=0
 
 
+uli/m6117c        := $(___) -march=i386        $(FPU_NONE)   -mtune=i386        $(OPT_DEF)  --param l1-cache-size=0  --param l2-cache-size=$(CACHE_386)
 
-idt/winchip-c6       := $(X__) -march=i586        $(FPU_MMX)    -mtune=winchip-c6  $(OPT_UARCH_PIPE_64)  --param l1-cache-size=32 --param l2-cache-size=$(CACHE_S7)
-idt/winchip2         := $(X__) -march=i586        $(FPU_3DNOW)  -mtune=winchip2    $(OPT_UARCH_SCAL_64)  --param l1-cache-size=32 --param l2-cache-size=$(CACHE_SS7)
 
 
+rise/mp6          := $(XX_) -march=i586        $(FPU_MMX)     $(TUNE_586MMX)    $(OPT_SIMD) --param l1-cache-size=8  --param l2-cache-size=$(CACHE_SS7)
 
-via/cyrix3-joshua    := $(___) -march=i686        $(FPU_3DNOW)  $(TUNE_6863DN)     $(OPT_UARCH_OOOE_64)  --param l1-cache-size=48 --param l2-cache-size=256
-via/c3-samuel        := $(___) -march=c3          $(FPU_3DNOW)  -mtune=c3          $(OPT_UARCH_SCAL_64)  --param l1-cache-size=64 --param l2-cache-size=0
-via/c3-samuel2       := $(___) -march=samuel-2    $(FPU_3DNOW)  -mtune=samuel-2    $(OPT_UARCH_SCAL_64)  --param l1-cache-size=64 --param l2-cache-size=64
-via/c3-ezra          := $(___) -march=samuel-2    $(FPU_3DNOW)  -mtune=samuel-2    $(OPT_UARCH_SCAL_64)  --param l1-cache-size=64 --param l2-cache-size=64
-via/c3-nehemiah      := $(___) -march=nehemiah    $(FPU_SSE)    -mtune=nehemiah    $(OPT_UARCH_SCAL_128) --param l1-cache-size=64 --param l2-cache-size=64
-via/c7-esther        := $(XX_) -march=esther      $(FPU_SSE3)   -mtune=esther      $(OPT_UARCH_SCAL_128) --param l1-cache-size=64 --param l2-cache-size=128
-via/eden-x2          := $(___) -march=eden-x2     $(FPU_SSE3)   -mtune=eden-x2     $(OPT_UARCH_SCAL_128) --param l1-cache-size=64 --param l2-cache-size=64
-via/nano             := $(___) -march=nano        $(FPU_SSSE3)  -mtune=nano        $(OPT_UARCH_SCAL_128) --param l1-cache-size=64 --param l2-cache-size=1024
-via/nano-1000        := $(___) -march=nano-1000   $(FPU_SSSE3)  -mtune=nano-1000   $(OPT_UARCH_SCAL_128) --param l1-cache-size=64 --param l2-cache-size=1024
-via/nano-2000        := $(___) -march=nano-2000   $(FPU_SSSE3)  -mtune=nano-2000   $(OPT_UARCH_SCAL_128) --param l1-cache-size=64 --param l2-cache-size=1024
-via/nano-3000        := $(___) -march=nano-3000   $(FPU_SSE4_1) -mtune=nano-3000   $(OPT_UARCH_SCAL_128) --param l1-cache-size=64 --param l2-cache-size=1024
-via/nano-4000        := $(___) -march=nano-4000   $(FPU_SSE4_1) -mtune=nano-4000   $(OPT_UARCH_SCAL_128) --param l1-cache-size=64 --param l2-cache-size=1024
-via/nano-x2          := $(___) -march=nano-x2     $(FPU_SSE4_1) -mtune=nano-x2     $(OPT_UARCH_SCAL_128) --param l1-cache-size=64 --param l2-cache-size=1024
-via/nano-x4          := $(___) -march=nano-x4     $(FPU_SSE4_1) -mtune=nano-x4     $(OPT_UARCH_SCAL_128) --param l1-cache-size=64 --param l2-cache-size=1024
-via/eden-x4          := $(___) -march=eden-x4     $(FPU_SSE4_2) -mtune=eden-x4     $(OPT_UARCH_SCAL_128) --param l1-cache-size=64 --param l2-cache-size=2048
 
-via/late             := $(XX_) -march=eden-x4     $(FPU_SSE4_2) -mtune=eden-x4     $(OPT_UARCH_SCAL_128)
 
+sis/55x           := $(___) -march=i586        $(FPU_MMX)     $(TUNE_586MMX)    $(OPT_SIMD) --param l1-cache-size=8  --param l2-cache-size=0
 
 
-umc/u5s              := $(___) -march=i486        $(FPU_NONE)   -mtune=i486        $(OPT_UARCH_PIPE)     --param l1-cache-size=6  --param l2-cache-size=$(CACHE_486)
-umc/u5d              := $(___) -march=i486        $(FPU_387)    -mtune=i486        $(OPT_UARCH_PIPE)     --param l1-cache-size=6  --param l2-cache-size=$(CACHE_486)
 
+dmnp/m6117d       := $(___) -march=i386        $(FPU_NONE)   -mtune=i386        $(OPT_DEF)  --param l1-cache-size=0  --param l2-cache-size=$(CACHE_386)
+dmnp/vortex86sx   := $(___) -march=i386        $(FPU_NONE)   -mtune=i386        $(OPT_DEF)  --param l1-cache-size=16 --param l2-cache-size=0
 
-
-transmeta/crusoe     := $(X__) -march=i686        $(FPU_MMX)    $(TUNE_686MMX)     $(OPT_UARCH_COMP)     --param l1-cache-size=64 --param l2-cache-size=256
-transmeta/efficeon   := $(___) -march=i686        $(FPU_SSE2)   $(TUNE_686SSE2)    $(OPT_UARCH_COMP)     --param l1-cache-size=64 --param l2-cache-size=1024
-transmeta/tm8800     := $(___) -march=i686        $(FPU_SSE3)   $(TUNE_686SSE3)    $(OPT_UARCH_COMP)     --param l1-cache-size=64 --param l2-cache-size=1024
-
-
-
-uli/m6117c           := $(___) -march=i386        $(FPU_NONE)   -mtune=i386        $(OPT_UARCH_CISC)     --param l1-cache-size=0  --param l2-cache-size=$(CACHE_386)
-
-
-
-rise/mp6             := $(X__) -march=i586        $(FPU_MMX)    $(TUNE_586MMX)     $(OPT_UARCH_SCAL_64)  --param l1-cache-size=8  --param l2-cache-size=$(CACHE_SS7)
-
-
-
-sis/55x              := $(___) -march=i586        $(FPU_MMX)    $(TUNE_586MMX)     $(OPT_UARCH_SCAL_64)  --param l1-cache-size=8  --param l2-cache-size=0
-
-
-
-dmnp/m6117d          := $(___) -march=i386        $(FPU_NONE)   -mtune=i386        $(OPT_UARCH_CISC)     --param l1-cache-size=0  --param l2-cache-size=$(CACHE_386)
-dmnp/vortex86        := $(___) -march=i586        $(FPU_MMX)    $(TUNE_586MMX)     $(OPT_UARCH_SCAL_64)  --param l1-cache-size=8  --param l2-cache-size=0
-dmnp/vortex86sx      := $(___) -march=i586        $(FPU_NONE)   $(TUNE_586)        $(OPT_UARCH_SCAL)     --param l1-cache-size=16 --param l2-cache-size=0
-dmnp/vortex86dx      := $(___) -march=i586        $(FPU_387)    $(TUNE_586)        $(OPT_UARCH_SCAL)     --param l1-cache-size=16 --param l2-cache-size=256
-dmnp/vortex86mx      := $(___) -march=i586        $(FPU_387)    $(TUNE_586)        $(OPT_UARCH_SCAL)     --param l1-cache-size=16 --param l2-cache-size=256
-dmnp/vortex86mxp     := $(___) -march=i586        $(FPU_387)    $(TUNE_586)        $(OPT_UARCH_SCAL)     --param l1-cache-size=16 --param l2-cache-size=256
-dmnp/vortex86dx2     := $(___) -march=i586        $(FPU_387)    $(TUNE_586)        $(OPT_UARCH_SCAL)     --param l1-cache-size=16 --param l2-cache-size=256
-dmnp/vortex86ex      := $(___) -march=i586        $(FPU_387)    $(TUNE_586)        $(OPT_UARCH_SCAL)     --param l1-cache-size=16 --param l2-cache-size=128
-dmnp/vortex86dx3     := $(___) -march=i686        $(FPU_SSE)    $(TUNE_686SSE)     $(OPT_UARCH_SCAL_128) --param l1-cache-size=32 --param l2-cache-size=256
-dmnp/vortex86ex2     := $(___) -march=i686        $(FPU_SSE)    $(TUNE_686SSE)     $(OPT_UARCH_SCAL_128) --param l1-cache-size=32 --param l2-cache-size=128
+dmnp/vortex86dx   := $(___) -march=i486        $(FPU_387)    -mtune=i486        $(OPT_DEF)  --param l1-cache-size=16 --param l2-cache-size=256
+dmnp/vortex86mx   := $(___) -march=i486        $(FPU_387)    -mtune=i486        $(OPT_DEF)  --param l1-cache-size=16 --param l2-cache-size=256
+dmnp/vortex86     := $(___) -march=i586        $(FPU_MMX)     $(TUNE_586MMX)    $(OPT_SIMD) --param l1-cache-size=8  --param l2-cache-size=0
+dmnp/vortex86dx2  := $(___) -march=i586        $(FPU_MMX)     $(TUNE_586MMX)    $(OPT_SIMD) --param l1-cache-size=16 --param l2-cache-size=256
+dmnp/vortex86dx3  := $(___) -march=i686        $(FPU_SSE)     $(TUNE_686SSE)    $(OPT_SIMD) --param l1-cache-size=32 --param l2-cache-size=512
 
 
 
@@ -408,25 +301,12 @@ CPUFLAGS := $($(CPU))
 
 # parse CPU optimization options
 ifeq ($(findstring -O3,$(CPUFLAGS)),-O3)
-MPT_COMPILER_NO_O=1
-endif
-ifeq ($(findstring -O2,$(CPUFLAGS)),-O2)
-MPT_COMPILER_NO_O=1
+OPTIMIZE=vectorize
+CPUFLAGS := $(filter-out -O3,$(CPUFLAGS))
 endif
 ifeq ($(findstring -Os,$(CPUFLAGS)),-Os)
-MPT_COMPILER_NO_O=1
-endif
-ifeq ($(findstring -Oz,$(CPUFLAGS)),-Oz)
-MPT_COMPILER_NO_O=1
-endif
-ifeq ($(findstring -O1,$(CPUFLAGS)),-O1)
-MPT_COMPILER_NO_O=1
-endif
-ifeq ($(findstring -O0,$(CPUFLAGS)),-O0)
-MPT_COMPILER_NO_O=1
-endif
-ifeq ($(findstring -Og,$(CPUFLAGS)),-Og)
-MPT_COMPILER_NO_O=1
+OPTIMIZE=size
+CPUFLAGS := $(filter-out -Os,$(CPUFLAGS))
 endif
 
 # Handle the no-FPU case by linking DJGPP's own emulator.
@@ -448,7 +328,6 @@ endif
 ifeq ($(FLAVOURED_DIR),1)
 
 EXESUFFIX=.exe
-SOSUFFIX=.dxe
 ifeq ($(findstring -msse,$(CPUFLAGS)),-msse)
 FLAVOUR_DIR=$(CPU)-sse/
 FLAVOUR_O=.$(subst /,-,$(CPU)-sse)
@@ -462,32 +341,19 @@ else ifeq ($(FLAVOURED_EXE),1)
 
 ifeq ($(CPU),generic/common)
 EXESUFFIX=.exe
-SOSUFFIX=.dxe
 else
 EXESUFFIX:=.exe
-SOSUFFIX=.dxe
 ifeq ($(findstring -msse,$(CPUFLAGS)),-msse)
 EXESUFFIX:=-SSE$(EXESUFFIX)
-SOSUFFIX:=-SSE$(SOSUFFIX)
 endif
-ifeq ($(OPTIMIZE),some)
-EXESUFFIX:=-O1$(EXESUFFIX)
-SOSUFFIX:=-O1$(SOSUFFIX)
-else ifeq ($(OPTIMIZE),extrasize)
-EXESUFFIX:=-Oz$(EXESUFFIX)
-SOSUFFIX:=-Oz$(SOSUFFIX)
-else ifeq ($(OPTIMIZE),size)
+ifeq ($(OPTIMIZE),size)
 EXESUFFIX:=-Os$(EXESUFFIX)
-SOSUFFIX:=-Os$(SOSUFFIX)
 else ifeq ($(OPTIMIZE),speed)
 EXESUFFIX:=-O2$(EXESUFFIX)
-SOSUFFIX:=-O2$(SOSUFFIX)
 else ifeq ($(OPTIMIZE),vectorize)
 EXESUFFIX:=-O3$(EXESUFFIX)
-SOSUFFIX:=-O3$(SOSUFFIX)
 endif
 EXESUFFIX:=-$(subst /,-,$(CPU))$(EXESUFFIX)
-SOSUFFIX:=-$(subst /,-,$(CPU))$(SOSUFFIX)
 endif
 ifeq ($(findstring -msse,$(CPUFLAGS)),-msse)
 FLAVOUR_O=.$(subst /,-,$(CPU)-sse)
@@ -498,13 +364,12 @@ endif
 else
 
 EXESUFFIX=.exe
-SOSUFFIX=.dxe
 FLAVOUR_DIR=
 FLAVOUR_O=
 
 endif
 
-CPPFLAGS +=
+CPPFLAGS += 
 CXXFLAGS += $(CPU_CFLAGS)
 CFLAGS   += $(CPU_CFLAGS)
 LDFLAGS  += $(CPU_LDFLAGS)
@@ -518,7 +383,6 @@ MPT_COMPILER_NOIPARA=1
 
 include build/make/warnings-gcc.mk
 
-ALLOW_LGPL=1
 DYNLINK=0
 SHARED_LIB=0
 STATIC_LIB=1
@@ -532,15 +396,10 @@ IS_CROSS=1
 MPT_COMPILER_NOVISIBILITY=1
 
 # causes crashes on process shutdown with liballegro
-MPT_COMPILER_NOSECTIONS=1
 MPT_COMPILER_NOGCSECTIONS=1
 
 MPT_COMPILER_NOALLOCAH=1
 
-NO_SHARED_LINKER_FLAG=1
-
-ENABLE_DXE=1
-
 ifeq ($(OPTIMIZE_LTO),1)
 CXXFLAGS += -flto=auto -Wno-attributes
 CFLAGS   += -flto=auto -Wno-attributes

Frameworks/OpenMPT/OpenMPT/build/make/config-emscripten.mk

@@ -19,8 +19,6 @@ EMSCRIPTEN_PORTS?=0
 
 ifneq ($(STDCXX),)
 CXXFLAGS_STDCXX = -std=$(STDCXX)
-else ifeq ($(shell printf '\n' > bin/empty.cpp ; if $(CXX) -std=c++23 -c bin/empty.cpp -o bin/empty.out > /dev/null 2>&1 ; then echo 'c++23' ; fi ), c++23)
-CXXFLAGS_STDCXX = -std=c++23
 else ifeq ($(shell printf '\n' > bin/empty.cpp ; if $(CXX) -std=c++20 -c bin/empty.cpp -o bin/empty.out > /dev/null 2>&1 ; then echo 'c++20' ; fi ), c++20)
 CXXFLAGS_STDCXX = -std=c++20
 else
@@ -28,10 +26,6 @@ CXXFLAGS_STDCXX = -std=c++17
 endif
 ifneq ($(STDC),)
 CFLAGS_STDC = -std=$(STDC)
-else ifeq ($(shell printf '\n' > bin/empty.c ; if $(CC) -std=c23 -c bin/empty.c -o bin/empty.out > /dev/null 2>&1 ; then echo 'c23' ; fi ), c23)
-CFLAGS_STDC = -std=c23
-else ifeq ($(shell printf '\n' > bin/empty.c ; if $(CC) -std=c18 -c bin/empty.c -o bin/empty.out > /dev/null 2>&1 ; then echo 'c18' ; fi ), c18)
-CFLAGS_STDC = -std=c18
 else ifeq ($(shell printf '\n' > bin/empty.c ; if $(CC) -std=c17 -c bin/empty.c -o bin/empty.out > /dev/null 2>&1 ; then echo 'c17' ; fi ), c17)
 CFLAGS_STDC = -std=c17
 else
@@ -54,15 +48,9 @@ LDFLAGS  += -pthread
 endif
 
 ifeq ($(EMSCRIPTEN_PORTS),1)
-ifeq ($(ANCIENT),1)
 CXXFLAGS += -s USE_ZLIB=1 -sUSE_MPG123=1 -sUSE_OGG=1 -sUSE_VORBIS=1 -DMPT_WITH_ZLIB -DMPT_WITH_MPG123 -DMPT_WITH_VORBIS -DMPT_WITH_VORBISFILE -DMPT_WITH_OGG
 CFLAGS   += -s USE_ZLIB=1 -sUSE_MPG123=1 -sUSE_OGG=1 -sUSE_VORBIS=1 -DMPT_WITH_ZLIB -DMPT_WITH_MPG123 -DMPT_WITH_VORBIS -DMPT_WITH_VORBISFILE -DMPT_WITH_OGG
 LDFLAGS  += -s USE_ZLIB=1 -sUSE_MPG123=1 -sUSE_OGG=1 -sUSE_VORBIS=1
-else
-CXXFLAGS += --use-port=zlib --use-port=mpg123 --use-port=vorbis --use-port=ogg -DMPT_WITH_ZLIB -DMPT_WITH_MPG123 -DMPT_WITH_VORBIS -DMPT_WITH_VORBISFILE -DMPT_WITH_OGG
-CFLAGS   += --use-port=zlib --use-port=mpg123 --use-port=vorbis --use-port=ogg -DMPT_WITH_ZLIB -DMPT_WITH_MPG123 -DMPT_WITH_VORBIS -DMPT_WITH_VORBISFILE -DMPT_WITH_OGG
-LDFLAGS  += --use-port=zlib --use-port=mpg123 --use-port=vorbis --use-port=ogg
-endif
 NO_MINIZ=1
 NO_MINIMP3=1
 NO_STBVORBIS=1
@@ -82,9 +70,15 @@ CXXFLAGS += -flto
 CFLAGS   += -flto
 LDFLAGS  += -flto
 
+# Work-around <https://github.com/emscripten-core/emscripten/issues/20810>.
+# The warning with emscripten 3.1.50 sounds very dangerous,
+# and since it is apparently caused by removing whitespace,
+# additional whitespace is a small price to pay for correctness.
+LDFLAGS  += -g1
+
 ifeq ($(EMSCRIPTEN_TARGET),default)
-# emits whatever is emscripten's default, currently (13.1.51) this is the same as "wasm" below.
-CPPFLAGS += 
+# emits whatever is emscripten's default, currently (1.38.8) this is the same as "wasm" below.
+CPPFLAGS += -DMPT_BUILD_WASM
 CXXFLAGS += 
 CFLAGS   += 
 LDFLAGS  += 
@@ -93,10 +87,10 @@ LDFLAGS += -s ALLOW_MEMORY_GROWTH=1
 
 else ifeq ($(EMSCRIPTEN_TARGET),all)
 # emits native wasm AND javascript with full wasm optimizations.
-CPPFLAGS += 
+CPPFLAGS += -DMPT_BUILD_WASM
 CXXFLAGS += 
 CFLAGS   += 
-LDFLAGS  += -s WASM=2 -s LEGACY_VM_SUPPORT=1
+LDFLAGS  += -s WASM=2 -s LEGACY_VM_SUPPORT=1 -Wno-transpile
 
 # work-around <https://github.com/emscripten-core/emscripten/issues/17897>.
 CXXFLAGS += -fno-inline-functions
@@ -107,7 +101,7 @@ LDFLAGS += -s ALLOW_MEMORY_GROWTH=1
 
 else ifeq ($(EMSCRIPTEN_TARGET),audioworkletprocessor)
 # emits an es6 module in a single file suitable for use in an AudioWorkletProcessor
-CPPFLAGS += -DMPT_BUILD_AUDIOWORKLETPROCESSOR
+CPPFLAGS += -DMPT_BUILD_WASM -DMPT_BUILD_AUDIOWORKLETPROCESSOR
 CXXFLAGS += 
 CFLAGS   += 
 LDFLAGS  += -s WASM=1 -s WASM_ASYNC_COMPILATION=0 -s MODULARIZE=1 -s EXPORT_ES6=1 -s SINGLE_FILE=1
@@ -116,7 +110,7 @@ LDFLAGS += -s ALLOW_MEMORY_GROWTH=1
 
 else ifeq ($(EMSCRIPTEN_TARGET),wasm)
 # emits native wasm.
-CPPFLAGS += 
+CPPFLAGS += -DMPT_BUILD_WASM
 CXXFLAGS += 
 CFLAGS   += 
 LDFLAGS  += -s WASM=1
@@ -125,10 +119,10 @@ LDFLAGS += -s ALLOW_MEMORY_GROWTH=1
 
 else ifeq ($(EMSCRIPTEN_TARGET),js)
 # emits only plain javascript with plain javascript focused optimizations.
-CPPFLAGS += 
+CPPFLAGS += -DMPT_BUILD_ASMJS
 CXXFLAGS += 
 CFLAGS   += 
-LDFLAGS  += -s WASM=0 -s LEGACY_VM_SUPPORT=1
+LDFLAGS  += -s WASM=0 -s LEGACY_VM_SUPPORT=1 -Wno-transpile
 
 # work-around <https://github.com/emscripten-core/emscripten/issues/17897>.
 CXXFLAGS += -fno-inline-functions
@@ -144,8 +138,6 @@ CFLAGS   += -s DISABLE_EXCEPTION_CATCHING=0 -fno-strict-aliasing
 LDFLAGS  += -s DISABLE_EXCEPTION_CATCHING=0 -s ERROR_ON_UNDEFINED_SYMBOLS=1 -s ERROR_ON_MISSING_LIBRARIES=1 -s EXPORT_NAME="'libopenmpt'"
 SO_LDFLAGS += -s EXPORTED_FUNCTIONS="['_malloc','_free']"
 
-NO_NO_UNDEFINED_LINKER_FLAG=1
-
 include build/make/warnings-clang.mk
 
 REQUIRES_RUNPREFIX=1
@@ -153,7 +145,7 @@ REQUIRES_RUNPREFIX=1
 EXESUFFIX=.js
 SOSUFFIX=.js
 RUNPREFIX=node 
-TEST_LDFLAGS= -lnodefs.js 
+TEST_LDFLAGS= --pre-js build/make/test-pre.js -lnodefs.js 
 
 ifeq ($(EMSCRIPTEN_THREADS),1)
 RUNPREFIX+=--experimental-wasm-threads --experimental-wasm-bulk-memory 

Frameworks/OpenMPT/OpenMPT/build/make/config-gcc.mk

@@ -14,8 +14,6 @@ endif
 
 ifneq ($(STDCXX),)
 CXXFLAGS_STDCXX = -std=$(STDCXX) -fexceptions -frtti -pthread
-else ifeq ($(shell printf '\n' > bin/empty.cpp ; if $(CXX) -std=c++23 -c bin/empty.cpp -o bin/empty.out > /dev/null 2>&1 ; then echo 'c++23' ; fi ), c++23)
-CXXFLAGS_STDCXX = -std=c++23 -fexceptions -frtti -pthread
 else ifeq ($(shell printf '\n' > bin/empty.cpp ; if $(CXX) -std=c++20 -c bin/empty.cpp -o bin/empty.out > /dev/null 2>&1 ; then echo 'c++20' ; fi ), c++20)
 CXXFLAGS_STDCXX = -std=c++20 -fexceptions -frtti -pthread
 else
@@ -23,10 +21,6 @@ CXXFLAGS_STDCXX = -std=c++17 -fexceptions -frtti -pthread
 endif
 ifneq ($(STDC),)
 CFLAGS_STDC = -std=$(STDC) -pthread
-else ifeq ($(shell printf '\n' > bin/empty.c ; if $(CC) -std=c23 -c bin/empty.c -o bin/empty.out > /dev/null 2>&1 ; then echo 'c23' ; fi ), c23)
-CFLAGS_STDC = -std=c23 -pthread
-else ifeq ($(shell printf '\n' > bin/empty.c ; if $(CC) -std=c18 -c bin/empty.c -o bin/empty.out > /dev/null 2>&1 ; then echo 'c18' ; fi ), c18)
-CFLAGS_STDC = -std=c18 -pthread
 else ifeq ($(shell printf '\n' > bin/empty.c ; if $(CC) -std=c17 -c bin/empty.c -o bin/empty.out > /dev/null 2>&1 ; then echo 'c17' ; fi ), c17)
 CFLAGS_STDC = -std=c17 -pthread
 else

Frameworks/OpenMPT/OpenMPT/build/make/config-icx.mk

@@ -14,8 +14,6 @@ endif
 
 ifneq ($(STDCXX),)
 CXXFLAGS_STDCXX = -std=$(STDCXX) -fexceptions -frtti -pthread
-else ifeq ($(shell printf '\n' > bin/empty.cpp ; if $(CXX) -std=c++23 -c bin/empty.cpp -o bin/empty.out > /dev/null 2>&1 ; then echo 'c++23' ; fi ), c++23)
-CXXFLAGS_STDCXX = -std=c++23 -fexceptions -frtti -pthread
 else ifeq ($(shell printf '\n' > bin/empty.cpp ; if $(CXX) -std=c++20 -c bin/empty.cpp -o bin/empty.out > /dev/null 2>&1 ; then echo 'c++20' ; fi ), c++20)
 CXXFLAGS_STDCXX = -std=c++20 -fexceptions -frtti -pthread
 else
@@ -23,10 +21,6 @@ CXXFLAGS_STDCXX = -std=c++17 -fexceptions -frtti -pthread
 endif
 ifneq ($(STDC),)
 CFLAGS_STDC = -std=$(STDC) -pthread
-else ifeq ($(shell printf '\n' > bin/empty.c ; if $(CC) -std=c23 -c bin/empty.c -o bin/empty.out > /dev/null 2>&1 ; then echo 'c23' ; fi ), c23)
-CFLAGS_STDC = -std=c23 -pthread
-else ifeq ($(shell printf '\n' > bin/empty.c ; if $(CC) -std=c18 -c bin/empty.c -o bin/empty.out > /dev/null 2>&1 ; then echo 'c18' ; fi ), c18)
-CFLAGS_STDC = -std=c18 -pthread
 else ifeq ($(shell printf '\n' > bin/empty.c ; if $(CC) -std=c17 -c bin/empty.c -o bin/empty.out > /dev/null 2>&1 ; then echo 'c17' ; fi ), c17)
 CFLAGS_STDC = -std=c17 -pthread
 else

Frameworks/OpenMPT/OpenMPT/build/make/config-macos.mk

@@ -1,5 +1,4 @@
 
-NO_NO_UNDEFINED_LINKER_FLAG=1
 NO_PULSEAUDIO?=1
 include build/make/config-clang.mk
 # Mac OS X overrides

Frameworks/OpenMPT/OpenMPT/build/make/config-mingw-w64.mk

@@ -38,8 +38,6 @@ endif
 
 ifneq ($(STDCXX),)
 CXXFLAGS_STDCXX = -std=$(STDCXX) -fexceptions -frtti
-else ifeq ($(shell printf '\n' > bin/empty.cpp ; if $(CXX) -std=c++23 -c bin/empty.cpp -o bin/empty.out > /dev/null 2>&1 ; then echo 'c++23' ; fi ), c++23)
-CXXFLAGS_STDCXX = -std=c++23 -fexceptions -frtti
 else ifeq ($(shell printf '\n' > bin/empty.cpp ; if $(CXX) -std=c++20 -c bin/empty.cpp -o bin/empty.out > /dev/null 2>&1 ; then echo 'c++20' ; fi ), c++20)
 CXXFLAGS_STDCXX = -std=c++20 -fexceptions -frtti
 else
@@ -47,10 +45,6 @@ CXXFLAGS_STDCXX = -std=c++17 -fexceptions -frtti
 endif
 ifneq ($(STDC),)
 CFLAGS_STDC = -std=$(STDC)
-else ifeq ($(shell printf '\n' > bin/empty.c ; if $(CC) -std=c23 -c bin/empty.c -o bin/empty.out > /dev/null 2>&1 ; then echo 'c23' ; fi ), c23)
-CFLAGS_STDC = -std=c23
-else ifeq ($(shell printf '\n' > bin/empty.c ; if $(CC) -std=c18 -c bin/empty.c -o bin/empty.out > /dev/null 2>&1 ; then echo 'c18' ; fi ), c18)
-CFLAGS_STDC = -std=c18
 else ifeq ($(shell printf '\n' > bin/empty.c ; if $(CC) -std=c17 -c bin/empty.c -o bin/empty.out > /dev/null 2>&1 ; then echo 'c17' ; fi ), c17)
 CFLAGS_STDC = -std=c17
 else
@@ -125,8 +119,6 @@ else
 $(error unknown WINDOWS_VERSION)
 endif
 
-MPT_COMPILER_NOALLOCAH=1
-
 ifneq ($(MINGW_COMPILER),clang)
 # See <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=115049>.
 MPT_COMPILER_NOIPARA=1
@@ -142,34 +134,22 @@ EXESUFFIX=.exe
 SOSUFFIX=.dll
 SOSUFFIXWINDOWS=1
 
-ALLOW_LGPL=0
-
 DYNLINK=0
 SHARED_LIB=1
 STATIC_LIB=0
 SHARED_SONAME=0
 
-ENABLE_DLL=1
-
 ifeq ($(HOST_FLAVOUR),MSYS2)
 
 else
 
 IS_CROSS=1
 
-ifeq ($(ALLOW_LGPL),1)
-LOCAL_ZLIB=1
-LOCAL_MPG123=1
-LOCAL_OGG=1
-LOCAL_VORBIS=1
-else
 NO_ZLIB=1
 NO_MPG123=1
 NO_OGG=1
 NO_VORBIS=1
 NO_VORBISFILE=1
-endif
-
 NO_PORTAUDIO=1
 NO_PORTAUDIOCPP=1
 NO_PULSEAUDIO=1

Frameworks/OpenMPT/OpenMPT/build/make/config-mingw.mk

@@ -14,8 +14,6 @@ endif
 
 ifneq ($(STDCXX),)
 CXXFLAGS_STDCXX = -std=$(STDCXX) -fexceptions -frtti
-else ifeq ($(shell printf '\n' > bin/empty.cpp ; if $(CXX) -std=gnu++23 -c bin/empty.cpp -o bin/empty.out > /dev/null 2>&1 ; then echo 'c++23' ; fi ), c++23)
-CXXFLAGS_STDCXX = -std=gnu++23 -fexceptions -frtti
 else ifeq ($(shell printf '\n' > bin/empty.cpp ; if $(CXX) -std=gnu++20 -c bin/empty.cpp -o bin/empty.out > /dev/null 2>&1 ; then echo 'c++20' ; fi ), c++20)
 CXXFLAGS_STDCXX = -std=gnu++20 -fexceptions -frtti
 else
@@ -23,10 +21,6 @@ CXXFLAGS_STDCXX = -std=gnu++17 -fexceptions -frtti
 endif
 ifneq ($(STDC),)
 CFLAGS_STDC = -std=$(STDC)
-else ifeq ($(shell printf '\n' > bin/empty.c ; if $(CC) -std=gnu23 -c bin/empty.c -o bin/empty.out > /dev/null 2>&1 ; then echo 'c23' ; fi ), c23)
-CFLAGS_STDC = -std=gnu23
-else ifeq ($(shell printf '\n' > bin/empty.c ; if $(CC) -std=gnu18 -c bin/empty.c -o bin/empty.out > /dev/null 2>&1 ; then echo 'c18' ; fi ), c18)
-CFLAGS_STDC = -std=gnu18
 else ifeq ($(shell printf '\n' > bin/empty.c ; if $(CC) -std=gnu17 -c bin/empty.c -o bin/empty.out > /dev/null 2>&1 ; then echo 'c17' ; fi ), c17)
 CFLAGS_STDC = -std=gnu17
 else
@@ -74,8 +68,6 @@ CXXFLAGS += -ffunction-sections -fdata-sections
 CFLAGS   += -ffunction-sections -fdata-sections
 LDFLAGS  += -Wl,--gc-sections
 
-MPT_COMPILER_NOALLOCAH=1
-
 CXXFLAGS += -march=i586 -m80387 -mtune=pentium
 CFLAGS   += -march=i586 -m80387 -mtune=pentium
 
@@ -104,19 +96,11 @@ XMP_OPENMPT=1
 
 IS_CROSS=1
 
-ifeq ($(ALLOW_LGPL),1)
-LOCAL_ZLIB=1
-LOCAL_MPG123=1
-LOCAL_OGG=1
-LOCAL_VORBIS=1
-else
 NO_ZLIB=1
 NO_MPG123=1
 NO_OGG=1
 NO_VORBIS=1
 NO_VORBISFILE=1
-endif
-
 NO_PORTAUDIO=1
 NO_PORTAUDIOCPP=1
 NO_PULSEAUDIO=1

Frameworks/OpenMPT/OpenMPT/build/make/config-mingw32crt.mk

@@ -14,8 +14,6 @@ endif
 
 ifneq ($(STDCXX),)
 CXXFLAGS_STDCXX = -std=$(STDCXX) -fexceptions -frtti
-else ifeq ($(shell printf '\n' > bin/empty.cpp ; if $(CXX) -std=gnu++23 -c bin/empty.cpp -o bin/empty.out > /dev/null 2>&1 ; then echo 'c++23' ; fi ), c++23)
-CXXFLAGS_STDCXX = -std=gnu++23 -fexceptions -frtti
 else ifeq ($(shell printf '\n' > bin/empty.cpp ; if $(CXX) -std=gnu++20 -c bin/empty.cpp -o bin/empty.out > /dev/null 2>&1 ; then echo 'c++20' ; fi ), c++20)
 CXXFLAGS_STDCXX = -std=gnu++20 -fexceptions -frtti
 else
@@ -23,10 +21,6 @@ CXXFLAGS_STDCXX = -std=gnu++17 -fexceptions -frtti
 endif
 ifneq ($(STDC),)
 CFLAGS_STDC = -std=$(STDC)
-else ifeq ($(shell printf '\n' > bin/empty.c ; if $(CC) -std=gnu23 -c bin/empty.c -o bin/empty.out > /dev/null 2>&1 ; then echo 'c23' ; fi ), c23)
-CFLAGS_STDC = -std=gnu23
-else ifeq ($(shell printf '\n' > bin/empty.c ; if $(CC) -std=gnu18 -c bin/empty.c -o bin/empty.out > /dev/null 2>&1 ; then echo 'c18' ; fi ), c18)
-CFLAGS_STDC = -std=gnu18
 else ifeq ($(shell printf '\n' > bin/empty.c ; if $(CC) -std=gnu17 -c bin/empty.c -o bin/empty.out > /dev/null 2>&1 ; then echo 'c17' ; fi ), c17)
 CFLAGS_STDC = -std=gnu17
 else
@@ -74,8 +68,6 @@ CXXFLAGS += -ffunction-sections -fdata-sections
 CFLAGS   += -ffunction-sections -fdata-sections
 LDFLAGS  += -Wl,--gc-sections
 
-MPT_COMPILER_NOALLOCAH=1
-
 CXXFLAGS += -march=i386 -m80387 -mtune=i486
 CFLAGS   += -march=i386 -m80387 -mtune=i486
 
@@ -105,19 +97,11 @@ XMP_OPENMPT=0
 
 IS_CROSS=1
 
-ifeq ($(ALLOW_LGPL),1)
-LOCAL_ZLIB=1
-LOCAL_MPG123=1
-LOCAL_OGG=1
-LOCAL_VORBIS=1
-else
 NO_ZLIB=1
 NO_MPG123=1
 NO_OGG=1
 NO_VORBIS=1
 NO_VORBISFILE=1
-endif
-
 NO_PORTAUDIO=1
 NO_PORTAUDIOCPP=1
 NO_PULSEAUDIO=1

Frameworks/OpenMPT/OpenMPT/build/make/config-standard.mk

@@ -12,11 +12,7 @@ ifeq ($(origin AR),default)
 AR  = ar
 endif
 
-#CXXFLAGS_STDCXX = -std=c++23
-#CXXFLAGS_STDCXX = -std=c++20
 CXXFLAGS_STDCXX = -std=c++17
-#CFLAGS_STDC = -std=c23
-#CFLAGS_STDC = -std=c18
 CFLAGS_STDC = -std=c17
 CXXFLAGS += $(CXXFLAGS_STDCXX)
 CFLAGS += $(CFLAGS_STDC)

Frameworks/OpenMPT/OpenMPT/build/make/config-unknown.mk

@@ -12,12 +12,7 @@ ifeq ($(origin AR),default)
 AR  = ar
 endif
 
-#CXXFLAGS_STDCXX = -std=c++23
-#CXXFLAGS_STDCXX = -std=c++20
 CXXFLAGS_STDCXX = -std=c++17
-#CFLAGS_STDC = -std=c23
-#CFLAGS_STDC = -std=c18
-#CFLAGS_STDC = -std=c17
 CFLAGS_STDC = -std=c11
 CXXFLAGS += $(CXXFLAGS_STDCXX)
 CFLAGS += $(CFLAGS_STDC)

Frameworks/OpenMPT/OpenMPT/build/make/test-pre.js

@@ -0,0 +1,9 @@
+
+var Module = {
+ 'preInit': function(text) {
+  FS.mkdir('/test');
+  FS.mount(NODEFS, {'root': '../test/'}, '/test');
+  FS.mkdir('/libopenmpt');
+  FS.mount(NODEFS, {'root': '../libopenmpt/'}, '/libopenmpt');
+ }
+};

Frameworks/OpenMPT/OpenMPT/build/make/warnings-clang.mk

@@ -2,7 +2,7 @@
 CXXFLAGS_WARNINGS += -Wcast-align -Wcast-qual -Wdouble-promotion -Wfloat-conversion -Wmissing-prototypes -Wshift-count-negative -Wshift-count-overflow -Wshift-op-parentheses -Wshift-overflow -Wshift-sign-overflow -Wundef
 CFLAGS_WARNINGS   += -Wcast-align -Wcast-qual -Wdouble-promotion -Wfloat-conversion -Wmissing-prototypes -Wshift-count-negative -Wshift-count-overflow -Wshift-op-parentheses -Wshift-overflow -Wshift-sign-overflow -Wundef
 
-CXXFLAGS_WARNINGS += -Wdeprecated -Wexit-time-destructors -Wextra-semi -Wglobal-constructors -Wimplicit-fallthrough -Wmissing-declarations -Wnon-virtual-dtor -Wreserved-id-macro
+CXXFLAGS_WARNINGS += -Wdeprecated -Wextra-semi -Wglobal-constructors -Wimplicit-fallthrough -Wmissing-declarations -Wnon-virtual-dtor -Wreserved-id-macro
 CFLAGS_WARNINGS   += 
 
 ifneq ($(ANCIENT),1)
@@ -15,14 +15,10 @@ endif
 #CXXFLAGS_WARNINGS += -Wconversion
 #CXXFLAGS_WARNINGS += -Weverything -Wno-c++98-compat -Wno-c++98-compat-pedantic -Wno-c++98-c++11-c++14-compat -Wno-padded -Wno-weak-vtables -Wno-sign-conversion -Wno-shadow-field-in-constructor -Wno-conversion -Wno-switch-enum -Wno-old-style-cast
 
-ifneq ($(NO_NO_UNDEFINED_LINKER_FLAG),1)
-LDFLAGS_WARNINGS  += -Wl,--no-undefined
-endif
-
 ifeq ($(MODERN),1)
 CXXFLAGS_WARNINGS += 
 CFLAGS_WARNINGS   += 
-LDFLAGS_WARNINGS  += 
+LDFLAGS_WARNINGS  += -Wl,-no-undefined
 endif
 
 CFLAGS_SILENT += -Wno-\#warnings

Frameworks/OpenMPT/OpenMPT/build/make/warnings-gcc.mk

@@ -4,18 +4,11 @@ CFLAGS_WARNINGS   += -Wcast-align -Wcast-qual -Wdouble-promotion -Wfloat-convers
 
 CXXFLAGS_WARNINGS += -Wno-psabi
 
-ifneq ($(NO_NO_UNDEFINED_LINKER_FLAG),1)
-LDFLAGS_WARNINGS  += -Wl,--no-undefined
-endif
-
 ifeq ($(MODERN),1)
-# GCC >= 12
-# -Wconversion is way too noisy for earlier GCC versions
 CFLAGS_WARNINGS += -Wframe-larger-than=4000
 #CXXFLAGS_WARNINGS += -Wshadow -Wswitch-enum 
-CXXFLAGS_WARNINGS += -Wconversion
 # gold
-LDFLAGS_WARNINGS  += -Wl,--detect-odr-violations
+LDFLAGS_WARNINGS  += -Wl,-no-undefined -Wl,--detect-odr-violations
 # GCC 8
 CXXFLAGS_WARNINGS += -Wcast-align=strict
 CFLAGS_WARNINGS   += -Wcast-align=strict

Frameworks/OpenMPT/OpenMPT/build/svn_version/svn_version.h

@@ -1,10 +1,10 @@
 
 #pragma once
-#define OPENMPT_VERSION_SVNVERSION "23497"
-#define OPENMPT_VERSION_REVISION 23497
+#define OPENMPT_VERSION_SVNVERSION "22826"
+#define OPENMPT_VERSION_REVISION 22826
 #define OPENMPT_VERSION_DIRTY 0
 #define OPENMPT_VERSION_MIXEDREVISIONS 0
-#define OPENMPT_VERSION_URL "https://source.openmpt.org/svn/openmpt/tags/libopenmpt-0.8.1"
-#define OPENMPT_VERSION_DATE "2025-06-14T13:04:39.042416Z"
+#define OPENMPT_VERSION_URL "https://source.openmpt.org/svn/openmpt/tags/libopenmpt-0.7.13"
+#define OPENMPT_VERSION_DATE "2025-01-06T13:49:43.586768Z"
 #define OPENMPT_VERSION_IS_PACKAGE 1
 

Frameworks/OpenMPT/OpenMPT/build/xcode-ios/libopenmpt.xcodeproj/project.pbxproj

@@ -20,14 +20,12 @@
 		1553F71F02BB89D19FB57D5F /* WavesReverb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7E0A11A78A94C41905798FE7 /* WavesReverb.cpp */; };
 		168C3C51AED92203DD202291 /* Message.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 681E06B9AC6CAC2BEE93E4F9 /* Message.cpp */; };
 		18C62C9BF7E346CDD3ECA2DB /* SampleIO.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 78CAB4630B587E55743122A3 /* SampleIO.cpp */; };
-		19C908D7F8E62309D4EF7F17 /* Load_tcb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 73A166DF062F30D16F07D51F /* Load_tcb.cpp */; };
+		1CD4D902FBF1F334D7FB4F42 /* mptFileIO.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 13F63AEAA68404DC0F5CA92A /* mptFileIO.cpp */; };
 		1CE1B0B6B52E9668E37596F6 /* Profiler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8F52A05ED3A145D015C87E9E /* Profiler.cpp */; };
 		1E48E6EB2E2E131D1AA19D2B /* Gargle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 78BD15B31AA6B1A511CDC3F3 /* Gargle.cpp */; };
 		1F7082161F13654859681856 /* mptFileType.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 074C76BE5EB1E9B010C004FE /* mptFileType.cpp */; };
-		212E136BD4241D1D254679AB /* MIDIMacroParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C61BC533BA1B0EA53F062373 /* MIDIMacroParser.cpp */; };
 		247D3937039A5369DFA3AF77 /* Load_plm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4E4D213FE0DAEB3149B38F7F /* Load_plm.cpp */; };
 		281FA911C06C8EC3EEB38F51 /* Sndfile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BAF08779FF3F2CEB416665B9 /* Sndfile.cpp */; };
-		2AE422F10A013D23E60A9931 /* Load_cba.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EDF8E6598086B04BE95F5499 /* Load_cba.cpp */; };
 		2B1F4A030A3C6435E645C043 /* Load_mo3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F49974BA1D7613D0AB0058B /* Load_mo3.cpp */; };
 		30BE965074D2678268A3EC90 /* mptTime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B176D8582299794AD8602698 /* mptTime.cpp */; };
 		30C4FED93067E20B6ABC9519 /* ModChannel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5FDB15C1B74088B3694EA401 /* ModChannel.cpp */; };
@@ -40,7 +38,6 @@
 		393D72CF5409E18157DA790F /* MPEGFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BF406A572C6878C92DFB6897 /* MPEGFrame.cpp */; };
 		39B7C99F18D4E3D1F4DE3FDF /* Load_mdl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2052C727B2E091191BB93567 /* Load_mdl.cpp */; };
 		3C92F25FD4DFD8110326D89F /* Fastmix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1054EEE754A3945996CACD27 /* Fastmix.cpp */; };
-		3E00C2FF58CD31B15C9DC93F /* Load_pt36.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE474F872B6F5DF92D024DC7 /* Load_pt36.cpp */; };
 		3EF604A50D1958579427AAE5 /* DSP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E2066CCD3D47C03F10A20B0D /* DSP.cpp */; };
 		3F8606FDF27C10AF439E6D3D /* SampleFormatMP3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4737ECA53B373617C0224AE5 /* SampleFormatMP3.cpp */; };
 		40F236CF2E59C981CB53BD0F /* I3DL2Reverb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA3E0E57B6C8C0C931AD8C97 /* I3DL2Reverb.cpp */; };
@@ -57,10 +54,8 @@
 		56DD54C135FA6EF31203CB01 /* Load_mtm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0990B3299C1E7D1B04F72169 /* Load_mtm.cpp */; };
 		574F1261366C2C93127588A1 /* load_j2b.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A33106C935BED0BB9E977509 /* load_j2b.cpp */; };
 		5EE7936B3E04AD9D1A0E09AB /* Load_667.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CB46E6335DD4B025C6AD5473 /* Load_667.cpp */; };
-		609638333FB352651BBCAE73 /* Load_ftm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0C4FEA7B9EDDB46D07B658BB /* Load_ftm.cpp */; };
 		63B0011DD79878CFF9E6275D /* Load_mus_km.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 02F4B8C5C982B0373784D705 /* Load_mus_km.cpp */; };
 		6600F8E10024EE13B04ACF21 /* ContainerMMCMP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 124C374986A67C3B048A0589 /* ContainerMMCMP.cpp */; };
-		66139DF74530B829213A1437 /* Load_ims.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26B859FFB94623F1221EC83F /* Load_ims.cpp */; };
 		689E270C1013C2BEB8D8CD4C /* DigiBoosterEcho.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D078EDD4AF1B894663FD8C14 /* DigiBoosterEcho.cpp */; };
 		69AC6475078D6527DF0BAAB5 /* ParamEq.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8C3D549D4EFDB50FAC3292DD /* ParamEq.cpp */; };
 		6A44FDD1AE58CF03A22A5411 /* tuning.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48199D39B93C3E2B6F02EB79 /* tuning.cpp */; };
@@ -73,43 +68,36 @@
 		7F5CA93E3358C270150AFF7E /* openmpt-vorbis.lib in Frameworks */ = {isa = PBXBuildFile; fileRef = AB169C264570851881A8EA66 /* openmpt-vorbis.lib */; };
 		7FDA539F18273951466E39DF /* Load_it.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 62235C27A6720199E8993A67 /* Load_it.cpp */; };
 		80EEA677809189A9BAE63CB7 /* MIDIMacros.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FB747FA860E7715A6F02BF /* MIDIMacros.cpp */; };
-		81C26ED360DF89053CE8E513 /* Load_gmc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D668A71B68F6710DD1CF155B /* Load_gmc.cpp */; };
 		8479AC1F9F461AD1A316B25F /* Load_digi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D14936A73E714519400434E7 /* Load_digi.cpp */; };
 		84A9E60B844CC93DBEA17C4B /* MixerLoops.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B810F0D30F7663C5C1847F13 /* MixerLoops.cpp */; };
-		84F9B8439FC626F5A396BE83 /* Load_unic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9EEAF28B0C1300FD0DA5F0CB /* Load_unic.cpp */; };
 		8676CA3F6593E471419D407F /* Load_gt2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 10E0ADC7A36E77B90C471C07 /* Load_gt2.cpp */; };
 		8751165421750B86D19AEC94 /* mptStringBuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C510221C396A670EB74DF05C /* mptStringBuffer.cpp */; };
-		877C818BA248F03DA61987CB /* Load_puma.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6DB68B53DADE99C5DC718993 /* Load_puma.cpp */; };
 		8B4D81ED6A6A9C1F4673F82D /* Load_dsm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5D60F958863D987F13C7DD5 /* Load_dsm.cpp */; };
 		8D04F5E56C221017482B6C25 /* WAVTools.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1F5AB80DB1E881FF1AC1264D /* WAVTools.cpp */; };
 		8F84E60E36FA81C0DFBF8C4E /* openmpt-ogg.lib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5B7F44F63A21E068EF03E336 /* openmpt-ogg.lib */; };
 		90C3E5D96FE1000B4BEA5C19 /* Load_mid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EC1456C17EA220B3E77AC501 /* Load_mid.cpp */; };
 		926864F471857F264D8EDB34 /* mptRandom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5D6A74BCEFF83EAE58D0E2FC /* mptRandom.cpp */; };
-		9580A935A565D56791D95F75 /* PlaybackTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EDB72A5D8FA0C64F86C7D89D /* PlaybackTest.cpp */; };
 		9715CA0B7632E43D523C404B /* Load_s3m.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1F41A2D3B1CF6CC51AA81113 /* Load_s3m.cpp */; };
 		976568F7F2B0B929E0E29F37 /* libopenmpt_ext_impl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7355A89F850CE891FA7AD6DF /* libopenmpt_ext_impl.cpp */; };
-		978580C976A29AFB52ABF709 /* MODTools.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 99E1AAB12C6F74A3954818F1 /* MODTools.cpp */; };
 		97AC91CD76C9ABFF52D3080D /* Load_stm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0735F17599C3BB67029C5FB5 /* Load_stm.cpp */; };
 		97B1A0C5975483F7D1A93705 /* Echo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9C9696EDF3FC09DFA60A252D /* Echo.cpp */; };
-		98C2B4F5B38F23A7B75FBB35 /* PlayState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FB77AD1D689FBB8F6A32AB5D /* PlayState.cpp */; };
 		9F1029ABB9DC985DBDAD2FEB /* ModSample.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A32EC1731056CFE511E9BFB3 /* ModSample.cpp */; };
 		9F2D020A8C9494BC298E884A /* PlugInterface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D89E49F2E528FC64600DC832 /* PlugInterface.cpp */; };
 		9FC1BA253DA2BAD715210065 /* Flanger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3286C74DF54727BF527C058D /* Flanger.cpp */; };
 		A0E13DD3392E238567752413 /* XMTools.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C6EC51BC0BD6A8D02E4A35B /* XMTools.cpp */; };
 		A5DAFA6B19C3721D3C1120AB /* WindowedFIR.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 14715833DAFF4FA549017673 /* WindowedFIR.cpp */; };
 		A7B576CD86D290FF62DBED0D /* Load_amf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 37F80675CA85D067335E74B5 /* Load_amf.cpp */; };
-		A88063C9879D7DFB63A6DA09 /* Load_stk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1D12DDB1AFA0A7A318794BF1 /* Load_stk.cpp */; };
 		A896F1F84677F2AA1DF63838 /* LFOPlugin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D6BBDE00997C3E72F6B11C40 /* LFOPlugin.cpp */; };
 		A9C7C28B051312BDF344F8CB /* AudioCriticalSection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3947FF534AFF3F45C06D2D93 /* AudioCriticalSection.cpp */; };
 		A9D47C71514A1823FA0F22B1 /* SoundFilePlayConfig.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F19DB8D9D040544B85225719 /* SoundFilePlayConfig.cpp */; };
 		AB7FFC4D9117037F545C128D /* mod_specifications.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 274EB9F5814FD0E74896C835 /* mod_specifications.cpp */; };
 		ABC5779D79E8CB4F00F71DDD /* OPL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B3A14F450EE2A2B7E23CED85 /* OPL.cpp */; };
 		B17E84D14F5F858326DDCB11 /* ContainerPP20.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38019939FAC1F9AB57F6D779 /* ContainerPP20.cpp */; };
-		B464B3479381CD796F8B2987 /* Load_ice.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D727124F69B4DC41D28D808F /* Load_ice.cpp */; };
 		B5220D6D8345611F0A53B3AD /* AGC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BFC43D151B059087EE5FDB55 /* AGC.cpp */; };
 		B591ED4C6887F6FEB9AA538C /* ComponentManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 13F9789407F8C2068CE3D6D4 /* ComponentManager.cpp */; };
 		B5D9190DF9ECEA3FEDBE6F4D /* Sndmix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A0FD6B58B3277A740F924F5 /* Sndmix.cpp */; };
 		BA54A1E79971BC19757B1827 /* Load_ams.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29DC06EFBC69D0E12542752F /* Load_ams.cpp */; };
+		BB65D2D86E5BDC8ABF7E3918 /* mptFileTemporary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FF7F8F60F37ED8D27869EDA0 /* mptFileTemporary.cpp */; };
 		BBC2281DFFD5F94FF3A77E5D /* Tables.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 488AACC5B9AD4DB76F73FB05 /* Tables.cpp */; };
 		BC15882904B4C65B27E07E69 /* patternContainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8BE9A4117CE11203E8E49251 /* patternContainer.cpp */; };
 		BCC110A956E505DB070AE6E9 /* DMOUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 664DAA91DAA7EF83588B78D1 /* DMOUtils.cpp */; };
@@ -117,18 +105,14 @@
 		BD4216739C5F30A578688CB3 /* Load_fmt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CF744BB2F850EAD985DB2FB /* Load_fmt.cpp */; };
 		BE9B2A6B02AEFB9DF68080AB /* Snd_fx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 74D7DB33E5FA7C259BC12973 /* Snd_fx.cpp */; };
 		C0082C03041BFD35F7ED8243 /* Reverb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B50C144B262EB53DDBF5628B /* Reverb.cpp */; };
-		C3D725375C240AE98A6B0B77 /* Load_fc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6BBD03FFB0A75B13D31AE7F /* Load_fc.cpp */; };
 		C4FBD3C878F7ECFA5AAA2A08 /* openmpt-mpg123.lib in Frameworks */ = {isa = PBXBuildFile; fileRef = 738151100DDB3A024A139F50 /* openmpt-mpg123.lib */; };
 		C55C8AFDA479A52F8083013D /* UMXTools.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C7851FA55A12E997C2EB8DE5 /* UMXTools.cpp */; };
-		C6B55BA579AB6557CACDC1E5 /* InstrumentSynth.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 89879ACD7D86E43F0271F90D /* InstrumentSynth.cpp */; };
 		C746074BA663217D826C7D8B /* Load_mt2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0E85EC13A113B60509EC5A53 /* Load_mt2.cpp */; };
 		C79768571036A68933625E97 /* libopenmpt_impl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7F22B5FF701A23F1DC1DA43F /* libopenmpt_impl.cpp */; };
-		C806B217E2D320C9E6A3B857 /* Load_kris.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 19B6191F86DE27918871175F /* Load_kris.cpp */; };
 		C81D1553A73A2F8583438B93 /* Load_dmf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 36CAA59BC9586F8D323113DB /* Load_dmf.cpp */; };
 		CB31B3AF3F1A2B616167D9EF /* modsmp_ctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 09E33737D0712EA93E735577 /* modsmp_ctrl.cpp */; };
 		CC12FBA114B239D337DDF1E1 /* Compressor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9334A009842C0DFBF02F8E49 /* Compressor.cpp */; };
 		CCEFFE57CC92E18906E79497 /* MIDIEvents.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A78B5E5FFEF0D151B0FEEC9F /* MIDIEvents.cpp */; };
-		CE9155C7ADAE6FF989B7CC07 /* Load_etx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 14754CCFA70316C10FDBBB0F /* Load_etx.cpp */; };
 		CEDA1F2FDEBF4B61CB32D56F /* Chorus.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84A787B7269123A91DB835F7 /* Chorus.cpp */; };
 		CF000469179F429B3ACAFAA9 /* tuningCollection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE0BC51D0D82A433CDBAA91 /* tuningCollection.cpp */; };
 		CF116C1742F9E3C965479257 /* Load_symmod.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7D070D1F43950491B1972B5F /* Load_symmod.cpp */; };
@@ -142,7 +126,6 @@
 		DEB582A5DE5865D718AD18E5 /* modcommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 746376CDCBC8E9BF7DD7050D /* modcommand.cpp */; };
 		DEBC9FDC22D0710E16A1F61C /* version.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E2FDF24AF52801665192D64 /* version.cpp */; };
 		DF08AE5AEEEDDA8CDB61649A /* mptPathString.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B406AC2ED2A06B4E4511902 /* mptPathString.cpp */; };
-		E234B24BC151CC7D9D5B288B /* Load_rtm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 079A67139A2831050300D553 /* Load_rtm.cpp */; };
 		E6583D037EA522B5ACEC2343 /* ITTools.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 778D494BBBDBEEBDFE03278B /* ITTools.cpp */; };
 		E76008D1C67D2303A2867F11 /* Load_med.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8F093E392197082B8A6FAC79 /* Load_med.cpp */; };
 		E79434E3857535955CF37B23 /* SampleFormats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD65792BA025D99DFD5AB76B /* SampleFormats.cpp */; };
@@ -215,7 +198,6 @@
 		02F4B8C5C982B0373784D705 /* Load_mus_km.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Load_mus_km.cpp; path = ../../soundlib/Load_mus_km.cpp; sourceTree = "<group>"; };
 		03BF85B7480E2B298A3563F7 /* TinyFFT.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = TinyFFT.cpp; path = ../../soundlib/TinyFFT.cpp; sourceTree = "<group>"; };
 		04155894998C17C608286ED4 /* openmpt-mpg123.lib */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "mpg123.xcodeproj"; path = ext/mpg123.xcodeproj; sourceTree = SOURCE_ROOT; };
-		042BC5075B9137F90D9F5347 /* PlaybackTest.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = PlaybackTest.h; path = ../../soundlib/PlaybackTest.h; sourceTree = "<group>"; };
 		046F30B171973F23732A2EF1 /* numeric.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = numeric.hpp; path = ../../src/mpt/base/numeric.hpp; sourceTree = "<group>"; };
 		04D4FEEB3466CDDD0F740D2B /* EQ.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = EQ.cpp; path = ../../sounddsp/EQ.cpp; sourceTree = "<group>"; };
 		04EAEC77C7AB4CE924E02AB7 /* DMOPlugin.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = DMOPlugin.h; path = ../../soundlib/plugins/dmo/DMOPlugin.h; sourceTree = "<group>"; };
@@ -224,7 +206,6 @@
 		073F0DABFB3E571D80296BEB /* SampleFormatSFZ.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = SampleFormatSFZ.cpp; path = ../../soundlib/SampleFormatSFZ.cpp; sourceTree = "<group>"; };
 		074C76BE5EB1E9B010C004FE /* mptFileType.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = mptFileType.cpp; path = ../../common/mptFileType.cpp; sourceTree = "<group>"; };
 		07580841CEBCC33359749681 /* tests_string_utility.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = tests_string_utility.hpp; path = ../../src/mpt/string/tests/tests_string_utility.hpp; sourceTree = "<group>"; };
-		079A67139A2831050300D553 /* Load_rtm.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Load_rtm.cpp; path = ../../soundlib/Load_rtm.cpp; sourceTree = "<group>"; };
 		079DA5A7A1C19AD951E77BE7 /* filedata_memory.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = filedata_memory.hpp; path = ../../src/mpt/io_read/filedata_memory.hpp; sourceTree = "<group>"; };
 		0863524F9AF11C4103C9C08F /* Load_ptm.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Load_ptm.cpp; path = ../../soundlib/Load_ptm.cpp; sourceTree = "<group>"; };
 		09387CD815C32F4A90A7FB18 /* PluginMixBuffer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = PluginMixBuffer.h; path = ../../soundlib/plugins/PluginMixBuffer.h; sourceTree = "<group>"; };
@@ -233,7 +214,6 @@
 		09E33737D0712EA93E735577 /* modsmp_ctrl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = modsmp_ctrl.cpp; path = ../../soundlib/modsmp_ctrl.cpp; sourceTree = "<group>"; };
 		0A20B0FECCE111702A15EF3E /* ComponentManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ComponentManager.h; path = ../../common/ComponentManager.h; sourceTree = "<group>"; };
 		0BC4F1DBADAE8DCDA4D5A01B /* ContainerXPK.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ContainerXPK.cpp; path = ../../soundlib/ContainerXPK.cpp; sourceTree = "<group>"; };
-		0C4FEA7B9EDDB46D07B658BB /* Load_ftm.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Load_ftm.cpp; path = ../../soundlib/Load_ftm.cpp; sourceTree = "<group>"; };
 		0D18D5B79FA69FA9087F43F7 /* Load_dtm.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Load_dtm.cpp; path = ../../soundlib/Load_dtm.cpp; sourceTree = "<group>"; };
 		0E85EC13A113B60509EC5A53 /* Load_mt2.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Load_mt2.cpp; path = ../../soundlib/Load_mt2.cpp; sourceTree = "<group>"; };
 		0F49974BA1D7613D0AB0058B /* Load_mo3.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Load_mo3.cpp; path = ../../soundlib/Load_mo3.cpp; sourceTree = "<group>"; };
@@ -245,9 +225,9 @@
 		1197459E05968F108A81A3DE /* feature_flags.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = feature_flags.hpp; path = ../../src/mpt/arch/feature_flags.hpp; sourceTree = "<group>"; };
 		124C374986A67C3B048A0589 /* ContainerMMCMP.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ContainerMMCMP.cpp; path = ../../soundlib/ContainerMMCMP.cpp; sourceTree = "<group>"; };
 		12DCF57C800503EE8197F3BC /* mptBaseUtils.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = mptBaseUtils.h; path = ../../common/mptBaseUtils.h; sourceTree = "<group>"; };
+		13F63AEAA68404DC0F5CA92A /* mptFileIO.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = mptFileIO.cpp; path = ../../common/mptFileIO.cpp; sourceTree = "<group>"; };
 		13F9789407F8C2068CE3D6D4 /* ComponentManager.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ComponentManager.cpp; path = ../../common/ComponentManager.cpp; sourceTree = "<group>"; };
 		14715833DAFF4FA549017673 /* WindowedFIR.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = WindowedFIR.cpp; path = ../../soundlib/WindowedFIR.cpp; sourceTree = "<group>"; };
-		14754CCFA70316C10FDBBB0F /* Load_etx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Load_etx.cpp; path = ../../soundlib/Load_etx.cpp; sourceTree = "<group>"; };
 		159B6F7E099AB8F08E85CDBE /* PluginManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = PluginManager.h; path = ../../soundlib/plugins/PluginManager.h; sourceTree = "<group>"; };
 		15A918AF09A862218E9376EF /* aligned_array.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = aligned_array.hpp; path = ../../src/mpt/base/aligned_array.hpp; sourceTree = "<group>"; };
 		1679D9615AC87ED39CEFB7A1 /* alloc.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = alloc.hpp; path = ../../src/mpt/base/alloc.hpp; sourceTree = "<group>"; };
@@ -255,18 +235,15 @@
 		178BC3E3DA4C245537810223 /* native_path.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = native_path.hpp; path = ../../src/mpt/path/native_path.hpp; sourceTree = "<group>"; };
 		17F58A2FDAB5EAA137EAC86F /* detect_libc.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = detect_libc.hpp; path = ../../src/mpt/base/detect_libc.hpp; sourceTree = "<group>"; };
 		18A72A335CF5CFA59F1D0873 /* seed.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = seed.hpp; path = ../../src/mpt/random/seed.hpp; sourceTree = "<group>"; };
-		19B6191F86DE27918871175F /* Load_kris.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Load_kris.cpp; path = ../../soundlib/Load_kris.cpp; sourceTree = "<group>"; };
 		1A0FD6B58B3277A740F924F5 /* Sndmix.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Sndmix.cpp; path = ../../soundlib/Sndmix.cpp; sourceTree = "<group>"; };
 		1A88E03F71EE533123FC6E7F /* RowVisitor.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = RowVisitor.cpp; path = ../../soundlib/RowVisitor.cpp; sourceTree = "<group>"; };
 		1A94BBC4BC7E57B6B3A56A04 /* mptStringFormat.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = mptStringFormat.h; path = ../../common/mptStringFormat.h; sourceTree = "<group>"; };
 		1AA25C6F0B99CA61779D4AAF /* check_platform.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = check_platform.hpp; path = ../../src/mpt/base/check_platform.hpp; sourceTree = "<group>"; };
 		1AD54F9F7616A3114970EDDF /* Paula.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Paula.h; path = ../../soundlib/Paula.h; sourceTree = "<group>"; };
 		1B5F95F15FAE3B63A1D57431 /* Tagging.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Tagging.cpp; path = ../../soundlib/Tagging.cpp; sourceTree = "<group>"; };
-		1BD71CF93D735A2B35E9F339 /* filedata_base_unseekable_buffer.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = filedata_base_unseekable_buffer.hpp; path = ../../src/mpt/io_read/filedata_base_unseekable_buffer.hpp; sourceTree = "<group>"; };
 		1C2F81B7DEEFE2293C24BFF7 /* detect_arch.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = detect_arch.hpp; path = ../../src/mpt/base/detect_arch.hpp; sourceTree = "<group>"; };
 		1C6D52530D64C04579684093 /* SampleFormatOpus.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = SampleFormatOpus.cpp; path = ../../soundlib/SampleFormatOpus.cpp; sourceTree = "<group>"; };
 		1CE2C4318A0AD2A38B9DC271 /* device.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = device.hpp; path = ../../src/mpt/random/device.hpp; sourceTree = "<group>"; };
-		1D12DDB1AFA0A7A318794BF1 /* Load_stk.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Load_stk.cpp; path = ../../soundlib/Load_stk.cpp; sourceTree = "<group>"; };
 		1E7AA06D8BA2AEDF8D359EAD /* simple.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = simple.hpp; path = ../../src/mpt/format/simple.hpp; sourceTree = "<group>"; };
 		1F41A2D3B1CF6CC51AA81113 /* Load_s3m.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Load_s3m.cpp; path = ../../soundlib/Load_s3m.cpp; sourceTree = "<group>"; };
 		1F5AB80DB1E881FF1AC1264D /* WAVTools.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = WAVTools.cpp; path = ../../soundlib/WAVTools.cpp; sourceTree = "<group>"; };
@@ -275,14 +252,12 @@
 		20B693A5E7448B175546B1E5 /* MixerSettings.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = MixerSettings.h; path = ../../soundlib/MixerSettings.h; sourceTree = "<group>"; };
 		212A36FD7B2B4DEF4272453D /* semantic_version.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = semantic_version.hpp; path = ../../src/mpt/base/semantic_version.hpp; sourceTree = "<group>"; };
 		2151B0037C9303754FED4E43 /* Mixer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Mixer.h; path = ../../soundlib/Mixer.h; sourceTree = "<group>"; };
-		219A364192BCD73348838481 /* size.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = size.hpp; path = ../../src/mpt/base/size.hpp; sourceTree = "<group>"; };
 		22594181666D12B35A3E97C1 /* fileref.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = fileref.hpp; path = ../../src/mpt/io_file/fileref.hpp; sourceTree = "<group>"; };
 		2323E4A5944685974A0D32E5 /* Snd_defs.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Snd_defs.h; path = ../../soundlib/Snd_defs.h; sourceTree = "<group>"; };
 		236E8DFB1D304A6D572F4C3B /* Tagging.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Tagging.h; path = ../../soundlib/Tagging.h; sourceTree = "<group>"; };
 		23EF16CF7F4F3B81C192DD0F /* filedata_base_buffered.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = filedata_base_buffered.hpp; path = ../../src/mpt/io_read/filedata_base_buffered.hpp; sourceTree = "<group>"; };
 		25972C49C780C83BBEA7DA89 /* ContainerUMX.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ContainerUMX.cpp; path = ../../soundlib/ContainerUMX.cpp; sourceTree = "<group>"; };
 		25EAC3A1C044AC93FC7D11E1 /* unique_basename.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = unique_basename.hpp; path = ../../src/mpt/io_file_unique/unique_basename.hpp; sourceTree = "<group>"; };
-		26B859FFB94623F1221EC83F /* Load_ims.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Load_ims.cpp; path = ../../soundlib/Load_ims.cpp; sourceTree = "<group>"; };
 		274EB9F5814FD0E74896C835 /* mod_specifications.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = mod_specifications.cpp; path = ../../soundlib/mod_specifications.cpp; sourceTree = "<group>"; };
 		27B40A4D98D6AB3F4E9D588D /* SampleIO.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SampleIO.h; path = ../../soundlib/SampleIO.h; sourceTree = "<group>"; };
 		2810796521D235D75BD137A5 /* XMTools.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = XMTools.h; path = ../../soundlib/XMTools.h; sourceTree = "<group>"; };
@@ -304,7 +279,6 @@
 		338C775D77DB1CCFBA02559D /* BitReader.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = BitReader.h; path = ../../soundlib/BitReader.h; sourceTree = "<group>"; };
 		34D45985C7622377303AC7C5 /* Load_imf.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Load_imf.cpp; path = ../../soundlib/Load_imf.cpp; sourceTree = "<group>"; };
 		352908E1F7E96953551E4721 /* libopenmpt_c.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = libopenmpt_c.cpp; path = ../../libopenmpt/libopenmpt_c.cpp; sourceTree = "<group>"; };
-		352971E219707A149D5DA822 /* libcxx.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = libcxx.hpp; path = ../../src/mpt/check/libcxx.hpp; sourceTree = "<group>"; };
 		36619CBCFDC657AE887E2AFC /* inputfile_filecursor.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = inputfile_filecursor.hpp; path = ../../src/mpt/io_file_read/inputfile_filecursor.hpp; sourceTree = "<group>"; };
 		36CAA59BC9586F8D323113DB /* Load_dmf.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Load_dmf.cpp; path = ../../soundlib/Load_dmf.cpp; sourceTree = "<group>"; };
 		37064A799107616B584E58B9 /* tests_random.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = tests_random.hpp; path = ../../src/mpt/random/tests/tests_random.hpp; sourceTree = "<group>"; };
@@ -334,7 +308,6 @@
 		43B7419134AEAF83A0B22FD1 /* libopenmpt_config.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = libopenmpt_config.h; path = ../../libopenmpt/libopenmpt_config.h; sourceTree = "<group>"; };
 		43CBFB4A068C5BBC63C1398A /* mptFileTemporary.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = mptFileTemporary.h; path = ../../common/mptFileTemporary.h; sourceTree = "<group>"; };
 		44E6E1C323897D35D86B8003 /* tests_base_bit.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = tests_base_bit.hpp; path = ../../src/mpt/base/tests/tests_base_bit.hpp; sourceTree = "<group>"; };
-		45A87D570868DDC9659DBB97 /* InstrumentSynth.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = InstrumentSynth.h; path = ../../soundlib/InstrumentSynth.h; sourceTree = "<group>"; };
 		45D0E0DE525B9350CD405F1E /* DigiBoosterEcho.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = DigiBoosterEcho.h; path = ../../soundlib/plugins/DigiBoosterEcho.h; sourceTree = "<group>"; };
 		45DBF5F73F9DB269799CB437 /* Dlsbank.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Dlsbank.h; path = ../../soundlib/Dlsbank.h; sourceTree = "<group>"; };
 		4614D43FB73775316CFE227F /* math.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = math.hpp; path = ../../src/mpt/base/math.hpp; sourceTree = "<group>"; };
@@ -354,6 +327,7 @@
 		4DFC0969924AAEDBD471E7A9 /* ltdl.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = ltdl.hpp; path = ../../src/mpt/detect/ltdl.hpp; sourceTree = "<group>"; };
 		4E4D213FE0DAEB3149B38F7F /* Load_plm.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Load_plm.cpp; path = ../../soundlib/Load_plm.cpp; sourceTree = "<group>"; };
 		4E96BB31E124852349FD2971 /* types.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = types.hpp; path = ../../src/mpt/string/types.hpp; sourceTree = "<group>"; };
+		4FB7A50743B6EE79C8A20347 /* floatingpoint.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = floatingpoint.hpp; path = ../../src/mpt/base/floatingpoint.hpp; sourceTree = "<group>"; };
 		50318A59BD5998CBBEEC8899 /* os_path.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = os_path.hpp; path = ../../src/mpt/path/os_path.hpp; sourceTree = "<group>"; };
 		50CF7EB4C1F21FA677B8CCF4 /* mptFileIO.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = mptFileIO.h; path = ../../common/mptFileIO.h; sourceTree = "<group>"; };
 		50FB747FA860E7715A6F02BF /* MIDIMacros.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = MIDIMacros.cpp; path = ../../soundlib/MIDIMacros.cpp; sourceTree = "<group>"; };
@@ -399,7 +373,6 @@
 		6B9C8BDDC301FECF75101A1D /* Gargle.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Gargle.h; path = ../../soundlib/plugins/dmo/Gargle.h; sourceTree = "<group>"; };
 		6C67B7D97E1EF7CBF38CE619 /* tests_base_math.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = tests_base_math.hpp; path = ../../src/mpt/base/tests/tests_base_math.hpp; sourceTree = "<group>"; };
 		6D2350A8B171F61AF3992EE8 /* FileReader.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = FileReader.h; path = ../../common/FileReader.h; sourceTree = "<group>"; };
-		6DB68B53DADE99C5DC718993 /* Load_puma.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Load_puma.cpp; path = ../../soundlib/Load_puma.cpp; sourceTree = "<group>"; };
 		6E84090F7E6935416ADCBF4F /* environment.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = environment.hpp; path = ../../src/mpt/environment/environment.hpp; sourceTree = "<group>"; };
 		6F3A912F8923F36144AA076F /* filecursor_callbackstream.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = filecursor_callbackstream.hpp; path = ../../src/mpt/io_read/filecursor_callbackstream.hpp; sourceTree = "<group>"; };
 		70644035FF1571275A9F8E75 /* libopenmpt_stream_callbacks_file_msvcrt.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = libopenmpt_stream_callbacks_file_msvcrt.h; path = ../../libopenmpt/libopenmpt_stream_callbacks_file_msvcrt.h; sourceTree = "<group>"; };
@@ -411,7 +384,6 @@
 		73262ABB150FC6AD0C36D8FB /* DMOUtils.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = DMOUtils.h; path = ../../soundlib/plugins/dmo/DMOUtils.h; sourceTree = "<group>"; };
 		7355A89F850CE891FA7AD6DF /* libopenmpt_ext_impl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = libopenmpt_ext_impl.cpp; path = ../../libopenmpt/libopenmpt_ext_impl.cpp; sourceTree = "<group>"; };
 		73781183B7C6B6F5F9EDEFC3 /* Snd_flt.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Snd_flt.cpp; path = ../../soundlib/Snd_flt.cpp; sourceTree = "<group>"; };
-		73A166DF062F30D16F07D51F /* Load_tcb.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Load_tcb.cpp; path = ../../soundlib/Load_tcb.cpp; sourceTree = "<group>"; };
 		73A52C155E915207A6771A55 /* EQ.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = EQ.h; path = ../../sounddsp/EQ.h; sourceTree = "<group>"; };
 		746376CDCBC8E9BF7DD7050D /* modcommand.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = modcommand.cpp; path = ../../soundlib/modcommand.cpp; sourceTree = "<group>"; };
 		74D7DB33E5FA7C259BC12973 /* Snd_fx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Snd_fx.cpp; path = ../../soundlib/Snd_fx.cpp; sourceTree = "<group>"; };
@@ -438,7 +410,6 @@
 		7FD19A57125F64497B380897 /* Load_ult.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Load_ult.cpp; path = ../../soundlib/Load_ult.cpp; sourceTree = "<group>"; };
 		80C993CB8D54463D0839120B /* message_macros.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = message_macros.hpp; path = ../../src/mpt/format/message_macros.hpp; sourceTree = "<group>"; };
 		80F9D5FD1722E7EFD889443D /* default_floatingpoint.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = default_floatingpoint.hpp; path = ../../src/mpt/format/default_floatingpoint.hpp; sourceTree = "<group>"; };
-		8209AB5BF32C4C4DA8F2F99B /* MODTools.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = MODTools.h; path = ../../soundlib/MODTools.h; sourceTree = "<group>"; };
 		82EA4C5D44A2DDCFEBBDAA9D /* tests_base_wrapping_divide.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = tests_base_wrapping_divide.hpp; path = ../../src/mpt/base/tests/tests_base_wrapping_divide.hpp; sourceTree = "<group>"; };
 		830F3566F431D658A9F883A6 /* Logging.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Logging.cpp; path = ../../common/Logging.cpp; sourceTree = "<group>"; };
 		84A787B7269123A91DB835F7 /* Chorus.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Chorus.cpp; path = ../../soundlib/plugins/dmo/Chorus.cpp; sourceTree = "<group>"; };
@@ -448,7 +419,6 @@
 		87A62ABDE1A741AFA8EE38FD /* AudioCriticalSection.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = AudioCriticalSection.h; path = ../../soundlib/AudioCriticalSection.h; sourceTree = "<group>"; };
 		8856685FF57E76D1F711669F /* base64.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = base64.hpp; path = ../../src/mpt/binary/base64.hpp; sourceTree = "<group>"; };
 		8876678BE2777E7DA9BE75CB /* default_engines.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = default_engines.hpp; path = ../../src/mpt/random/default_engines.hpp; sourceTree = "<group>"; };
-		89879ACD7D86E43F0271F90D /* InstrumentSynth.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = InstrumentSynth.cpp; path = ../../soundlib/InstrumentSynth.cpp; sourceTree = "<group>"; };
 		8A87EA73FEE22F657CC5B8B3 /* macros.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = macros.hpp; path = ../../src/mpt/string_transcode/macros.hpp; sourceTree = "<group>"; };
 		8ABDA3472E24D0F9455A8987 /* filedata_base_unseekable.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = filedata_base_unseekable.hpp; path = ../../src/mpt/io_read/filedata_base_unseekable.hpp; sourceTree = "<group>"; };
 		8ABF23E958E2779BDFF0CA29 /* mutex.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = mutex.hpp; path = ../../src/mpt/mutex/mutex.hpp; sourceTree = "<group>"; };
@@ -465,6 +435,7 @@
 		8F52A05ED3A145D015C87E9E /* Profiler.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Profiler.cpp; path = ../../common/Profiler.cpp; sourceTree = "<group>"; };
 		9061AC518460F5C3094C0A91 /* SampleFormatBRR.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = SampleFormatBRR.cpp; path = ../../soundlib/SampleFormatBRR.cpp; sourceTree = "<group>"; };
 		90E45EE632CDFAD829F50D26 /* mptStringBuffer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = mptStringBuffer.h; path = ../../common/mptStringBuffer.h; sourceTree = "<group>"; };
+		9133E604FE5BF476FFEEE444 /* OpCodes.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = OpCodes.h; path = ../../soundlib/plugins/OpCodes.h; sourceTree = "<group>"; };
 		915D6003E8C2D2F59AD0EE43 /* message.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = message.hpp; path = ../../src/mpt/format/message.hpp; sourceTree = "<group>"; };
 		91AA522185A99B930A94B061 /* I3DL2Reverb.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = I3DL2Reverb.h; path = ../../soundlib/plugins/dmo/I3DL2Reverb.h; sourceTree = "<group>"; };
 		91EC613953A4F2ABFABFBF79 /* libopenmpt_stream_callbacks_file.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = libopenmpt_stream_callbacks_file.h; path = ../../libopenmpt/libopenmpt_stream_callbacks_file.h; sourceTree = "<group>"; };
@@ -478,7 +449,6 @@
 		97B8EC8104E0FAF30673EAC1 /* OggStream.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = OggStream.cpp; path = ../../soundlib/OggStream.cpp; sourceTree = "<group>"; };
 		97BF12BD2A4CDCAF932580FD /* Load_gdm.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Load_gdm.cpp; path = ../../soundlib/Load_gdm.cpp; sourceTree = "<group>"; };
 		995821ED5E0D785F127C202D /* tests_string_buffer.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = tests_string_buffer.hpp; path = ../../src/mpt/string/tests/tests_string_buffer.hpp; sourceTree = "<group>"; };
-		99E1AAB12C6F74A3954818F1 /* MODTools.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = MODTools.cpp; path = ../../soundlib/MODTools.cpp; sourceTree = "<group>"; };
 		9B1917A761A70F19CFA935E7 /* ParamEq.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ParamEq.h; path = ../../soundlib/plugins/dmo/ParamEq.h; sourceTree = "<group>"; };
 		9B95674D94FB68BF8896C58D /* libopenmpt.dll */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; name = libopenmpt.dll; path = libopenmpt.dll; sourceTree = BUILT_PRODUCTS_DIR; };
 		9BB2E75F2E40B1519719559F /* Load_far.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Load_far.cpp; path = ../../soundlib/Load_far.cpp; sourceTree = "<group>"; };
@@ -491,7 +461,6 @@
 		9E737DF712CDC2E990B14C37 /* Distortion.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Distortion.h; path = ../../soundlib/plugins/dmo/Distortion.h; sourceTree = "<group>"; };
 		9E8AC865F88BDF57BFD2D6A5 /* tests_binary.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = tests_binary.hpp; path = ../../src/mpt/binary/tests/tests_binary.hpp; sourceTree = "<group>"; };
 		9EB0D073130B156590EE9EB3 /* Compressor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Compressor.h; path = ../../soundlib/plugins/dmo/Compressor.h; sourceTree = "<group>"; };
-		9EEAF28B0C1300FD0DA5F0CB /* Load_unic.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Load_unic.cpp; path = ../../soundlib/Load_unic.cpp; sourceTree = "<group>"; };
 		9F187E69B9E4ED1BBDB584A9 /* outputfile.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = outputfile.hpp; path = ../../src/mpt/io_file/outputfile.hpp; sourceTree = "<group>"; };
 		9F2E1C1AF92F330CC0762A5A /* BuildSettingsCompiler.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = BuildSettingsCompiler.h; path = ../../common/BuildSettingsCompiler.h; sourceTree = "<group>"; };
 		9FCB791A628BD98CBFC0B75A /* dos_memory.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = dos_memory.hpp; path = ../../src/mpt/osinfo/dos_memory.hpp; sourceTree = "<group>"; };
@@ -502,7 +471,6 @@
 		A32EC1731056CFE511E9BFB3 /* ModSample.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ModSample.cpp; path = ../../soundlib/ModSample.cpp; sourceTree = "<group>"; };
 		A33106C935BED0BB9E977509 /* load_j2b.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = load_j2b.cpp; path = ../../soundlib/load_j2b.cpp; sourceTree = "<group>"; };
 		A34959973B963F4969DD3FD7 /* filedata.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = filedata.hpp; path = ../../src/mpt/io_read/filedata.hpp; sourceTree = "<group>"; };
-		A35EA1E7E7AD475929D48027 /* PlayState.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = PlayState.h; path = ../../soundlib/PlayState.h; sourceTree = "<group>"; };
 		A527626137B52C53A08DD0A1 /* int24.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = int24.hpp; path = ../../src/mpt/endian/int24.hpp; sourceTree = "<group>"; };
 		A78B5E5FFEF0D151B0FEEC9F /* MIDIEvents.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = MIDIEvents.cpp; path = ../../soundlib/MIDIEvents.cpp; sourceTree = "<group>"; };
 		A7A09A55A16256C7DB615895 /* Paula.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Paula.cpp; path = ../../soundlib/Paula.cpp; sourceTree = "<group>"; };
@@ -525,9 +493,7 @@
 		B517EB3DCFE459EFD3B4F17D /* exception.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = exception.hpp; path = ../../src/mpt/exception/exception.hpp; sourceTree = "<group>"; };
 		B5449C6B226CAADD23FF9AAB /* ModSequence.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ModSequence.h; path = ../../soundlib/ModSequence.h; sourceTree = "<group>"; };
 		B547A5AF29A1EAA1A78573EF /* type_traits.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = type_traits.hpp; path = ../../src/mpt/endian/type_traits.hpp; sourceTree = "<group>"; };
-		B55D7A70F9AC1FE23BD358B0 /* GzipWriter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = GzipWriter.h; path = ../../common/GzipWriter.h; sourceTree = "<group>"; };
 		B569F9F747F7C3E9B0D06837 /* Load_669.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Load_669.cpp; path = ../../soundlib/Load_669.cpp; sourceTree = "<group>"; };
-		B6BBD03FFB0A75B13D31AE7F /* Load_fc.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Load_fc.cpp; path = ../../soundlib/Load_fc.cpp; sourceTree = "<group>"; };
 		B810F0D30F7663C5C1847F13 /* MixerLoops.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = MixerLoops.cpp; path = ../../soundlib/MixerLoops.cpp; sourceTree = "<group>"; };
 		B99E396D4C2C035FB504A7AD /* Load_c67.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Load_c67.cpp; path = ../../soundlib/Load_c67.cpp; sourceTree = "<group>"; };
 		B9B7FE84CBE1DB36FFD2C4C4 /* windows.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = windows.hpp; path = ../../src/mpt/check/windows.hpp; sourceTree = "<group>"; };
@@ -538,7 +504,6 @@
 		BAF08779FF3F2CEB416665B9 /* Sndfile.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Sndfile.cpp; path = ../../soundlib/Sndfile.cpp; sourceTree = "<group>"; };
 		BBEF0B95B5B0C807EFAFC9D5 /* ITTools.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ITTools.h; path = ../../soundlib/ITTools.h; sourceTree = "<group>"; };
 		BD023BA1315C8093AF4009E1 /* simple_spec.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = simple_spec.hpp; path = ../../src/mpt/format/simple_spec.hpp; sourceTree = "<group>"; };
-		BE474F872B6F5DF92D024DC7 /* Load_pt36.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Load_pt36.cpp; path = ../../soundlib/Load_pt36.cpp; sourceTree = "<group>"; };
 		BF406A572C6878C92DFB6897 /* MPEGFrame.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = MPEGFrame.cpp; path = ../../soundlib/MPEGFrame.cpp; sourceTree = "<group>"; };
 		BFC43D151B059087EE5FDB55 /* AGC.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = AGC.cpp; path = ../../sounddsp/AGC.cpp; sourceTree = "<group>"; };
 		C0B331FD5340FBEFBC19A03D /* MixerLoops.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = MixerLoops.h; path = ../../soundlib/MixerLoops.h; sourceTree = "<group>"; };
@@ -548,7 +513,6 @@
 		C3E634155673FE07BF4CA255 /* macros.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = macros.hpp; path = ../../src/mpt/base/macros.hpp; sourceTree = "<group>"; };
 		C3FAC67D5688906FBF6134BD /* detect.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = detect.hpp; path = ../../src/mpt/base/detect.hpp; sourceTree = "<group>"; };
 		C510221C396A670EB74DF05C /* mptStringBuffer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = mptStringBuffer.cpp; path = ../../common/mptStringBuffer.cpp; sourceTree = "<group>"; };
-		C61BC533BA1B0EA53F062373 /* MIDIMacroParser.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = MIDIMacroParser.cpp; path = ../../soundlib/MIDIMacroParser.cpp; sourceTree = "<group>"; };
 		C6F2110A1E5783FCD0659F4A /* FileReaderFwd.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = FileReaderFwd.h; path = ../../common/FileReaderFwd.h; sourceTree = "<group>"; };
 		C7851FA55A12E997C2EB8DE5 /* UMXTools.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = UMXTools.cpp; path = ../../soundlib/UMXTools.cpp; sourceTree = "<group>"; };
 		C875E7BBB96D55AD2570D5FB /* floatingpoint.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = floatingpoint.hpp; path = ../../src/mpt/endian/floatingpoint.hpp; sourceTree = "<group>"; };
@@ -556,7 +520,6 @@
 		C950084F5BDDD241C4B6768F /* Load_sfx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Load_sfx.cpp; path = ../../soundlib/Load_sfx.cpp; sourceTree = "<group>"; };
 		C9545B192355720BEA9C6959 /* arithmetic_shift.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = arithmetic_shift.hpp; path = ../../src/mpt/base/arithmetic_shift.hpp; sourceTree = "<group>"; };
 		C9DD180C21428AFED350A64C /* mptPathString.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = mptPathString.h; path = ../../common/mptPathString.h; sourceTree = "<group>"; };
-		C9E029A3906E2115FE7047E3 /* debugging.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = debugging.hpp; path = ../../src/mpt/base/debugging.hpp; sourceTree = "<group>"; };
 		CA2995890E783AFB509F73C9 /* array.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = array.hpp; path = ../../src/mpt/base/array.hpp; sourceTree = "<group>"; };
 		CA67A8613B8A4953F150F6A1 /* S3MTools.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = S3MTools.h; path = ../../soundlib/S3MTools.h; sourceTree = "<group>"; };
 		CB4660EB0F95065D51BC3F2B /* pattern.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = pattern.cpp; path = ../../soundlib/pattern.cpp; sourceTree = "<group>"; };
@@ -578,9 +541,7 @@
 		D35A7771C759C0E34C44D5B1 /* WavesReverb.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = WavesReverb.h; path = ../../soundlib/plugins/dmo/WavesReverb.h; sourceTree = "<group>"; };
 		D37D7529660B3F1BCEE3E369 /* MIDIMacros.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = MIDIMacros.h; path = ../../soundlib/MIDIMacros.h; sourceTree = "<group>"; };
 		D432AEE7E417DB19D08B6527 /* tests_parse.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = tests_parse.hpp; path = ../../src/mpt/parse/tests/tests_parse.hpp; sourceTree = "<group>"; };
-		D668A71B68F6710DD1CF155B /* Load_gmc.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Load_gmc.cpp; path = ../../soundlib/Load_gmc.cpp; sourceTree = "<group>"; };
 		D6BBDE00997C3E72F6B11C40 /* LFOPlugin.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LFOPlugin.cpp; path = ../../soundlib/plugins/LFOPlugin.cpp; sourceTree = "<group>"; };
-		D727124F69B4DC41D28D808F /* Load_ice.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Load_ice.cpp; path = ../../soundlib/Load_ice.cpp; sourceTree = "<group>"; };
 		D89E49F2E528FC64600DC832 /* PlugInterface.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = PlugInterface.cpp; path = ../../soundlib/plugins/PlugInterface.cpp; sourceTree = "<group>"; };
 		D941724BCA38E03D363C608B /* saturate_round.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = saturate_round.hpp; path = ../../src/mpt/base/saturate_round.hpp; sourceTree = "<group>"; };
 		DA41BBEFE6CC6E6161B13A2F /* transcode.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = transcode.hpp; path = ../../src/mpt/string_transcode/transcode.hpp; sourceTree = "<group>"; };
@@ -599,21 +560,18 @@
 		E2066CCD3D47C03F10A20B0D /* DSP.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = DSP.cpp; path = ../../sounddsp/DSP.cpp; sourceTree = "<group>"; };
 		E276AB813DD6D033801A71C1 /* filedata_base_seekable.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = filedata_base_seekable.hpp; path = ../../src/mpt/io_read/filedata_base_seekable.hpp; sourceTree = "<group>"; };
 		E2B3BCB34FDBCB25516EBAF3 /* random.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = random.hpp; path = ../../src/mpt/random/random.hpp; sourceTree = "<group>"; };
-		E38574ABA645D51D037AB2EB /* any_engine.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = any_engine.hpp; path = ../../src/mpt/random/any_engine.hpp; sourceTree = "<group>"; };
 		E438935FD53001514133819F /* mod_specifications.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = mod_specifications.h; path = ../../soundlib/mod_specifications.h; sourceTree = "<group>"; };
 		E4C0ABA9F677EB9B6BE5D9E9 /* libopenmpt_ext_impl.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = libopenmpt_ext_impl.hpp; path = ../../libopenmpt/libopenmpt_ext_impl.hpp; sourceTree = "<group>"; };
 		E59C6F4DDF5E2BBF195D2D8D /* Loaders.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Loaders.h; path = ../../soundlib/Loaders.h; sourceTree = "<group>"; };
 		E64FF33AA9BBB4ECE85F597A /* openmpt-ogg.lib */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "ogg.xcodeproj"; path = ext/ogg.xcodeproj; sourceTree = SOURCE_ROOT; };
 		E6905433791E1E25E1F6C273 /* SampleCopy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SampleCopy.h; path = ../../soundlib/SampleCopy.h; sourceTree = "<group>"; };
 		E7811C8A7A0EE67CE2E78ACA /* class.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = class.hpp; path = ../../src/mpt/osinfo/class.hpp; sourceTree = "<group>"; };
-		E7ACD57DAA6D35EF07A213BD /* MIDIMacroParser.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = MIDIMacroParser.h; path = ../../soundlib/MIDIMacroParser.h; sourceTree = "<group>"; };
 		E898D5ABAF26CD1D1D28F3EB /* ModInstrument.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ModInstrument.h; path = ../../soundlib/ModInstrument.h; sourceTree = "<group>"; };
 		EABA2F1F4147999119C0AD5F /* AGC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = AGC.h; path = ../../sounddsp/AGC.h; sourceTree = "<group>"; };
 		EC1456C17EA220B3E77AC501 /* Load_mid.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Load_mid.cpp; path = ../../soundlib/Load_mid.cpp; sourceTree = "<group>"; };
 		ED3DBD7D7FCB876FE8A42BBD /* memory.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = memory.hpp; path = ../../src/mpt/base/memory.hpp; sourceTree = "<group>"; };
-		EDB72A5D8FA0C64F86C7D89D /* PlaybackTest.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = PlaybackTest.cpp; path = ../../soundlib/PlaybackTest.cpp; sourceTree = "<group>"; };
-		EDF8E6598086B04BE95F5499 /* Load_cba.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Load_cba.cpp; path = ../../soundlib/Load_cba.cpp; sourceTree = "<group>"; };
 		EEC8D9B98156A3ABEA2F47F9 /* tuningbase.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = tuningbase.h; path = ../../soundlib/tuningbase.h; sourceTree = "<group>"; };
+		EF78F5224ABA48941E149362 /* Dither.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Dither.h; path = ../../common/Dither.h; sourceTree = "<group>"; };
 		F06C78E982FA42DBEBD2E729 /* RowVisitor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = RowVisitor.h; path = ../../soundlib/RowVisitor.h; sourceTree = "<group>"; };
 		F1208C2D83AE561FEC86FA6D /* Load_psm.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Load_psm.cpp; path = ../../soundlib/Load_psm.cpp; sourceTree = "<group>"; };
 		F18CD1F1E58C1B636A773031 /* saturate_cast.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = saturate_cast.hpp; path = ../../src/mpt/base/saturate_cast.hpp; sourceTree = "<group>"; };
@@ -627,7 +585,6 @@
 		F48DAABB97F4D86DAF2A90FB /* filecursor_traits_memory.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = filecursor_traits_memory.hpp; path = ../../src/mpt/io_read/filecursor_traits_memory.hpp; sourceTree = "<group>"; };
 		F5D2F247BC60E9B92A631087 /* libopenmpt.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = libopenmpt.hpp; path = ../../libopenmpt/libopenmpt.hpp; sourceTree = "<group>"; };
 		F5D60F958863D987F13C7DD5 /* Load_dsm.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Load_dsm.cpp; path = ../../soundlib/Load_dsm.cpp; sourceTree = "<group>"; };
-		F5DB217BB89B81ED15D05FBB /* type_traits.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = type_traits.hpp; path = ../../src/mpt/base/type_traits.hpp; sourceTree = "<group>"; };
 		F61229996734CA8B1CFB77D9 /* guid.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = guid.hpp; path = ../../src/mpt/uuid/guid.hpp; sourceTree = "<group>"; };
 		F6F37E8F68161F811DDCCCCF /* span.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = span.hpp; path = ../../src/mpt/base/span.hpp; sourceTree = "<group>"; };
 		F78A378464B245F6664535C4 /* mptBaseTypes.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = mptBaseTypes.h; path = ../../common/mptBaseTypes.h; sourceTree = "<group>"; };
@@ -635,13 +592,12 @@
 		F9D67691EACDE48356D164D1 /* SampleFormatFLAC.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = SampleFormatFLAC.cpp; path = ../../soundlib/SampleFormatFLAC.cpp; sourceTree = "<group>"; };
 		FB5FB0E7EF5EFA59744A0F27 /* libopenmpt_ext.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = libopenmpt_ext.hpp; path = ../../libopenmpt/libopenmpt_ext.hpp; sourceTree = "<group>"; };
 		FB635E3D352E14EFEA89647D /* filecursor_traits_filedata.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = filecursor_traits_filedata.hpp; path = ../../src/mpt/io_read/filecursor_traits_filedata.hpp; sourceTree = "<group>"; };
-		FB77AD1D689FBB8F6A32AB5D /* PlayState.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = PlayState.cpp; path = ../../soundlib/PlayState.cpp; sourceTree = "<group>"; };
 		FBE197BEECD905B058DC85FE /* serialization_utils.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = serialization_utils.h; path = ../../common/serialization_utils.h; sourceTree = "<group>"; };
 		FBF22E79CF82B5EBC2544CB9 /* libopenmpt_stream_callbacks_file_posix_lfs64.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = libopenmpt_stream_callbacks_file_posix_lfs64.h; path = ../../libopenmpt/libopenmpt_stream_callbacks_file_posix_lfs64.h; sourceTree = "<group>"; };
-		FC83067740D1ABE982F8E4B7 /* float.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = float.hpp; path = ../../src/mpt/base/float.hpp; sourceTree = "<group>"; };
 		FC85D407DBA2EE39B7AC4A47 /* inputfile.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = inputfile.hpp; path = ../../src/mpt/io_file/inputfile.hpp; sourceTree = "<group>"; };
 		FED01DA32FB4159542CC4BE3 /* tuning.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = tuning.h; path = ../../soundlib/tuning.h; sourceTree = "<group>"; };
 		FEDB3A1791690409FA41A857 /* Echo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Echo.h; path = ../../soundlib/plugins/dmo/Echo.h; sourceTree = "<group>"; };
+		FF7F8F60F37ED8D27869EDA0 /* mptFileTemporary.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = mptFileTemporary.cpp; path = ../../common/mptFileTemporary.cpp; sourceTree = "<group>"; };
 		FFB3088F4401AE018628E6CF /* Resampler.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Resampler.h; path = ../../soundlib/Resampler.h; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -757,6 +713,7 @@
 				45D0E0DE525B9350CD405F1E /* DigiBoosterEcho.h */,
 				D6BBDE00997C3E72F6B11C40 /* LFOPlugin.cpp */,
 				6858F8CA2EE6F03C9CE9170A /* LFOPlugin.h */,
+				9133E604FE5BF476FFEEE444 /* OpCodes.h */,
 				D89E49F2E528FC64600DC832 /* PlugInterface.cpp */,
 				6058487C545791EED942A6BC /* PlugInterface.h */,
 				CE32D5B4DABD882655A253F4 /* PluginManager.cpp */,
@@ -941,7 +898,6 @@
 			children = (
 				64377F84A84B50B69C1CD5C4 /* compiler.hpp */,
 				417FE082D6F69FB44592F6C2 /* libc.hpp */,
-				352971E219707A149D5DA822 /* libcxx.hpp */,
 				788395FAAA7CE0AC245C1C3A /* mfc.hpp */,
 				B9B7FE84CBE1DB36FFD2C4C4 /* windows.hpp */,
 			);
@@ -1074,9 +1030,9 @@
 				9F2E1C1AF92F330CC0762A5A /* BuildSettingsCompiler.h */,
 				13F9789407F8C2068CE3D6D4 /* ComponentManager.cpp */,
 				0A20B0FECCE111702A15EF3E /* ComponentManager.h */,
+				EF78F5224ABA48941E149362 /* Dither.h */,
 				6D2350A8B171F61AF3992EE8 /* FileReader.h */,
 				C6F2110A1E5783FCD0659F4A /* FileReaderFwd.h */,
-				B55D7A70F9AC1FE23BD358B0 /* GzipWriter.h */,
 				830F3566F431D658A9F883A6 /* Logging.cpp */,
 				6303157093E70D62A6FF43B0 /* Logging.h */,
 				8F52A05ED3A145D015C87E9E /* Profiler.cpp */,
@@ -1087,7 +1043,9 @@
 				F78A378464B245F6664535C4 /* mptBaseTypes.h */,
 				12DCF57C800503EE8197F3BC /* mptBaseUtils.h */,
 				BA99A2F415DAF666E9354134 /* mptCPU.h */,
+				13F63AEAA68404DC0F5CA92A /* mptFileIO.cpp */,
 				50CF7EB4C1F21FA677B8CCF4 /* mptFileIO.h */,
+				FF7F8F60F37ED8D27869EDA0 /* mptFileTemporary.cpp */,
 				43CBFB4A068C5BBC63C1398A /* mptFileTemporary.h */,
 				074C76BE5EB1E9B010C004FE /* mptFileType.cpp */,
 				AFFB10484288DA3AAB617E88 /* mptFileType.h */,
@@ -1158,7 +1116,6 @@
 				1AA25C6F0B99CA61779D4AAF /* check_platform.hpp */,
 				86260AE5E2AD0F576B4FC925 /* compiletime_warning.hpp */,
 				021DA33D0EA855AF898D217D /* constexpr_throw.hpp */,
-				C9E029A3906E2115FE7047E3 /* debugging.hpp */,
 				C3FAC67D5688906FBF6134BD /* detect.hpp */,
 				1C2F81B7DEEFE2293C24BFF7 /* detect_arch.hpp */,
 				321030713E9AE2E3B97FAEB1 /* detect_compiler.hpp */,
@@ -1166,7 +1123,7 @@
 				755174CF6950BE41EE3BD30F /* detect_libcxx.hpp */,
 				175234BFDDE02C314BE252FF /* detect_os.hpp */,
 				107683B90475CD2B8960E1F9 /* detect_quirks.hpp */,
-				FC83067740D1ABE982F8E4B7 /* float.hpp */,
+				4FB7A50743B6EE79C8A20347 /* floatingpoint.hpp */,
 				787945A7E5A15419E73443E7 /* integer.hpp */,
 				C3E634155673FE07BF4CA255 /* macros.hpp */,
 				4614D43FB73775316CFE227F /* math.hpp */,
@@ -1180,11 +1137,9 @@
 				D941724BCA38E03D363C608B /* saturate_round.hpp */,
 				85812219180EEC0B80E79059 /* secure.hpp */,
 				212A36FD7B2B4DEF4272453D /* semantic_version.hpp */,
-				219A364192BCD73348838481 /* size.hpp */,
 				A105879DAD903A0F287505DD /* source_location.hpp */,
 				F6F37E8F68161F811DDCCCCF /* span.hpp */,
 				8BDA4A4F76C67041BEAC388F /* tests */,
-				F5DB217BB89B81ED15D05FBB /* type_traits.hpp */,
 				5609DBF3C331EA65C4C4DA33 /* utility.hpp */,
 				AB10601718386E8919CB5E57 /* version.hpp */,
 				2C28EA4338B39CB5B3986883 /* wrapping_divide.hpp */,
@@ -1303,35 +1258,25 @@
 				778D494BBBDBEEBDFE03278B /* ITTools.cpp */,
 				BBEF0B95B5B0C807EFAFC9D5 /* ITTools.h */,
 				567D9E616834DE53DDA2CCA1 /* InstrumentExtensions.cpp */,
-				89879ACD7D86E43F0271F90D /* InstrumentSynth.cpp */,
-				45A87D570868DDC9659DBB97 /* InstrumentSynth.h */,
 				9E091D790F2BBE6BC4F26BB9 /* IntMixer.h */,
 				CB46E6335DD4B025C6AD5473 /* Load_667.cpp */,
 				B569F9F747F7C3E9B0D06837 /* Load_669.cpp */,
 				37F80675CA85D067335E74B5 /* Load_amf.cpp */,
 				29DC06EFBC69D0E12542752F /* Load_ams.cpp */,
 				B99E396D4C2C035FB504A7AD /* Load_c67.cpp */,
-				EDF8E6598086B04BE95F5499 /* Load_cba.cpp */,
 				6A66E753FCF4B14565CD5593 /* Load_dbm.cpp */,
 				D14936A73E714519400434E7 /* Load_digi.cpp */,
 				36CAA59BC9586F8D323113DB /* Load_dmf.cpp */,
 				F5D60F958863D987F13C7DD5 /* Load_dsm.cpp */,
 				9BE2D067090ADED90A9DCEA7 /* Load_dsym.cpp */,
 				0D18D5B79FA69FA9087F43F7 /* Load_dtm.cpp */,
-				14754CCFA70316C10FDBBB0F /* Load_etx.cpp */,
 				9BB2E75F2E40B1519719559F /* Load_far.cpp */,
-				B6BBD03FFB0A75B13D31AE7F /* Load_fc.cpp */,
 				9CF744BB2F850EAD985DB2FB /* Load_fmt.cpp */,
-				0C4FEA7B9EDDB46D07B658BB /* Load_ftm.cpp */,
 				97BF12BD2A4CDCAF932580FD /* Load_gdm.cpp */,
-				D668A71B68F6710DD1CF155B /* Load_gmc.cpp */,
 				10E0ADC7A36E77B90C471C07 /* Load_gt2.cpp */,
-				D727124F69B4DC41D28D808F /* Load_ice.cpp */,
 				34D45985C7622377303AC7C5 /* Load_imf.cpp */,
-				26B859FFB94623F1221EC83F /* Load_ims.cpp */,
 				62235C27A6720199E8993A67 /* Load_it.cpp */,
 				6A572747FCE4F13965BD9587 /* Load_itp.cpp */,
-				19B6191F86DE27918871175F /* Load_kris.cpp */,
 				2052C727B2E091191BB93567 /* Load_mdl.cpp */,
 				8F093E392197082B8A6FAC79 /* Load_med.cpp */,
 				EC1456C17EA220B3E77AC501 /* Load_mid.cpp */,
@@ -1343,32 +1288,22 @@
 				6AE995E9FD775FDB66500429 /* Load_okt.cpp */,
 				4E4D213FE0DAEB3149B38F7F /* Load_plm.cpp */,
 				F1208C2D83AE561FEC86FA6D /* Load_psm.cpp */,
-				BE474F872B6F5DF92D024DC7 /* Load_pt36.cpp */,
 				0863524F9AF11C4103C9C08F /* Load_ptm.cpp */,
-				6DB68B53DADE99C5DC718993 /* Load_puma.cpp */,
-				079A67139A2831050300D553 /* Load_rtm.cpp */,
 				1F41A2D3B1CF6CC51AA81113 /* Load_s3m.cpp */,
 				C950084F5BDDD241C4B6768F /* Load_sfx.cpp */,
-				1D12DDB1AFA0A7A318794BF1 /* Load_stk.cpp */,
 				0735F17599C3BB67029C5FB5 /* Load_stm.cpp */,
 				666A8F1BF8F8590D61D0FD5B /* Load_stp.cpp */,
 				7D070D1F43950491B1972B5F /* Load_symmod.cpp */,
-				73A166DF062F30D16F07D51F /* Load_tcb.cpp */,
 				54393E69E6C7085B4F9FACA9 /* Load_uax.cpp */,
 				7FD19A57125F64497B380897 /* Load_ult.cpp */,
-				9EEAF28B0C1300FD0DA5F0CB /* Load_unic.cpp */,
 				694D3F69FBDB095B64B3ADA9 /* Load_wav.cpp */,
 				2A6435F76EB2DB69B0DA1437 /* Load_xm.cpp */,
 				2EF17543C17F3F352A57E383 /* Load_xmf.cpp */,
 				E59C6F4DDF5E2BBF195D2D8D /* Loaders.h */,
 				A78B5E5FFEF0D151B0FEEC9F /* MIDIEvents.cpp */,
 				F42AAB0986B874FBEF911949 /* MIDIEvents.h */,
-				C61BC533BA1B0EA53F062373 /* MIDIMacroParser.cpp */,
-				E7ACD57DAA6D35EF07A213BD /* MIDIMacroParser.h */,
 				50FB747FA860E7715A6F02BF /* MIDIMacros.cpp */,
 				D37D7529660B3F1BCEE3E369 /* MIDIMacros.h */,
-				99E1AAB12C6F74A3954818F1 /* MODTools.cpp */,
-				8209AB5BF32C4C4DA8F2F99B /* MODTools.h */,
 				BF406A572C6878C92DFB6897 /* MPEGFrame.cpp */,
 				A0ADCD61E4FC72D32723ABA1 /* MPEGFrame.h */,
 				681E06B9AC6CAC2BEE93E4F9 /* Message.cpp */,
@@ -1396,10 +1331,6 @@
 				F1E743CB3635E93D785D220B /* OggStream.h */,
 				A7A09A55A16256C7DB615895 /* Paula.cpp */,
 				1AD54F9F7616A3114970EDDF /* Paula.h */,
-				FB77AD1D689FBB8F6A32AB5D /* PlayState.cpp */,
-				A35EA1E7E7AD475929D48027 /* PlayState.h */,
-				EDB72A5D8FA0C64F86C7D89D /* PlaybackTest.cpp */,
-				042BC5075B9137F90D9F5347 /* PlaybackTest.h */,
 				FFB3088F4401AE018628E6CF /* Resampler.h */,
 				1A88E03F71EE533123FC6E7F /* RowVisitor.cpp */,
 				F06C78E982FA42DBEBD2E729 /* RowVisitor.h */,
@@ -1475,7 +1406,6 @@
 		F76908210E7BA353FE979E61 /* random */ = {
 			isa = PBXGroup;
 			children = (
-				E38574ABA645D51D037AB2EB /* any_engine.hpp */,
 				8DE932C12076FCB3894FA101 /* crand.hpp */,
 				8876678BE2777E7DA9BE75CB /* default_engines.hpp */,
 				1CE2C4318A0AD2A38B9DC271 /* device.hpp */,
@@ -1504,7 +1434,6 @@
 				23EF16CF7F4F3B81C192DD0F /* filedata_base_buffered.hpp */,
 				E276AB813DD6D033801A71C1 /* filedata_base_seekable.hpp */,
 				8ABDA3472E24D0F9455A8987 /* filedata_base_unseekable.hpp */,
-				1BD71CF93D735A2B35E9F339 /* filedata_base_unseekable_buffer.hpp */,
 				E0CF51E794CB6B19767DA827 /* filedata_callbackstream.hpp */,
 				079DA5A7A1C19AD951E77BE7 /* filedata_memory.hpp */,
 				CE271C83BB8EAF355888A2C3 /* filedata_stdstream.hpp */,
@@ -1628,6 +1557,8 @@
 				B591ED4C6887F6FEB9AA538C /* ComponentManager.cpp in Sources */,
 				527E833E969254708A63D97E /* Logging.cpp in Sources */,
 				1CE1B0B6B52E9668E37596F6 /* Profiler.cpp in Sources */,
+				1CD4D902FBF1F334D7FB4F42 /* mptFileIO.cpp in Sources */,
+				BB65D2D86E5BDC8ABF7E3918 /* mptFileTemporary.cpp in Sources */,
 				1F7082161F13654859681856 /* mptFileType.cpp in Sources */,
 				DF08AE5AEEEDDA8CDB61649A /* mptPathString.cpp in Sources */,
 				926864F471857F264D8EDB34 /* mptRandom.cpp in Sources */,
@@ -1653,33 +1584,24 @@
 				32D83065D0B93117A83776A5 /* ITCompression.cpp in Sources */,
 				E6583D037EA522B5ACEC2343 /* ITTools.cpp in Sources */,
 				4FD75379AB22A3AB995489B9 /* InstrumentExtensions.cpp in Sources */,
-				C6B55BA579AB6557CACDC1E5 /* InstrumentSynth.cpp in Sources */,
 				5EE7936B3E04AD9D1A0E09AB /* Load_667.cpp in Sources */,
 				4E13C16F2D30DBA1093A37AF /* Load_669.cpp in Sources */,
 				A7B576CD86D290FF62DBED0D /* Load_amf.cpp in Sources */,
 				BA54A1E79971BC19757B1827 /* Load_ams.cpp in Sources */,
 				44F9DD452416F77700205385 /* Load_c67.cpp in Sources */,
-				2AE422F10A013D23E60A9931 /* Load_cba.cpp in Sources */,
 				7B65168B5A8230BD368B8CCB /* Load_dbm.cpp in Sources */,
 				8479AC1F9F461AD1A316B25F /* Load_digi.cpp in Sources */,
 				C81D1553A73A2F8583438B93 /* Load_dmf.cpp in Sources */,
 				8B4D81ED6A6A9C1F4673F82D /* Load_dsm.cpp in Sources */,
 				D2EFC1DFEDBC3091F18CC81F /* Load_dsym.cpp in Sources */,
 				F5A6792FD4C39361B0CCEF6F /* Load_dtm.cpp in Sources */,
-				CE9155C7ADAE6FF989B7CC07 /* Load_etx.cpp in Sources */,
 				D1EA5157B1076B898D10C797 /* Load_far.cpp in Sources */,
-				C3D725375C240AE98A6B0B77 /* Load_fc.cpp in Sources */,
 				BD4216739C5F30A578688CB3 /* Load_fmt.cpp in Sources */,
-				609638333FB352651BBCAE73 /* Load_ftm.cpp in Sources */,
 				707EA3954F9BBDC72BA519D5 /* Load_gdm.cpp in Sources */,
-				81C26ED360DF89053CE8E513 /* Load_gmc.cpp in Sources */,
 				8676CA3F6593E471419D407F /* Load_gt2.cpp in Sources */,
-				B464B3479381CD796F8B2987 /* Load_ice.cpp in Sources */,
 				537472DD32918D0F0E9AE91D /* Load_imf.cpp in Sources */,
-				66139DF74530B829213A1437 /* Load_ims.cpp in Sources */,
 				7FDA539F18273951466E39DF /* Load_it.cpp in Sources */,
 				E7C01BBFC6DD35F1A2E691FF /* Load_itp.cpp in Sources */,
-				C806B217E2D320C9E6A3B857 /* Load_kris.cpp in Sources */,
 				39B7C99F18D4E3D1F4DE3FDF /* Load_mdl.cpp in Sources */,
 				E76008D1C67D2303A2867F11 /* Load_med.cpp in Sources */,
 				90C3E5D96FE1000B4BEA5C19 /* Load_mid.cpp in Sources */,
@@ -1691,27 +1613,19 @@
 				49C7038128E41DB304ED79C1 /* Load_okt.cpp in Sources */,
 				247D3937039A5369DFA3AF77 /* Load_plm.cpp in Sources */,
 				0CEBFC05EC091637C8127245 /* Load_psm.cpp in Sources */,
-				3E00C2FF58CD31B15C9DC93F /* Load_pt36.cpp in Sources */,
 				7744F34756620D79326B6987 /* Load_ptm.cpp in Sources */,
-				877C818BA248F03DA61987CB /* Load_puma.cpp in Sources */,
-				E234B24BC151CC7D9D5B288B /* Load_rtm.cpp in Sources */,
 				9715CA0B7632E43D523C404B /* Load_s3m.cpp in Sources */,
 				EA420947C95F2379A5687F87 /* Load_sfx.cpp in Sources */,
-				A88063C9879D7DFB63A6DA09 /* Load_stk.cpp in Sources */,
 				97AC91CD76C9ABFF52D3080D /* Load_stm.cpp in Sources */,
 				FE6ED6D3DD8BF105B9954D13 /* Load_stp.cpp in Sources */,
 				CF116C1742F9E3C965479257 /* Load_symmod.cpp in Sources */,
-				19C908D7F8E62309D4EF7F17 /* Load_tcb.cpp in Sources */,
 				4174F40120920E33FC9B6A41 /* Load_uax.cpp in Sources */,
 				F4EF37CFD40C5201B015AE0F /* Load_ult.cpp in Sources */,
-				84F9B8439FC626F5A396BE83 /* Load_unic.cpp in Sources */,
 				BD3885019C559F33785EFB41 /* Load_wav.cpp in Sources */,
 				00BB926F99087821C74F78AF /* Load_xm.cpp in Sources */,
 				F57A8B7BD497A5ADB0A101BB /* Load_xmf.cpp in Sources */,
 				CCEFFE57CC92E18906E79497 /* MIDIEvents.cpp in Sources */,
-				212E136BD4241D1D254679AB /* MIDIMacroParser.cpp in Sources */,
 				80EEA677809189A9BAE63CB7 /* MIDIMacros.cpp in Sources */,
-				978580C976A29AFB52ABF709 /* MODTools.cpp in Sources */,
 				393D72CF5409E18157DA790F /* MPEGFrame.cpp in Sources */,
 				168C3C51AED92203DD202291 /* Message.cpp in Sources */,
 				7A5E5DAB8A4389DD76B713EB /* MixFuncTable.cpp in Sources */,
@@ -1724,8 +1638,6 @@
 				ABC5779D79E8CB4F00F71DDD /* OPL.cpp in Sources */,
 				FD083C9917D4AB4B1BA542D9 /* OggStream.cpp in Sources */,
 				33DB2DAD46050A5F79F5F3ED /* Paula.cpp in Sources */,
-				98C2B4F5B38F23A7B75FBB35 /* PlayState.cpp in Sources */,
-				9580A935A565D56791D95F75 /* PlaybackTest.cpp in Sources */,
 				119C6E37113F51694B940477 /* RowVisitor.cpp in Sources */,
 				D443016FB3601BA18F6977AF /* S3MTools.cpp in Sources */,
 				77A73F692A9D491B7BBFA5A9 /* SampleFormatBRR.cpp in Sources */,

Frameworks/OpenMPT/OpenMPT/build/xcode-macosx/libopenmpt.xcodeproj/project.pbxproj

@@ -20,15 +20,13 @@
 		1553F71F02BB89D19FB57D5F /* WavesReverb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7E0A11A78A94C41905798FE7 /* WavesReverb.cpp */; };
 		168C3C51AED92203DD202291 /* Message.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 681E06B9AC6CAC2BEE93E4F9 /* Message.cpp */; };
 		18C62C9BF7E346CDD3ECA2DB /* SampleIO.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 78CAB4630B587E55743122A3 /* SampleIO.cpp */; };
-		19C908D7F8E62309D4EF7F17 /* Load_tcb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 73A166DF062F30D16F07D51F /* Load_tcb.cpp */; };
+		1CD4D902FBF1F334D7FB4F42 /* mptFileIO.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 13F63AEAA68404DC0F5CA92A /* mptFileIO.cpp */; };
 		1CE1B0B6B52E9668E37596F6 /* Profiler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8F52A05ED3A145D015C87E9E /* Profiler.cpp */; };
 		1E48E6EB2E2E131D1AA19D2B /* Gargle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 78BD15B31AA6B1A511CDC3F3 /* Gargle.cpp */; };
 		1F7082161F13654859681856 /* mptFileType.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 074C76BE5EB1E9B010C004FE /* mptFileType.cpp */; };
-		212E136BD4241D1D254679AB /* MIDIMacroParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C61BC533BA1B0EA53F062373 /* MIDIMacroParser.cpp */; };
 		247D3937039A5369DFA3AF77 /* Load_plm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4E4D213FE0DAEB3149B38F7F /* Load_plm.cpp */; };
 		281FA911C06C8EC3EEB38F51 /* Sndfile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BAF08779FF3F2CEB416665B9 /* Sndfile.cpp */; };
 		2837D1CEECED2840A15BD00E /* openmpt-ogg.lib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5DFCA7B6A69BE5E8C9C79DF6 /* openmpt-ogg.lib */; };
-		2AE422F10A013D23E60A9931 /* Load_cba.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EDF8E6598086B04BE95F5499 /* Load_cba.cpp */; };
 		2B1F4A030A3C6435E645C043 /* Load_mo3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F49974BA1D7613D0AB0058B /* Load_mo3.cpp */; };
 		30BE965074D2678268A3EC90 /* mptTime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B176D8582299794AD8602698 /* mptTime.cpp */; };
 		30C4FED93067E20B6ABC9519 /* ModChannel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5FDB15C1B74088B3694EA401 /* ModChannel.cpp */; };
@@ -41,7 +39,6 @@
 		393D72CF5409E18157DA790F /* MPEGFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BF406A572C6878C92DFB6897 /* MPEGFrame.cpp */; };
 		39B7C99F18D4E3D1F4DE3FDF /* Load_mdl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2052C727B2E091191BB93567 /* Load_mdl.cpp */; };
 		3C92F25FD4DFD8110326D89F /* Fastmix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1054EEE754A3945996CACD27 /* Fastmix.cpp */; };
-		3E00C2FF58CD31B15C9DC93F /* Load_pt36.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE474F872B6F5DF92D024DC7 /* Load_pt36.cpp */; };
 		3EF604A50D1958579427AAE5 /* DSP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E2066CCD3D47C03F10A20B0D /* DSP.cpp */; };
 		3F8606FDF27C10AF439E6D3D /* SampleFormatMP3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4737ECA53B373617C0224AE5 /* SampleFormatMP3.cpp */; };
 		40F236CF2E59C981CB53BD0F /* I3DL2Reverb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA3E0E57B6C8C0C931AD8C97 /* I3DL2Reverb.cpp */; };
@@ -58,10 +55,8 @@
 		56DD54C135FA6EF31203CB01 /* Load_mtm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0990B3299C1E7D1B04F72169 /* Load_mtm.cpp */; };
 		574F1261366C2C93127588A1 /* load_j2b.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A33106C935BED0BB9E977509 /* load_j2b.cpp */; };
 		5EE7936B3E04AD9D1A0E09AB /* Load_667.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CB46E6335DD4B025C6AD5473 /* Load_667.cpp */; };
-		609638333FB352651BBCAE73 /* Load_ftm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0C4FEA7B9EDDB46D07B658BB /* Load_ftm.cpp */; };
 		63B0011DD79878CFF9E6275D /* Load_mus_km.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 02F4B8C5C982B0373784D705 /* Load_mus_km.cpp */; };
 		6600F8E10024EE13B04ACF21 /* ContainerMMCMP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 124C374986A67C3B048A0589 /* ContainerMMCMP.cpp */; };
-		66139DF74530B829213A1437 /* Load_ims.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26B859FFB94623F1221EC83F /* Load_ims.cpp */; };
 		689E270C1013C2BEB8D8CD4C /* DigiBoosterEcho.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D078EDD4AF1B894663FD8C14 /* DigiBoosterEcho.cpp */; };
 		69AC6475078D6527DF0BAAB5 /* ParamEq.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8C3D549D4EFDB50FAC3292DD /* ParamEq.cpp */; };
 		6A44FDD1AE58CF03A22A5411 /* tuning.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48199D39B93C3E2B6F02EB79 /* tuning.cpp */; };
@@ -74,24 +69,18 @@
 		7DDE7A6B76A93A1D011DA0AB /* SampleFormatMediaFoundation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D2D268330651A7A51E4B8673 /* SampleFormatMediaFoundation.cpp */; };
 		7FDA539F18273951466E39DF /* Load_it.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 62235C27A6720199E8993A67 /* Load_it.cpp */; };
 		80EEA677809189A9BAE63CB7 /* MIDIMacros.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FB747FA860E7715A6F02BF /* MIDIMacros.cpp */; };
-		81C26ED360DF89053CE8E513 /* Load_gmc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D668A71B68F6710DD1CF155B /* Load_gmc.cpp */; };
 		8479AC1F9F461AD1A316B25F /* Load_digi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D14936A73E714519400434E7 /* Load_digi.cpp */; };
 		84A9E60B844CC93DBEA17C4B /* MixerLoops.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B810F0D30F7663C5C1847F13 /* MixerLoops.cpp */; };
-		84F9B8439FC626F5A396BE83 /* Load_unic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9EEAF28B0C1300FD0DA5F0CB /* Load_unic.cpp */; };
 		8676CA3F6593E471419D407F /* Load_gt2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 10E0ADC7A36E77B90C471C07 /* Load_gt2.cpp */; };
 		8751165421750B86D19AEC94 /* mptStringBuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C510221C396A670EB74DF05C /* mptStringBuffer.cpp */; };
-		877C818BA248F03DA61987CB /* Load_puma.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6DB68B53DADE99C5DC718993 /* Load_puma.cpp */; };
 		8B4D81ED6A6A9C1F4673F82D /* Load_dsm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5D60F958863D987F13C7DD5 /* Load_dsm.cpp */; };
 		8D04F5E56C221017482B6C25 /* WAVTools.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1F5AB80DB1E881FF1AC1264D /* WAVTools.cpp */; };
 		90C3E5D96FE1000B4BEA5C19 /* Load_mid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EC1456C17EA220B3E77AC501 /* Load_mid.cpp */; };
 		926864F471857F264D8EDB34 /* mptRandom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5D6A74BCEFF83EAE58D0E2FC /* mptRandom.cpp */; };
-		9580A935A565D56791D95F75 /* PlaybackTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EDB72A5D8FA0C64F86C7D89D /* PlaybackTest.cpp */; };
 		9715CA0B7632E43D523C404B /* Load_s3m.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1F41A2D3B1CF6CC51AA81113 /* Load_s3m.cpp */; };
 		976568F7F2B0B929E0E29F37 /* libopenmpt_ext_impl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7355A89F850CE891FA7AD6DF /* libopenmpt_ext_impl.cpp */; };
-		978580C976A29AFB52ABF709 /* MODTools.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 99E1AAB12C6F74A3954818F1 /* MODTools.cpp */; };
 		97AC91CD76C9ABFF52D3080D /* Load_stm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0735F17599C3BB67029C5FB5 /* Load_stm.cpp */; };
 		97B1A0C5975483F7D1A93705 /* Echo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9C9696EDF3FC09DFA60A252D /* Echo.cpp */; };
-		98C2B4F5B38F23A7B75FBB35 /* PlayState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FB77AD1D689FBB8F6A32AB5D /* PlayState.cpp */; };
 		9F1029ABB9DC985DBDAD2FEB /* ModSample.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A32EC1731056CFE511E9BFB3 /* ModSample.cpp */; };
 		9F2D020A8C9494BC298E884A /* PlugInterface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D89E49F2E528FC64600DC832 /* PlugInterface.cpp */; };
 		9FC1BA253DA2BAD715210065 /* Flanger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3286C74DF54727BF527C058D /* Flanger.cpp */; };
@@ -99,18 +88,17 @@
 		A5815DFEB5CE41F0B3BB0C3E /* openmpt-vorbis.lib in Frameworks */ = {isa = PBXBuildFile; fileRef = E7CD47E68F42E3983807EE26 /* openmpt-vorbis.lib */; };
 		A5DAFA6B19C3721D3C1120AB /* WindowedFIR.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 14715833DAFF4FA549017673 /* WindowedFIR.cpp */; };
 		A7B576CD86D290FF62DBED0D /* Load_amf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 37F80675CA85D067335E74B5 /* Load_amf.cpp */; };
-		A88063C9879D7DFB63A6DA09 /* Load_stk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1D12DDB1AFA0A7A318794BF1 /* Load_stk.cpp */; };
 		A896F1F84677F2AA1DF63838 /* LFOPlugin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D6BBDE00997C3E72F6B11C40 /* LFOPlugin.cpp */; };
 		A9C7C28B051312BDF344F8CB /* AudioCriticalSection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3947FF534AFF3F45C06D2D93 /* AudioCriticalSection.cpp */; };
 		A9D47C71514A1823FA0F22B1 /* SoundFilePlayConfig.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F19DB8D9D040544B85225719 /* SoundFilePlayConfig.cpp */; };
 		AB7FFC4D9117037F545C128D /* mod_specifications.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 274EB9F5814FD0E74896C835 /* mod_specifications.cpp */; };
 		ABC5779D79E8CB4F00F71DDD /* OPL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B3A14F450EE2A2B7E23CED85 /* OPL.cpp */; };
 		B17E84D14F5F858326DDCB11 /* ContainerPP20.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38019939FAC1F9AB57F6D779 /* ContainerPP20.cpp */; };
-		B464B3479381CD796F8B2987 /* Load_ice.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D727124F69B4DC41D28D808F /* Load_ice.cpp */; };
 		B5220D6D8345611F0A53B3AD /* AGC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BFC43D151B059087EE5FDB55 /* AGC.cpp */; };
 		B591ED4C6887F6FEB9AA538C /* ComponentManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 13F9789407F8C2068CE3D6D4 /* ComponentManager.cpp */; };
 		B5D9190DF9ECEA3FEDBE6F4D /* Sndmix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A0FD6B58B3277A740F924F5 /* Sndmix.cpp */; };
 		BA54A1E79971BC19757B1827 /* Load_ams.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29DC06EFBC69D0E12542752F /* Load_ams.cpp */; };
+		BB65D2D86E5BDC8ABF7E3918 /* mptFileTemporary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FF7F8F60F37ED8D27869EDA0 /* mptFileTemporary.cpp */; };
 		BBC2281DFFD5F94FF3A77E5D /* Tables.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 488AACC5B9AD4DB76F73FB05 /* Tables.cpp */; };
 		BC15882904B4C65B27E07E69 /* patternContainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8BE9A4117CE11203E8E49251 /* patternContainer.cpp */; };
 		BCC110A956E505DB070AE6E9 /* DMOUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 664DAA91DAA7EF83588B78D1 /* DMOUtils.cpp */; };
@@ -118,17 +106,13 @@
 		BD4216739C5F30A578688CB3 /* Load_fmt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CF744BB2F850EAD985DB2FB /* Load_fmt.cpp */; };
 		BE9B2A6B02AEFB9DF68080AB /* Snd_fx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 74D7DB33E5FA7C259BC12973 /* Snd_fx.cpp */; };
 		C0082C03041BFD35F7ED8243 /* Reverb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B50C144B262EB53DDBF5628B /* Reverb.cpp */; };
-		C3D725375C240AE98A6B0B77 /* Load_fc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6BBD03FFB0A75B13D31AE7F /* Load_fc.cpp */; };
 		C55C8AFDA479A52F8083013D /* UMXTools.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C7851FA55A12E997C2EB8DE5 /* UMXTools.cpp */; };
-		C6B55BA579AB6557CACDC1E5 /* InstrumentSynth.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 89879ACD7D86E43F0271F90D /* InstrumentSynth.cpp */; };
 		C746074BA663217D826C7D8B /* Load_mt2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0E85EC13A113B60509EC5A53 /* Load_mt2.cpp */; };
 		C79768571036A68933625E97 /* libopenmpt_impl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7F22B5FF701A23F1DC1DA43F /* libopenmpt_impl.cpp */; };
-		C806B217E2D320C9E6A3B857 /* Load_kris.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 19B6191F86DE27918871175F /* Load_kris.cpp */; };
 		C81D1553A73A2F8583438B93 /* Load_dmf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 36CAA59BC9586F8D323113DB /* Load_dmf.cpp */; };
 		CB31B3AF3F1A2B616167D9EF /* modsmp_ctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 09E33737D0712EA93E735577 /* modsmp_ctrl.cpp */; };
 		CC12FBA114B239D337DDF1E1 /* Compressor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9334A009842C0DFBF02F8E49 /* Compressor.cpp */; };
 		CCEFFE57CC92E18906E79497 /* MIDIEvents.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A78B5E5FFEF0D151B0FEEC9F /* MIDIEvents.cpp */; };
-		CE9155C7ADAE6FF989B7CC07 /* Load_etx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 14754CCFA70316C10FDBBB0F /* Load_etx.cpp */; };
 		CEDA1F2FDEBF4B61CB32D56F /* Chorus.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84A787B7269123A91DB835F7 /* Chorus.cpp */; };
 		CF000469179F429B3ACAFAA9 /* tuningCollection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE0BC51D0D82A433CDBAA91 /* tuningCollection.cpp */; };
 		CF116C1742F9E3C965479257 /* Load_symmod.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7D070D1F43950491B1972B5F /* Load_symmod.cpp */; };
@@ -142,7 +126,6 @@
 		DEB582A5DE5865D718AD18E5 /* modcommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 746376CDCBC8E9BF7DD7050D /* modcommand.cpp */; };
 		DEBC9FDC22D0710E16A1F61C /* version.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E2FDF24AF52801665192D64 /* version.cpp */; };
 		DF08AE5AEEEDDA8CDB61649A /* mptPathString.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B406AC2ED2A06B4E4511902 /* mptPathString.cpp */; };
-		E234B24BC151CC7D9D5B288B /* Load_rtm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 079A67139A2831050300D553 /* Load_rtm.cpp */; };
 		E6583D037EA522B5ACEC2343 /* ITTools.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 778D494BBBDBEEBDFE03278B /* ITTools.cpp */; };
 		E76008D1C67D2303A2867F11 /* Load_med.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8F093E392197082B8A6FAC79 /* Load_med.cpp */; };
 		E79434E3857535955CF37B23 /* SampleFormats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD65792BA025D99DFD5AB76B /* SampleFormats.cpp */; };
@@ -215,7 +198,6 @@
 		02F4B8C5C982B0373784D705 /* Load_mus_km.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Load_mus_km.cpp; path = ../../soundlib/Load_mus_km.cpp; sourceTree = "<group>"; };
 		03BF85B7480E2B298A3563F7 /* TinyFFT.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = TinyFFT.cpp; path = ../../soundlib/TinyFFT.cpp; sourceTree = "<group>"; };
 		04155894998C17C608286ED4 /* openmpt-mpg123.lib */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "mpg123.xcodeproj"; path = ext/mpg123.xcodeproj; sourceTree = SOURCE_ROOT; };
-		042BC5075B9137F90D9F5347 /* PlaybackTest.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = PlaybackTest.h; path = ../../soundlib/PlaybackTest.h; sourceTree = "<group>"; };
 		046F30B171973F23732A2EF1 /* numeric.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = numeric.hpp; path = ../../src/mpt/base/numeric.hpp; sourceTree = "<group>"; };
 		04D4FEEB3466CDDD0F740D2B /* EQ.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = EQ.cpp; path = ../../sounddsp/EQ.cpp; sourceTree = "<group>"; };
 		04EAEC77C7AB4CE924E02AB7 /* DMOPlugin.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = DMOPlugin.h; path = ../../soundlib/plugins/dmo/DMOPlugin.h; sourceTree = "<group>"; };
@@ -224,7 +206,6 @@
 		073F0DABFB3E571D80296BEB /* SampleFormatSFZ.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = SampleFormatSFZ.cpp; path = ../../soundlib/SampleFormatSFZ.cpp; sourceTree = "<group>"; };
 		074C76BE5EB1E9B010C004FE /* mptFileType.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = mptFileType.cpp; path = ../../common/mptFileType.cpp; sourceTree = "<group>"; };
 		07580841CEBCC33359749681 /* tests_string_utility.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = tests_string_utility.hpp; path = ../../src/mpt/string/tests/tests_string_utility.hpp; sourceTree = "<group>"; };
-		079A67139A2831050300D553 /* Load_rtm.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Load_rtm.cpp; path = ../../soundlib/Load_rtm.cpp; sourceTree = "<group>"; };
 		079DA5A7A1C19AD951E77BE7 /* filedata_memory.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = filedata_memory.hpp; path = ../../src/mpt/io_read/filedata_memory.hpp; sourceTree = "<group>"; };
 		0863524F9AF11C4103C9C08F /* Load_ptm.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Load_ptm.cpp; path = ../../soundlib/Load_ptm.cpp; sourceTree = "<group>"; };
 		09387CD815C32F4A90A7FB18 /* PluginMixBuffer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = PluginMixBuffer.h; path = ../../soundlib/plugins/PluginMixBuffer.h; sourceTree = "<group>"; };
@@ -233,7 +214,6 @@
 		09E33737D0712EA93E735577 /* modsmp_ctrl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = modsmp_ctrl.cpp; path = ../../soundlib/modsmp_ctrl.cpp; sourceTree = "<group>"; };
 		0A20B0FECCE111702A15EF3E /* ComponentManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ComponentManager.h; path = ../../common/ComponentManager.h; sourceTree = "<group>"; };
 		0BC4F1DBADAE8DCDA4D5A01B /* ContainerXPK.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ContainerXPK.cpp; path = ../../soundlib/ContainerXPK.cpp; sourceTree = "<group>"; };
-		0C4FEA7B9EDDB46D07B658BB /* Load_ftm.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Load_ftm.cpp; path = ../../soundlib/Load_ftm.cpp; sourceTree = "<group>"; };
 		0D18D5B79FA69FA9087F43F7 /* Load_dtm.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Load_dtm.cpp; path = ../../soundlib/Load_dtm.cpp; sourceTree = "<group>"; };
 		0E85EC13A113B60509EC5A53 /* Load_mt2.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Load_mt2.cpp; path = ../../soundlib/Load_mt2.cpp; sourceTree = "<group>"; };
 		0F49974BA1D7613D0AB0058B /* Load_mo3.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Load_mo3.cpp; path = ../../soundlib/Load_mo3.cpp; sourceTree = "<group>"; };
@@ -245,9 +225,9 @@
 		1197459E05968F108A81A3DE /* feature_flags.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = feature_flags.hpp; path = ../../src/mpt/arch/feature_flags.hpp; sourceTree = "<group>"; };
 		124C374986A67C3B048A0589 /* ContainerMMCMP.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ContainerMMCMP.cpp; path = ../../soundlib/ContainerMMCMP.cpp; sourceTree = "<group>"; };
 		12DCF57C800503EE8197F3BC /* mptBaseUtils.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = mptBaseUtils.h; path = ../../common/mptBaseUtils.h; sourceTree = "<group>"; };
+		13F63AEAA68404DC0F5CA92A /* mptFileIO.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = mptFileIO.cpp; path = ../../common/mptFileIO.cpp; sourceTree = "<group>"; };
 		13F9789407F8C2068CE3D6D4 /* ComponentManager.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ComponentManager.cpp; path = ../../common/ComponentManager.cpp; sourceTree = "<group>"; };
 		14715833DAFF4FA549017673 /* WindowedFIR.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = WindowedFIR.cpp; path = ../../soundlib/WindowedFIR.cpp; sourceTree = "<group>"; };
-		14754CCFA70316C10FDBBB0F /* Load_etx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Load_etx.cpp; path = ../../soundlib/Load_etx.cpp; sourceTree = "<group>"; };
 		159B6F7E099AB8F08E85CDBE /* PluginManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = PluginManager.h; path = ../../soundlib/plugins/PluginManager.h; sourceTree = "<group>"; };
 		15A918AF09A862218E9376EF /* aligned_array.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = aligned_array.hpp; path = ../../src/mpt/base/aligned_array.hpp; sourceTree = "<group>"; };
 		1679D9615AC87ED39CEFB7A1 /* alloc.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = alloc.hpp; path = ../../src/mpt/base/alloc.hpp; sourceTree = "<group>"; };
@@ -255,18 +235,15 @@
 		178BC3E3DA4C245537810223 /* native_path.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = native_path.hpp; path = ../../src/mpt/path/native_path.hpp; sourceTree = "<group>"; };
 		17F58A2FDAB5EAA137EAC86F /* detect_libc.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = detect_libc.hpp; path = ../../src/mpt/base/detect_libc.hpp; sourceTree = "<group>"; };
 		18A72A335CF5CFA59F1D0873 /* seed.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = seed.hpp; path = ../../src/mpt/random/seed.hpp; sourceTree = "<group>"; };
-		19B6191F86DE27918871175F /* Load_kris.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Load_kris.cpp; path = ../../soundlib/Load_kris.cpp; sourceTree = "<group>"; };
 		1A0FD6B58B3277A740F924F5 /* Sndmix.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Sndmix.cpp; path = ../../soundlib/Sndmix.cpp; sourceTree = "<group>"; };
 		1A88E03F71EE533123FC6E7F /* RowVisitor.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = RowVisitor.cpp; path = ../../soundlib/RowVisitor.cpp; sourceTree = "<group>"; };
 		1A94BBC4BC7E57B6B3A56A04 /* mptStringFormat.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = mptStringFormat.h; path = ../../common/mptStringFormat.h; sourceTree = "<group>"; };
 		1AA25C6F0B99CA61779D4AAF /* check_platform.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = check_platform.hpp; path = ../../src/mpt/base/check_platform.hpp; sourceTree = "<group>"; };
 		1AD54F9F7616A3114970EDDF /* Paula.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Paula.h; path = ../../soundlib/Paula.h; sourceTree = "<group>"; };
 		1B5F95F15FAE3B63A1D57431 /* Tagging.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Tagging.cpp; path = ../../soundlib/Tagging.cpp; sourceTree = "<group>"; };
-		1BD71CF93D735A2B35E9F339 /* filedata_base_unseekable_buffer.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = filedata_base_unseekable_buffer.hpp; path = ../../src/mpt/io_read/filedata_base_unseekable_buffer.hpp; sourceTree = "<group>"; };
 		1C2F81B7DEEFE2293C24BFF7 /* detect_arch.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = detect_arch.hpp; path = ../../src/mpt/base/detect_arch.hpp; sourceTree = "<group>"; };
 		1C6D52530D64C04579684093 /* SampleFormatOpus.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = SampleFormatOpus.cpp; path = ../../soundlib/SampleFormatOpus.cpp; sourceTree = "<group>"; };
 		1CE2C4318A0AD2A38B9DC271 /* device.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = device.hpp; path = ../../src/mpt/random/device.hpp; sourceTree = "<group>"; };
-		1D12DDB1AFA0A7A318794BF1 /* Load_stk.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Load_stk.cpp; path = ../../soundlib/Load_stk.cpp; sourceTree = "<group>"; };
 		1E7AA06D8BA2AEDF8D359EAD /* simple.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = simple.hpp; path = ../../src/mpt/format/simple.hpp; sourceTree = "<group>"; };
 		1F41A2D3B1CF6CC51AA81113 /* Load_s3m.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Load_s3m.cpp; path = ../../soundlib/Load_s3m.cpp; sourceTree = "<group>"; };
 		1F5AB80DB1E881FF1AC1264D /* WAVTools.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = WAVTools.cpp; path = ../../soundlib/WAVTools.cpp; sourceTree = "<group>"; };
@@ -275,14 +252,12 @@
 		20B693A5E7448B175546B1E5 /* MixerSettings.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = MixerSettings.h; path = ../../soundlib/MixerSettings.h; sourceTree = "<group>"; };
 		212A36FD7B2B4DEF4272453D /* semantic_version.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = semantic_version.hpp; path = ../../src/mpt/base/semantic_version.hpp; sourceTree = "<group>"; };
 		2151B0037C9303754FED4E43 /* Mixer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Mixer.h; path = ../../soundlib/Mixer.h; sourceTree = "<group>"; };
-		219A364192BCD73348838481 /* size.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = size.hpp; path = ../../src/mpt/base/size.hpp; sourceTree = "<group>"; };
 		22594181666D12B35A3E97C1 /* fileref.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = fileref.hpp; path = ../../src/mpt/io_file/fileref.hpp; sourceTree = "<group>"; };
 		2323E4A5944685974A0D32E5 /* Snd_defs.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Snd_defs.h; path = ../../soundlib/Snd_defs.h; sourceTree = "<group>"; };
 		236E8DFB1D304A6D572F4C3B /* Tagging.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Tagging.h; path = ../../soundlib/Tagging.h; sourceTree = "<group>"; };
 		23EF16CF7F4F3B81C192DD0F /* filedata_base_buffered.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = filedata_base_buffered.hpp; path = ../../src/mpt/io_read/filedata_base_buffered.hpp; sourceTree = "<group>"; };
 		25972C49C780C83BBEA7DA89 /* ContainerUMX.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ContainerUMX.cpp; path = ../../soundlib/ContainerUMX.cpp; sourceTree = "<group>"; };
 		25EAC3A1C044AC93FC7D11E1 /* unique_basename.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = unique_basename.hpp; path = ../../src/mpt/io_file_unique/unique_basename.hpp; sourceTree = "<group>"; };
-		26B859FFB94623F1221EC83F /* Load_ims.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Load_ims.cpp; path = ../../soundlib/Load_ims.cpp; sourceTree = "<group>"; };
 		274EB9F5814FD0E74896C835 /* mod_specifications.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = mod_specifications.cpp; path = ../../soundlib/mod_specifications.cpp; sourceTree = "<group>"; };
 		27B40A4D98D6AB3F4E9D588D /* SampleIO.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SampleIO.h; path = ../../soundlib/SampleIO.h; sourceTree = "<group>"; };
 		2810796521D235D75BD137A5 /* XMTools.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = XMTools.h; path = ../../soundlib/XMTools.h; sourceTree = "<group>"; };
@@ -304,7 +279,6 @@
 		338C775D77DB1CCFBA02559D /* BitReader.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = BitReader.h; path = ../../soundlib/BitReader.h; sourceTree = "<group>"; };
 		34D45985C7622377303AC7C5 /* Load_imf.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Load_imf.cpp; path = ../../soundlib/Load_imf.cpp; sourceTree = "<group>"; };
 		352908E1F7E96953551E4721 /* libopenmpt_c.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = libopenmpt_c.cpp; path = ../../libopenmpt/libopenmpt_c.cpp; sourceTree = "<group>"; };
-		352971E219707A149D5DA822 /* libcxx.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = libcxx.hpp; path = ../../src/mpt/check/libcxx.hpp; sourceTree = "<group>"; };
 		36619CBCFDC657AE887E2AFC /* inputfile_filecursor.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = inputfile_filecursor.hpp; path = ../../src/mpt/io_file_read/inputfile_filecursor.hpp; sourceTree = "<group>"; };
 		36CAA59BC9586F8D323113DB /* Load_dmf.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Load_dmf.cpp; path = ../../soundlib/Load_dmf.cpp; sourceTree = "<group>"; };
 		37064A799107616B584E58B9 /* tests_random.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = tests_random.hpp; path = ../../src/mpt/random/tests/tests_random.hpp; sourceTree = "<group>"; };
@@ -334,7 +308,6 @@
 		43B7419134AEAF83A0B22FD1 /* libopenmpt_config.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = libopenmpt_config.h; path = ../../libopenmpt/libopenmpt_config.h; sourceTree = "<group>"; };
 		43CBFB4A068C5BBC63C1398A /* mptFileTemporary.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = mptFileTemporary.h; path = ../../common/mptFileTemporary.h; sourceTree = "<group>"; };
 		44E6E1C323897D35D86B8003 /* tests_base_bit.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = tests_base_bit.hpp; path = ../../src/mpt/base/tests/tests_base_bit.hpp; sourceTree = "<group>"; };
-		45A87D570868DDC9659DBB97 /* InstrumentSynth.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = InstrumentSynth.h; path = ../../soundlib/InstrumentSynth.h; sourceTree = "<group>"; };
 		45D0E0DE525B9350CD405F1E /* DigiBoosterEcho.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = DigiBoosterEcho.h; path = ../../soundlib/plugins/DigiBoosterEcho.h; sourceTree = "<group>"; };
 		45DBF5F73F9DB269799CB437 /* Dlsbank.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Dlsbank.h; path = ../../soundlib/Dlsbank.h; sourceTree = "<group>"; };
 		4614D43FB73775316CFE227F /* math.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = math.hpp; path = ../../src/mpt/base/math.hpp; sourceTree = "<group>"; };
@@ -354,6 +327,7 @@
 		4DFC0969924AAEDBD471E7A9 /* ltdl.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = ltdl.hpp; path = ../../src/mpt/detect/ltdl.hpp; sourceTree = "<group>"; };
 		4E4D213FE0DAEB3149B38F7F /* Load_plm.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Load_plm.cpp; path = ../../soundlib/Load_plm.cpp; sourceTree = "<group>"; };
 		4E96BB31E124852349FD2971 /* types.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = types.hpp; path = ../../src/mpt/string/types.hpp; sourceTree = "<group>"; };
+		4FB7A50743B6EE79C8A20347 /* floatingpoint.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = floatingpoint.hpp; path = ../../src/mpt/base/floatingpoint.hpp; sourceTree = "<group>"; };
 		50318A59BD5998CBBEEC8899 /* os_path.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = os_path.hpp; path = ../../src/mpt/path/os_path.hpp; sourceTree = "<group>"; };
 		50CF7EB4C1F21FA677B8CCF4 /* mptFileIO.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = mptFileIO.h; path = ../../common/mptFileIO.h; sourceTree = "<group>"; };
 		50FB747FA860E7715A6F02BF /* MIDIMacros.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = MIDIMacros.cpp; path = ../../soundlib/MIDIMacros.cpp; sourceTree = "<group>"; };
@@ -399,7 +373,6 @@
 		6B9C8BDDC301FECF75101A1D /* Gargle.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Gargle.h; path = ../../soundlib/plugins/dmo/Gargle.h; sourceTree = "<group>"; };
 		6C67B7D97E1EF7CBF38CE619 /* tests_base_math.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = tests_base_math.hpp; path = ../../src/mpt/base/tests/tests_base_math.hpp; sourceTree = "<group>"; };
 		6D2350A8B171F61AF3992EE8 /* FileReader.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = FileReader.h; path = ../../common/FileReader.h; sourceTree = "<group>"; };
-		6DB68B53DADE99C5DC718993 /* Load_puma.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Load_puma.cpp; path = ../../soundlib/Load_puma.cpp; sourceTree = "<group>"; };
 		6E84090F7E6935416ADCBF4F /* environment.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = environment.hpp; path = ../../src/mpt/environment/environment.hpp; sourceTree = "<group>"; };
 		6F3A912F8923F36144AA076F /* filecursor_callbackstream.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = filecursor_callbackstream.hpp; path = ../../src/mpt/io_read/filecursor_callbackstream.hpp; sourceTree = "<group>"; };
 		70644035FF1571275A9F8E75 /* libopenmpt_stream_callbacks_file_msvcrt.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = libopenmpt_stream_callbacks_file_msvcrt.h; path = ../../libopenmpt/libopenmpt_stream_callbacks_file_msvcrt.h; sourceTree = "<group>"; };
@@ -411,7 +384,6 @@
 		73262ABB150FC6AD0C36D8FB /* DMOUtils.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = DMOUtils.h; path = ../../soundlib/plugins/dmo/DMOUtils.h; sourceTree = "<group>"; };
 		7355A89F850CE891FA7AD6DF /* libopenmpt_ext_impl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = libopenmpt_ext_impl.cpp; path = ../../libopenmpt/libopenmpt_ext_impl.cpp; sourceTree = "<group>"; };
 		73781183B7C6B6F5F9EDEFC3 /* Snd_flt.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Snd_flt.cpp; path = ../../soundlib/Snd_flt.cpp; sourceTree = "<group>"; };
-		73A166DF062F30D16F07D51F /* Load_tcb.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Load_tcb.cpp; path = ../../soundlib/Load_tcb.cpp; sourceTree = "<group>"; };
 		73A52C155E915207A6771A55 /* EQ.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = EQ.h; path = ../../sounddsp/EQ.h; sourceTree = "<group>"; };
 		746376CDCBC8E9BF7DD7050D /* modcommand.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = modcommand.cpp; path = ../../soundlib/modcommand.cpp; sourceTree = "<group>"; };
 		74D7DB33E5FA7C259BC12973 /* Snd_fx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Snd_fx.cpp; path = ../../soundlib/Snd_fx.cpp; sourceTree = "<group>"; };
@@ -438,7 +410,6 @@
 		7FD19A57125F64497B380897 /* Load_ult.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Load_ult.cpp; path = ../../soundlib/Load_ult.cpp; sourceTree = "<group>"; };
 		80C993CB8D54463D0839120B /* message_macros.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = message_macros.hpp; path = ../../src/mpt/format/message_macros.hpp; sourceTree = "<group>"; };
 		80F9D5FD1722E7EFD889443D /* default_floatingpoint.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = default_floatingpoint.hpp; path = ../../src/mpt/format/default_floatingpoint.hpp; sourceTree = "<group>"; };
-		8209AB5BF32C4C4DA8F2F99B /* MODTools.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = MODTools.h; path = ../../soundlib/MODTools.h; sourceTree = "<group>"; };
 		82EA4C5D44A2DDCFEBBDAA9D /* tests_base_wrapping_divide.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = tests_base_wrapping_divide.hpp; path = ../../src/mpt/base/tests/tests_base_wrapping_divide.hpp; sourceTree = "<group>"; };
 		830F3566F431D658A9F883A6 /* Logging.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Logging.cpp; path = ../../common/Logging.cpp; sourceTree = "<group>"; };
 		84A787B7269123A91DB835F7 /* Chorus.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Chorus.cpp; path = ../../soundlib/plugins/dmo/Chorus.cpp; sourceTree = "<group>"; };
@@ -448,7 +419,6 @@
 		87A62ABDE1A741AFA8EE38FD /* AudioCriticalSection.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = AudioCriticalSection.h; path = ../../soundlib/AudioCriticalSection.h; sourceTree = "<group>"; };
 		8856685FF57E76D1F711669F /* base64.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = base64.hpp; path = ../../src/mpt/binary/base64.hpp; sourceTree = "<group>"; };
 		8876678BE2777E7DA9BE75CB /* default_engines.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = default_engines.hpp; path = ../../src/mpt/random/default_engines.hpp; sourceTree = "<group>"; };
-		89879ACD7D86E43F0271F90D /* InstrumentSynth.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = InstrumentSynth.cpp; path = ../../soundlib/InstrumentSynth.cpp; sourceTree = "<group>"; };
 		8A87EA73FEE22F657CC5B8B3 /* macros.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = macros.hpp; path = ../../src/mpt/string_transcode/macros.hpp; sourceTree = "<group>"; };
 		8ABDA3472E24D0F9455A8987 /* filedata_base_unseekable.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = filedata_base_unseekable.hpp; path = ../../src/mpt/io_read/filedata_base_unseekable.hpp; sourceTree = "<group>"; };
 		8ABF23E958E2779BDFF0CA29 /* mutex.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = mutex.hpp; path = ../../src/mpt/mutex/mutex.hpp; sourceTree = "<group>"; };
@@ -465,6 +435,7 @@
 		8F52A05ED3A145D015C87E9E /* Profiler.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Profiler.cpp; path = ../../common/Profiler.cpp; sourceTree = "<group>"; };
 		9061AC518460F5C3094C0A91 /* SampleFormatBRR.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = SampleFormatBRR.cpp; path = ../../soundlib/SampleFormatBRR.cpp; sourceTree = "<group>"; };
 		90E45EE632CDFAD829F50D26 /* mptStringBuffer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = mptStringBuffer.h; path = ../../common/mptStringBuffer.h; sourceTree = "<group>"; };
+		9133E604FE5BF476FFEEE444 /* OpCodes.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = OpCodes.h; path = ../../soundlib/plugins/OpCodes.h; sourceTree = "<group>"; };
 		915D6003E8C2D2F59AD0EE43 /* message.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = message.hpp; path = ../../src/mpt/format/message.hpp; sourceTree = "<group>"; };
 		91AA522185A99B930A94B061 /* I3DL2Reverb.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = I3DL2Reverb.h; path = ../../soundlib/plugins/dmo/I3DL2Reverb.h; sourceTree = "<group>"; };
 		91EC613953A4F2ABFABFBF79 /* libopenmpt_stream_callbacks_file.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = libopenmpt_stream_callbacks_file.h; path = ../../libopenmpt/libopenmpt_stream_callbacks_file.h; sourceTree = "<group>"; };
@@ -478,7 +449,6 @@
 		97B8EC8104E0FAF30673EAC1 /* OggStream.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = OggStream.cpp; path = ../../soundlib/OggStream.cpp; sourceTree = "<group>"; };
 		97BF12BD2A4CDCAF932580FD /* Load_gdm.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Load_gdm.cpp; path = ../../soundlib/Load_gdm.cpp; sourceTree = "<group>"; };
 		995821ED5E0D785F127C202D /* tests_string_buffer.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = tests_string_buffer.hpp; path = ../../src/mpt/string/tests/tests_string_buffer.hpp; sourceTree = "<group>"; };
-		99E1AAB12C6F74A3954818F1 /* MODTools.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = MODTools.cpp; path = ../../soundlib/MODTools.cpp; sourceTree = "<group>"; };
 		9B1917A761A70F19CFA935E7 /* ParamEq.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ParamEq.h; path = ../../soundlib/plugins/dmo/ParamEq.h; sourceTree = "<group>"; };
 		9B95674D94FB68BF8896C58D /* libopenmpt.dll */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; name = libopenmpt.dll; path = libopenmpt.dll; sourceTree = BUILT_PRODUCTS_DIR; };
 		9BB2E75F2E40B1519719559F /* Load_far.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Load_far.cpp; path = ../../soundlib/Load_far.cpp; sourceTree = "<group>"; };
@@ -491,7 +461,6 @@
 		9E737DF712CDC2E990B14C37 /* Distortion.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Distortion.h; path = ../../soundlib/plugins/dmo/Distortion.h; sourceTree = "<group>"; };
 		9E8AC865F88BDF57BFD2D6A5 /* tests_binary.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = tests_binary.hpp; path = ../../src/mpt/binary/tests/tests_binary.hpp; sourceTree = "<group>"; };
 		9EB0D073130B156590EE9EB3 /* Compressor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Compressor.h; path = ../../soundlib/plugins/dmo/Compressor.h; sourceTree = "<group>"; };
-		9EEAF28B0C1300FD0DA5F0CB /* Load_unic.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Load_unic.cpp; path = ../../soundlib/Load_unic.cpp; sourceTree = "<group>"; };
 		9F187E69B9E4ED1BBDB584A9 /* outputfile.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = outputfile.hpp; path = ../../src/mpt/io_file/outputfile.hpp; sourceTree = "<group>"; };
 		9F2E1C1AF92F330CC0762A5A /* BuildSettingsCompiler.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = BuildSettingsCompiler.h; path = ../../common/BuildSettingsCompiler.h; sourceTree = "<group>"; };
 		9FCB791A628BD98CBFC0B75A /* dos_memory.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = dos_memory.hpp; path = ../../src/mpt/osinfo/dos_memory.hpp; sourceTree = "<group>"; };
@@ -502,7 +471,6 @@
 		A32EC1731056CFE511E9BFB3 /* ModSample.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ModSample.cpp; path = ../../soundlib/ModSample.cpp; sourceTree = "<group>"; };
 		A33106C935BED0BB9E977509 /* load_j2b.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = load_j2b.cpp; path = ../../soundlib/load_j2b.cpp; sourceTree = "<group>"; };
 		A34959973B963F4969DD3FD7 /* filedata.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = filedata.hpp; path = ../../src/mpt/io_read/filedata.hpp; sourceTree = "<group>"; };
-		A35EA1E7E7AD475929D48027 /* PlayState.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = PlayState.h; path = ../../soundlib/PlayState.h; sourceTree = "<group>"; };
 		A527626137B52C53A08DD0A1 /* int24.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = int24.hpp; path = ../../src/mpt/endian/int24.hpp; sourceTree = "<group>"; };
 		A78B5E5FFEF0D151B0FEEC9F /* MIDIEvents.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = MIDIEvents.cpp; path = ../../soundlib/MIDIEvents.cpp; sourceTree = "<group>"; };
 		A7A09A55A16256C7DB615895 /* Paula.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Paula.cpp; path = ../../soundlib/Paula.cpp; sourceTree = "<group>"; };
@@ -525,9 +493,7 @@
 		B517EB3DCFE459EFD3B4F17D /* exception.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = exception.hpp; path = ../../src/mpt/exception/exception.hpp; sourceTree = "<group>"; };
 		B5449C6B226CAADD23FF9AAB /* ModSequence.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ModSequence.h; path = ../../soundlib/ModSequence.h; sourceTree = "<group>"; };
 		B547A5AF29A1EAA1A78573EF /* type_traits.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = type_traits.hpp; path = ../../src/mpt/endian/type_traits.hpp; sourceTree = "<group>"; };
-		B55D7A70F9AC1FE23BD358B0 /* GzipWriter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = GzipWriter.h; path = ../../common/GzipWriter.h; sourceTree = "<group>"; };
 		B569F9F747F7C3E9B0D06837 /* Load_669.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Load_669.cpp; path = ../../soundlib/Load_669.cpp; sourceTree = "<group>"; };
-		B6BBD03FFB0A75B13D31AE7F /* Load_fc.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Load_fc.cpp; path = ../../soundlib/Load_fc.cpp; sourceTree = "<group>"; };
 		B810F0D30F7663C5C1847F13 /* MixerLoops.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = MixerLoops.cpp; path = ../../soundlib/MixerLoops.cpp; sourceTree = "<group>"; };
 		B99E396D4C2C035FB504A7AD /* Load_c67.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Load_c67.cpp; path = ../../soundlib/Load_c67.cpp; sourceTree = "<group>"; };
 		B9B7FE84CBE1DB36FFD2C4C4 /* windows.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = windows.hpp; path = ../../src/mpt/check/windows.hpp; sourceTree = "<group>"; };
@@ -538,7 +504,6 @@
 		BAF08779FF3F2CEB416665B9 /* Sndfile.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Sndfile.cpp; path = ../../soundlib/Sndfile.cpp; sourceTree = "<group>"; };
 		BBEF0B95B5B0C807EFAFC9D5 /* ITTools.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ITTools.h; path = ../../soundlib/ITTools.h; sourceTree = "<group>"; };
 		BD023BA1315C8093AF4009E1 /* simple_spec.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = simple_spec.hpp; path = ../../src/mpt/format/simple_spec.hpp; sourceTree = "<group>"; };
-		BE474F872B6F5DF92D024DC7 /* Load_pt36.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Load_pt36.cpp; path = ../../soundlib/Load_pt36.cpp; sourceTree = "<group>"; };
 		BF406A572C6878C92DFB6897 /* MPEGFrame.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = MPEGFrame.cpp; path = ../../soundlib/MPEGFrame.cpp; sourceTree = "<group>"; };
 		BFC43D151B059087EE5FDB55 /* AGC.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = AGC.cpp; path = ../../sounddsp/AGC.cpp; sourceTree = "<group>"; };
 		C0B331FD5340FBEFBC19A03D /* MixerLoops.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = MixerLoops.h; path = ../../soundlib/MixerLoops.h; sourceTree = "<group>"; };
@@ -548,7 +513,6 @@
 		C3E634155673FE07BF4CA255 /* macros.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = macros.hpp; path = ../../src/mpt/base/macros.hpp; sourceTree = "<group>"; };
 		C3FAC67D5688906FBF6134BD /* detect.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = detect.hpp; path = ../../src/mpt/base/detect.hpp; sourceTree = "<group>"; };
 		C510221C396A670EB74DF05C /* mptStringBuffer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = mptStringBuffer.cpp; path = ../../common/mptStringBuffer.cpp; sourceTree = "<group>"; };
-		C61BC533BA1B0EA53F062373 /* MIDIMacroParser.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = MIDIMacroParser.cpp; path = ../../soundlib/MIDIMacroParser.cpp; sourceTree = "<group>"; };
 		C6F2110A1E5783FCD0659F4A /* FileReaderFwd.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = FileReaderFwd.h; path = ../../common/FileReaderFwd.h; sourceTree = "<group>"; };
 		C7851FA55A12E997C2EB8DE5 /* UMXTools.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = UMXTools.cpp; path = ../../soundlib/UMXTools.cpp; sourceTree = "<group>"; };
 		C875E7BBB96D55AD2570D5FB /* floatingpoint.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = floatingpoint.hpp; path = ../../src/mpt/endian/floatingpoint.hpp; sourceTree = "<group>"; };
@@ -556,7 +520,6 @@
 		C950084F5BDDD241C4B6768F /* Load_sfx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Load_sfx.cpp; path = ../../soundlib/Load_sfx.cpp; sourceTree = "<group>"; };
 		C9545B192355720BEA9C6959 /* arithmetic_shift.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = arithmetic_shift.hpp; path = ../../src/mpt/base/arithmetic_shift.hpp; sourceTree = "<group>"; };
 		C9DD180C21428AFED350A64C /* mptPathString.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = mptPathString.h; path = ../../common/mptPathString.h; sourceTree = "<group>"; };
-		C9E029A3906E2115FE7047E3 /* debugging.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = debugging.hpp; path = ../../src/mpt/base/debugging.hpp; sourceTree = "<group>"; };
 		CA2995890E783AFB509F73C9 /* array.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = array.hpp; path = ../../src/mpt/base/array.hpp; sourceTree = "<group>"; };
 		CA67A8613B8A4953F150F6A1 /* S3MTools.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = S3MTools.h; path = ../../soundlib/S3MTools.h; sourceTree = "<group>"; };
 		CB4660EB0F95065D51BC3F2B /* pattern.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = pattern.cpp; path = ../../soundlib/pattern.cpp; sourceTree = "<group>"; };
@@ -578,9 +541,7 @@
 		D35A7771C759C0E34C44D5B1 /* WavesReverb.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = WavesReverb.h; path = ../../soundlib/plugins/dmo/WavesReverb.h; sourceTree = "<group>"; };
 		D37D7529660B3F1BCEE3E369 /* MIDIMacros.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = MIDIMacros.h; path = ../../soundlib/MIDIMacros.h; sourceTree = "<group>"; };
 		D432AEE7E417DB19D08B6527 /* tests_parse.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = tests_parse.hpp; path = ../../src/mpt/parse/tests/tests_parse.hpp; sourceTree = "<group>"; };
-		D668A71B68F6710DD1CF155B /* Load_gmc.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Load_gmc.cpp; path = ../../soundlib/Load_gmc.cpp; sourceTree = "<group>"; };
 		D6BBDE00997C3E72F6B11C40 /* LFOPlugin.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LFOPlugin.cpp; path = ../../soundlib/plugins/LFOPlugin.cpp; sourceTree = "<group>"; };
-		D727124F69B4DC41D28D808F /* Load_ice.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Load_ice.cpp; path = ../../soundlib/Load_ice.cpp; sourceTree = "<group>"; };
 		D89E49F2E528FC64600DC832 /* PlugInterface.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = PlugInterface.cpp; path = ../../soundlib/plugins/PlugInterface.cpp; sourceTree = "<group>"; };
 		D941724BCA38E03D363C608B /* saturate_round.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = saturate_round.hpp; path = ../../src/mpt/base/saturate_round.hpp; sourceTree = "<group>"; };
 		DA41BBEFE6CC6E6161B13A2F /* transcode.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = transcode.hpp; path = ../../src/mpt/string_transcode/transcode.hpp; sourceTree = "<group>"; };
@@ -599,21 +560,18 @@
 		E2066CCD3D47C03F10A20B0D /* DSP.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = DSP.cpp; path = ../../sounddsp/DSP.cpp; sourceTree = "<group>"; };
 		E276AB813DD6D033801A71C1 /* filedata_base_seekable.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = filedata_base_seekable.hpp; path = ../../src/mpt/io_read/filedata_base_seekable.hpp; sourceTree = "<group>"; };
 		E2B3BCB34FDBCB25516EBAF3 /* random.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = random.hpp; path = ../../src/mpt/random/random.hpp; sourceTree = "<group>"; };
-		E38574ABA645D51D037AB2EB /* any_engine.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = any_engine.hpp; path = ../../src/mpt/random/any_engine.hpp; sourceTree = "<group>"; };
 		E438935FD53001514133819F /* mod_specifications.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = mod_specifications.h; path = ../../soundlib/mod_specifications.h; sourceTree = "<group>"; };
 		E4C0ABA9F677EB9B6BE5D9E9 /* libopenmpt_ext_impl.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = libopenmpt_ext_impl.hpp; path = ../../libopenmpt/libopenmpt_ext_impl.hpp; sourceTree = "<group>"; };
 		E59C6F4DDF5E2BBF195D2D8D /* Loaders.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Loaders.h; path = ../../soundlib/Loaders.h; sourceTree = "<group>"; };
 		E64FF33AA9BBB4ECE85F597A /* openmpt-ogg.lib */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "ogg.xcodeproj"; path = ext/ogg.xcodeproj; sourceTree = SOURCE_ROOT; };
 		E6905433791E1E25E1F6C273 /* SampleCopy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SampleCopy.h; path = ../../soundlib/SampleCopy.h; sourceTree = "<group>"; };
 		E7811C8A7A0EE67CE2E78ACA /* class.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = class.hpp; path = ../../src/mpt/osinfo/class.hpp; sourceTree = "<group>"; };
-		E7ACD57DAA6D35EF07A213BD /* MIDIMacroParser.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = MIDIMacroParser.h; path = ../../soundlib/MIDIMacroParser.h; sourceTree = "<group>"; };
 		E898D5ABAF26CD1D1D28F3EB /* ModInstrument.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ModInstrument.h; path = ../../soundlib/ModInstrument.h; sourceTree = "<group>"; };
 		EABA2F1F4147999119C0AD5F /* AGC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = AGC.h; path = ../../sounddsp/AGC.h; sourceTree = "<group>"; };
 		EC1456C17EA220B3E77AC501 /* Load_mid.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Load_mid.cpp; path = ../../soundlib/Load_mid.cpp; sourceTree = "<group>"; };
 		ED3DBD7D7FCB876FE8A42BBD /* memory.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = memory.hpp; path = ../../src/mpt/base/memory.hpp; sourceTree = "<group>"; };
-		EDB72A5D8FA0C64F86C7D89D /* PlaybackTest.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = PlaybackTest.cpp; path = ../../soundlib/PlaybackTest.cpp; sourceTree = "<group>"; };
-		EDF8E6598086B04BE95F5499 /* Load_cba.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Load_cba.cpp; path = ../../soundlib/Load_cba.cpp; sourceTree = "<group>"; };
 		EEC8D9B98156A3ABEA2F47F9 /* tuningbase.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = tuningbase.h; path = ../../soundlib/tuningbase.h; sourceTree = "<group>"; };
+		EF78F5224ABA48941E149362 /* Dither.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Dither.h; path = ../../common/Dither.h; sourceTree = "<group>"; };
 		F06C78E982FA42DBEBD2E729 /* RowVisitor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = RowVisitor.h; path = ../../soundlib/RowVisitor.h; sourceTree = "<group>"; };
 		F1208C2D83AE561FEC86FA6D /* Load_psm.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Load_psm.cpp; path = ../../soundlib/Load_psm.cpp; sourceTree = "<group>"; };
 		F18CD1F1E58C1B636A773031 /* saturate_cast.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = saturate_cast.hpp; path = ../../src/mpt/base/saturate_cast.hpp; sourceTree = "<group>"; };
@@ -627,7 +585,6 @@
 		F48DAABB97F4D86DAF2A90FB /* filecursor_traits_memory.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = filecursor_traits_memory.hpp; path = ../../src/mpt/io_read/filecursor_traits_memory.hpp; sourceTree = "<group>"; };
 		F5D2F247BC60E9B92A631087 /* libopenmpt.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = libopenmpt.hpp; path = ../../libopenmpt/libopenmpt.hpp; sourceTree = "<group>"; };
 		F5D60F958863D987F13C7DD5 /* Load_dsm.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Load_dsm.cpp; path = ../../soundlib/Load_dsm.cpp; sourceTree = "<group>"; };
-		F5DB217BB89B81ED15D05FBB /* type_traits.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = type_traits.hpp; path = ../../src/mpt/base/type_traits.hpp; sourceTree = "<group>"; };
 		F61229996734CA8B1CFB77D9 /* guid.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = guid.hpp; path = ../../src/mpt/uuid/guid.hpp; sourceTree = "<group>"; };
 		F6F37E8F68161F811DDCCCCF /* span.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = span.hpp; path = ../../src/mpt/base/span.hpp; sourceTree = "<group>"; };
 		F78A378464B245F6664535C4 /* mptBaseTypes.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = mptBaseTypes.h; path = ../../common/mptBaseTypes.h; sourceTree = "<group>"; };
@@ -635,13 +592,12 @@
 		F9D67691EACDE48356D164D1 /* SampleFormatFLAC.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = SampleFormatFLAC.cpp; path = ../../soundlib/SampleFormatFLAC.cpp; sourceTree = "<group>"; };
 		FB5FB0E7EF5EFA59744A0F27 /* libopenmpt_ext.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = libopenmpt_ext.hpp; path = ../../libopenmpt/libopenmpt_ext.hpp; sourceTree = "<group>"; };
 		FB635E3D352E14EFEA89647D /* filecursor_traits_filedata.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = filecursor_traits_filedata.hpp; path = ../../src/mpt/io_read/filecursor_traits_filedata.hpp; sourceTree = "<group>"; };
-		FB77AD1D689FBB8F6A32AB5D /* PlayState.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = PlayState.cpp; path = ../../soundlib/PlayState.cpp; sourceTree = "<group>"; };
 		FBE197BEECD905B058DC85FE /* serialization_utils.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = serialization_utils.h; path = ../../common/serialization_utils.h; sourceTree = "<group>"; };
 		FBF22E79CF82B5EBC2544CB9 /* libopenmpt_stream_callbacks_file_posix_lfs64.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = libopenmpt_stream_callbacks_file_posix_lfs64.h; path = ../../libopenmpt/libopenmpt_stream_callbacks_file_posix_lfs64.h; sourceTree = "<group>"; };
-		FC83067740D1ABE982F8E4B7 /* float.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = float.hpp; path = ../../src/mpt/base/float.hpp; sourceTree = "<group>"; };
 		FC85D407DBA2EE39B7AC4A47 /* inputfile.hpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = inputfile.hpp; path = ../../src/mpt/io_file/inputfile.hpp; sourceTree = "<group>"; };
 		FED01DA32FB4159542CC4BE3 /* tuning.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = tuning.h; path = ../../soundlib/tuning.h; sourceTree = "<group>"; };
 		FEDB3A1791690409FA41A857 /* Echo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Echo.h; path = ../../soundlib/plugins/dmo/Echo.h; sourceTree = "<group>"; };
+		FF7F8F60F37ED8D27869EDA0 /* mptFileTemporary.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = mptFileTemporary.cpp; path = ../../common/mptFileTemporary.cpp; sourceTree = "<group>"; };
 		FFB3088F4401AE018628E6CF /* Resampler.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Resampler.h; path = ../../soundlib/Resampler.h; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -757,6 +713,7 @@
 				45D0E0DE525B9350CD405F1E /* DigiBoosterEcho.h */,
 				D6BBDE00997C3E72F6B11C40 /* LFOPlugin.cpp */,
 				6858F8CA2EE6F03C9CE9170A /* LFOPlugin.h */,
+				9133E604FE5BF476FFEEE444 /* OpCodes.h */,
 				D89E49F2E528FC64600DC832 /* PlugInterface.cpp */,
 				6058487C545791EED942A6BC /* PlugInterface.h */,
 				CE32D5B4DABD882655A253F4 /* PluginManager.cpp */,
@@ -941,7 +898,6 @@
 			children = (
 				64377F84A84B50B69C1CD5C4 /* compiler.hpp */,
 				417FE082D6F69FB44592F6C2 /* libc.hpp */,
-				352971E219707A149D5DA822 /* libcxx.hpp */,
 				788395FAAA7CE0AC245C1C3A /* mfc.hpp */,
 				B9B7FE84CBE1DB36FFD2C4C4 /* windows.hpp */,
 			);
@@ -1074,9 +1030,9 @@
 				9F2E1C1AF92F330CC0762A5A /* BuildSettingsCompiler.h */,
 				13F9789407F8C2068CE3D6D4 /* ComponentManager.cpp */,
 				0A20B0FECCE111702A15EF3E /* ComponentManager.h */,
+				EF78F5224ABA48941E149362 /* Dither.h */,
 				6D2350A8B171F61AF3992EE8 /* FileReader.h */,
 				C6F2110A1E5783FCD0659F4A /* FileReaderFwd.h */,
-				B55D7A70F9AC1FE23BD358B0 /* GzipWriter.h */,
 				830F3566F431D658A9F883A6 /* Logging.cpp */,
 				6303157093E70D62A6FF43B0 /* Logging.h */,
 				8F52A05ED3A145D015C87E9E /* Profiler.cpp */,
@@ -1087,7 +1043,9 @@
 				F78A378464B245F6664535C4 /* mptBaseTypes.h */,
 				12DCF57C800503EE8197F3BC /* mptBaseUtils.h */,
 				BA99A2F415DAF666E9354134 /* mptCPU.h */,
+				13F63AEAA68404DC0F5CA92A /* mptFileIO.cpp */,
 				50CF7EB4C1F21FA677B8CCF4 /* mptFileIO.h */,
+				FF7F8F60F37ED8D27869EDA0 /* mptFileTemporary.cpp */,
 				43CBFB4A068C5BBC63C1398A /* mptFileTemporary.h */,
 				074C76BE5EB1E9B010C004FE /* mptFileType.cpp */,
 				AFFB10484288DA3AAB617E88 /* mptFileType.h */,
@@ -1158,7 +1116,6 @@
 				1AA25C6F0B99CA61779D4AAF /* check_platform.hpp */,
 				86260AE5E2AD0F576B4FC925 /* compiletime_warning.hpp */,
 				021DA33D0EA855AF898D217D /* constexpr_throw.hpp */,
-				C9E029A3906E2115FE7047E3 /* debugging.hpp */,
 				C3FAC67D5688906FBF6134BD /* detect.hpp */,
 				1C2F81B7DEEFE2293C24BFF7 /* detect_arch.hpp */,
 				321030713E9AE2E3B97FAEB1 /* detect_compiler.hpp */,
@@ -1166,7 +1123,7 @@
 				755174CF6950BE41EE3BD30F /* detect_libcxx.hpp */,
 				175234BFDDE02C314BE252FF /* detect_os.hpp */,
 				107683B90475CD2B8960E1F9 /* detect_quirks.hpp */,
-				FC83067740D1ABE982F8E4B7 /* float.hpp */,
+				4FB7A50743B6EE79C8A20347 /* floatingpoint.hpp */,
 				787945A7E5A15419E73443E7 /* integer.hpp */,
 				C3E634155673FE07BF4CA255 /* macros.hpp */,
 				4614D43FB73775316CFE227F /* math.hpp */,
@@ -1180,11 +1137,9 @@
 				D941724BCA38E03D363C608B /* saturate_round.hpp */,
 				85812219180EEC0B80E79059 /* secure.hpp */,
 				212A36FD7B2B4DEF4272453D /* semantic_version.hpp */,
-				219A364192BCD73348838481 /* size.hpp */,
 				A105879DAD903A0F287505DD /* source_location.hpp */,
 				F6F37E8F68161F811DDCCCCF /* span.hpp */,
 				8BDA4A4F76C67041BEAC388F /* tests */,
-				F5DB217BB89B81ED15D05FBB /* type_traits.hpp */,
 				5609DBF3C331EA65C4C4DA33 /* utility.hpp */,
 				AB10601718386E8919CB5E57 /* version.hpp */,
 				2C28EA4338B39CB5B3986883 /* wrapping_divide.hpp */,
@@ -1303,35 +1258,25 @@
 				778D494BBBDBEEBDFE03278B /* ITTools.cpp */,
 				BBEF0B95B5B0C807EFAFC9D5 /* ITTools.h */,
 				567D9E616834DE53DDA2CCA1 /* InstrumentExtensions.cpp */,
-				89879ACD7D86E43F0271F90D /* InstrumentSynth.cpp */,
-				45A87D570868DDC9659DBB97 /* InstrumentSynth.h */,
 				9E091D790F2BBE6BC4F26BB9 /* IntMixer.h */,
 				CB46E6335DD4B025C6AD5473 /* Load_667.cpp */,
 				B569F9F747F7C3E9B0D06837 /* Load_669.cpp */,
 				37F80675CA85D067335E74B5 /* Load_amf.cpp */,
 				29DC06EFBC69D0E12542752F /* Load_ams.cpp */,
 				B99E396D4C2C035FB504A7AD /* Load_c67.cpp */,
-				EDF8E6598086B04BE95F5499 /* Load_cba.cpp */,
 				6A66E753FCF4B14565CD5593 /* Load_dbm.cpp */,
 				D14936A73E714519400434E7 /* Load_digi.cpp */,
 				36CAA59BC9586F8D323113DB /* Load_dmf.cpp */,
 				F5D60F958863D987F13C7DD5 /* Load_dsm.cpp */,
 				9BE2D067090ADED90A9DCEA7 /* Load_dsym.cpp */,
 				0D18D5B79FA69FA9087F43F7 /* Load_dtm.cpp */,
-				14754CCFA70316C10FDBBB0F /* Load_etx.cpp */,
 				9BB2E75F2E40B1519719559F /* Load_far.cpp */,
-				B6BBD03FFB0A75B13D31AE7F /* Load_fc.cpp */,
 				9CF744BB2F850EAD985DB2FB /* Load_fmt.cpp */,
-				0C4FEA7B9EDDB46D07B658BB /* Load_ftm.cpp */,
 				97BF12BD2A4CDCAF932580FD /* Load_gdm.cpp */,
-				D668A71B68F6710DD1CF155B /* Load_gmc.cpp */,
 				10E0ADC7A36E77B90C471C07 /* Load_gt2.cpp */,
-				D727124F69B4DC41D28D808F /* Load_ice.cpp */,
 				34D45985C7622377303AC7C5 /* Load_imf.cpp */,
-				26B859FFB94623F1221EC83F /* Load_ims.cpp */,
 				62235C27A6720199E8993A67 /* Load_it.cpp */,
 				6A572747FCE4F13965BD9587 /* Load_itp.cpp */,
-				19B6191F86DE27918871175F /* Load_kris.cpp */,
 				2052C727B2E091191BB93567 /* Load_mdl.cpp */,
 				8F093E392197082B8A6FAC79 /* Load_med.cpp */,
 				EC1456C17EA220B3E77AC501 /* Load_mid.cpp */,
@@ -1343,32 +1288,22 @@
 				6AE995E9FD775FDB66500429 /* Load_okt.cpp */,
 				4E4D213FE0DAEB3149B38F7F /* Load_plm.cpp */,
 				F1208C2D83AE561FEC86FA6D /* Load_psm.cpp */,
-				BE474F872B6F5DF92D024DC7 /* Load_pt36.cpp */,
 				0863524F9AF11C4103C9C08F /* Load_ptm.cpp */,
-				6DB68B53DADE99C5DC718993 /* Load_puma.cpp */,
-				079A67139A2831050300D553 /* Load_rtm.cpp */,
 				1F41A2D3B1CF6CC51AA81113 /* Load_s3m.cpp */,
 				C950084F5BDDD241C4B6768F /* Load_sfx.cpp */,
-				1D12DDB1AFA0A7A318794BF1 /* Load_stk.cpp */,
 				0735F17599C3BB67029C5FB5 /* Load_stm.cpp */,
 				666A8F1BF8F8590D61D0FD5B /* Load_stp.cpp */,
 				7D070D1F43950491B1972B5F /* Load_symmod.cpp */,
-				73A166DF062F30D16F07D51F /* Load_tcb.cpp */,
 				54393E69E6C7085B4F9FACA9 /* Load_uax.cpp */,
 				7FD19A57125F64497B380897 /* Load_ult.cpp */,
-				9EEAF28B0C1300FD0DA5F0CB /* Load_unic.cpp */,
 				694D3F69FBDB095B64B3ADA9 /* Load_wav.cpp */,
 				2A6435F76EB2DB69B0DA1437 /* Load_xm.cpp */,
 				2EF17543C17F3F352A57E383 /* Load_xmf.cpp */,
 				E59C6F4DDF5E2BBF195D2D8D /* Loaders.h */,
 				A78B5E5FFEF0D151B0FEEC9F /* MIDIEvents.cpp */,
 				F42AAB0986B874FBEF911949 /* MIDIEvents.h */,
-				C61BC533BA1B0EA53F062373 /* MIDIMacroParser.cpp */,
-				E7ACD57DAA6D35EF07A213BD /* MIDIMacroParser.h */,
 				50FB747FA860E7715A6F02BF /* MIDIMacros.cpp */,
 				D37D7529660B3F1BCEE3E369 /* MIDIMacros.h */,
-				99E1AAB12C6F74A3954818F1 /* MODTools.cpp */,
-				8209AB5BF32C4C4DA8F2F99B /* MODTools.h */,
 				BF406A572C6878C92DFB6897 /* MPEGFrame.cpp */,
 				A0ADCD61E4FC72D32723ABA1 /* MPEGFrame.h */,
 				681E06B9AC6CAC2BEE93E4F9 /* Message.cpp */,
@@ -1396,10 +1331,6 @@
 				F1E743CB3635E93D785D220B /* OggStream.h */,
 				A7A09A55A16256C7DB615895 /* Paula.cpp */,
 				1AD54F9F7616A3114970EDDF /* Paula.h */,
-				FB77AD1D689FBB8F6A32AB5D /* PlayState.cpp */,
-				A35EA1E7E7AD475929D48027 /* PlayState.h */,
-				EDB72A5D8FA0C64F86C7D89D /* PlaybackTest.cpp */,
-				042BC5075B9137F90D9F5347 /* PlaybackTest.h */,
 				FFB3088F4401AE018628E6CF /* Resampler.h */,
 				1A88E03F71EE533123FC6E7F /* RowVisitor.cpp */,
 				F06C78E982FA42DBEBD2E729 /* RowVisitor.h */,
@@ -1475,7 +1406,6 @@
 		F76908210E7BA353FE979E61 /* random */ = {
 			isa = PBXGroup;
 			children = (
-				E38574ABA645D51D037AB2EB /* any_engine.hpp */,
 				8DE932C12076FCB3894FA101 /* crand.hpp */,
 				8876678BE2777E7DA9BE75CB /* default_engines.hpp */,
 				1CE2C4318A0AD2A38B9DC271 /* device.hpp */,
@@ -1504,7 +1434,6 @@
 				23EF16CF7F4F3B81C192DD0F /* filedata_base_buffered.hpp */,
 				E276AB813DD6D033801A71C1 /* filedata_base_seekable.hpp */,
 				8ABDA3472E24D0F9455A8987 /* filedata_base_unseekable.hpp */,
-				1BD71CF93D735A2B35E9F339 /* filedata_base_unseekable_buffer.hpp */,
 				E0CF51E794CB6B19767DA827 /* filedata_callbackstream.hpp */,
 				079DA5A7A1C19AD951E77BE7 /* filedata_memory.hpp */,
 				CE271C83BB8EAF355888A2C3 /* filedata_stdstream.hpp */,
@@ -1628,6 +1557,8 @@
 				B591ED4C6887F6FEB9AA538C /* ComponentManager.cpp in Sources */,
 				527E833E969254708A63D97E /* Logging.cpp in Sources */,
 				1CE1B0B6B52E9668E37596F6 /* Profiler.cpp in Sources */,
+				1CD4D902FBF1F334D7FB4F42 /* mptFileIO.cpp in Sources */,
+				BB65D2D86E5BDC8ABF7E3918 /* mptFileTemporary.cpp in Sources */,
 				1F7082161F13654859681856 /* mptFileType.cpp in Sources */,
 				DF08AE5AEEEDDA8CDB61649A /* mptPathString.cpp in Sources */,
 				926864F471857F264D8EDB34 /* mptRandom.cpp in Sources */,
@@ -1653,33 +1584,24 @@
 				32D83065D0B93117A83776A5 /* ITCompression.cpp in Sources */,
 				E6583D037EA522B5ACEC2343 /* ITTools.cpp in Sources */,
 				4FD75379AB22A3AB995489B9 /* InstrumentExtensions.cpp in Sources */,
-				C6B55BA579AB6557CACDC1E5 /* InstrumentSynth.cpp in Sources */,
 				5EE7936B3E04AD9D1A0E09AB /* Load_667.cpp in Sources */,
 				4E13C16F2D30DBA1093A37AF /* Load_669.cpp in Sources */,
 				A7B576CD86D290FF62DBED0D /* Load_amf.cpp in Sources */,
 				BA54A1E79971BC19757B1827 /* Load_ams.cpp in Sources */,
 				44F9DD452416F77700205385 /* Load_c67.cpp in Sources */,
-				2AE422F10A013D23E60A9931 /* Load_cba.cpp in Sources */,
 				7B65168B5A8230BD368B8CCB /* Load_dbm.cpp in Sources */,
 				8479AC1F9F461AD1A316B25F /* Load_digi.cpp in Sources */,
 				C81D1553A73A2F8583438B93 /* Load_dmf.cpp in Sources */,
 				8B4D81ED6A6A9C1F4673F82D /* Load_dsm.cpp in Sources */,
 				D2EFC1DFEDBC3091F18CC81F /* Load_dsym.cpp in Sources */,
 				F5A6792FD4C39361B0CCEF6F /* Load_dtm.cpp in Sources */,
-				CE9155C7ADAE6FF989B7CC07 /* Load_etx.cpp in Sources */,
 				D1EA5157B1076B898D10C797 /* Load_far.cpp in Sources */,
-				C3D725375C240AE98A6B0B77 /* Load_fc.cpp in Sources */,
 				BD4216739C5F30A578688CB3 /* Load_fmt.cpp in Sources */,
-				609638333FB352651BBCAE73 /* Load_ftm.cpp in Sources */,
 				707EA3954F9BBDC72BA519D5 /* Load_gdm.cpp in Sources */,
-				81C26ED360DF89053CE8E513 /* Load_gmc.cpp in Sources */,
 				8676CA3F6593E471419D407F /* Load_gt2.cpp in Sources */,
-				B464B3479381CD796F8B2987 /* Load_ice.cpp in Sources */,
 				537472DD32918D0F0E9AE91D /* Load_imf.cpp in Sources */,
-				66139DF74530B829213A1437 /* Load_ims.cpp in Sources */,
 				7FDA539F18273951466E39DF /* Load_it.cpp in Sources */,
 				E7C01BBFC6DD35F1A2E691FF /* Load_itp.cpp in Sources */,
-				C806B217E2D320C9E6A3B857 /* Load_kris.cpp in Sources */,
 				39B7C99F18D4E3D1F4DE3FDF /* Load_mdl.cpp in Sources */,
 				E76008D1C67D2303A2867F11 /* Load_med.cpp in Sources */,
 				90C3E5D96FE1000B4BEA5C19 /* Load_mid.cpp in Sources */,
@@ -1691,27 +1613,19 @@
 				49C7038128E41DB304ED79C1 /* Load_okt.cpp in Sources */,
 				247D3937039A5369DFA3AF77 /* Load_plm.cpp in Sources */,
 				0CEBFC05EC091637C8127245 /* Load_psm.cpp in Sources */,
-				3E00C2FF58CD31B15C9DC93F /* Load_pt36.cpp in Sources */,
 				7744F34756620D79326B6987 /* Load_ptm.cpp in Sources */,
-				877C818BA248F03DA61987CB /* Load_puma.cpp in Sources */,
-				E234B24BC151CC7D9D5B288B /* Load_rtm.cpp in Sources */,
 				9715CA0B7632E43D523C404B /* Load_s3m.cpp in Sources */,
 				EA420947C95F2379A5687F87 /* Load_sfx.cpp in Sources */,
-				A88063C9879D7DFB63A6DA09 /* Load_stk.cpp in Sources */,
 				97AC91CD76C9ABFF52D3080D /* Load_stm.cpp in Sources */,
 				FE6ED6D3DD8BF105B9954D13 /* Load_stp.cpp in Sources */,
 				CF116C1742F9E3C965479257 /* Load_symmod.cpp in Sources */,
-				19C908D7F8E62309D4EF7F17 /* Load_tcb.cpp in Sources */,
 				4174F40120920E33FC9B6A41 /* Load_uax.cpp in Sources */,
 				F4EF37CFD40C5201B015AE0F /* Load_ult.cpp in Sources */,
-				84F9B8439FC626F5A396BE83 /* Load_unic.cpp in Sources */,
 				BD3885019C559F33785EFB41 /* Load_wav.cpp in Sources */,
 				00BB926F99087821C74F78AF /* Load_xm.cpp in Sources */,
 				F57A8B7BD497A5ADB0A101BB /* Load_xmf.cpp in Sources */,
 				CCEFFE57CC92E18906E79497 /* MIDIEvents.cpp in Sources */,
-				212E136BD4241D1D254679AB /* MIDIMacroParser.cpp in Sources */,
 				80EEA677809189A9BAE63CB7 /* MIDIMacros.cpp in Sources */,
-				978580C976A29AFB52ABF709 /* MODTools.cpp in Sources */,
 				393D72CF5409E18157DA790F /* MPEGFrame.cpp in Sources */,
 				168C3C51AED92203DD202291 /* Message.cpp in Sources */,
 				7A5E5DAB8A4389DD76B713EB /* MixFuncTable.cpp in Sources */,
@@ -1724,8 +1638,6 @@
 				ABC5779D79E8CB4F00F71DDD /* OPL.cpp in Sources */,
 				FD083C9917D4AB4B1BA542D9 /* OggStream.cpp in Sources */,
 				33DB2DAD46050A5F79F5F3ED /* Paula.cpp in Sources */,
-				98C2B4F5B38F23A7B75FBB35 /* PlayState.cpp in Sources */,
-				9580A935A565D56791D95F75 /* PlaybackTest.cpp in Sources */,
 				119C6E37113F51694B940477 /* RowVisitor.cpp in Sources */,
 				D443016FB3601BA18F6977AF /* S3MTools.cpp in Sources */,
 				77A73F692A9D491B7BBFA5A9 /* SampleFormatBRR.cpp in Sources */,

Frameworks/OpenMPT/OpenMPT/common/BuildSettings.h

@@ -88,9 +88,6 @@
 #define ENABLE_TESTS
 #endif
 
-// Enable generation and verification of playback traces
-#define MPT_ENABLE_PLAYBACK_TRACE
-
 // Disable any file saving functionality (not really useful except for the player library)
 //#define MODPLUG_NO_FILESAVE
 
@@ -122,10 +119,6 @@
 
 #define MPT_ENABLE_UPDATE
 
-#if defined(MPT_BUILD_DEBUG)
-#define MPT_ENABLE_PLAYBACK_TEST_MENU
-#endif
-
 // Disable unarchiving support
 //#define NO_ARCHIVE_SUPPORT
 
@@ -164,7 +157,6 @@
 
 #if defined(LIBOPENMPT_BUILD_TEST)
 #define ENABLE_TESTS
-#define MPT_ENABLE_PLAYBACK_TRACE
 #else
 #define MODPLUG_NO_FILESAVE
 #endif
@@ -238,19 +230,19 @@
 #endif
 
 #if defined(MPT_ENABLE_ARCH_INTRINSICS)
-#if MPT_ARCH_X86
+#if MPT_COMPILER_MSVC && MPT_ARCH_X86
 
 #define MPT_ENABLE_ARCH_X86
 
-#define MPT_WANT_ARCH_INTRINSICS_X86_SSE
-#define MPT_WANT_ARCH_INTRINSICS_X86_SSE2
+#define MPT_ENABLE_ARCH_INTRINSICS_SSE
+#define MPT_ENABLE_ARCH_INTRINSICS_SSE2
 
-#elif MPT_ARCH_AMD64
+#elif MPT_COMPILER_MSVC && MPT_ARCH_AMD64
 
 #define MPT_ENABLE_ARCH_AMD64
 
-#define MPT_WANT_ARCH_INTRINSICS_X86_SSE
-#define MPT_WANT_ARCH_INTRINSICS_X86_SSE2
+#define MPT_ENABLE_ARCH_INTRINSICS_SSE
+#define MPT_ENABLE_ARCH_INTRINSICS_SSE2
 
 #endif // arch
 #endif // MPT_ENABLE_ARCH_INTRINSICS
@@ -335,8 +327,6 @@
 
 #endif
 
-#define MPT_CONFIGURATION_IO_READ_FILEDATA_NO_64BIT
-
 
 
 // platform configuration

Frameworks/OpenMPT/OpenMPT/common/ComponentManager.cpp

@@ -463,6 +463,12 @@ ComponentInfo ComponentManager::GetComponentInfo(std::string name) const
 }
 
 
+mpt::PathString ComponentManager::GetComponentPath() const
+{
+	return m_Settings.Path();
+}
+
+
 #endif // MPT_COMPONENT_MANAGER
 
 

Frameworks/OpenMPT/OpenMPT/common/ComponentManager.h

@@ -308,6 +308,7 @@ public:
 	virtual bool LoadOnStartup() const = 0;
 	virtual bool KeepLoaded() const = 0;
 	virtual bool IsBlocked(const std::string &key) const = 0;
+	virtual mpt::PathString Path() const = 0;
 protected:
 	virtual ~IComponentManagerSettings() = default;
 };
@@ -320,6 +321,7 @@ public:
 	bool LoadOnStartup() const override { return false; }
 	bool KeepLoaded() const override { return true; }
 	bool IsBlocked(const std::string & /*key*/ ) const override { return false; }
+	mpt::PathString Path() const override { return mpt::PathString(); }
 };
 
 
@@ -372,6 +374,7 @@ public:
 	std::shared_ptr<const IComponent> ReloadComponent(const IComponentFactory &componentFactory);
 	std::vector<std::string> GetRegisteredComponents() const;
 	ComponentInfo GetComponentInfo(std::string name) const;
+	mpt::PathString GetComponentPath() const;
 };
 
 
@@ -420,6 +423,12 @@ std::shared_ptr<const type> ReloadComponent()
 }
 
 
+inline mpt::PathString GetComponentPath()
+{
+	return ComponentManager::Instance()->GetComponentPath();
+}
+
+
 #else // !MPT_COMPONENT_MANAGER
 
 
@@ -429,15 +438,8 @@ std::shared_ptr<const type> ReloadComponent()
 template <typename type>
 std::shared_ptr<const type> GetComponent()
 {
-#if MPT_COMPILER_CLANG
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wexit-time-destructors"
-#endif // MPT_COMPILER_CLANG
 	static std::weak_ptr<type> cache;
 	static mpt::mutex m;
-#if MPT_COMPILER_CLANG
-#pragma clang diagnostic pop
-#endif // MPT_COMPILER_CLANG	mpt::lock_guard<mpt::mutex> l(m);
 	mpt::lock_guard<mpt::mutex> l(m);
 	std::shared_ptr<type> component = cache.lock();
 	if(!component)

Frameworks/OpenMPT/OpenMPT/common/Dither.h

@@ -0,0 +1,86 @@
+/*
+ * Dither.h
+ * --------
+ * Purpose: Dithering when converting to lower resolution sample formats.
+ * Notes  : (currently none)
+ * Authors: Olivier Lapicque
+ *          OpenMPT Devs
+ * The OpenMPT source code is released under the BSD license. Read LICENSE for more details.
+ */
+
+
+#pragma once
+
+#include "openmpt/all/BuildSettings.hpp"
+
+#include "mpt/base/macros.hpp"
+#include "mpt/string/types.hpp"
+#include "openmpt/soundbase/Dither.hpp"
+#include "openmpt/soundbase/DitherModPlug.hpp"
+#include "openmpt/soundbase/DitherNone.hpp"
+#include "openmpt/soundbase/DitherSimple.hpp"
+
+#include "mptRandom.h"
+
+#include <vector>
+#include <variant>
+
+#include <cstddef>
+
+
+OPENMPT_NAMESPACE_BEGIN
+
+
+using Dither_Default = Dither_Simple;
+
+
+class DitherNamesOpenMPT
+{
+public:
+	static mpt::ustring GetModeName(std::size_t mode)
+	{
+		mpt::ustring result;
+		switch(mode)
+		{
+			case 0:
+				// no dither
+				result = MPT_USTRING("no");
+				break;
+			case 1:
+				// chosen by OpenMPT code, might change
+				result = MPT_USTRING("default");
+				break;
+			case 2:
+				// rectangular, 0.5 bit depth, no noise shaping (original ModPlug Tracker)
+				result = MPT_USTRING("0.5 bit");
+				break;
+			case 3:
+				// rectangular, 1 bit depth, simple 1st order noise shaping
+				result = MPT_USTRING("1 bit");
+				break;
+			default:
+				result = MPT_USTRING("");
+				break;
+		}
+		return result;
+	}
+};
+
+
+using DithersOpenMPT =
+	Dithers<std::variant<MultiChannelDither<Dither_None>, MultiChannelDither<Dither_Default>, MultiChannelDither<Dither_ModPlug>, MultiChannelDither<Dither_Simple>>, DitherNamesOpenMPT, 4, 1, 0, mpt::good_prng>;
+
+
+struct DithersWrapperOpenMPT
+	: DithersOpenMPT
+{
+	template <typename Trd>
+	DithersWrapperOpenMPT(Trd &rd, std::size_t mode = DithersOpenMPT::DefaultDither, std::size_t channels = DithersOpenMPT::DefaultChannels)
+		: DithersOpenMPT(rd, mode, channels)
+	{
+		return;
+	}
+};
+
+
+OPENMPT_NAMESPACE_END

Frameworks/OpenMPT/OpenMPT/common/FileReader.h

@@ -45,11 +45,11 @@ namespace FileReaderExt
 	// Read a string of length srcSize into fixed-length char array destBuffer using a given read mode.
 	// The file cursor is advanced by "srcSize" bytes.
 	// Returns true if at least one byte could be read or 0 bytes were requested.
-	template<mpt::String::ReadWriteMode mode, std::size_t destSize, typename TFileCursor>
-	bool ReadString(TFileCursor &f, char (&destBuffer)[destSize], const std::size_t srcSize)
+	template<mpt::String::ReadWriteMode mode, size_t destSize, typename TFileCursor>
+	bool ReadString(TFileCursor &f, char (&destBuffer)[destSize], const typename TFileCursor::pos_type srcSize)
 	{
 		typename TFileCursor::PinnedView source = f.ReadPinnedView(srcSize); // Make sure the string is cached properly.
-		std::size_t realSrcSize = source.size();	// In case fewer bytes are available
+		typename TFileCursor::pos_type realSrcSize = source.size();	// In case fewer bytes are available
 		mpt::String::WriteAutoBuf(destBuffer) = mpt::String::ReadBuf(mode, mpt::byte_cast<const char*>(source.data()), realSrcSize);
 		return (realSrcSize > 0 || srcSize == 0);
 	}
@@ -58,11 +58,11 @@ namespace FileReaderExt
 	// The file cursor is advanced by "srcSize" bytes.
 	// Returns true if at least one character could be read or 0 characters were requested.
 	template<mpt::String::ReadWriteMode mode, typename TFileCursor>
-	bool ReadString(TFileCursor &f, std::string &dest, const std::size_t srcSize)
+	bool ReadString(TFileCursor &f, std::string &dest, const typename TFileCursor::pos_type srcSize)
 	{
 		dest.clear();
 		typename TFileCursor::PinnedView source = f.ReadPinnedView(srcSize);	// Make sure the string is cached properly.
-		std::size_t realSrcSize = source.size();	// In case fewer bytes are available
+		typename TFileCursor::pos_type realSrcSize = source.size();	// In case fewer bytes are available
 		dest = mpt::String::ReadBuf(mode, mpt::byte_cast<const char*>(source.data()), realSrcSize);
 		return (realSrcSize > 0 || srcSize == 0);
 	}
@@ -71,10 +71,10 @@ namespace FileReaderExt
 	// The file cursor is advanced by "srcSize" bytes.
 	// Returns true if at least one character could be read or 0 characters were requested.
 	template<mpt::String::ReadWriteMode mode, std::size_t len, typename TFileCursor>
-	bool ReadString(TFileCursor &f, mpt::charbuf<len> &dest, const std::size_t srcSize)
+	bool ReadString(TFileCursor &f, mpt::charbuf<len> &dest, const typename TFileCursor::pos_type srcSize)
 	{
 		typename TFileCursor::PinnedView source = f.ReadPinnedView(srcSize);	// Make sure the string is cached properly.
-		std::size_t realSrcSize = source.size();	// In case fewer bytes are available
+		typename TFileCursor::pos_type realSrcSize = source.size();	// In case fewer bytes are available
 		dest = mpt::String::ReadBuf(mode, mpt::byte_cast<const char*>(source.data()), realSrcSize);
 		return (realSrcSize > 0 || srcSize == 0);
 	}
@@ -83,11 +83,11 @@ namespace FileReaderExt
 	// The file cursor is advanced by "srcSize" bytes.
 	// Returns true if at least one character could be read or 0 characters were requested.
 	template<mpt::String::ReadWriteMode mode, typename TFileCursor>
-	bool ReadString(TFileCursor &f, mpt::ustring &dest, mpt::Charset charset, const std::size_t srcSize)
+	bool ReadString(TFileCursor &f, mpt::ustring &dest, mpt::Charset charset, const typename TFileCursor::pos_type srcSize)
 	{
 		dest.clear();
 		typename TFileCursor::PinnedView source = f.ReadPinnedView(srcSize);	// Make sure the string is cached properly.
-		std::size_t realSrcSize = source.size();	// In case fewer bytes are available
+		typename TFileCursor::pos_type realSrcSize = source.size();	// In case fewer bytes are available
 		dest = mpt::ToUnicode(charset, mpt::String::ReadBuf(mode, mpt::byte_cast<const char*>(source.data()), realSrcSize));
 		return (realSrcSize > 0 || srcSize == 0);
 	}
@@ -95,8 +95,8 @@ namespace FileReaderExt
 	// Read a string with a preprended length field of type Tsize (must be a packed<*,*> type) into a std::string dest using a given read mode.
 	// The file cursor is advanced by the string length.
 	// Returns true if the size field could be read and at least one character could be read or 0 characters were requested.
-	template<typename Tsize, mpt::String::ReadWriteMode mode, std::size_t destSize, typename TFileCursor>
-	bool ReadSizedString(TFileCursor &f, char (&destBuffer)[destSize], const std::size_t maxLength = std::numeric_limits<std::size_t>::max())
+	template<typename Tsize, mpt::String::ReadWriteMode mode, size_t destSize, typename TFileCursor>
+	bool ReadSizedString(TFileCursor &f, char (&destBuffer)[destSize], const typename TFileCursor::pos_type maxLength = std::numeric_limits<typename TFileCursor::pos_type>::max())
 	{
 		static_assert(mpt::is_binary_safe<Tsize>::value);
 		Tsize srcSize;
@@ -104,14 +104,14 @@ namespace FileReaderExt
 		{
 			return false;
 		}
-		return FileReaderExt::ReadString<mode>(f, destBuffer, std::min(static_cast<std::size_t>(srcSize), maxLength));
+		return FileReaderExt::ReadString<mode>(f, destBuffer, std::min(static_cast<typename TFileCursor::pos_type>(srcSize), maxLength));
 	}
 
 	// Read a string with a preprended length field of type Tsize (must be a packed<*,*> type) into a std::string dest using a given read mode.
 	// The file cursor is advanced by the string length.
 	// Returns true if the size field could be read and at least one character could be read or 0 characters were requested.
 	template<typename Tsize, mpt::String::ReadWriteMode mode, typename TFileCursor>
-	bool ReadSizedString(TFileCursor &f, std::string &dest, const std::size_t maxLength = std::numeric_limits<std::size_t>::max())
+	bool ReadSizedString(TFileCursor &f, std::string &dest, const typename TFileCursor::pos_type maxLength = std::numeric_limits<typename TFileCursor::pos_type>::max())
 	{
 		static_assert(mpt::is_binary_safe<Tsize>::value);
 		Tsize srcSize;
@@ -119,14 +119,14 @@ namespace FileReaderExt
 		{
 			return false;
 		}
-		return FileReaderExt::ReadString<mode>(f, dest, std::min(static_cast<std::size_t>(srcSize), maxLength));
+		return FileReaderExt::ReadString<mode>(f, dest, std::min(static_cast<typename TFileCursor::pos_type>(srcSize), maxLength));
 	}
 
 	// Read a string with a preprended length field of type Tsize (must be a packed<*,*> type) into a mpt::charbuf dest using a given read mode.
 	// The file cursor is advanced by the string length.
 	// Returns true if the size field could be read and at least one character could be read or 0 characters were requested.
 	template<typename Tsize, mpt::String::ReadWriteMode mode, std::size_t len, typename TFileCursor>
-	bool ReadSizedString(TFileCursor &f, mpt::charbuf<len> &dest, const std::size_t maxLength = std::numeric_limits<std::size_t>::max())
+	bool ReadSizedString(TFileCursor &f, mpt::charbuf<len> &dest, const typename TFileCursor::pos_type maxLength = std::numeric_limits<typename TFileCursor::pos_type>::max())
 	{
 		static_assert(mpt::is_binary_safe<Tsize>::value);
 		Tsize srcSize;
@@ -134,7 +134,7 @@ namespace FileReaderExt
 		{
 			return false;
 		}
-		return FileReaderExt::ReadString<mode>(f, dest, std::min(static_cast<std::size_t>(srcSize), maxLength));
+		return FileReaderExt::ReadString<mode>(f, dest, std::min(static_cast<typename TFileCursor::pos_type>(srcSize), maxLength));
 	}
 
 } // namespace FileReaderExt
@@ -157,6 +157,7 @@ private:
 public:
 
 	using pos_type = typename traits_type::pos_type;
+	using off_t = pos_type;
 
 	using data_type = typename traits_type::data_type;
 	using ref_data_type = typename traits_type::ref_data_type;
@@ -220,13 +221,13 @@ public:
 	}
 
 	template <typename T>
-	T ReadTruncatedIntLE(std::size_t size)
+	T ReadTruncatedIntLE(pos_type size)
 	{
 		return mpt::IO::FileReader::ReadTruncatedIntLE<T>(*this, size);
 	}
 
 	template <typename T>
-	T ReadSizedIntLE(std::size_t size)
+	T ReadSizedIntLE(pos_type size)
 	{
 		return mpt::IO::FileReader::ReadSizedIntLE<T>(*this, size);
 	}
@@ -323,17 +324,17 @@ public:
 	}
 
 	template <typename T>
-	std::size_t ReadStructPartial(T &target, std::size_t partialSize = sizeof(T))
+	size_t ReadStructPartial(T &target, size_t partialSize = sizeof(T))
 	{
 		return mpt::IO::FileReader::ReadStructPartial(*this, target, partialSize);
 	}
 
-	bool ReadNullString(std::string &dest, const std::size_t maxLength = std::numeric_limits<std::size_t>::max())
+	bool ReadNullString(std::string &dest, const pos_type maxLength = std::numeric_limits<pos_type>::max())
 	{
 		return mpt::IO::FileReader::ReadNullString(*this, dest, maxLength);
 	}
 
-	bool ReadLine(std::string &dest, const std::size_t maxLength = std::numeric_limits<std::size_t>::max())
+	bool ReadLine(std::string &dest, const pos_type maxLength = std::numeric_limits<pos_type>::max())
 	{
 		return mpt::IO::FileReader::ReadLine(*this, dest, maxLength);
 	}
@@ -357,12 +358,12 @@ public:
 	}
 
 	template<typename T>
-	bool ReadVector(std::vector<T> &destVector, std::size_t destSize)
+	bool ReadVector(std::vector<T> &destVector, size_t destSize)
 	{
 		return mpt::IO::FileReader::ReadVector(*this, destVector, destSize);
 	}
 
-	template<std::size_t N>
+	template<size_t N>
 	bool ReadMagic(const char (&magic)[N])
 	{
 		return mpt::IO::FileReader::ReadMagic(*this, magic);
@@ -381,61 +382,61 @@ public:
 	using ChunkList = mpt::IO::FileReader::ChunkList<T, FileReader>;
 
 	template<typename T>
-	Item<T> ReadNextChunk(pos_type alignment)
+	Item<T> ReadNextChunk(off_t alignment)
 	{
 		return mpt::IO::FileReader::ReadNextChunk<T, FileReader>(*this, alignment);
 	}
 
 	template<typename T>
-	ChunkList<T> ReadChunks(pos_type alignment)
+	ChunkList<T> ReadChunks(off_t alignment)
 	{
 		return mpt::IO::FileReader::ReadChunks<T, FileReader>(*this, alignment);
 	}
 
 	template<typename T>
-	ChunkList<T> ReadChunksUntil(pos_type alignment, decltype(T().GetID()) stopAtID)
+	ChunkList<T> ReadChunksUntil(off_t alignment, decltype(T().GetID()) stopAtID)
 	{
 		return mpt::IO::FileReader::ReadChunksUntil<T, FileReader>(*this, alignment, stopAtID);
 	}
 
-	template<mpt::String::ReadWriteMode mode, std::size_t destSize>
-	bool ReadString(char (&destBuffer)[destSize], const std::size_t srcSize)
+	template<mpt::String::ReadWriteMode mode, size_t destSize>
+	bool ReadString(char (&destBuffer)[destSize], const pos_type srcSize)
 	{
 		return FileReaderExt::ReadString<mode>(*this, destBuffer, srcSize);
 	}
 
 	template<mpt::String::ReadWriteMode mode>
-	bool ReadString(std::string &dest, const std::size_t srcSize)
+	bool ReadString(std::string &dest, const pos_type srcSize)
 	{
 		return FileReaderExt::ReadString<mode>(*this, dest, srcSize);
 	}
 
 	template<mpt::String::ReadWriteMode mode, std::size_t len>
-	bool ReadString(mpt::charbuf<len> &dest, const std::size_t srcSize)
+	bool ReadString(mpt::charbuf<len> &dest, const pos_type srcSize)
 	{
 		return FileReaderExt::ReadString<mode>(*this, dest, srcSize);
 	}
 
 	template<mpt::String::ReadWriteMode mode>
-	bool ReadString(mpt::ustring &dest, mpt::Charset charset, const std::size_t srcSize)
+	bool ReadString(mpt::ustring &dest, mpt::Charset charset, const pos_type srcSize)
 	{
 		return FileReaderExt::ReadString<mode>(*this, dest, charset, srcSize);
 	}
 
-	template<typename Tsize, mpt::String::ReadWriteMode mode, std::size_t destSize>
-	bool ReadSizedString(char (&destBuffer)[destSize], const std::size_t maxLength = std::numeric_limits<std::size_t>::max())
+	template<typename Tsize, mpt::String::ReadWriteMode mode, size_t destSize>
+	bool ReadSizedString(char (&destBuffer)[destSize], const pos_type maxLength = std::numeric_limits<pos_type>::max())
 	{
 		return FileReaderExt::ReadSizedString<Tsize, mode>(*this, destBuffer, maxLength);
 	}
 
 	template<typename Tsize, mpt::String::ReadWriteMode mode>
-	bool ReadSizedString(std::string &dest, const std::size_t maxLength = std::numeric_limits<std::size_t>::max())
+	bool ReadSizedString(std::string &dest, const pos_type maxLength = std::numeric_limits<pos_type>::max())
 	{
 		return FileReaderExt::ReadSizedString<Tsize, mode>(*this, dest, maxLength);
 	}
 
 	template<typename Tsize, mpt::String::ReadWriteMode mode, std::size_t len>
-	bool ReadSizedString(mpt::charbuf<len> &dest, const std::size_t maxLength = std::numeric_limits<std::size_t>::max())
+	bool ReadSizedString(mpt::charbuf<len> &dest, const pos_type maxLength = std::numeric_limits<pos_type>::max())
 	{
 		return FileReaderExt::ReadSizedString<Tsize, mode, len>(*this, dest, maxLength);
 	}

Frameworks/OpenMPT/OpenMPT/common/FileReaderFwd.h

@@ -36,10 +36,10 @@ class FileCursorFilenameTraits;
 template <typename Ttraits, typename Tfilenametraits>
 class FileCursor;
 
-} // namespace IO
+}
 
-} // inline namespace MPT_INLINE_NS
-} // namespace mpt
+}
+}
 
 OPENMPT_NAMESPACE_BEGIN
 

Frameworks/OpenMPT/OpenMPT/common/GzipWriter.h

@@ -1,57 +0,0 @@
-/*
- * GzipWriter.h
- * ------------
- * Purpose: Simple wrapper around zlib's Gzip writer
- * Notes  : miniz doesn't implement Gzip writing, so this is only compatible with zlib.
- * Authors: OpenMPT Devs
- * The OpenMPT source code is released under the BSD license. Read LICENSE for more details.
- */
-
-
-#pragma once
-
-#include "openmpt/all/BuildSettings.hpp"
-
-#include "mptString.h"
-#include "mpt/io/io.hpp"
-#include "mpt/io/io_stdstream.hpp"
-
-#ifdef MPT_WITH_ZLIB
-
-#include <zlib.h>
-
-OPENMPT_NAMESPACE_BEGIN
-
-inline void WriteGzip(std::ostream &output, std::string &outData, const mpt::ustring &fileName)
-{
-	z_stream strm{};
-	strm.avail_in = static_cast<uInt>(outData.size());
-	strm.next_in = reinterpret_cast<Bytef *>(outData.data());
-	if(deflateInit2(&strm, Z_BEST_COMPRESSION, Z_DEFLATED, 15 | 16, 9, Z_DEFAULT_STRATEGY) != Z_OK)
-		throw std::runtime_error{"zlib init failed"};
-	gz_header gzHeader{};
-	gzHeader.time = static_cast<uLong>(time(nullptr));
-	std::string filenameISO = mpt::ToCharset(mpt::Charset::ISO8859_1, fileName);
-	gzHeader.name = reinterpret_cast<Bytef *>(filenameISO.data());
-	deflateSetHeader(&strm, &gzHeader);
-	try
-	{
-		do
-		{
-			std::array<Bytef, mpt::IO::BUFFERSIZE_TINY> buffer;
-			strm.avail_out = static_cast<uInt>(buffer.size());
-			strm.next_out = buffer.data();
-			deflate(&strm, Z_FINISH);
-			mpt::IO::WritePartial(output, buffer, buffer.size() - strm.avail_out);
-		} while(strm.avail_out == 0);
-		deflateEnd(&strm);
-	} catch(const std::exception &)
-	{
-		deflateEnd(&strm);
-		throw;
-	}
-}
-
-OPENMPT_NAMESPACE_END
-
-#endif

Frameworks/OpenMPT/OpenMPT/common/Logging.cpp

@@ -16,14 +16,8 @@
 #include "mpt/io/base.hpp"
 #include "mpt/io/io.hpp"
 #include "mpt/io/io_stdstream.hpp"
-#if defined(MODPLUG_TRACKER)
-#include "mpt/io_file/fstream.hpp"
-#endif
 
-#if defined(MODPLUG_TRACKER)
 #include "mptFileIO.h"
-#endif
-
 #if defined(MODPLUG_TRACKER)
 #include <atomic>
 #endif
@@ -134,7 +128,7 @@ void GlobalLogger::SendLogMessage(const mpt::source_location &loc, LogLevel leve
 #endif
 		if(mpt::log::FileEnabled)
 		{
-			static std::optional<mpt::IO::ofstream> s_logfile;
+			static std::optional<mpt::ofstream> s_logfile;
 			if(!s_logfile)
 			{
 				s_logfile.emplace(P_("mptrack.log"), std::ios::app);
@@ -324,7 +318,7 @@ bool Dump(const mpt::PathString &filename)
 	// sort according to index in case of overflows
 	std::stable_sort(Entries.begin(), Entries.end());
 
-	mpt::IO::ofstream f(filename);
+	mpt::ofstream f(filename);
 
 	f << "Build: OpenMPT " << mpt::transcode<std::string>(mpt::logfile_encoding, Build::GetVersionStringExtended()) << std::endl;
 

Frameworks/OpenMPT/OpenMPT/common/mptBaseTypes.h

@@ -12,11 +12,10 @@
 
 #include "openmpt/all/BuildSettings.hpp"
 
-#include "mpt/base/check_platform.hpp"
-#include "mpt/base/float.hpp"
 #include "mpt/base/integer.hpp"
+#include "mpt/base/floatingpoint.hpp"
 #include "mpt/base/pointer.hpp"
-#include "mpt/base/size.hpp"
+#include "mpt/base/check_platform.hpp"
 #include "mpt/base/source_location.hpp"
 #include "openmpt/base/Types.hpp"
 

Frameworks/OpenMPT/OpenMPT/common/mptCPU.h

@@ -28,6 +28,9 @@ namespace CPU
 #ifdef MPT_ENABLE_ARCH_INTRINSICS
 
 
+
+
+
 #if defined(MODPLUG_TRACKER) && !defined(MPT_BUILD_WINESUPPORT)
 
 
@@ -90,6 +93,11 @@ public:
 #endif // MODPLUG_TRACKER
 
 
+
+
+
+// legacy interface
+
 namespace feature = mpt::arch::current::feature;
 namespace mode = mpt::arch::current::mode;
 
@@ -104,6 +112,8 @@ namespace mode = mpt::arch::current::mode;
 }
 
 
+
+
 #endif // MPT_ENABLE_ARCH_INTRINSICS