Merge branch 'main' into Cog-ru

Audio/Chain/AudioChunk.h

@@ -80,6 +80,7 @@ enum {
 + (uint32_t)findChannelIndex:(uint32_t)flag;
 
 - (id)init;
+- (id)initWithProperties:(NSDictionary *)properties;
 
 - (void)assignSamples:(const void *)data frameCount:(size_t)count;
 
@@ -88,6 +89,7 @@ enum {
 - (BOOL)isEmpty;
 
 - (size_t)frameCount;
+- (void)setFrameCount:(size_t)count; // For truncation only
 
 - (double)duration;
 

Audio/Chain/AudioChunk.m

@@ -7,6 +7,8 @@
 
 #import "AudioChunk.h"
 
+#import "CoreAudioUtils.h"
+
 @implementation AudioChunk
 
 - (id)init {
@@ -21,6 +23,18 @@
 	return self;
 }
 
+- (id)initWithProperties:(NSDictionary *)properties {
+	self = [super init];
+
+	if(self) {
+		chunkData = [[NSMutableData alloc] init];
+		[self setFormat:propertiesToASBD(properties)];
+		lossless = [[properties objectForKey:@"encoding"] isEqualToString:@"lossless"];
+	}
+
+	return self;
+}
+
 static const uint32_t AudioChannelConfigTable[] = {
 	0,
 	AudioConfigMono,
@@ -156,6 +170,16 @@ static const uint32_t AudioChannelConfigTable[] = {
 	return 0;
 }
 
+- (void)setFrameCount:(size_t)count {
+	if(formatAssigned) {
+		count *= format.mBytesPerPacket;
+		size_t currentLength = [chunkData length];
+		if(count < currentLength) {
+			[chunkData replaceBytesInRange:NSMakeRange(count, currentLength - count) withBytes:NULL length:0];
+		}
+	}
+}
+
 - (double)duration {
 	if(formatAssigned) {
 		const size_t bytesPerPacket = format.mBytesPerPacket;

Audio/Chain/ConverterNode.m

@@ -432,34 +432,37 @@ static void convert_be_to_le(uint8_t *buffer, size_t bitsPerSample, size_t bytes
 }
 
 - (void)process {
-	char writeBuf[CHUNK_SIZE];
-
 	// Removed endOfStream check from here, since we want to be able to flush the converter
 	// when the end of stream is reached. Convert function instead processes what it can,
 	// and returns 0 samples when it has nothing more to process at the end of stream.
 	while([self shouldContinue] == YES) {
-		int amountConverted;
+		AudioChunk *chunk = nil;
 		while(paused) {
 			usleep(500);
 		}
 		@autoreleasepool {
-			amountConverted = [self convert:writeBuf amount:CHUNK_SIZE];
+			chunk = [self convert];
 		}
-		if(!amountConverted) {
+		if(!chunk) {
 			if(paused) {
 				continue;
-			} else if(streamFormatChanged) {
+			} else if(!streamFormatChanged) {
-				[self cleanUp];
-				[self setupWithInputFormat:newInputFormat withInputConfig:newInputChannelConfig isLossless:rememberedLossless];
-				continue;
-			} else
 				break;
 			}
-		[self writeData:writeBuf amount:amountConverted];
+		} else {
+			@autoreleasepool {
+				[self writeChunk:chunk];
+				chunk = nil;
+			}
+		}
+		if(streamFormatChanged) {
+			[self cleanUp];
+			[self setupWithInputFormat:newInputFormat withInputConfig:newInputChannelConfig isLossless:rememberedLossless];
+		}
 	}
 }
 
-- (int)convert:(void *)dest amount:(int)amount {
+- (AudioChunk *)convert {
 	UInt32 ioNumberPackets;
 	int amountReadFromFC;
 	int amountRead = 0;
@@ -472,7 +475,7 @@ static void convert_be_to_le(uint8_t *buffer, size_t bitsPerSample, size_t bytes
 tryagain:
 	if(stopping || [self shouldContinue] == NO) {
 		convertEntered = NO;
-		return amountRead;
+		return nil;
 	}
 
 	amountReadFromFC = 0;
@@ -543,7 +546,7 @@ tryagain:
 
 			if(!bytesReadFromInput) {
 				convertEntered = NO;
-				return amountRead;
+				return nil;
 			}
 
 			if(bytesReadFromInput && isBigEndian) {
@@ -703,19 +706,26 @@ tryagain:
 	if(floatOffset == floatSize)
 		goto tryagain;
 
-	ioNumberPackets = (amount - amountRead);
-	if(ioNumberPackets > (floatSize - floatOffset))
 	ioNumberPackets = (UInt32)(floatSize - floatOffset);
 
 	ioNumberPackets -= ioNumberPackets % dmFloatFormat.mBytesPerPacket;
 
-	memcpy(((uint8_t *)dest) + amountRead, ((uint8_t *)floatBuffer) + floatOffset, ioNumberPackets);
+	if(ioNumberPackets) {
+		AudioChunk *chunk = [[AudioChunk alloc] init];
+		[chunk setFormat:nodeFormat];
+		if(nodeChannelConfig) {
+			[chunk setChannelConfig:nodeChannelConfig];
+		}
+		[chunk assignSamples:floatBuffer frameCount:ioNumberPackets / dmFloatFormat.mBytesPerPacket];
 
 		floatOffset += ioNumberPackets;
 		amountRead += ioNumberPackets;
+		convertEntered = NO;
+		return chunk;
+	}
 
 	convertEntered = NO;
-	return amountRead;
+	return nil;
 }
 
 - (void)observeValueForKeyPath:(NSString *)keyPath

Audio/Chain/Downmix.m

@@ -149,10 +149,12 @@ static void downmix_to_stereo(const float *inBuffer, int channels, uint32_t conf
 
 static void downmix_to_mono(const float *inBuffer, int channels, uint32_t config, float *outBuffer, size_t count) {
 	float tempBuffer[count * 2];
+	if(channels > 2 || config != AudioConfigStereo) {
 		downmix_to_stereo(inBuffer, channels, config, tempBuffer, count);
 		inBuffer = tempBuffer;
 		channels = 2;
 		config = AudioConfigStereo;
+	}
 	cblas_scopy((int)count, inBuffer, 2, outBuffer, 1);
 	vDSP_vadd(outBuffer, 1, inBuffer + 1, 2, outBuffer, 1, count);
 }

Audio/Chain/InputNode.m

@@ -142,10 +142,6 @@ static void *kInputNodeContext = &kInputNodeContext;
 }
 
 - (void)process {
-	int amountInBuffer = 0;
-	int bytesInBuffer = 0;
-	void *inputBuffer = malloc(CHUNK_SIZE * 8 * 18); // Maximum 18 channels, dunno what we'll receive
-
 	BOOL shouldClose = YES;
 	BOOL seekError = NO;
 
@@ -165,7 +161,6 @@ static void *kInputNodeContext = &kInputNodeContext;
 			ConverterNode *converter = [bufferChain converter];
 			DLog(@"SEEKING! Resetting Buffer");
 
-			amountInBuffer = 0;
 			// This resets the converter's buffer
 			[self resetBuffer];
 			[converter resetBuffer];
@@ -174,7 +169,9 @@ static void *kInputNodeContext = &kInputNodeContext;
 			DLog(@"Reset buffer!");
 
 			DLog(@"SEEKING!");
+			@autoreleasepool {
 				seekError = [decoder seek:seekFrame] < 0;
+			}
 
 			shouldSeek = NO;
 			DLog(@"Seeked! Resetting Buffer");
@@ -185,19 +182,16 @@ static void *kInputNodeContext = &kInputNodeContext;
 			}
 		}
 
-		if(amountInBuffer < CHUNK_SIZE) {
+		AudioChunk *chunk;
-			int framesToRead = CHUNK_SIZE - amountInBuffer;
-			int framesRead;
 		@autoreleasepool {
-				framesRead = [decoder readAudio:((char *)inputBuffer) + bytesInBuffer frames:framesToRead];
+			chunk = [decoder readAudio];
 		}
 
-			if(framesRead > 0 && !seekError) {
+		if(chunk && [chunk frameCount]) {
-				amountInBuffer += framesRead;
+			@autoreleasepool {
-				bytesInBuffer += framesRead * bytesPerFrame;
+				[self writeChunk:chunk];
-				[self writeData:inputBuffer amount:bytesInBuffer];
+				chunk = nil;
-				amountInBuffer = 0;
+			}
-				bytesInBuffer = 0;
 		} else {
 			DLog(@"End of stream? %@", [self properties]);
 
@@ -219,19 +213,15 @@ static void *kInputNodeContext = &kInputNodeContext;
 				endOfStream = NO;
 				shouldClose = NO;
 				continue;
-				}
+			} else {
-				else {
 				break;
 			}
 		}
 	}
-	}
 
 	if(shouldClose)
 		[decoder close];
 
-	free(inputBuffer);
-
 	[exitAtTheEndOfTheStream signal];
 
 	DLog("Input node thread stopping");

Audio/Chain/Node.h

@@ -19,7 +19,7 @@
 	ChunkList *buffer;
 	Semaphore *semaphore;
 
-	NSRecursiveLock *accessLock;
+	NSLock *accessLock;
 
 	id __weak previousNode;
 	id __weak controller;
@@ -37,6 +37,7 @@
 - (id _Nullable)initWithController:(id _Nonnull)c previous:(id _Nullable)p;
 
 - (void)writeData:(const void *_Nonnull)ptr amount:(size_t)a;
+- (void)writeChunk:(AudioChunk *_Nonnull)chunk;
 - (AudioChunk *_Nonnull)readChunk:(size_t)maxFrames;
 
 - (BOOL)peekFormat:(AudioStreamBasicDescription *_Nonnull)format channelConfig:(uint32_t *_Nonnull)config;

Audio/Chain/Node.m

@@ -25,7 +25,7 @@
 		buffer = [[ChunkList alloc] initWithMaximumDuration:3.0];
 		semaphore = [[Semaphore alloc] init];
 
-		accessLock = [[NSRecursiveLock alloc] init];
+		accessLock = [[NSLock alloc] init];
 
 		initialBufferFilled = NO;
 
@@ -91,6 +91,35 @@
 	[accessLock unlock];
 }
 
+- (void)writeChunk:(AudioChunk *)chunk {
+	[accessLock lock];
+
+	const double chunkDuration = [chunk duration];
+	double durationLeft = [buffer maxDuration] - [buffer listDuration];
+
+	while(shouldContinue == YES && chunkDuration > durationLeft) {
+		if(durationLeft < chunkDuration) {
+			if(initialBufferFilled == NO) {
+				initialBufferFilled = YES;
+				if([controller respondsToSelector:@selector(initialBufferFilled:)])
+					[controller performSelector:@selector(initialBufferFilled:) withObject:self];
+			}
+		}
+
+		if(durationLeft < chunkDuration || shouldReset) {
+			[accessLock unlock];
+			[semaphore wait];
+			[accessLock lock];
+		}
+
+		durationLeft = [buffer maxDuration] - [buffer listDuration];
+	}
+
+	[buffer addChunk:chunk];
+
+	[accessLock unlock];
+}
+
 // Should be overwriten by subclass.
 - (void)process {
 }

Audio/CogAudio.xcodeproj/project.pbxproj

@@ -819,6 +819,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
@@ -865,6 +866,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;

Audio/CogPluginMulti.m

@@ -79,9 +79,9 @@ static void *kCogDecoderMultiContext = &kCogDecoderMultiContext;
 	return @{};
 }
 
-- (int)readAudio:(void *)buffer frames:(UInt32)frames {
+- (AudioChunk *)readAudio {
-	if(theDecoder != nil) return [theDecoder readAudio:buffer frames:frames];
+	if(theDecoder != nil) return [theDecoder readAudio];
-	return 0;
+	return nil;
 }
 
 - (BOOL)open:(id<CogSource>)source {

Audio/Output/HeadphoneFilter.h

@@ -15,10 +15,10 @@
 	vDSP_DFT_Setup dftSetupF;
 	vDSP_DFT_Setup dftSetupB;
 
-	size_t fftSize;
+	int fftSize;
-	size_t fftSizeOver2;
+	int fftSizeOver2;
-	size_t bufferSize;
+	int bufferSize;
-	size_t paddedBufferSize;
+	int paddedBufferSize;
 	int channelCount;
 
 	DSPSplitComplex signal_fft;
@@ -38,7 +38,7 @@
 
 - (id)initWithImpulseFile:(NSURL *)url forSampleRate:(double)sampleRate withInputChannels:(int)channels withConfig:(uint32_t)config;
 
-- (void)process:(const float *)inBuffer sampleCount:(size_t)count toBuffer:(float *)outBuffer;
+- (void)process:(const float *)inBuffer sampleCount:(int)count toBuffer:(float *)outBuffer;
 
 - (void)reset;
 

Audio/Output/HeadphoneFilter.mm

@@ -302,7 +302,7 @@ static impulseCache *_sharedController = nil;
 
 		paddedBufferSize = fftSize;
 		fftSizeOver2 = (fftSize + 1) / 2;
-		const size_t fftSizeOver2Plus1 = fftSizeOver2 + 1; // DFT float overwrites plus one, double doesn't
+		const int fftSizeOver2Plus1 = fftSizeOver2 + 1; // DFT float overwrites plus one, double doesn't
 
 		dftSetupF = vDSP_DFT_zrop_CreateSetup(nil, fftSize, vDSP_DFT_FORWARD);
 		dftSetupB = vDSP_DFT_zrop_CreateSetup(nil, fftSize, vDSP_DFT_INVERSE);

Audio/Plugin.h

@@ -1,5 +1,7 @@
 // Plugins! HOORAY!
 
+#import "AudioChunk.h"
+
 @protocol CogSource <NSObject>
 + (NSArray *)schemes; // http, file, etc
 
@@ -42,7 +44,7 @@
 - (NSDictionary *)properties;
 - (NSDictionary *)metadata; // Only to be implemented for dynamic metadata, send events on change
 
-- (int)readAudio:(void *)buffer frames:(UInt32)frames;
+- (AudioChunk *)readAudio;
 
 - (BOOL)open:(id<CogSource>)source;
 - (long)seek:(long)frame;

Audio/Visualization/VisualizationController.m

@@ -83,6 +83,12 @@ static VisualizationController *_sharedController = nil;
 - (void)copyVisPCM:(float *)outPCM visFFT:(float *)outFFT latencyOffset:(double)latency {
 	if(!outPCM && !outFFT) return;
 
+	if(!visAudio || !visAudioSize) {
+		if(outPCM) bzero(outPCM, sizeof(float) * 4096);
+		if(outFFT) bzero(outFFT, sizeof(float) * 2048);
+		return;
+	}
+
 	float tempPCM[4096];
 	if(!outPCM) outPCM = &tempPCM[0];
 

Cog.xcodeproj/project.pbxproj

@@ -940,6 +940,7 @@
 		83489C4E2782F2DF00BDCEA2 /* libvgmPlayer.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = libvgmPlayer.xcodeproj; path = Plugins/libvgmPlayer/libvgmPlayer.xcodeproj; sourceTree = "<group>"; };
 		8349270127B4EFFC0009AB2B /* duplicateItemsTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; name = duplicateItemsTemplate.pdf; path = Images/duplicateItemsTemplate.pdf; sourceTree = "<group>"; };
 		8349270B27B4EFFC0009AB2B /* deadItemsTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; name = deadItemsTemplate.pdf; path = Images/deadItemsTemplate.pdf; sourceTree = "<group>"; };
+		834A42C4287B01B600EB9D9B /* AudioChunk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AudioChunk.h; path = Audio/Chain/AudioChunk.h; sourceTree = SOURCE_ROOT; };
 		834B05E82859C006000B7DC0 /* TotalTimeTransformer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = TotalTimeTransformer.h; path = Transformers/TotalTimeTransformer.h; sourceTree = "<group>"; };
 		834B05E92859C006000B7DC0 /* TotalTimeTransformer.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = TotalTimeTransformer.m; path = Transformers/TotalTimeTransformer.m; sourceTree = "<group>"; };
 		8355D6B4180612F300D05687 /* NSData+MD5.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSData+MD5.h"; sourceTree = "<group>"; };
@@ -1076,6 +1077,18 @@
 		83E5E54B18087CA5001F3284 /* miniModeOnTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; name = miniModeOnTemplate.pdf; path = Images/miniModeOnTemplate.pdf; sourceTree = "<group>"; };
 		83E5EFAC1FFEF78100659F0F /* OpenMPT.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = OpenMPT.xcodeproj; path = Plugins/OpenMPT/OpenMPT.xcodeproj; sourceTree = "<group>"; };
 		83ED3AC7279A91C000904199 /* hdcdLogoTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; name = hdcdLogoTemplate.pdf; path = Images/hdcdLogoTemplate.pdf; sourceTree = "<group>"; };
+		83F0E6A3287CAB3800D84594 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/AboutWindowController.strings; sourceTree = "<group>"; };
+		83F0E6A4287CAB3800D84594 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/Equalizer.strings; sourceTree = "<group>"; };
+		83F0E6A5287CAB3800D84594 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/InfoInspector.strings; sourceTree = "<group>"; };
+		83F0E6A6287CAB3800D84594 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/MainMenu.strings; sourceTree = "<group>"; };
+		83F0E6A7287CAB3800D84594 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/OpenURLPanel.strings; sourceTree = "<group>"; };
+		83F0E6A8287CAB3800D84594 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/FileTree.strings; sourceTree = "<group>"; };
+		83F0E6A9287CAB3800D84594 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/SpectrumWindow.strings; sourceTree = "<group>"; };
+		83F0E6AA287CAB3800D84594 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/SpotlightPanel.strings; sourceTree = "<group>"; };
+		83F0E6AB287CAB3800D84594 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/Feedback.strings; sourceTree = "<group>"; };
+		83F0E8AD287CD48800D84594 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		83F0E8B1287CD50700D84594 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/Localizable.strings; sourceTree = "<group>"; };
+		83F0E8B2287CD52500D84594 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.html; name = pl; path = pl.lproj/Credits.html; 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>"; };
@@ -1240,6 +1253,7 @@
 		177EC0110B8BC2CF0000BC8C /* Utils */ = {
 			isa = PBXGroup;
 			children = (
+				834A42C4287B01B600EB9D9B /* AudioChunk.h */,
 				8384912518080F2D00E7332D /* Logging.h */,
 				07E18DF10D62B38400BB0E11 /* NSArray+ShuffleUtils.h */,
 				07E18DF20D62B38400BB0E11 /* NSArray+ShuffleUtils.m */,
@@ -2093,6 +2107,7 @@
 				fr,
 				he,
 				ja,
+				pl,
 				ru,
 			);
 			mainGroup = 29B97314FDCFA39411CA2CEA /* Cog */;
@@ -2846,6 +2861,7 @@
 			children = (
 				833F681E1CDBCAA700AFB9F0 /* es */,
 				835C888C22CC1882001B4B3F /* en */,
+				83F0E8AD287CD48800D84594 /* pl */,
 				491C55C2287AA4B7007D96F5 /* ru */,
 			);
 			name = InfoPlist.strings;
@@ -2867,6 +2883,7 @@
 				83BC5AB720E4C91400631CD4 /* Base */,
 				83BC5AD220E4D0B400631CD4 /* es */,
 				83BC5AD420E4D0B600631CD4 /* en */,
+				83F0E6A8287CAB3800D84594 /* pl */,
 				491C55BB287AA4B6007D96F5 /* ru */,
 			);
 			name = FileTree.xib;
@@ -2878,6 +2895,7 @@
 				83BC5AB520E4C91200631CD4 /* Base */,
 				83BC5AC620E4D04600631CD4 /* en */,
 				83BC5AC820E4D05A00631CD4 /* es */,
+				83F0E6A6287CAB3800D84594 /* pl */,
 				491C55B9287AA4B6007D96F5 /* ru */,
 			);
 			name = MainMenu.xib;
@@ -2889,6 +2907,7 @@
 				83BC5AB620E4C91300631CD4 /* Base */,
 				83BC5ACE20E4D09700631CD4 /* es */,
 				83BC5AD020E4D09800631CD4 /* en */,
+				83F0E6A7287CAB3800D84594 /* pl */,
 				491C55BA287AA4B6007D96F5 /* ru */,
 			);
 			name = OpenURLPanel.xib;
@@ -2900,6 +2919,7 @@
 				83BC5AB820E4C91400631CD4 /* Base */,
 				83BC5AD620E4D0D800631CD4 /* es */,
 				83BC5AD820E4D0D900631CD4 /* en */,
+				83F0E6AA287CAB3800D84594 /* pl */,
 				491C55BD287AA4B6007D96F5 /* ru */,
 			);
 			name = SpotlightPanel.xib;
@@ -2911,6 +2931,7 @@
 				83BC5AB420E4C91100631CD4 /* Base */,
 				83BC5ACA20E4D07200631CD4 /* es */,
 				83BC5ACC20E4D07700631CD4 /* en */,
+				83F0E6A5287CAB3800D84594 /* pl */,
 				491C55B8287AA4B6007D96F5 /* ru */,
 			);
 			name = InfoInspector.xib;
@@ -2922,6 +2943,7 @@
 				83BC5AB920E4C91500631CD4 /* Base */,
 				83BC5ADA20E4D0E900631CD4 /* en */,
 				83BC5ADC20E4D0EC00631CD4 /* es */,
+				83F0E6AB287CAB3800D84594 /* pl */,
 				491C55BE287AA4B6007D96F5 /* ru */,
 			);
 			name = Feedback.xib;
@@ -2932,6 +2954,7 @@
 			children = (
 				833F68251CDBCAA800AFB9F0 /* es */,
 				835C888B22CC1881001B4B3F /* en */,
+				83F0E8B2287CD52500D84594 /* pl */,
 				491C55C4287AA4B7007D96F5 /* ru */,
 			);
 			name = Credits.html;
@@ -2943,6 +2966,7 @@
 				830C37A027B95E3000E02BB0 /* Base */,
 				839614A8286EDA0400D3EEDB /* en */,
 				839614AA286EDA0600D3EEDB /* es */,
+				83F0E6A4287CAB3800D84594 /* pl */,
 				491C55B7287AA4B6007D96F5 /* ru */,
 			);
 			name = Equalizer.xib;
@@ -2954,6 +2978,7 @@
 				839614A1286ED97200D3EEDB /* Base */,
 				839614A4286ED98600D3EEDB /* en */,
 				839614A6286ED98800D3EEDB /* es */,
+				83F0E6A3287CAB3800D84594 /* pl */,
 				491C55B6287AA4B6007D96F5 /* ru */,
 			);
 			name = AboutWindowController.xib;
@@ -2965,6 +2990,7 @@
 				839614AC286EDA5C00D3EEDB /* Base */,
 				839614AF286EDA6800D3EEDB /* en */,
 				839614B1286EDA6E00D3EEDB /* es */,
+				83F0E6A9287CAB3800D84594 /* pl */,
 				491C55BC287AA4B6007D96F5 /* ru */,
 			);
 			name = SpectrumWindow.xib;
@@ -2975,6 +3001,7 @@
 			children = (
 				833F681F1CDBCAA800AFB9F0 /* es */,
 				835C888D22CC1882001B4B3F /* en */,
+				83F0E8B1287CD50700D84594 /* pl */,
 				491C55C3287AA4B7007D96F5 /* ru */,
 			);
 			name = Localizable.strings;
@@ -2988,7 +3015,6 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = "Cog color";
-				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Cog.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
@@ -3044,7 +3070,6 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = "Cog color";
-				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Cog.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
@@ -3097,6 +3122,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
@@ -3140,6 +3166,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;

Frameworks/File_Extractor/File_Extractor.xcodeproj/project.pbxproj

@@ -283,6 +283,7 @@
 		83C210AC19CD92960093C461 /* pathfn.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = pathfn.cpp; sourceTree = "<group>"; };
 		83C210AE19CD97DB0093C461 /* timefn.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = timefn.cpp; sourceTree = "<group>"; };
 		83C210AF19CD97DB0093C461 /* timefn.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = timefn.hpp; sourceTree = "<group>"; };
+		83F0E6B3287CAB4100D84594 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -646,6 +647,7 @@
 				en,
 				es,
 				Base,
+				pl,
 			);
 			mainGroup = 8359FF3217FEF39F0060F3ED;
 			productRefGroup = 8359FF3D17FEF39F0060F3ED /* Products */;
@@ -746,6 +748,7 @@
 			children = (
 				8359FF4917FEF39F0060F3ED /* en */,
 				833F68401CDBCAB300AFB9F0 /* es */,
+				83F0E6B3287CAB4100D84594 /* pl */,
 			);
 			name = InfoPlist.strings;
 			sourceTree = "<group>";
@@ -761,6 +764,7 @@
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
@@ -817,6 +821,7 @@
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;

Frameworks/File_Extractor/File_Extractor/pl.lproj/InfoPlist.strings

@@ -0,0 +1,2 @@
+/* Localized versions of Info.plist keys */
+

Frameworks/GME/GME.xcodeproj/project.pbxproj

@@ -236,6 +236,7 @@
 		8370B70C17F615FE001A4D7A /* Spc_Sfm.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Spc_Sfm.cpp; path = gme/Spc_Sfm.cpp; sourceTree = "<group>"; };
 		8370B70D17F615FE001A4D7A /* Spc_Sfm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Spc_Sfm.h; path = gme/Spc_Sfm.h; sourceTree = "<group>"; };
 		83747B7F2862D4DB0021245F /* Shared.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Shared.xcconfig; sourceTree = "<group>"; };
+		83F0E6B7287CAB4100D84594 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		83FC5D3B181B47FB00B917E5 /* dsp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dsp.cpp; sourceTree = "<group>"; };
 		83FC5D3C181B47FB00B917E5 /* dsp.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = dsp.hpp; sourceTree = "<group>"; };
 		83FC5D57181B47FB00B917E5 /* smp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = smp.cpp; sourceTree = "<group>"; };
@@ -641,6 +642,7 @@
 				en,
 				es,
 				Base,
+				pl,
 			);
 			mainGroup = 0867D691FE84028FC02AAC07 /* GME */;
 			productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
@@ -727,6 +729,7 @@
 			children = (
 				833F68361CDBCAB200AFB9F0 /* es */,
 				835C889022CC1884001B4B3F /* en */,
+				83F0E6B7287CAB4100D84594 /* pl */,
 			);
 			name = InfoPlist.strings;
 			sourceTree = "<group>";
@@ -806,6 +809,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
@@ -852,6 +856,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;

Frameworks/HighlyAdvanced/HighlyAdvanced.xcodeproj/project.pbxproj

@@ -68,6 +68,7 @@
 		8343798717F97CF600584396 /* Sound.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Sound.cpp; sourceTree = "<group>"; };
 		8343798817F97CF600584396 /* Sound.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Sound.h; sourceTree = "<group>"; };
 		83747B8E2862D5040021245F /* Shared.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Shared.xcconfig; sourceTree = "<group>"; };
+		83F0E6BD287CAB4200D84594 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -263,6 +264,7 @@
 				en,
 				es,
 				Base,
+				pl,
 			);
 			mainGroup = 8343792B17F97BDB00584396;
 			productRefGroup = 8343793617F97BDB00584396 /* Products */;
@@ -311,6 +313,7 @@
 			children = (
 				8343794217F97BDB00584396 /* en */,
 				833F682F1CDBCAB100AFB9F0 /* es */,
+				83F0E6BD287CAB4200D84594 /* pl */,
 			);
 			name = InfoPlist.strings;
 			sourceTree = "<group>";
@@ -326,6 +329,7 @@
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
@@ -381,6 +385,7 @@
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;

Frameworks/HighlyAdvanced/HighlyAdvanced/pl.lproj/InfoPlist.strings

@@ -0,0 +1,2 @@
+/* Localized versions of Info.plist keys */
+

Frameworks/HighlyExperimental/HighlyExperimental.xcodeproj/project.pbxproj

@@ -50,6 +50,7 @@
 		8360EF5817F92DB0005208A4 /* vfs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = vfs.c; path = Core/vfs.c; sourceTree = "<group>"; };
 		8360EF5917F92DB0005208A4 /* vfs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = vfs.h; path = Core/vfs.h; sourceTree = "<group>"; };
 		83747BA22862D5390021245F /* Shared.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Shared.xcconfig; sourceTree = "<group>"; };
+		83F0E6B9287CAB4200D84594 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -202,6 +203,7 @@
 				en,
 				es,
 				Base,
+				pl,
 			);
 			mainGroup = 8360EF0617F92C91005208A4;
 			productRefGroup = 8360EF1117F92C91005208A4 /* Products */;
@@ -248,6 +250,7 @@
 			children = (
 				8360EF1D17F92C91005208A4 /* en */,
 				833F682B1CDBCAB000AFB9F0 /* es */,
+				83F0E6B9287CAB4200D84594 /* pl */,
 			);
 			name = InfoPlist.strings;
 			sourceTree = "<group>";
@@ -263,6 +266,7 @@
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
@@ -318,6 +322,7 @@
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;

Frameworks/HighlyExperimental/HighlyExperimental/pl.lproj/InfoPlist.strings

@@ -0,0 +1,2 @@
+/* Localized versions of Info.plist keys */
+

Frameworks/HighlyQuixotic/HighlyQuixotic.xcodeproj/project.pbxproj

@@ -34,6 +34,7 @@
 		8343791C17F96EA600584396 /* z80.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = z80.c; path = Core/z80.c; sourceTree = "<group>"; };
 		8343791D17F96EA600584396 /* z80.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = z80.h; path = Core/z80.h; sourceTree = "<group>"; };
 		83747B932862D5160021245F /* Shared.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Shared.xcconfig; sourceTree = "<group>"; };
+		83F0E6BC287CAB4200D84594 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -174,6 +175,7 @@
 				en,
 				es,
 				Base,
+				pl,
 			);
 			mainGroup = 834378D417F96E2600584396;
 			productRefGroup = 834378DF17F96E2600584396 /* Products */;
@@ -216,6 +218,7 @@
 			children = (
 				834378EB17F96E2600584396 /* en */,
 				833F682E1CDBCAB100AFB9F0 /* es */,
+				83F0E6BC287CAB4200D84594 /* pl */,
 			);
 			name = InfoPlist.strings;
 			sourceTree = "<group>";
@@ -231,6 +234,7 @@
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
@@ -290,6 +294,7 @@
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;

Frameworks/HighlyQuixotic/HighlyQuixotic/pl.lproj/InfoPlist.strings

@@ -0,0 +1,2 @@
+/* Localized versions of Info.plist keys */
+

Frameworks/HighlyTheoretical/HighlyTheoretical.xcodeproj/project.pbxproj

@@ -52,6 +52,7 @@
 		834378C317F9666D00584396 /* m68kops.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = m68kops.h; sourceTree = "<group>"; };
 		834378C417F9666D00584396 /* macros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = macros.h; sourceTree = "<group>"; };
 		83747B982862D5230021245F /* Shared.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Shared.xcconfig; sourceTree = "<group>"; };
+		83F0E6BB287CAB4200D84594 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -216,6 +217,7 @@
 				en,
 				es,
 				Base,
+				pl,
 			);
 			mainGroup = 8343786417F9658E00584396;
 			productRefGroup = 8343786F17F9658E00584396 /* Products */;
@@ -261,6 +263,7 @@
 			children = (
 				8343787B17F9658E00584396 /* en */,
 				833F682D1CDBCAB000AFB9F0 /* es */,
+				83F0E6BB287CAB4200D84594 /* pl */,
 			);
 			name = InfoPlist.strings;
 			sourceTree = "<group>";
@@ -276,6 +279,7 @@
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
@@ -337,6 +341,7 @@
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;

Frameworks/HighlyTheoretical/HighlyTheoretical/pl.lproj/InfoPlist.strings

@@ -0,0 +1,2 @@
+/* Localized versions of Info.plist keys */
+

Frameworks/HivelyPlayer/HivelyPlayer.xcodeproj/project.pbxproj

@@ -24,6 +24,7 @@
 		836FB58F182054B700B3AD2D /* blip_buf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = blip_buf.c; sourceTree = "<group>"; };
 		836FB590182054B700B3AD2D /* blip_buf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = blip_buf.h; sourceTree = "<group>"; };
 		83747BB12862D55A0021245F /* Shared.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Shared.xcconfig; sourceTree = "<group>"; };
+		83F0E6C1287CAB4200D84594 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -156,6 +157,7 @@
 				en,
 				es,
 				Base,
+				pl,
 			);
 			mainGroup = 836FB54C182053D700B3AD2D;
 			productRefGroup = 836FB557182053D700B3AD2D /* Products */;
@@ -196,6 +198,7 @@
 			children = (
 				836FB563182053D700B3AD2D /* en */,
 				833F68481CDBCABF00AFB9F0 /* es */,
+				83F0E6C1287CAB4200D84594 /* pl */,
 			);
 			name = InfoPlist.strings;
 			sourceTree = "<group>";
@@ -211,6 +214,7 @@
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
@@ -267,6 +271,7 @@
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;

Frameworks/HivelyPlayer/HivelyPlayer/pl.lproj/InfoPlist.strings

@@ -0,0 +1,2 @@
+/* Localized versions of Info.plist keys */
+

Frameworks/MPCDec/MPCDec.xcodeproj/project.pbxproj

@@ -59,6 +59,7 @@
 		83A16F1B19F48FB800842DBC /* mpcmath.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mpcmath.h; sourceTree = "<group>"; };
 		83A16F1C19F48FB800842DBC /* reader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = reader.h; sourceTree = "<group>"; };
 		83A16F1D19F48FB800842DBC /* streaminfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = streaminfo.h; sourceTree = "<group>"; };
+		83F0E6C6287CAB4300D84594 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		8DC2EF5A0486A6940098B216 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
 		8DC2EF5B0486A6940098B216 /* mpcdec.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = mpcdec.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		8E6096BF09F314CF006D8BD7 /* mpc_decoder.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = mpc_decoder.c; path = Files/src/mpc_decoder.c; sourceTree = "<group>"; };
@@ -256,6 +257,7 @@
 				en,
 				es,
 				Base,
+				pl,
 			);
 			mainGroup = 0867D691FE84028FC02AAC07 /* MPCDec */;
 			productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
@@ -306,6 +308,7 @@
 			children = (
 				833F683F1CDBCAB300AFB9F0 /* es */,
 				835C889222CC1885001B4B3F /* en */,
+				83F0E6C6287CAB4300D84594 /* pl */,
 			);
 			name = InfoPlist.strings;
 			sourceTree = "<group>";
@@ -369,6 +372,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
@@ -413,6 +417,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;

Frameworks/SSEQPlayer/SSEQPlayer.xcodeproj/project.pbxproj

@@ -84,6 +84,7 @@
 		8384901D1807649A00E7332D /* SYMBSection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SYMBSection.h; sourceTree = "<group>"; };
 		8384901E1807649A00E7332D /* Track.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Track.cpp; sourceTree = "<group>"; };
 		8384901F1807649A00E7332D /* Track.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Track.h; sourceTree = "<group>"; };
+		83F0E6BE287CAB4200D84594 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -265,6 +266,7 @@
 				en,
 				es,
 				Base,
+				pl,
 			);
 			mainGroup = 83848FAE1807623F00E7332D;
 			productRefGroup = 83848FB91807623F00E7332D /* Products */;
@@ -316,6 +318,7 @@
 			children = (
 				83848FC51807623F00E7332D /* en */,
 				833F68301CDBCAB100AFB9F0 /* es */,
+				83F0E6BE287CAB4200D84594 /* pl */,
 			);
 			name = InfoPlist.strings;
 			sourceTree = "<group>";
@@ -331,6 +334,7 @@
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
 				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
@@ -386,6 +390,7 @@
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
 				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;

Frameworks/SSEQPlayer/SSEQPlayer/pl.lproj/InfoPlist.strings

@@ -0,0 +1,2 @@
+/* Localized versions of Info.plist keys */
+

Frameworks/Shorten/Shorten.xcodeproj/project.pbxproj

@@ -38,6 +38,7 @@
 		833F683E1CDBCAB300AFB9F0 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		835C889522CC1888001B4B3F /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		83747BCA2862D5970021245F /* Shared.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Shared.xcconfig; sourceTree = "<group>"; };
+		83F0E6C9287CAB4300D84594 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		8DC2EF5A0486A6940098B216 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
 		8DC2EF5B0486A6940098B216 /* Shorten.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Shorten.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
@@ -200,6 +201,7 @@
 				en,
 				es,
 				Base,
+				pl,
 			);
 			mainGroup = 0867D691FE84028FC02AAC07 /* Shorten */;
 			productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
@@ -245,6 +247,7 @@
 			children = (
 				833F683E1CDBCAB300AFB9F0 /* es */,
 				835C889522CC1888001B4B3F /* en */,
+				83F0E6C9287CAB4300D84594 /* pl */,
 			);
 			name = InfoPlist.strings;
 			sourceTree = "<group>";
@@ -313,6 +316,7 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
@@ -364,6 +368,7 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;

Frameworks/TagLib/TagLib.xcodeproj/project.pbxproj

@@ -276,6 +276,7 @@
 		83747BD22862D5B00021245F /* Shared.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Shared.xcconfig; sourceTree = "<group>"; };
 		83B46FC92707EED200847FC9 /* libiconv.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libiconv.tbd; path = usr/lib/libiconv.tbd; sourceTree = SDKROOT; };
 		83B46FCB2707EEDB00847FC9 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
+		83F0E6CA287CAB4300D84594 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		8DC2EF5A0486A6940098B216 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
 		8DC2EF5B0486A6940098B216 /* TagLib.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = TagLib.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		EDE862FC25CF6BD60086EFD3 /* tpropertymap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tpropertymap.cpp; sourceTree = "<group>"; };
@@ -996,6 +997,7 @@
 				en,
 				es,
 				Base,
+				pl,
 			);
 			mainGroup = 0867D691FE84028FC02AAC07 /* TagLib */;
 			productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
@@ -1114,6 +1116,7 @@
 			children = (
 				833F683D1CDBCAB300AFB9F0 /* es */,
 				835C889822CC1889001B4B3F /* en */,
+				83F0E6CA287CAB4300D84594 /* pl */,
 			);
 			name = InfoPlist.strings;
 			sourceTree = "<group>";
@@ -1179,6 +1182,7 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
@@ -1227,6 +1231,7 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;

Frameworks/TagLib/pl.lproj/InfoPlist.strings

@@ -0,0 +1,3 @@
+/* Localized versions of Info.plist keys */
+
+NSHumanReadableCopyright = "© __MyCompanyName__, 2006";

Frameworks/WavPack/WavPack.xcodeproj/project.pbxproj

@@ -73,6 +73,7 @@
 		83DD1DCE17FA038A00249519 /* wavpack_local.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = wavpack_local.h; path = Files/wavpack_local.h; sourceTree = "<group>"; };
 		83DD1DCF17FA038A00249519 /* wavpack_version.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = wavpack_version.h; path = Files/wavpack_version.h; sourceTree = "<group>"; };
 		83DD1DD317FA03F900249519 /* tags.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = tags.c; path = Files/tags.c; sourceTree = "<group>"; };
+		83F0E6CD287CAB4400D84594 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		8DC2EF5A0486A6940098B216 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
 		8DC2EF5B0486A6940098B216 /* WavPack.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = WavPack.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		8E7574AF09F31BB90080F1EE /* md5.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = md5.h; path = Files/md5.h; sourceTree = "<group>"; };
@@ -272,6 +273,7 @@
 				en,
 				es,
 				Base,
+				pl,
 			);
 			mainGroup = 0867D691FE84028FC02AAC07 /* WavPack */;
 			productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
@@ -337,6 +339,7 @@
 			children = (
 				833F683A1CDBCAB200AFB9F0 /* es */,
 				835C889B22CC188A001B4B3F /* en */,
+				83F0E6CD287CAB4400D84594 /* pl */,
 			);
 			name = InfoPlist.strings;
 			sourceTree = "<group>";
@@ -429,6 +432,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
@@ -474,6 +478,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;

Frameworks/lazyusf2/lazyusf2.xcodeproj/project.pbxproj

@@ -1079,6 +1079,7 @@
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
@@ -1135,6 +1136,7 @@
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;

Frameworks/midi_processing/midi_processing.xcodeproj/project.pbxproj

@@ -44,6 +44,7 @@
 		83B066EE180D5724008E3612 /* midi_processor_syx.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = midi_processor_syx.cpp; sourceTree = "<group>"; };
 		83B066EF180D5724008E3612 /* midi_processor_xmi.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = midi_processor_xmi.cpp; sourceTree = "<group>"; };
 		83B066F0180D5724008E3612 /* midi_processor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = midi_processor.h; sourceTree = "<group>"; };
+		83F0E6C5287CAB4300D84594 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -186,6 +187,7 @@
 				en,
 				es,
 				Base,
+				pl,
 			);
 			mainGroup = 83B066A2180D56B9008E3612;
 			productRefGroup = 83B066AD180D56B9008E3612 /* Products */;
@@ -236,6 +238,7 @@
 			children = (
 				83B066B9180D56B9008E3612 /* en */,
 				833F68441CDBCABF00AFB9F0 /* es */,
+				83F0E6C5287CAB4300D84594 /* pl */,
 			);
 			name = InfoPlist.strings;
 			sourceTree = "<group>";
@@ -251,6 +254,7 @@
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
@@ -307,6 +311,7 @@
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;

Frameworks/midi_processing/midi_processing/pl.lproj/InfoPlist.strings

@@ -0,0 +1,2 @@
+/* Localized versions of Info.plist keys */
+

Frameworks/psflib/psflib.xcodeproj/project.pbxproj

@@ -26,6 +26,7 @@
 		8343785717F93D8200584396 /* psflib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = psflib.c; sourceTree = "<group>"; };
 		8343785817F93D8200584396 /* psflib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = psflib.h; sourceTree = "<group>"; };
 		83747B9D2862D52E0021245F /* Shared.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Shared.xcconfig; sourceTree = "<group>"; };
+		83F0E6BA287CAB4200D84594 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -160,6 +161,7 @@
 				en,
 				es,
 				Base,
+				pl,
 			);
 			mainGroup = 8343781217F93CB500584396;
 			productRefGroup = 8343781D17F93CB500584396 /* Products */;
@@ -200,6 +202,7 @@
 			children = (
 				8343782917F93CB500584396 /* en */,
 				833F682C1CDBCAB000AFB9F0 /* es */,
+				83F0E6BA287CAB4200D84594 /* pl */,
 			);
 			name = InfoPlist.strings;
 			sourceTree = "<group>";
@@ -215,6 +218,7 @@
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
@@ -270,6 +274,7 @@
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;

Frameworks/psflib/psflib/pl.lproj/InfoPlist.strings

@@ -0,0 +1,2 @@
+/* Localized versions of Info.plist keys */
+

Frameworks/vgmstream/libvgmstream.xcodeproj/project.pbxproj

@@ -1536,6 +1536,7 @@
 		83F0AA5C21E2028B004BBC04 /* smp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = smp.c; sourceTree = "<group>"; };
 		83F0AA5D21E2028B004BBC04 /* vsv_streamfile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vsv_streamfile.h; sourceTree = "<group>"; };
 		83F0AA5E21E2028C004BBC04 /* vsv.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = vsv.c; sourceTree = "<group>"; };
+		83F0E6CC287CAB4400D84594 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		83F1EE28245D4FB10076E182 /* imuse_decoder.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = imuse_decoder.c; sourceTree = "<group>"; };
 		83F1EE2C245D4FB20076E182 /* vadpcm_decoder.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = vadpcm_decoder.c; sourceTree = "<group>"; };
 		83F1EE2F245D4FC10076E182 /* imuse.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = imuse.c; sourceTree = "<group>"; };
@@ -2661,6 +2662,7 @@
 				en,
 				es,
 				Base,
+				pl,
 			);
 			mainGroup = 836F6B2F18BDB8880095E648;
 			productRefGroup = 836F6B3A18BDB8880095E648 /* Products */;
@@ -3328,6 +3330,7 @@
 			isa = PBXVariantGroup;
 			children = (
 				836F6B4618BDB8880095E648 /* en */,
+				83F0E6CC287CAB4400D84594 /* pl */,
 			);
 			name = InfoPlist.strings;
 			sourceTree = "<group>";
@@ -3343,6 +3346,7 @@
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
@@ -3421,6 +3425,7 @@
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;

Frameworks/vgmstream/vgmstream/pl.lproj/InfoPlist.strings

@@ -0,0 +1,2 @@
+/* Localized versions of Info.plist keys */
+

Frameworks/vio2sf/vio2sf.xcodeproj/project.pbxproj

@@ -99,6 +99,7 @@
 		83DE0C6C180A9CA400269051 /* types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = types.h; sourceTree = "<group>"; };
 		83DE0CB7180A9FD000269051 /* state.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = state.c; sourceTree = "<group>"; };
 		83DE0CB9180A9FE300269051 /* state.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = state.h; sourceTree = "<group>"; };
+		83F0E6BF287CAB4200D84594 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -309,6 +310,7 @@
 				en,
 				es,
 				Base,
+				pl,
 			);
 			mainGroup = 83DE0BFC180A9BD400269051;
 			productRefGroup = 83DE0C07180A9BD400269051 /* Products */;
@@ -363,6 +365,7 @@
 			children = (
 				83DE0C13180A9BD400269051 /* en */,
 				833F68311CDBCAB100AFB9F0 /* es */,
+				83F0E6BF287CAB4200D84594 /* pl */,
 			);
 			name = InfoPlist.strings;
 			sourceTree = "<group>";
@@ -378,6 +381,7 @@
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
@@ -434,6 +438,7 @@
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;

Frameworks/vio2sf/vio2sf/pl.lproj/InfoPlist.strings

@@ -0,0 +1,2 @@
+/* Localized versions of Info.plist keys */
+

Plugins/APL/APL.xcodeproj/project.pbxproj

@@ -17,6 +17,7 @@
 		089C167FFE841241C02AAC07 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
 		1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
 		32DBCF630370AF2F00C91783 /* APL_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APL_Prefix.pch; sourceTree = "<group>"; };
+		834A42AF287AF34300EB9D9B /* AudioChunk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AudioChunk.h; path = ../../Audio/Chain/AudioChunk.h; sourceTree = "<group>"; };
 		83747FE32862E8B60021245F /* Shared.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Shared.xcconfig; sourceTree = "<group>"; };
 		838491281808135500E7332D /* Logging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Logging.h; path = ../../Utils/Logging.h; sourceTree = "<group>"; };
 		8D5B49B7048680CD000E48DA /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -74,6 +75,7 @@
 		08FB77AFFE84173DC02AAC07 /* Classes */ = {
 			isa = PBXGroup;
 			children = (
+				834A42AF287AF34300EB9D9B /* AudioChunk.h */,
 				838491281808135500E7332D /* Logging.h */,
 				8E8D423C0CBB0FF600135C1B /* Plugin.h */,
 				8E8D42350CBB0F9800135C1B /* APLDecoder.h */,
@@ -207,6 +209,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
@@ -251,6 +254,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;

Plugins/APL/APLDecoder.m

@@ -108,18 +108,24 @@
 	return framePosition;
 }
 
-- (int)readAudio:(void *)buf frames:(UInt32)frames {
+- (AudioChunk *)readAudio {
-	if(framePosition + frames > trackEnd)
+	int maxFrames = INT_MAX;
-		frames = (UInt32)(trackEnd - framePosition);
 
-	if(!frames) {
+	if(framePosition + maxFrames > trackEnd)
+		maxFrames = (int)(trackEnd - framePosition);
+
+	if(!maxFrames) {
 		DLog(@"APL readAudio Returning 0");
-		return 0;
+		return nil;
 	}
 
-	int n = [decoder readAudio:buf frames:frames];
+	AudioChunk *chunk = [decoder readAudio];
-	framePosition += n;
+	if(chunk.frameCount > maxFrames) {
-	return n;
+		[chunk setFrameCount:maxFrames];
+	}
+
+	framePosition += chunk.frameCount;
+	return chunk;
 }
 
 - (BOOL)isSilence {

Plugins/AdPlug/AdPlug.xcodeproj/project.pbxproj

@@ -52,6 +52,7 @@
 
 /* Begin PBXFileReference section */
 		833A8999286FF2FD0022E036 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
+		834A42AE287AF27A00EB9D9B /* AudioChunk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AudioChunk.h; path = ../../../Audio/Chain/AudioChunk.h; sourceTree = "<group>"; };
 		83747C6D2862DDDB0021245F /* Shared.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Shared.xcconfig; sourceTree = "<group>"; };
 		83D3C5F3201C674D005564CB /* AdPlug.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = AdPlug.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
 		83D3C5F6201C674D005564CB /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -123,6 +124,7 @@
 		83D3C5F5201C674D005564CB /* AdPlug */ = {
 			isa = PBXGroup;
 			children = (
+				834A42AE287AF27A00EB9D9B /* AudioChunk.h */,
 				83D3C667201C7020005564CB /* adplug.db */,
 				83D3C657201C6E24005564CB /* AdPlugContainer.h */,
 				83D3C654201C6E24005564CB /* AdPlugContainer.mm */,

Plugins/AdPlug/AdPlug/AdPlugDecoder.mm

@@ -103,7 +103,14 @@ static CAdPlugDatabase *g_database = NULL;
 	return @{};
 }
 
-- (int)readAudio:(void *)buf frames:(UInt32)frames {
+- (AudioChunk *)readAudio {
+	int frames = 1024;
+	int16_t buffer[1024 * 2];
+
+	id audioChunkClass = NSClassFromString(@"AudioChunk");
+	AudioChunk *chunk = [[audioChunkClass alloc] initWithProperties:[self properties]];
+	void *buf = (void *)buffer;
+
 	int total = 0;
 	bool dont_loop = !IsRepeatOneSet();
 	if(dont_loop && current_pos + frames > length)
@@ -128,7 +135,9 @@ static CAdPlugDatabase *g_database = NULL;
 		total += samples_now;
 	}
 
-	return total;
+	[chunk assignSamples:buffer frameCount:total];
+
+	return chunk;
 }
 
 - (long)seek:(long)frame {

Plugins/ArchiveSource/ArchiveSource.xcodeproj/project.pbxproj

@@ -33,6 +33,7 @@
 
 /* Begin PBXFileReference section */
 		8307D31A286070EA000FF8EB /* SandboxBroker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SandboxBroker.h; path = ../../../Utils/SandboxBroker.h; sourceTree = "<group>"; };
+		834A42B0287AF4BF00EB9D9B /* AudioChunk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AudioChunk.h; path = ../../../Audio/Chain/AudioChunk.h; sourceTree = "<group>"; };
 		8359009717FEF6490060F3ED /* ArchiveSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ArchiveSource.h; sourceTree = "<group>"; };
 		8359009817FEF6490060F3ED /* ArchiveSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ArchiveSource.m; sourceTree = "<group>"; };
 		8359009A17FEFDA80060F3ED /* ArchiveContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ArchiveContainer.h; sourceTree = "<group>"; };
@@ -49,6 +50,7 @@
 		8359FF6A17FEF39F0060F3ED /* File_Extractor.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = File_Extractor.xcodeproj; path = ../../Frameworks/File_Extractor/File_Extractor.xcodeproj; sourceTree = "<group>"; };
 		83747C632862DDA00021245F /* Shared.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Shared.xcconfig; sourceTree = "<group>"; };
 		8384913518081BA000E7332D /* Logging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Logging.h; path = ../../../Utils/Logging.h; sourceTree = "<group>"; };
+		83F0E6B4287CAB4100D84594 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -105,6 +107,7 @@
 		8359FF2017FEF35C0060F3ED /* ArchiveSource */ = {
 			isa = PBXGroup;
 			children = (
+				834A42B0287AF4BF00EB9D9B /* AudioChunk.h */,
 				8307D31A286070EA000FF8EB /* SandboxBroker.h */,
 				8384913518081BA000E7332D /* Logging.h */,
 				835900A017FF079C0060F3ED /* Plugin.h */,
@@ -189,6 +192,7 @@
 				en,
 				es,
 				Base,
+				pl,
 			);
 			mainGroup = 8359FF0E17FEF35C0060F3ED;
 			productRefGroup = 8359FF1817FEF35C0060F3ED /* Products */;
@@ -252,6 +256,7 @@
 			isa = PBXVariantGroup;
 			children = (
 				8359FF2417FEF35C0060F3ED /* en */,
+				83F0E6B4287CAB4100D84594 /* pl */,
 			);
 			name = InfoPlist.strings;
 			sourceTree = "<group>";
@@ -267,6 +272,7 @@
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
@@ -322,6 +328,7 @@
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;

Plugins/ArchiveSource/ArchiveSource/pl.lproj/InfoPlist.strings

@@ -0,0 +1,2 @@
+/* Localized versions of Info.plist keys */
+

Plugins/CoreAudio/CoreAudio.xcodeproj/project.pbxproj

@@ -23,6 +23,7 @@
 		17C93EAB0B8FF3CE008627D6 /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = /System/Library/Frameworks/CoreAudio.framework; sourceTree = "<absolute>"; };
 		17C93EB20B8FF3E1008627D6 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = /System/Library/Frameworks/AudioToolbox.framework; sourceTree = "<absolute>"; };
 		32DBCF630370AF2F00C91783 /* CoreAudio_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CoreAudio_Prefix.pch; sourceTree = "<group>"; };
+		834A42B1287AF4D900EB9D9B /* AudioChunk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AudioChunk.h; path = ../../Audio/Chain/AudioChunk.h; sourceTree = "<group>"; };
 		83747C5E2862DD880021245F /* Shared.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Shared.xcconfig; sourceTree = "<group>"; };
 		83849129180813E800E7332D /* Logging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Logging.h; path = ../../Utils/Logging.h; sourceTree = "<group>"; };
 		8D5B49B6048680CD000E48DA /* CoreAudio.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CoreAudio.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -77,6 +78,7 @@
 		08FB77AFFE84173DC02AAC07 /* Classes */ = {
 			isa = PBXGroup;
 			children = (
+				834A42B1287AF4D900EB9D9B /* AudioChunk.h */,
 				83849129180813E800E7332D /* Logging.h */,
 				177FCFCA0B90C9A10011C3B5 /* Plugin.h */,
 				17C93E720B8FF192008627D6 /* CoreAudioDecoder.h */,
@@ -250,6 +252,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
@@ -294,6 +297,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;

Plugins/CoreAudio/CoreAudioDecoder.m

@@ -306,25 +306,33 @@ static SInt64 getSizeProc(void *clientData) {
 	return YES;
 }
 
-- (int)readAudio:(void *)buf frames:(UInt32)frames {
+- (AudioChunk *)readAudio {
 	OSStatus err;
 	AudioBufferList bufferList;
 	UInt32 frameCount;
 
+	int frames = 1024;
+	size_t bytesPerFrame = channels * (bitsPerSample / 8);
+	uint8_t buffer[frames * bytesPerFrame];
+
 	// Set up the AudioBufferList
 	bufferList.mNumberBuffers = 1;
 	bufferList.mBuffers[0].mNumberChannels = channels;
-	bufferList.mBuffers[0].mData = buf;
+	bufferList.mBuffers[0].mData = buffer;
 	bufferList.mBuffers[0].mDataByteSize = frames * channels * (bitsPerSample / 8);
 
 	// Read a chunk of PCM input (converted from whatever format)
 	frameCount = frames;
 	err = ExtAudioFileRead(_in, &frameCount, &bufferList);
 	if(err != noErr) {
-		return 0;
+		return nil;
 	}
 
-	return frameCount;
+	id audioChunkClass = NSClassFromString(@"AudioChunk");
+	AudioChunk *chunk = [[audioChunkClass alloc] initWithProperties:[self properties]];
+	[chunk assignSamples:buffer frameCount:frameCount];
+
+	return chunk;
 }
 
 - (long)seek:(long)frame {

Plugins/CueSheet/CueSheet.xcodeproj/project.pbxproj

@@ -24,11 +24,13 @@
 		17DA346D0CC04FCD0003F6B2 /* CueSheetMetadataReader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CueSheetMetadataReader.m; sourceTree = "<group>"; };
 		32DBCF630370AF2F00C91783 /* CueSheet_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CueSheet_Prefix.pch; sourceTree = "<group>"; };
 		833F68371CDBCAB200AFB9F0 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		834A42B2287AF59900EB9D9B /* AudioChunk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AudioChunk.h; path = ../../Audio/Chain/AudioChunk.h; sourceTree = "<group>"; };
 		835C888E22CC1883001B4B3F /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		83747C592862DD660021245F /* Shared.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Shared.xcconfig; sourceTree = "<group>"; };
 		8384912A180814D900E7332D /* Logging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Logging.h; path = ../../Utils/Logging.h; sourceTree = "<group>"; };
 		839DA7D0274A2EA9001B18E5 /* AudioMetadataReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AudioMetadataReader.h; path = ../../Audio/AudioMetadataReader.h; sourceTree = "<group>"; };
 		839DA7D3274A2FD4001B18E5 /* NSDictionary+Merge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSDictionary+Merge.h"; path = "../../Utils/NSDictionary+Merge.h"; sourceTree = "<group>"; };
+		83F0E6B5287CAB4100D84594 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		8D5B49B6048680CD000E48DA /* CueSheet.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CueSheet.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
 		8D5B49B7048680CD000E48DA /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		8E8D42240CBB0F5800135C1B /* CueSheetContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CueSheetContainer.h; sourceTree = "<group>"; };
@@ -89,6 +91,7 @@
 		08FB77AFFE84173DC02AAC07 /* Classes */ = {
 			isa = PBXGroup;
 			children = (
+				834A42B2287AF59900EB9D9B /* AudioChunk.h */,
 				839DA7D3274A2FD4001B18E5 /* NSDictionary+Merge.h */,
 				839DA7D0274A2EA9001B18E5 /* AudioMetadataReader.h */,
 				8384912A180814D900E7332D /* Logging.h */,
@@ -193,6 +196,7 @@
 				en,
 				es,
 				Base,
+				pl,
 			);
 			mainGroup = 089C166AFE841209C02AAC07 /* CueSheet */;
 			projectDirPath = "";
@@ -235,6 +239,7 @@
 			children = (
 				833F68371CDBCAB200AFB9F0 /* es */,
 				835C888E22CC1883001B4B3F /* en */,
+				83F0E6B5287CAB4100D84594 /* pl */,
 			);
 			name = InfoPlist.strings;
 			sourceTree = "<group>";
@@ -290,6 +295,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
@@ -334,6 +340,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;

Plugins/CueSheet/CueSheetDecoder.m

@@ -83,6 +83,8 @@ static void *kCueSheetDecoderContext = &kCueSheetDecoderContext;
 
 		decoder = [NSClassFromString(@"AudioDecoder") audioDecoderForSource:source skipCue:YES];
 
+		[self registerObservers];
+
 		if(![decoder open:source]) {
 			ALog(@"Could not open cuesheet decoder");
 			return NO;
@@ -166,22 +168,6 @@ static void *kCueSheetDecoderContext = &kCueSheetDecoderContext;
 	} else {
 		// Fix for embedded cuesheet handler parsing non-embedded files,
 		// or files that are already in the playlist without a fragment
-		source = [NSClassFromString(@"AudioSource") audioSourceForURL:url];
-
-		if(![source open:url]) {
-			ALog(@"Could not open cuesheet source");
-			return NO;
-		}
-
-		decoder = [NSClassFromString(@"AudioDecoder") audioDecoderForSource:source skipCue:YES];
-
-		[self registerObservers];
-
-		if(![decoder open:source]) {
-			ALog(@"Could not open cuesheet decoder");
-			return NO;
-		}
-
 		NSDictionary *properties = [decoder properties];
 		int bitsPerSample = [[properties objectForKey:@"bitsPerSample"] intValue];
 		int channels = [[properties objectForKey:@"channels"] intValue];
@@ -323,25 +309,32 @@ static void *kCueSheetDecoderContext = &kCueSheetDecoderContext;
 	return framePosition - trackStart;
 }
 
-- (int)readAudio:(void *)buf frames:(UInt32)frames {
+- (AudioChunk *)readAudio {
 	if(!seekedToStart) {
 		[self seek:0];
 	}
 
+	int frames = INT_MAX;
+
 	if(!noFragment && framePosition + frames > trackEnd) {
 		frames = (UInt32)(trackEnd - framePosition);
 	}
 
 	if(!frames) {
 		DLog(@"Returning 0");
-		return 0;
+		return nil;
 	}
 
-	int n = [decoder readAudio:buf frames:frames];
+	AudioChunk *chunk = [decoder readAudio];
 
-	framePosition += n;
+	size_t n = chunk.frameCount;
+	if(n > frames) {
+		[chunk setFrameCount:frames];
+	}
 
-	return n;
+	framePosition += chunk.frameCount;
+
+	return chunk;
 }
 
 - (BOOL)isSilence {

Plugins/FFMPEG/FFMPEG.xcodeproj/project.pbxproj

@@ -45,6 +45,7 @@
 		089C1672FE841209C02AAC07 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
 		089C167FFE841241C02AAC07 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
 		1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
+		834A42B3287AF65000EB9D9B /* AudioChunk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AudioChunk.h; path = ../../Audio/Chain/AudioChunk.h; sourceTree = "<group>"; };
 		8352D48E1CDDB023009D16AA /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; };
 		8352D4901CDDB02A009D16AA /* VideoDecodeAcceleration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = VideoDecodeAcceleration.framework; path = System/Library/Frameworks/VideoDecodeAcceleration.framework; sourceTree = SDKROOT; };
 		8352D4921CDDB034009D16AA /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
@@ -145,6 +146,7 @@
 		08FB77AFFE84173DC02AAC07 /* Classes */ = {
 			isa = PBXGroup;
 			children = (
+				834A42B3287AF65000EB9D9B /* AudioChunk.h */,
 				8356BD1A27B3D06F0074E50C /* HTTPSource.h */,
 				8356BCEA27B37DA40074E50C /* TagLibID3v2Reader.h */,
 				8356BCE827B37C6F0074E50C /* NSDictionary+Merge.h */,
@@ -332,6 +334,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
@@ -380,6 +383,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;

Plugins/FFMPEG/FFMPEGDecoder.h

@@ -45,8 +45,7 @@ int64_t ffmpeg_seek(void *opaque, int64_t offset, int whence);
 
 	BOOL metadataUpdated;
 
-	int prebufferedAudio;
+	AudioChunk *prebufferedChunk;
-	uint8_t *prebufferedAudioData;
 
 	BOOL rawDSD;
 	BOOL rawDSDReverseBits;

Plugins/FFMPEG/FFMPEGDecoder.m

@@ -471,13 +471,10 @@ static uint8_t reverse_bits[0x100];
 	metadataUpdated = NO;
 	[self updateMetadata];
 
-	prebufferedAudio = 0;
+	prebufferedChunk = nil;
-	prebufferedAudioData = NULL;
 
 	if(attachedPicIndex >= 0) {
-		int frameSize = rawDSD ? channels : channels * (bitsPerSample / 8);
+		prebufferedChunk = [self readAudio];
-		prebufferedAudioData = malloc(1024 * frameSize);
-		[self readAudio:prebufferedAudioData frames:1024];
 	}
 
 	return YES;
@@ -681,30 +678,31 @@ static void setDictionary(NSMutableDictionary *dict, NSString *tag, NSString *va
 	}
 }
 
-- (int)readAudio:(void *)buf frames:(UInt32)frames {
+- (AudioChunk *)readAudio {
 	if(!seekedToStart) {
 		[self seek:0];
 	}
 
+	if(prebufferedChunk) {
+		// A bit of ignored read-ahead to support embedded artwork
+		size_t framesReadNow = prebufferedChunk.frameCount;
+		framesRead -= framesReadNow;
+		AudioChunk *chunk = prebufferedChunk;
+		prebufferedChunk = nil;
+		return chunk;
+	}
+
+	if(totalFrames && framesRead >= totalFrames)
+		return nil;
+
+	int frames = 1024;
+
 	int frameSize = rawDSD ? channels : channels * (bitsPerSample / 8);
 	int bytesToRead = frames * frameSize;
 	int bytesRead = 0;
 
-	if(prebufferedAudio) {
+	uint8_t buffer[bytesToRead];
-		// A bit of ignored read-ahead to support embedded artwork
+	void *buf = (void *)buffer;
-		int bytesBuffered = prebufferedAudio * frameSize;
-		int bytesToCopy = (bytesBuffered > bytesToRead) ? bytesToRead : bytesBuffered;
-		memcpy(buf, prebufferedAudioData, bytesToCopy);
-		memmove(prebufferedAudioData, prebufferedAudioData + bytesToCopy, bytesBuffered - bytesToCopy);
-		prebufferedAudio -= bytesToCopy / frameSize;
-		bytesRead = bytesToCopy;
-
-		int framesReadNow = bytesRead / frameSize;
-		framesRead -= framesReadNow;
-	}
-
-	if(totalFrames && framesRead >= totalFrames)
-		return 0;
 
 	int dataSize = 0;
 
@@ -909,7 +907,11 @@ static void setDictionary(NSMutableDictionary *dict, NSString *tag, NSString *va
 
 	framesRead += framesReadNow;
 
-	return framesReadNow;
+	id audioChunkClass = NSClassFromString(@"AudioChunk");
+	AudioChunk *chunk = [[audioChunkClass alloc] initWithProperties:[self properties]];
+	[chunk assignSamples:buffer frameCount:framesReadNow];
+
+	return chunk;
 }
 
 - (long)seek:(long)frame {
@@ -918,7 +920,7 @@ static void setDictionary(NSMutableDictionary *dict, NSString *tag, NSString *va
 
 	seekedToStart = YES;
 
-	prebufferedAudio = 0;
+	prebufferedChunk = nil;
 
 	if(frame >= totalFrames) {
 		framesRead = totalFrames;

Plugins/FileSource/FileSource.xcodeproj/project.pbxproj

@@ -39,6 +39,7 @@
 		32DBCF630370AF2F00C91783 /* FileSource_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileSource_Prefix.pch; sourceTree = "<group>"; };
 		8307D31B2860722C000FF8EB /* SandboxBroker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SandboxBroker.h; path = ../../Utils/SandboxBroker.h; sourceTree = "<group>"; };
 		8335FF6817FF765A002D8DD2 /* File_Extractor.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = File_Extractor.xcodeproj; path = ../../Frameworks/File_Extractor/File_Extractor.xcodeproj; sourceTree = "<group>"; };
+		834A42AD287AF25600EB9D9B /* AudioChunk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AudioChunk.h; path = ../../Audio/Chain/AudioChunk.h; sourceTree = "<group>"; };
 		83747C4F2862DD2F0021245F /* Shared.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Shared.xcconfig; sourceTree = "<group>"; };
 		8D5B49B6048680CD000E48DA /* FileSource.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = FileSource.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
 		8D5B49B7048680CD000E48DA /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -91,6 +92,7 @@
 		08FB77AFFE84173DC02AAC07 /* Classes */ = {
 			isa = PBXGroup;
 			children = (
+				834A42AD287AF25600EB9D9B /* AudioChunk.h */,
 				8307D31B2860722C000FF8EB /* SandboxBroker.h */,
 				17ADB4080B979A8A00257CA2 /* Plugin.h */,
 				17ADB4180B979AEB00257CA2 /* FileSource.h */,
@@ -294,6 +296,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
@@ -339,6 +342,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;

Plugins/Flac/Flac.xcodeproj/project.pbxproj

@@ -36,6 +36,7 @@
 		32DBCF630370AF2F00C91783 /* Flac_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Flac_Prefix.pch; sourceTree = "<group>"; };
 		8301C145287805F500651A6E /* NSDictionary+Merge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSDictionary+Merge.h"; path = "../../Utils/NSDictionary+Merge.h"; sourceTree = "<group>"; };
 		8301C146287805F500651A6E /* NSDictionary+Merge.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSDictionary+Merge.m"; path = "../../Utils/NSDictionary+Merge.m"; sourceTree = "<group>"; };
+		834A42B4287AF7AA00EB9D9B /* AudioChunk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AudioChunk.h; path = ../../Audio/Chain/AudioChunk.h; sourceTree = "<group>"; };
 		8356BD1927B3CCBB0074E50C /* HTTPSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HTTPSource.h; path = ../HTTPSource/HTTPSource.h; sourceTree = "<group>"; };
 		836EF0D927BB970B00BF35B2 /* libFLAC.8.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libFLAC.8.dylib; path = ../../ThirdParty/flac/lib/libFLAC.8.dylib; sourceTree = "<group>"; };
 		83747C4A2862DCF40021245F /* Shared.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Shared.xcconfig; sourceTree = "<group>"; };
@@ -92,6 +93,7 @@
 		08FB77AFFE84173DC02AAC07 /* Classes */ = {
 			isa = PBXGroup;
 			children = (
+				834A42B4287AF7AA00EB9D9B /* AudioChunk.h */,
 				8301C145287805F500651A6E /* NSDictionary+Merge.h */,
 				8301C146287805F500651A6E /* NSDictionary+Merge.m */,
 				83AA660A27B7DAE40098D4B8 /* cuesheet.m */,
@@ -285,6 +287,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
@@ -329,6 +332,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;

Plugins/Flac/FlacDecoder.m

@@ -361,39 +361,23 @@ void ErrorCallback(const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorS
 	return YES;
 }
 
-- (int)readAudio:(void *)buffer frames:(UInt32)frames {
+- (AudioChunk *)readAudio {
-	int framesRead = 0;
+	id audioChunkClass = NSClassFromString(@"AudioChunk");
-	while(framesRead < frames) {
+	AudioChunk *chunk = nil;
-		if(blockBufferFrames == 0) {
-			if(framesRead) {
-				break;
-			}
 
 	if(FLAC__stream_decoder_get_state(decoder) == FLAC__STREAM_DECODER_END_OF_STREAM) {
-				break;
+		return nil;
 	}
 
 	if(!FLAC__stream_decoder_process_single(decoder)) {
-				break;
+		return nil;
 	}
-		}
-
-		int bytesPerFrame = ((bitsPerSample + 7) / 8) * channels;
-
-		int framesToRead = blockBufferFrames;
-		if(blockBufferFrames > frames) {
-			framesToRead = frames;
-		}
-
-		memcpy(((uint8_t *)buffer) + (framesRead * bytesPerFrame), (uint8_t *)blockBuffer, framesToRead * bytesPerFrame);
-
-		frames -= framesToRead;
-		framesRead += framesToRead;
-		blockBufferFrames -= framesToRead;
 
 	if(blockBufferFrames > 0) {
-			memmove((uint8_t *)blockBuffer, ((uint8_t *)blockBuffer) + (framesToRead * bytesPerFrame), blockBufferFrames * bytesPerFrame);
+		chunk = [[audioChunkClass alloc] initWithProperties:[self properties]];
-		}
+		[chunk assignSamples:blockBuffer frameCount:blockBufferFrames];
+
+		blockBufferFrames = 0;
 	}
 
 	if(![source seekable]) {
@@ -429,7 +413,7 @@ void ErrorCallback(const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorS
 		}
 	}
 
-	return framesRead;
+	return chunk;
 }
 
 - (void)close {

Plugins/GME/GME.xcodeproj/project.pbxproj

@@ -63,9 +63,11 @@
 		8319C74E237629D300BFFAE0 /* GamePropertiesReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GamePropertiesReader.h; sourceTree = "<group>"; };
 		8319C74F237629D400BFFAE0 /* GamePropertiesReader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GamePropertiesReader.m; sourceTree = "<group>"; };
 		833F68351CDBCAB200AFB9F0 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		834A42B5287AF8FE00EB9D9B /* AudioChunk.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = AudioChunk.h; path = ../../Audio/Chain/AudioChunk.h; sourceTree = "<group>"; };
 		835C888F22CC1883001B4B3F /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		83747C452862DCD90021245F /* Shared.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Shared.xcconfig; sourceTree = "<group>"; };
 		8384912E1808175400E7332D /* Logging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Logging.h; path = ../../Utils/Logging.h; sourceTree = "<group>"; };
+		83F0E6B6287CAB4100D84594 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		83FAF8A518ADD4D100057CAF /* PlaylistController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PlaylistController.h; path = ../../Playlist/PlaylistController.h; sourceTree = "<group>"; };
 		8D5B49B6048680CD000E48DA /* GME.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = GME.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
 		8D5B49B7048680CD000E48DA /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -119,6 +121,7 @@
 		08FB77AFFE84173DC02AAC07 /* Classes */ = {
 			isa = PBXGroup;
 			children = (
+				834A42B5287AF8FE00EB9D9B /* AudioChunk.h */,
 				17C8F33B0CBED3BE008D969D /* GameContainer.h */,
 				17C8F33C0CBED3BE008D969D /* GameContainer.m */,
 				17C8F33D0CBED3BE008D969D /* GameDecoder.h */,
@@ -231,6 +234,7 @@
 				en,
 				es,
 				Base,
+				pl,
 			);
 			mainGroup = 089C166AFE841209C02AAC07 /* GME */;
 			projectDirPath = "";
@@ -296,6 +300,7 @@
 			children = (
 				833F68351CDBCAB200AFB9F0 /* es */,
 				835C888F22CC1883001B4B3F /* en */,
+				83F0E6B6287CAB4100D84594 /* pl */,
 			);
 			name = InfoPlist.strings;
 			sourceTree = "<group>";
@@ -351,6 +356,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
@@ -396,6 +402,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;

Plugins/GME/GameDecoder.m

@@ -174,11 +174,18 @@ gme_err_t readCallback(void *data, void *out, int count) {
 	return @{};
 }
 
-- (int)readAudio:(void *)buf frames:(UInt32)frames {
+- (AudioChunk *)readAudio {
+	int frames = 1024;
+	int16_t buffer[frames * 2];
+	void *buf = (void *)buffer;
+
+	id audioChunkClass = NSClassFromString(@"AudioChunk");
+	AudioChunk *chunk = [[audioChunkClass alloc] initWithProperties:[self properties]];
+
 	int numSamples = frames * 2; // channels = 2
 
 	if(gme_track_ended(emu)) {
-		return 0;
+		return nil;
 	}
 
 	if(IsRepeatOneSet())
@@ -190,7 +197,11 @@ gme_err_t readCallback(void *data, void *out, int count) {
 
 	// Some formats support length, but we'll add that in the future.
 	//(From gme.txt) If track length, then use it. If loop length, play for intro + loop * 2. Otherwise, default to 2.5 minutes
-	return frames; // GME will always generate samples. There's no real EOS.
+	// GME will always generate samples. There's no real EOS.
+
+	[chunk assignSamples:buffer frameCount:numSamples];
+
+	return chunk;
 }
 
 - (long)seek:(long)frame {

Plugins/HTTPSource/HTTPSource.xcodeproj/project.pbxproj

@@ -32,6 +32,7 @@
 		17ADB60C0B97A74800257CA2 /* HTTPSource.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = HTTPSource.h; sourceTree = "<group>"; };
 		17ADB6340B97A8B400257CA2 /* Plugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Plugin.h; path = ../../Audio/Plugin.h; sourceTree = SOURCE_ROOT; };
 		32DBCF630370AF2F00C91783 /* HTTPSource_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTTPSource_Prefix.pch; sourceTree = "<group>"; };
+		834A42B9287AFAB500EB9D9B /* AudioChunk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AudioChunk.h; path = ../../Audio/Chain/AudioChunk.h; sourceTree = "<group>"; };
 		8356BD1727B3B7340074E50C /* libcurl.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libcurl.tbd; path = usr/lib/libcurl.tbd; sourceTree = SDKROOT; };
 		83747C362862DC0D0021245F /* Shared.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Shared.xcconfig; sourceTree = "<group>"; };
 		8384912F1808180000E7332D /* Logging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Logging.h; path = ../../Utils/Logging.h; sourceTree = "<group>"; };
@@ -87,6 +88,7 @@
 		08FB77AFFE84173DC02AAC07 /* Classes */ = {
 			isa = PBXGroup;
 			children = (
+				834A42B9287AFAB500EB9D9B /* AudioChunk.h */,
 				8384912F1808180000E7332D /* Logging.h */,
 				17ADB6340B97A8B400257CA2 /* Plugin.h */,
 				17ADB60C0B97A74800257CA2 /* HTTPSource.h */,
@@ -273,6 +275,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
@@ -317,6 +320,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;

Plugins/HighlyComplete/HighlyComplete.xcodeproj/project.pbxproj

@@ -190,6 +190,7 @@
 		8343790C17F96E2600584396 /* HighlyQuixotic.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = HighlyQuixotic.xcodeproj; path = ../../Frameworks/HighlyQuixotic/HighlyQuixotic.xcodeproj; sourceTree = "<group>"; };
 		8343796317F97BDB00584396 /* HighlyAdvanced.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = HighlyAdvanced.xcodeproj; path = ../../Frameworks/HighlyAdvanced/HighlyAdvanced.xcodeproj; sourceTree = "<group>"; };
 		834379A717F9818400584396 /* HCDecoder.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = HCDecoder.mm; sourceTree = "<group>"; };
+		834A42B6287AF99600EB9D9B /* AudioChunk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AudioChunk.h; path = ../../../Audio/Chain/AudioChunk.h; sourceTree = "<group>"; };
 		8360EEE417F92AC8005208A4 /* HighlyComplete.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = HighlyComplete.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
 		8360EEE717F92AC8005208A4 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
 		8360EEEA17F92AC8005208A4 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
@@ -204,6 +205,7 @@
 		83CA241E1D7BC47C00F2EA53 /* mGBA.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = mGBA.xcodeproj; path = ../../Frameworks/mGBA/mGBA.xcodeproj; sourceTree = "<group>"; };
 		83DE0C34180A9BD400269051 /* vio2sf.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = vio2sf.xcodeproj; path = ../../Frameworks/vio2sf/vio2sf.xcodeproj; sourceTree = "<group>"; };
 		83E2F4C923566B0C006F7A41 /* lazyusf2.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = lazyusf2.xcodeproj; path = ../../Frameworks/lazyusf2/lazyusf2.xcodeproj; sourceTree = "<group>"; };
+		83F0E6B8287CAB4200D84594 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		83FAF8A318ADD27F00057CAF /* PlaylistController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PlaylistController.h; path = ../../../Playlist/PlaylistController.h; sourceTree = "<group>"; };
 		83FC32591BF5AB9000962B36 /* HighlyExperimental.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = HighlyExperimental.xcodeproj; path = ../../Frameworks/HighlyExperimental/HighlyExperimental.xcodeproj; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -311,6 +313,7 @@
 		8360EEED17F92AC8005208A4 /* HighlyComplete */ = {
 			isa = PBXGroup;
 			children = (
+				834A42B6287AF99600EB9D9B /* AudioChunk.h */,
 				83AA660827B7CCB00098D4B8 /* Logging.h */,
 				83FAF8A318ADD27F00057CAF /* PlaylistController.h */,
 				8324C584181513A10046F78F /* circular_buffer.h */,
@@ -434,6 +437,7 @@
 				en,
 				es,
 				Base,
+				pl,
 			);
 			mainGroup = 8360EEDB17F92AC8005208A4;
 			productRefGroup = 8360EEE517F92AC8005208A4 /* Products */;
@@ -619,6 +623,7 @@
 			isa = PBXVariantGroup;
 			children = (
 				8360EEF117F92AC8005208A4 /* en */,
+				83F0E6B8287CAB4200D84594 /* pl */,
 			);
 			name = InfoPlist.strings;
 			sourceTree = "<group>";
@@ -634,6 +639,7 @@
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
@@ -689,6 +695,7 @@
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;

Plugins/HighlyComplete/HighlyComplete/HCDecoder.mm

@@ -72,7 +72,7 @@
 - (psf_file_container *)init {
 	if((self = [super init])) {
 		lock = [[NSLock alloc] init];
-		list = [[NSMutableDictionary alloc] initWithCapacity:0];
+		list = [[NSMutableDictionary alloc] init];
 	}
 	return self;
 }
@@ -1302,7 +1302,7 @@ static int usf_info(void *context, const char *name, const char *value) {
 	return frames;
 }
 
-- (int)readAudio:(void *)buf frames:(UInt32)frames {
+- (AudioChunk *)readAudio {
 	if(!emulatorCore) {
 		if(![self initializeDecoder])
 			return 0;
@@ -1314,6 +1314,10 @@ static int usf_info(void *context, const char *name, const char *value) {
 		usfRemoveSilence = NO;
 	}
 
+	int frames = 1024;
+	int16_t buffer[frames * 2];
+	void *buf = (void *)buffer;
+
 	unsigned long written = silence_test_buffer.data_available() / 2;
 	if(written > frames)
 		written = frames;
@@ -1342,7 +1346,11 @@ static int usf_info(void *context, const char *name, const char *value) {
 
 	framesRead += written;
 
-	return (int)written;
+	id audioChunkClass = NSClassFromString(@"AudioChunk");
+	AudioChunk *chunk = [[audioChunkClass alloc] initWithProperties:[self properties]];
+	[chunk assignSamples:buffer frameCount:written];
+
+	return chunk;
 }
 
 - (void)closeDecoder {

Plugins/HighlyComplete/HighlyComplete/pl.lproj/InfoPlist.strings

@@ -0,0 +1,2 @@
+/* Localized versions of Info.plist keys */
+

Plugins/Hively/Hively.xcodeproj/project.pbxproj

@@ -49,6 +49,7 @@
 /* Begin PBXFileReference section */
 		831C7F6918ADD73F00CE4A69 /* PlaylistController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PlaylistController.h; path = ../../../Playlist/PlaylistController.h; sourceTree = "<group>"; };
 		833F68471CDBCABF00AFB9F0 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		834A42B8287AFA3600EB9D9B /* AudioChunk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AudioChunk.h; path = ../../../Audio/Chain/AudioChunk.h; sourceTree = "<group>"; };
 		836FB52D1820538700B3AD2D /* Hively.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Hively.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
 		836FB5301820538700B3AD2D /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
 		836FB5331820538700B3AD2D /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
@@ -66,6 +67,7 @@
 		836FB59F1820556F00B3AD2D /* HVLContainer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HVLContainer.m; sourceTree = "<group>"; };
 		836FB5A31820557E00B3AD2D /* Plugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Plugin.h; path = ../../../Audio/Plugin.h; sourceTree = "<group>"; };
 		83747C3B2862DC450021245F /* Shared.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Shared.xcconfig; sourceTree = "<group>"; };
+		83F0E6C0287CAB4200D84594 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -122,6 +124,7 @@
 		836FB5361820538700B3AD2D /* Hively */ = {
 			isa = PBXGroup;
 			children = (
+				834A42B8287AFA3600EB9D9B /* AudioChunk.h */,
 				831C7F6918ADD73F00CE4A69 /* PlaylistController.h */,
 				836FB5A31820557E00B3AD2D /* Plugin.h */,
 				836FB59A1820556F00B3AD2D /* HVLDecoder.h */,
@@ -207,6 +210,7 @@
 				en,
 				es,
 				Base,
+				pl,
 			);
 			mainGroup = 836FB5241820538700B3AD2D;
 			productRefGroup = 836FB52E1820538700B3AD2D /* Products */;
@@ -272,6 +276,7 @@
 			children = (
 				836FB53A1820538700B3AD2D /* en */,
 				833F68471CDBCABF00AFB9F0 /* es */,
+				83F0E6C0287CAB4200D84594 /* pl */,
 			);
 			name = InfoPlist.strings;
 			sourceTree = "<group>";
@@ -287,6 +292,7 @@
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
@@ -343,6 +349,7 @@
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;

Plugins/Hively/Hively/HVLDecoder.m

@@ -107,7 +107,11 @@ static void oneTimeInit(void) {
 	return @{};
 }
 
-- (int)readAudio:(void *)buf frames:(UInt32)frames {
+- (AudioChunk *)readAudio {
+	int frames = 1024;
+	float buffer[frames * 2];
+	void *buf = (void *)buffer;
+
 	BOOL repeatone = IsRepeatOneSet();
 
 	if(!repeatone && framesRead >= totalFrames)
@@ -157,7 +161,11 @@ static void oneTimeInit(void) {
 
 	framesRead += total;
 
-	return total;
+	id audioChunkClass = NSClassFromString(@"AudioChunk");
+	AudioChunk *chunk = [[audioChunkClass alloc] initWithProperties:[self properties]];
+	[chunk assignSamples:buffer frameCount:total];
+
+	return chunk;
 }
 
 - (long)seek:(long)frame {

Plugins/Hively/Hively/pl.lproj/InfoPlist.strings

@@ -0,0 +1,2 @@
+/* Localized versions of Info.plist keys */
+

Plugins/M3u/M3u.xcodeproj/project.pbxproj

@@ -18,9 +18,11 @@
 		1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
 		32DBCF630370AF2F00C91783 /* M3u_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = M3u_Prefix.pch; sourceTree = "<group>"; };
 		833F68391CDBCAB200AFB9F0 /* es */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		834A42BA287AFAEF00EB9D9B /* AudioChunk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AudioChunk.h; path = ../../Audio/Chain/AudioChunk.h; sourceTree = "<group>"; };
 		835C889122CC1885001B4B3F /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		83747C2C2862DBBE0021245F /* Shared.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Shared.xcconfig; sourceTree = "<group>"; };
 		83849130180818B100E7332D /* Logging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Logging.h; path = ../../Utils/Logging.h; sourceTree = "<group>"; };
+		83F0E6C3287CAB4300D84594 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		8D5B49B6048680CD000E48DA /* M3u.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = M3u.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
 		8D5B49B7048680CD000E48DA /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		8E8D401B0CBAFEF200135C1B /* Plugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Plugin.h; path = ../../Audio/Plugin.h; sourceTree = SOURCE_ROOT; };
@@ -75,6 +77,7 @@
 		08FB77AFFE84173DC02AAC07 /* Classes */ = {
 			isa = PBXGroup;
 			children = (
+				834A42BA287AFAEF00EB9D9B /* AudioChunk.h */,
 				83849130180818B100E7332D /* Logging.h */,
 				8E8D401B0CBAFEF200135C1B /* Plugin.h */,
 				8E8D40270CBAFF4300135C1B /* M3uContainer.h */,
@@ -169,6 +172,7 @@
 				en,
 				es,
 				Base,
+				pl,
 			);
 			mainGroup = 089C166AFE841209C02AAC07 /* M3u */;
 			projectDirPath = "";
@@ -207,6 +211,7 @@
 			children = (
 				833F68391CDBCAB200AFB9F0 /* es */,
 				835C889122CC1885001B4B3F /* en */,
+				83F0E6C3287CAB4300D84594 /* pl */,
 			);
 			name = InfoPlist.strings;
 			sourceTree = "<group>";
@@ -265,6 +270,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
@@ -308,6 +314,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;

Plugins/MAD/MAD.xcodeproj/project.pbxproj

@@ -15,6 +15,7 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
+		834A42BB287AFB0700EB9D9B /* AudioChunk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AudioChunk.h; path = ../../Audio/Chain/AudioChunk.h; sourceTree = "<group>"; };
 		8372C92327C785BD00E250C9 /* MAD.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MAD.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
 		8372C93327C7861300E250C9 /* MADDecoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MADDecoder.h; sourceTree = "<group>"; };
 		8372C93427C7861300E250C9 /* MADDecoder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MADDecoder.m; sourceTree = "<group>"; };
@@ -48,6 +49,7 @@
 			children = (
 				83747C262862DB9F0021245F /* Xcode-config */,
 				83F97B6628600F9300A70B97 /* ThirdParty */,
+				834A42BB287AFB0700EB9D9B /* AudioChunk.h */,
 				8372C93A27C786DD00E250C9 /* HTTPSource.h */,
 				8372C93927C7866B00E250C9 /* Logging.h */,
 				8372C93827C7865A00E250C9 /* Plugin.h */,

Plugins/MAD/MADDecoder.m

@@ -470,7 +470,7 @@
 	return ret;
 }
 
-- (void)writeOutput {
+- (BOOL)writeOutput {
 	unsigned long startingSample = 0;
 	unsigned long sampleCount = _synth.pcm.length;
 
@@ -485,7 +485,7 @@
 		// Past the end of the file.
 		if(totalFrames - _endPadding <= _framesDecoded) {
 			// DLog(@"End of file. Not writing.");
-			return;
+			return YES;
 		}
 
 		// Clip this for the following calculation, so this doesn't underflow
@@ -497,6 +497,11 @@
 			// DLog(@"End of file. %li",  totalFrames - _endPadding - _framesDecoded);
 			sampleCount = totalFrames - _endPadding - _framesDecoded + startingSample;
 		}
+	} else {
+		// Past the end of the file.
+		if(totalFrames <= _framesDecoded) {
+			return YES;
+		}
 	}
 
 	// We haven't even gotten to the start yet
@@ -504,7 +509,7 @@
 		// DLog(@"Skipping entire sample");
 		_framesDecoded += sampleCount;
 		framesToSkip -= sampleCount;
-		return;
+		return NO;
 	}
 
 	framesToSkip = 0;
@@ -536,6 +541,8 @@
 	// FILE *f = fopen("data.raw", "a");
 	// fwrite(_outputBuffer, channels * 2, _outputFrames, f);
 	// fclose(f);
+
+	return NO;
 }
 
 - (int)decodeMPEGFrame {
@@ -651,7 +658,7 @@
 	return 1;
 }
 
-- (BOOL)syncFormat:(BOOL)updateNow {
+- (BOOL)syncFormat {
 	float _sampleRate = _frame.header.samplerate;
 	int _channels = MAD_NCHANNELS(&_frame.header);
 	int _layer = 3;
@@ -674,7 +681,7 @@
 	                _channels != channels ||
 	                _layer != layer);
 
-	if(changed && updateNow) {
+	if(changed) {
 		sampleRate = _sampleRate;
 		channels = _channels;
 		layer = _layer;
@@ -686,29 +693,22 @@
 	return changed;
 }
 
-- (int)readAudio:(void *)buffer frames:(UInt32)frames {
+- (AudioChunk *)readAudio {
-	int framesRead = 0;
-
 	if(!_firstFrame)
-		[self syncFormat:YES];
+		[self syncFormat];
+
+	id audioChunkClass = NSClassFromString(@"AudioChunk");
+	AudioChunk *chunk = nil;
 
 	for(;;) {
-		long framesRemaining = frames - framesRead;
+		long framesToCopy = _outputFrames;
-		long framesToCopy = (_outputFrames > framesRemaining ? framesRemaining : _outputFrames);
 
 		if(framesToCopy) {
-			memcpy(buffer + (framesRead * channels * sizeof(float)), _outputBuffer, framesToCopy * channels * sizeof(float));
+			chunk = [[audioChunkClass alloc] initWithProperties:[self properties]];
-			framesRead += framesToCopy;
+			[chunk assignSamples:_outputBuffer frameCount:framesToCopy];
-
+			_outputFrames = 0;
-			if(framesToCopy != _outputFrames) {
-				memmove(_outputBuffer, _outputBuffer + (framesToCopy * channels), (_outputFrames - framesToCopy) * channels * sizeof(float));
-			}
-
-			_outputFrames -= framesToCopy;
-		}
-
-		if(framesRead == frames)
 			break;
+		}
 
 		int r = [self decodeMPEGFrame];
 		// DLog(@"Decoding frame: %i", r);
@@ -717,21 +717,18 @@
 		else if(r == -1) // Unrecoverable error
 			break;
 
-		[self writeOutput];
+		if([self writeOutput]) {
+			return nil;
+		}
 		// DLog(@"Wrote output");
 
-		if([self syncFormat:NO]) {
+		[self syncFormat];
-			if(framesRead)
-				break;
-			else
-				[self syncFormat:YES];
-		}
 	}
 
 	[self updateMetadata];
 
 	// DLog(@"Read: %i/%i", bytesRead, size);
-	return framesRead;
+	return chunk;
 }
 
 - (void)close {

Plugins/MIDI/MIDI.xcodeproj/project.pbxproj

@@ -99,6 +99,7 @@
 		831E2A9427B4B2FA006F1C86 /* json.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = json.h; sourceTree = "<group>"; };
 		831E2A9527B4B2FA006F1C86 /* json-builder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "json-builder.h"; sourceTree = "<group>"; };
 		833F68431CDBCABE00AFB9F0 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		834A42BC287AFC7F00EB9D9B /* AudioChunk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AudioChunk.h; path = ../../../Audio/Chain/AudioChunk.h; sourceTree = "<group>"; };
 		834BE9191DE407CB00A07DCD /* resampler.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = resampler.c; sourceTree = "<group>"; };
 		834BE91A1DE407CB00A07DCD /* resampler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = resampler.h; sourceTree = "<group>"; };
 		8356BCC427B352620074E50C /* BMPlayer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BMPlayer.cpp; sourceTree = "<group>"; };
@@ -154,6 +155,7 @@
 		83C35704180EDD1C007E9DF0 /* MIDIMetadataReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MIDIMetadataReader.h; sourceTree = "<group>"; };
 		83E973451C4378880007F413 /* AUPlayer.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AUPlayer.mm; sourceTree = "<group>"; };
 		83E973461C4378880007F413 /* AUPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AUPlayer.h; sourceTree = "<group>"; };
+		83F0E6C4287CAB4300D84594 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		83FAF8A618ADD60100057CAF /* PlaylistController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PlaylistController.h; path = ../../../Playlist/PlaylistController.h; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -306,6 +308,7 @@
 		83B06690180D5668008E3612 /* MIDI */ = {
 			isa = PBXGroup;
 			children = (
+				834A42BC287AFC7F00EB9D9B /* AudioChunk.h */,
 				8307D31E28607377000FF8EB /* SandboxBroker.h */,
 				831E2A9127B4B2FA006F1C86 /* json */,
 				831E2A7D27B4B2B2006F1C86 /* BASS */,
@@ -403,6 +406,7 @@
 				en,
 				es,
 				Base,
+				pl,
 			);
 			mainGroup = 83B0667E180D5668008E3612;
 			productRefGroup = 83B06688180D5668008E3612 /* Products */;
@@ -482,6 +486,7 @@
 			children = (
 				83B06694180D5668008E3612 /* en */,
 				833F68431CDBCABE00AFB9F0 /* es */,
+				83F0E6C4287CAB4300D84594 /* pl */,
 			);
 			name = InfoPlist.strings;
 			sourceTree = "<group>";
@@ -497,6 +502,7 @@
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
@@ -553,6 +559,7 @@
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;

Plugins/MIDI/MIDI/MIDIDecoder.mm

@@ -276,14 +276,14 @@ static OSType getOSType(const char *in_) {
 	return YES;
 }
 
-- (int)readAudio:(void *)buf frames:(UInt32)frames {
+- (AudioChunk *)readAudio {
 	BOOL repeatone = IsRepeatOneSet();
 	long localFramesLength = framesLength;
 	long localTotalFrames = totalFrames;
 
 	if(!player) {
 		if(![self initDecoder])
-			return -1;
+			return nil;
 	}
 
 	player->setLoopMode((repeatone || isLooped) ? (MIDIPlayer::loop_mode_enable | MIDIPlayer::loop_mode_force) : 0);
@@ -302,7 +302,10 @@ static OSType getOSType(const char *in_) {
 		soundFontsAssigned = YES;
 	}
 
-	UInt32 frames_done = player->Play((float *)buf, frames);
+	int frames = 1024;
+	float buffer[frames * 2];
+
+	UInt32 frames_done = player->Play(buffer, frames);
 
 	if(!frames_done)
 		return 0;
@@ -315,7 +318,7 @@ static OSType getOSType(const char *in_) {
 			long fadeEnd = (framesRead + frames > localTotalFrames) ? localTotalFrames : (framesRead + frames);
 			long fadePos;
 
-			float *buff = (float *)buf;
+			float *buff = buffer;
 
 			float fadeScale = (float)(framesFade - (fadeStart - localFramesLength)) / framesFade;
 			float fadeStep = 1.0 / (float)framesFade;
@@ -337,13 +340,17 @@ static OSType getOSType(const char *in_) {
 	}
 
 	framesRead += frames;
-	return frames;
+
+	id audioChunkClass = NSClassFromString(@"AudioChunk");
+	AudioChunk *chunk = [[audioChunkClass alloc] initWithProperties:[self properties]];
+	[chunk assignSamples:buffer frameCount:frames];
+
+	return chunk;
 }
 
 - (long)seek:(long)frame {
 	if(!player) {
-		float temp[2];
+		if(![self readAudio])
-		if([self readAudio:temp frames:1] < 1)
 			return -1;
 	}
 

Plugins/MIDI/MIDI/pl.lproj/InfoPlist.strings

@@ -0,0 +1,2 @@
+/* Localized versions of Info.plist keys */
+

Plugins/Musepack/Musepack.xcodeproj/project.pbxproj

@@ -51,6 +51,7 @@
 		1703330A0B8FB64500327265 /* MusepackDecoder.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MusepackDecoder.m; sourceTree = "<group>"; };
 		17F562570C3BD97B0019975C /* MPCDec.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = MPCDec.xcodeproj; path = ../../Frameworks/MPCDec/MPCDec.xcodeproj; sourceTree = SOURCE_ROOT; };
 		32DBCF630370AF2F00C91783 /* Musepack_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Musepack_Prefix.pch; sourceTree = "<group>"; };
+		834A42BD287AFD0D00EB9D9B /* AudioChunk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AudioChunk.h; path = ../../Audio/Chain/AudioChunk.h; sourceTree = "<group>"; };
 		83747C1D2862DB560021245F /* Shared.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Shared.xcconfig; sourceTree = "<group>"; };
 		838491311808190400E7332D /* Logging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Logging.h; path = ../../Utils/Logging.h; sourceTree = "<group>"; };
 		8D5B49B6048680CD000E48DA /* Musepack.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Musepack.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -105,6 +106,7 @@
 		08FB77AFFE84173DC02AAC07 /* Classes */ = {
 			isa = PBXGroup;
 			children = (
+				834A42BD287AFD0D00EB9D9B /* AudioChunk.h */,
 				838491311808190400E7332D /* Logging.h */,
 				8E2B8B4A0B9B48D000F2D9E8 /* Plugin.h */,
 				170333090B8FB64500327265 /* MusepackDecoder.h */,
@@ -323,6 +325,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
@@ -367,6 +370,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;

Plugins/Musepack/MusepackDecoder.m

@@ -109,11 +109,15 @@ mpc_bool_t CanSeekProc(mpc_reader *p_reader) {
 	return YES;
 }
 
-- (int)readAudio:(void *)buf frames:(UInt32)frames {
+- (AudioChunk *)readAudio {
 	MPC_SAMPLE_FORMAT sampleBuffer[MPC_DECODER_BUFFER_LENGTH];
 
+	int frames = 1024;
+	float buffer[frames * 2];
+	void *buf = (void *)buffer;
+
 	int framesRead = 0;
-	int bytesPerFrame = sizeof(float) * 2; // bitsPerSample == 16, channels == 2
+	int bytesPerFrame = sizeof(float) * 2; // bitsPerSample == 32, channels == 2
 	while(framesRead < frames) {
 		// Fill from buffer, going by bufferFrames
 		// if still needs more, decode and repeat
@@ -150,7 +154,11 @@ mpc_bool_t CanSeekProc(mpc_reader *p_reader) {
 		}
 	}
 
-	return framesRead;
+	id audioChunkClass = NSClassFromString(@"AudioChunk");
+	AudioChunk *chunk = [[audioChunkClass alloc] initWithProperties:[self properties]];
+	[chunk assignSamples:buffer frameCount:framesRead];
+
+	return chunk;
 }
 
 - (void)close {

Plugins/OpenMPT/OpenMPT.xcodeproj/project.pbxproj

@@ -48,6 +48,7 @@
 
 /* Begin PBXFileReference section */
 		833A899B286FF3150022E036 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
+		834A42BE287AFDC300EB9D9B /* AudioChunk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AudioChunk.h; path = ../../Audio/Chain/AudioChunk.h; sourceTree = "<group>"; };
 		83747C182862DB2F0021245F /* Shared.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Shared.xcconfig; sourceTree = "<group>"; };
 		83E5EFA31FFEF78100659F0F /* OpenMPT.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = OpenMPT.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
 		83E5EFA61FFEF78100659F0F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -124,6 +125,7 @@
 		83E5FE6A1FFF003900659F0F /* Classes */ = {
 			isa = PBXGroup;
 			children = (
+				834A42BE287AFDC300EB9D9B /* AudioChunk.h */,
 				83E5FE6B1FFF004D00659F0F /* Logging.h */,
 				83E5FE761FFF076F00659F0F /* PlaylistController.h */,
 				83E5FE6C1FFF006400659F0F /* Plugin.h */,

Plugins/OpenMPT/OpenMPT/OMPTDecoder.mm

@@ -112,9 +112,13 @@ static void g_push_archive_extensions(std::vector<std::string> &list) {
 	return @{};
 }
 
-- (int)readAudio:(void *)buf frames:(UInt32)frames {
+- (AudioChunk *)readAudio {
 	mod->set_repeat_count(IsRepeatOneSet() ? -1 : 0);
 
+	int frames = 1024;
+	float buffer[frames * 2];
+	void *buf = (void *)buffer;
+
 	int total = 0;
 	while(total < frames) {
 		int framesToRender = 1024;
@@ -131,7 +135,11 @@ static void g_push_archive_extensions(std::vector<std::string> &list) {
 			break;
 	}
 
-	return total;
+	id audioChunkClass = NSClassFromString(@"AudioChunk");
+	AudioChunk *chunk = [[audioChunkClass alloc] initWithProperties:[self properties]];
+	[chunk assignSamples:buffer frameCount:total];
+
+	return chunk;
 }
 
 - (long)seek:(long)frame {

Plugins/Opus/Opus/OpusDecoder.m

@@ -222,7 +222,7 @@ static void setDictionary(NSMutableDictionary *dict, NSString *tag, NSString *va
 	}
 }
 
-- (int)readAudio:(void *)buf frames:(UInt32)frames {
+- (AudioChunk *)readAudio {
 	int numread;
 	int total = 0;
 
@@ -236,7 +236,10 @@ static void setDictionary(NSMutableDictionary *dict, NSString *tag, NSString *va
 		[self updateMetadata];
 	}
 
+	int frames = 1024;
 	int size = frames * channels;
+	float buffer[size];
+	void *buf = (void *)buffer;
 
 	do {
 		float *out = ((float *)buf) + total;
@@ -265,7 +268,11 @@ static void setDictionary(NSMutableDictionary *dict, NSString *tag, NSString *va
 
 	[self updateIcyMetadata];
 
-	return total / channels;
+	id audioChunkClass = NSClassFromString(@"AudioChunk");
+	AudioChunk *chunk = [[audioChunkClass alloc] initWithProperties:[self properties]];
+	[chunk assignSamples:buffer frameCount:total / channels];
+
+	return chunk;
 }
 
 - (void)close {

Plugins/Opus/Opus/pl.lproj/InfoPlist.strings

@@ -0,0 +1,2 @@
+/* Localized versions of Info.plist keys */
+

Plugins/Opus/OpusPlugin.xcodeproj/project.pbxproj

@@ -32,6 +32,7 @@
 		83186314285CEC91001422CC /* NSDictionary+Merge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSDictionary+Merge.h"; path = "../../../Utils/NSDictionary+Merge.h"; sourceTree = "<group>"; };
 		83186315285CEC91001422CC /* NSDictionary+Merge.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSDictionary+Merge.m"; path = "../../../Utils/NSDictionary+Merge.m"; sourceTree = "<group>"; };
 		833F68411CDBCABC00AFB9F0 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		834A42BF287AFE2600EB9D9B /* AudioChunk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AudioChunk.h; path = ../../../Audio/Chain/AudioChunk.h; sourceTree = "<group>"; };
 		8356BD1B27B469B80074E50C /* HTTPSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HTTPSource.h; path = ../../HTTPSource/HTTPSource.h; sourceTree = "<group>"; };
 		836EF0CE27BB952F00BF35B2 /* libopusfile.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libopusfile.0.dylib; path = ../../ThirdParty/opusfile/lib/libopusfile.0.dylib; sourceTree = "<group>"; };
 		83747C0E2862DAC70021245F /* Shared.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Shared.xcconfig; sourceTree = "<group>"; };
@@ -47,6 +48,7 @@
 		8375B36B17FFF1CB0092A79F /* OpusDecoder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OpusDecoder.m; sourceTree = "<group>"; };
 		8375B36D17FFF1FE0092A79F /* Plugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Plugin.h; path = ../../../Audio/Plugin.h; sourceTree = "<group>"; };
 		8384913718081F2700E7332D /* Logging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Logging.h; path = ../../../Utils/Logging.h; sourceTree = "<group>"; };
+		83F0E6C7287CAB4300D84594 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -114,6 +116,7 @@
 		8375B04517FFEA400092A79F /* Opus */ = {
 			isa = PBXGroup;
 			children = (
+				834A42BF287AFE2600EB9D9B /* AudioChunk.h */,
 				83186314285CEC91001422CC /* NSDictionary+Merge.h */,
 				83186315285CEC91001422CC /* NSDictionary+Merge.m */,
 				8356BD1B27B469B80074E50C /* HTTPSource.h */,
@@ -180,6 +183,7 @@
 				en,
 				es,
 				Base,
+				pl,
 			);
 			mainGroup = 8375B03317FFEA400092A79F;
 			productRefGroup = 8375B03D17FFEA400092A79F /* Products */;
@@ -220,6 +224,7 @@
 			children = (
 				8375B04917FFEA400092A79F /* en */,
 				833F68411CDBCABC00AFB9F0 /* es */,
+				83F0E6C7287CAB4300D84594 /* pl */,
 			);
 			name = InfoPlist.strings;
 			sourceTree = "<group>";
@@ -235,6 +240,7 @@
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
@@ -291,6 +297,7 @@
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;

Plugins/Pls/Pls.xcodeproj/project.pbxproj

@@ -18,9 +18,11 @@
 		1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
 		32DBCF630370AF2F00C91783 /* Pls_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Pls_Prefix.pch; sourceTree = "<group>"; };
 		833F68381CDBCAB200AFB9F0 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		834A42C0287AFEB100EB9D9B /* AudioChunk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AudioChunk.h; path = ../../Audio/Chain/AudioChunk.h; sourceTree = "<group>"; };
 		835C889422CC1887001B4B3F /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		83747C092862DAA90021245F /* Shared.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Shared.xcconfig; sourceTree = "<group>"; };
 		838491321808193F00E7332D /* Logging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Logging.h; path = ../../Utils/Logging.h; sourceTree = "<group>"; };
+		83F0E6C8287CAB4300D84594 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		8D5B49B6048680CD000E48DA /* Pls.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Pls.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
 		8D5B49B7048680CD000E48DA /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		8E8D419F0CBB0CA700135C1B /* PlsContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlsContainer.h; sourceTree = "<group>"; };
@@ -75,6 +77,7 @@
 		08FB77AFFE84173DC02AAC07 /* Classes */ = {
 			isa = PBXGroup;
 			children = (
+				834A42C0287AFEB100EB9D9B /* AudioChunk.h */,
 				838491321808193F00E7332D /* Logging.h */,
 				8E8D41A50CBB0CBE00135C1B /* Plugin.h */,
 				8E8D419F0CBB0CA700135C1B /* PlsContainer.h */,
@@ -169,6 +172,7 @@
 				en,
 				es,
 				Base,
+				pl,
 			);
 			mainGroup = 089C166AFE841209C02AAC07 /* Pls */;
 			projectDirPath = "";
@@ -207,6 +211,7 @@
 			children = (
 				833F68381CDBCAB200AFB9F0 /* es */,
 				835C889422CC1887001B4B3F /* en */,
+				83F0E6C8287CAB4300D84594 /* pl */,
 			);
 			name = InfoPlist.strings;
 			sourceTree = "<group>";
@@ -262,6 +267,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
@@ -305,6 +311,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;

Plugins/Shorten/Shorten.xcodeproj/project.pbxproj

@@ -52,6 +52,7 @@
 		177FCFAC0B90C96B0011C3B5 /* Plugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Plugin.h; path = ../../Audio/Plugin.h; sourceTree = SOURCE_ROOT; };
 		17F563DD0C3BDBF10019975C /* Shorten.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Shorten.xcodeproj; path = ../../Frameworks/Shorten/Shorten.xcodeproj; sourceTree = SOURCE_ROOT; };
 		32DBCF630370AF2F00C91783 /* Shorten_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Shorten_Prefix.pch; sourceTree = "<group>"; };
+		834A42A9287AEF1300EB9D9B /* AudioChunk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AudioChunk.h; path = ../../Audio/Chain/AudioChunk.h; sourceTree = "<group>"; };
 		83747C042862DA780021245F /* Shared.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Shared.xcconfig; sourceTree = "<group>"; };
 		8D5B49B6048680CD000E48DA /* Shorten.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Shorten.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
 		8D5B49B7048680CD000E48DA /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -104,6 +105,7 @@
 		08FB77AFFE84173DC02AAC07 /* Classes */ = {
 			isa = PBXGroup;
 			children = (
+				834A42A9287AEF1300EB9D9B /* AudioChunk.h */,
 				177FCFAC0B90C96B0011C3B5 /* Plugin.h */,
 				1745C42B0B90C1DC00A6768C /* ShortenDecoder.h */,
 				1745C42C0B90C1DC00A6768C /* ShortenDecoder.mm */,
@@ -321,6 +323,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
@@ -365,6 +368,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;

Plugins/Shorten/ShortenDecoder.mm

@@ -41,16 +41,25 @@
 	return YES;
 }
 
-- (int)readAudio:(void *)buf frames:(UInt32)frames {
+- (AudioChunk *)readAudio {
+	long frames = 1024;
 	long bytesPerFrame = channels * (bitsPerSample / 8);
 	long amountRead;
 
+	id audioChunkClass = NSClassFromString(@"AudioChunk");
+	AudioChunk *chunk = [[audioChunkClass alloc] initWithProperties:[self properties]];
+
+	uint8_t buffer[bytesPerFrame * 1024];
+	void *buf = (void *)buffer;
+
 	// For some reason a busy loop is causing pops when output is set to 48000. Probably CPU starvation, since the SHN decoder seems to use a multithreaded nonblocking approach.
 	do {
 		amountRead = decoder->read(buf, frames * bytesPerFrame);
 	} while(amountRead == -1);
 
-	return (int)(amountRead / bytesPerFrame);
+	[chunk assignSamples:buf frameCount:amountRead / bytesPerFrame];
+
+	return chunk;
 }
 
 - (long)seek:(long)sample {

Plugins/SilenceDecoder/SilenceDecoder.xcodeproj/project.pbxproj

@@ -12,6 +12,7 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
+		834A42C1287AFED700EB9D9B /* AudioChunk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AudioChunk.h; path = ../../../Audio/Chain/AudioChunk.h; sourceTree = "<group>"; };
 		83747BFA2862D95C0021245F /* Shared.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Shared.xcconfig; sourceTree = "<group>"; };
 		83F9D7E71A884B44007ABEC2 /* SilenceDecoder.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SilenceDecoder.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
 		83F9D7EB1A884B44007ABEC2 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -64,6 +65,7 @@
 		83F9D7E91A884B44007ABEC2 /* SilenceDecoder */ = {
 			isa = PBXGroup;
 			children = (
+				834A42C1287AFED700EB9D9B /* AudioChunk.h */,
 				83F9D8091A884CB5007ABEC2 /* Logging.h */,
 				83F9D8081A884C93007ABEC2 /* Plugin.h */,
 				83F9D8041A884C23007ABEC2 /* PlaylistController.h */,

Plugins/SilenceDecoder/SilenceDecoder/SilenceDecoder.m

@@ -50,7 +50,11 @@ enum { channels = 2 };
 	return @{};
 }
 
-- (int)readAudio:(void *)buf frames:(UInt32)frames {
+- (AudioChunk *)readAudio {
+	int frames = 1024;
+	float buffer[frames * channels];
+	void *buf = (void *)buffer;
+
 	int total = frames;
 
 	if(!IsRepeatOneSet()) {
@@ -62,7 +66,11 @@ enum { channels = 2 };
 
 	memset(buf, 0, sizeof(float) * total * channels);
 
-	return total;
+	id audioChunkClass = NSClassFromString(@"AudioChunk");
+	AudioChunk *chunk = [[audioChunkClass alloc] initWithProperties:[self properties]];
+	[chunk assignSamples:buffer frameCount:total];
+
+	return chunk;
 }
 
 - (long)seek:(long)frame {

Plugins/TagLib/TagLib.xcodeproj/project.pbxproj

@@ -12,6 +12,7 @@
 		17F563B40C3BDBB30019975C /* TagLib.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 17F563A60C3BDB8F0019975C /* TagLib.framework */; };
 		17F563B60C3BDBB50019975C /* TagLib.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17F563A60C3BDB8F0019975C /* TagLib.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
 		8307D31D286072BF000FF8EB /* SandboxBroker.h in Headers */ = {isa = PBXBuildFile; fileRef = 8307D31C286072BF000FF8EB /* SandboxBroker.h */; };
+		834A42C3287AFF5E00EB9D9B /* AudioChunk.h in Headers */ = {isa = PBXBuildFile; fileRef = 834A42C2287AFF5E00EB9D9B /* AudioChunk.h */; };
 		8356BCE527B377C20074E50C /* TagLibID3v2Reader.h in Headers */ = {isa = PBXBuildFile; fileRef = 8356BCE327B377C20074E50C /* TagLibID3v2Reader.h */; };
 		8356BCE627B377C20074E50C /* TagLibID3v2Reader.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8356BCE427B377C20074E50C /* TagLibID3v2Reader.mm */; };
 		8384913A18081FFC00E7332D /* Logging.h in Headers */ = {isa = PBXBuildFile; fileRef = 8384913918081FFC00E7332D /* Logging.h */; };
@@ -60,6 +61,7 @@
 		17F563A00C3BDB8F0019975C /* TagLib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = TagLib.xcodeproj; path = ../../Frameworks/TagLib/TagLib.xcodeproj; sourceTree = SOURCE_ROOT; };
 		32DBCF630370AF2F00C91783 /* TagLib_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TagLib_Prefix.pch; sourceTree = "<group>"; };
 		8307D31C286072BF000FF8EB /* SandboxBroker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SandboxBroker.h; path = ../../Utils/SandboxBroker.h; sourceTree = "<group>"; };
+		834A42C2287AFF5E00EB9D9B /* AudioChunk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AudioChunk.h; path = ../../Audio/Chain/AudioChunk.h; sourceTree = "<group>"; };
 		8356BCE327B377C20074E50C /* TagLibID3v2Reader.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TagLibID3v2Reader.h; sourceTree = "<group>"; };
 		8356BCE427B377C20074E50C /* TagLibID3v2Reader.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = TagLibID3v2Reader.mm; sourceTree = "<group>"; };
 		83747BF52862D9470021245F /* Shared.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Shared.xcconfig; sourceTree = "<group>"; };
@@ -115,6 +117,7 @@
 		08FB77AFFE84173DC02AAC07 /* Classes */ = {
 			isa = PBXGroup;
 			children = (
+				834A42C2287AFF5E00EB9D9B /* AudioChunk.h */,
 				8307D31C286072BF000FF8EB /* SandboxBroker.h */,
 				8384913918081FFC00E7332D /* Logging.h */,
 				07CACE890ED1AD1000C0F1E8 /* TagLibMetadataWriter.h */,
@@ -188,6 +191,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				8384913A18081FFC00E7332D /* Logging.h in Headers */,
+				834A42C3287AFF5E00EB9D9B /* AudioChunk.h in Headers */,
 				8307D31D286072BF000FF8EB /* SandboxBroker.h in Headers */,
 				8356BCE527B377C20074E50C /* TagLibID3v2Reader.h in Headers */,
 			);
@@ -357,6 +361,7 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
@@ -402,6 +407,7 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;

Plugins/Vorbis/VorbisDecoder.m

@@ -200,9 +200,10 @@ static void setDictionary(NSMutableDictionary *dict, NSString *tag, NSString *va
 	}
 }
 
-- (int)readAudio:(void *)buf frames:(UInt32)frames {
+- (AudioChunk *)readAudio {
 	int numread;
 	int total = 0;
+	int frames = 1024;
 
 	if(currentSection != lastSection) {
 		vorbis_info *vi;
@@ -218,6 +219,12 @@ static void setDictionary(NSMutableDictionary *dict, NSString *tag, NSString *va
 		[self updateMetadata];
 	}
 
+	id audioChunkClass = NSClassFromString(@"AudioChunk");
+	AudioChunk *chunk = [[audioChunkClass alloc] initWithProperties:[self properties]];
+
+	float buffer[frames * channels];
+	void *buf = (void *)buffer;
+
 	do {
 		lastSection = currentSection;
 		float **pcm;
@@ -247,7 +254,9 @@ static void setDictionary(NSMutableDictionary *dict, NSString *tag, NSString *va
 
 	[self updateIcyMetadata];
 
-	return total;
+	[chunk assignSamples:buffer frameCount:total];
+
+	return chunk;
 }
 
 - (void)close {

Plugins/Vorbis/VorbisPlugin.xcodeproj/project.pbxproj

@@ -28,6 +28,7 @@
 		8301C14A287810F300651A6E /* libFLAC.8.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libFLAC.8.dylib; path = ../../ThirdParty/flac/lib/libFLAC.8.dylib; sourceTree = "<group>"; };
 		83186311285CEBD2001422CC /* NSDictionary+Merge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSDictionary+Merge.h"; path = "../../Utils/NSDictionary+Merge.h"; sourceTree = "<group>"; };
 		83186312285CEBD2001422CC /* NSDictionary+Merge.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSDictionary+Merge.m"; path = "../../Utils/NSDictionary+Merge.m"; sourceTree = "<group>"; };
+		834A42AB287AF0B000EB9D9B /* AudioChunk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AudioChunk.h; path = ../../Audio/Chain/AudioChunk.h; sourceTree = "<group>"; };
 		8356BD1C27B46A2D0074E50C /* HTTPSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HTTPSource.h; path = ../HTTPSource/HTTPSource.h; sourceTree = "<group>"; };
 		836EF0D427BB969D00BF35B2 /* libvorbisfile.3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libvorbisfile.3.dylib; path = ../../ThirdParty/vorbis/lib/libvorbisfile.3.dylib; sourceTree = "<group>"; };
 		836EF0DE27BB987000BF35B2 /* libvorbis.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libvorbis.0.dylib; path = ../../ThirdParty/vorbis/lib/libvorbis.0.dylib; sourceTree = "<group>"; };
@@ -92,6 +93,7 @@
 		08FB77AFFE84173DC02AAC07 /* Classes */ = {
 			isa = PBXGroup;
 			children = (
+				834A42AB287AF0B000EB9D9B /* AudioChunk.h */,
 				83186311285CEBD2001422CC /* NSDictionary+Merge.h */,
 				83186312285CEBD2001422CC /* NSDictionary+Merge.m */,
 				8356BD1C27B46A2D0074E50C /* HTTPSource.h */,
@@ -354,6 +356,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
@@ -398,6 +401,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;

Plugins/WavPack/WavPack.xcodeproj/project.pbxproj

@@ -52,6 +52,7 @@
 		177FCF940B90C9450011C3B5 /* Plugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Plugin.h; path = ../../Audio/Plugin.h; sourceTree = SOURCE_ROOT; };
 		17F562C20C3BDA5A0019975C /* WavPack.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = WavPack.xcodeproj; path = ../../Frameworks/WavPack/WavPack.xcodeproj; sourceTree = SOURCE_ROOT; };
 		32DBCF630370AF2F00C91783 /* WavPack_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WavPack_Prefix.pch; sourceTree = "<group>"; };
+		834A42AA287AEFC300EB9D9B /* AudioChunk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AudioChunk.h; path = ../../Audio/Chain/AudioChunk.h; sourceTree = "<group>"; };
 		83747BE62862D8D60021245F /* Shared.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Shared.xcconfig; sourceTree = "<group>"; };
 		83849133180819EB00E7332D /* Logging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Logging.h; path = ../../Utils/Logging.h; sourceTree = "<group>"; };
 		8D5B49B6048680CD000E48DA /* WavPack.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = WavPack.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -105,6 +106,7 @@
 		08FB77AFFE84173DC02AAC07 /* Classes */ = {
 			isa = PBXGroup;
 			children = (
+				834A42AA287AEFC300EB9D9B /* AudioChunk.h */,
 				83849133180819EB00E7332D /* Logging.h */,
 				177FCF940B90C9450011C3B5 /* Plugin.h */,
 				1745C4D50B90C42500A6768C /* WavPackDecoder.h */,
@@ -325,6 +327,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
@@ -369,6 +372,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;

Plugins/WavPack/WavPackDecoder.m

@@ -196,7 +196,12 @@ int32_t WriteBytesProc(void *ds, void *data, int32_t bcount) {
     return n;
 }
 */
-- (int)readAudio:(void *)buf frames:(UInt32)frames {
+- (AudioChunk *)readAudio {
+	int32_t frames = 1024;
+
+	id audioChunkClass = NSClassFromString(@"AudioChunk");
+	AudioChunk *chunk = [[audioChunkClass alloc] initWithProperties:[self properties]];
+
 	uint32_t sample;
 	int32_t audioSample;
 	uint32_t samplesRead;
@@ -204,6 +209,10 @@ int32_t WriteBytesProc(void *ds, void *data, int32_t bcount) {
 	int16_t *alias16;
 	int32_t *alias32;
 
+	const size_t bufferSize = frames * [chunk format].mBytesPerFrame;
+	uint8_t buffer[bufferSize];
+	void *buf = (void *)buffer;
+
 	size_t newSize = frames * sizeof(int32_t) * channels;
 	if(!inputBuffer || newSize > inputBufferSize) {
 		inputBuffer = realloc(inputBuffer, inputBufferSize = newSize);
@@ -248,7 +257,9 @@ int32_t WriteBytesProc(void *ds, void *data, int32_t bcount) {
 			ALog(@"Unsupported sample size: %d", bitsPerSample);
 	}
 
-	return samplesRead;
+	[chunk assignSamples:buffer frameCount:samplesRead];
+
+	return chunk;
 }
 
 - (long)seek:(long)frame {

Plugins/libvgmPlayer/libvgmDecoder.mm

@@ -208,9 +208,18 @@ const int masterVol = 0x10000; // Fixed point 16.16
 	return @{};
 }
 
-- (int)readAudio:(void*)buf frames:(UInt32)frames {
+- (AudioChunk*)readAudio {
 	if([self trackEnded])
-		return 0;
+		return nil;
+
+	id audioChunkClass = NSClassFromString(@"AudioChunk");
+	AudioChunk* chunk = [[audioChunkClass alloc] initWithProperties:[self properties]];
+
+	int frames = 1024;
+	const size_t bytesPerFrame = [chunk format].mBytesPerFrame;
+	uint8_t buffer[frames * bytesPerFrame];
+
+	void* buf = (void*)buffer;
 
 	BOOL repeatOne = IsRepeatOneSet();
 	uint32_t maxLoops = repeatOne ? 0 : (uint32_t)loopCount;
@@ -238,7 +247,9 @@ const int masterVol = 0x10000; // Fixed point 16.16
 		framesDone += framesToDo;
 	}
 
-	return framesDone;
+	[chunk assignSamples:buffer frameCount:framesDone];
+
+	return chunk;
 }
 
 - (long)seek:(long)frame {