Removed LibsndfileDecoder from iOS builds

sbooth · Sep 29, 2012 · 04ea4c6 · 04ea4c6
1 parent 508bc89
commit 04ea4c6
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 41 deletions.
diff --git a/Decoders/AudioDecoder.cpp b/Decoders/AudioDecoder.cpp
@@ -45,16 +45,14 @@
 #include "WavPackDecoder.h"
 #include "MPEGDecoder.h"
 #include "OggVorbisDecoder.h"
+#include "OggSpeexDecoder.h"
 #if !TARGET_OS_IPHONE
 # include "MusepackDecoder.h"
 # include "MonkeysAudioDecoder.h"
-#endif
-#include "OggSpeexDecoder.h"
-#if !TARGET_OS_IPHONE
 # include "MODDecoder.h"
 # include "TrueAudioDecoder.h"
+# include "LibsndfileDecoder.h"
 #endif
-#include "LibsndfileDecoder.h"
 
 // ========================================
 // Error Codes
@@ -87,33 +85,31 @@ CFArrayRef AudioDecoder::CreateSupportedFileExtensions()
 	CFArrayAppendArray(supportedExtensions, decoderExtensions, CFRangeMake(0, CFArrayGetCount(decoderExtensions)));
 	CFRelease(decoderExtensions), decoderExtensions = nullptr;
 
-#if !TARGET_OS_IPHONE
-	decoderExtensions = MusepackDecoder::CreateSupportedFileExtensions();
+	decoderExtensions = OggSpeexDecoder::CreateSupportedFileExtensions();
 	CFArrayAppendArray(supportedExtensions, decoderExtensions, CFRangeMake(0, CFArrayGetCount(decoderExtensions)));
 	CFRelease(decoderExtensions), decoderExtensions = nullptr;
 
-	decoderExtensions = MonkeysAudioDecoder::CreateSupportedFileExtensions();
+#if !TARGET_OS_IPHONE
+	decoderExtensions = MusepackDecoder::CreateSupportedFileExtensions();
 	CFArrayAppendArray(supportedExtensions, decoderExtensions, CFRangeMake(0, CFArrayGetCount(decoderExtensions)));
 	CFRelease(decoderExtensions), decoderExtensions = nullptr;
-#endif
 
-	decoderExtensions = OggSpeexDecoder::CreateSupportedFileExtensions();
+	decoderExtensions = MonkeysAudioDecoder::CreateSupportedFileExtensions();
 	CFArrayAppendArray(supportedExtensions, decoderExtensions, CFRangeMake(0, CFArrayGetCount(decoderExtensions)));
 	CFRelease(decoderExtensions), decoderExtensions = nullptr;
 
-#if !TARGET_OS_IPHONE
 	decoderExtensions = MODDecoder::CreateSupportedFileExtensions();
 	CFArrayAppendArray(supportedExtensions, decoderExtensions, CFRangeMake(0, CFArrayGetCount(decoderExtensions)));
 	CFRelease(decoderExtensions), decoderExtensions = nullptr;
 
 	decoderExtensions = TrueAudioDecoder::CreateSupportedFileExtensions();
 	CFArrayAppendArray(supportedExtensions, decoderExtensions, CFRangeMake(0, CFArrayGetCount(decoderExtensions)));
 	CFRelease(decoderExtensions), decoderExtensions = nullptr;
-#endif
 
 	decoderExtensions = LibsndfileDecoder::CreateSupportedFileExtensions();
 	CFArrayAppendArray(supportedExtensions, decoderExtensions, CFRangeMake(0, CFArrayGetCount(decoderExtensions)));
 	CFRelease(decoderExtensions), decoderExtensions = nullptr;
+#endif
 
 	decoderExtensions = CoreAudioDecoder::CreateSupportedFileExtensions();
 	CFArrayAppendArray(supportedExtensions, decoderExtensions, CFRangeMake(0, CFArrayGetCount(decoderExtensions)));
@@ -148,6 +144,10 @@ CFArrayRef AudioDecoder::CreateSupportedMIMETypes()
 	CFArrayAppendArray(supportedMIMETypes, decoderMIMETypes, CFRangeMake(0, CFArrayGetCount(decoderMIMETypes)));
 	CFRelease(decoderMIMETypes), decoderMIMETypes = nullptr;
 
+	decoderMIMETypes = OggSpeexDecoder::CreateSupportedMIMETypes();
+	CFArrayAppendArray(supportedMIMETypes, decoderMIMETypes, CFRangeMake(0, CFArrayGetCount(decoderMIMETypes)));
+	CFRelease(decoderMIMETypes), decoderMIMETypes = nullptr;
+
 #if !TARGET_OS_IPHONE
 	decoderMIMETypes = MusepackDecoder::CreateSupportedMIMETypes();
 	CFArrayAppendArray(supportedMIMETypes, decoderMIMETypes, CFRangeMake(0, CFArrayGetCount(decoderMIMETypes)));
@@ -156,25 +156,19 @@ CFArrayRef AudioDecoder::CreateSupportedMIMETypes()
 	decoderMIMETypes = MonkeysAudioDecoder::CreateSupportedMIMETypes();
 	CFArrayAppendArray(supportedMIMETypes, decoderMIMETypes, CFRangeMake(0, CFArrayGetCount(decoderMIMETypes)));
 	CFRelease(decoderMIMETypes), decoderMIMETypes = nullptr;
-#endif
-
-	decoderMIMETypes = OggSpeexDecoder::CreateSupportedMIMETypes();
-	CFArrayAppendArray(supportedMIMETypes, decoderMIMETypes, CFRangeMake(0, CFArrayGetCount(decoderMIMETypes)));
-	CFRelease(decoderMIMETypes), decoderMIMETypes = nullptr;
 
-#if !TARGET_OS_IPHONE
 	decoderMIMETypes = MODDecoder::CreateSupportedMIMETypes();
 	CFArrayAppendArray(supportedMIMETypes, decoderMIMETypes, CFRangeMake(0, CFArrayGetCount(decoderMIMETypes)));
 	CFRelease(decoderMIMETypes), decoderMIMETypes = nullptr;
 
 	decoderMIMETypes = TrueAudioDecoder::CreateSupportedMIMETypes();
 	CFArrayAppendArray(supportedMIMETypes, decoderMIMETypes, CFRangeMake(0, CFArrayGetCount(decoderMIMETypes)));
 	CFRelease(decoderMIMETypes), decoderMIMETypes = nullptr;
-#endif
 
 	decoderMIMETypes = LibsndfileDecoder::CreateSupportedMIMETypes();
 	CFArrayAppendArray(supportedMIMETypes, decoderMIMETypes, CFRangeMake(0, CFArrayGetCount(decoderMIMETypes)));
 	CFRelease(decoderMIMETypes), decoderMIMETypes = nullptr;
+#endif
 
 	decoderMIMETypes = CoreAudioDecoder::CreateSupportedMIMETypes();
 	CFArrayAppendArray(supportedMIMETypes, decoderMIMETypes, CFRangeMake(0, CFArrayGetCount(decoderMIMETypes)));
@@ -325,30 +319,28 @@ AudioDecoder * AudioDecoder::CreateDecoderForInputSource(InputSource *inputSourc
 				delete decoder, decoder = nullptr;
 			}
 		}
-#if !TARGET_OS_IPHONE
-		if(nullptr == decoder && MusepackDecoder::HandlesMIMEType(mimeType)) {
-			decoder = new MusepackDecoder(inputSource);
+		if(nullptr == decoder && OggSpeexDecoder::HandlesMIMEType(mimeType)) {
+			decoder = new OggSpeexDecoder(inputSource);
 			if(AutomaticallyOpenDecoders() && !decoder->Open(error)) {
 				decoder->mInputSource = nullptr;
 				delete decoder, decoder = nullptr;
 			}
 		}
-		if(nullptr == decoder && MonkeysAudioDecoder::HandlesMIMEType(mimeType)) {
-			decoder = new MonkeysAudioDecoder(inputSource);
+#if !TARGET_OS_IPHONE
+		if(nullptr == decoder && MusepackDecoder::HandlesMIMEType(mimeType)) {
+			decoder = new MusepackDecoder(inputSource);
 			if(AutomaticallyOpenDecoders() && !decoder->Open(error)) {
 				decoder->mInputSource = nullptr;
 				delete decoder, decoder = nullptr;
 			}
 		}
-#endif
-		if(nullptr == decoder && OggSpeexDecoder::HandlesMIMEType(mimeType)) {
-			decoder = new OggSpeexDecoder(inputSource);
+		if(nullptr == decoder && MonkeysAudioDecoder::HandlesMIMEType(mimeType)) {
+			decoder = new MonkeysAudioDecoder(inputSource);
 			if(AutomaticallyOpenDecoders() && !decoder->Open(error)) {
 				decoder->mInputSource = nullptr;
 				delete decoder, decoder = nullptr;
 			}
 		}
-#if !TARGET_OS_IPHONE
 		if(nullptr == decoder && MODDecoder::HandlesMIMEType(mimeType)) {
 			decoder = new MODDecoder(inputSource);
 			if(AutomaticallyOpenDecoders() && !decoder->Open(error)) {
@@ -363,14 +355,14 @@ AudioDecoder * AudioDecoder::CreateDecoderForInputSource(InputSource *inputSourc
 				delete decoder, decoder = nullptr;
 			}
 		}
-#endif
 		if(nullptr == decoder && LibsndfileDecoder::HandlesMIMEType(mimeType)) {
 			decoder = new LibsndfileDecoder(inputSource);
 			if(AutomaticallyOpenDecoders() && !decoder->Open(error)) {
 				decoder->mInputSource = nullptr;
 				delete decoder, decoder = nullptr;
 			}
 		}
+#endif
 		if(nullptr == decoder && CoreAudioDecoder::HandlesMIMEType(mimeType)) {
 			decoder = new CoreAudioDecoder(inputSource);
 			if(AutomaticallyOpenDecoders() && !decoder->Open(error)) {
@@ -456,30 +448,28 @@ AudioDecoder * AudioDecoder::CreateDecoderForInputSource(InputSource *inputSourc
 			delete decoder, decoder = nullptr;
 		}
 	}
-#if !TARGET_OS_IPHONE
-	if(nullptr == decoder && MusepackDecoder::HandlesFilesWithExtension(pathExtension)) {
-		decoder = new MusepackDecoder(inputSource);
+	if(nullptr == decoder && OggSpeexDecoder::HandlesFilesWithExtension(pathExtension)) {
+		decoder = new OggSpeexDecoder(inputSource);
 		if(AutomaticallyOpenDecoders() && !decoder->Open(error)) {
 			decoder->mInputSource = nullptr;
 			delete decoder, decoder = nullptr;
 		}
 	}
-	if(nullptr == decoder && MonkeysAudioDecoder::HandlesFilesWithExtension(pathExtension)) {
-		decoder = new MonkeysAudioDecoder(inputSource);
+#if !TARGET_OS_IPHONE
+	if(nullptr == decoder && MusepackDecoder::HandlesFilesWithExtension(pathExtension)) {
+		decoder = new MusepackDecoder(inputSource);
 		if(AutomaticallyOpenDecoders() && !decoder->Open(error)) {
 			decoder->mInputSource = nullptr;
 			delete decoder, decoder = nullptr;
 		}
 	}
-#endif
-	if(nullptr == decoder && OggSpeexDecoder::HandlesFilesWithExtension(pathExtension)) {
-		decoder = new OggSpeexDecoder(inputSource);
+	if(nullptr == decoder && MonkeysAudioDecoder::HandlesFilesWithExtension(pathExtension)) {
+		decoder = new MonkeysAudioDecoder(inputSource);
 		if(AutomaticallyOpenDecoders() && !decoder->Open(error)) {
 			decoder->mInputSource = nullptr;
 			delete decoder, decoder = nullptr;
 		}
 	}
-#if !TARGET_OS_IPHONE
 	if(nullptr == decoder && MODDecoder::HandlesFilesWithExtension(pathExtension)) {
 		decoder = new MODDecoder(inputSource);
 		if(AutomaticallyOpenDecoders() && !decoder->Open(error)) {
@@ -494,14 +484,14 @@ AudioDecoder * AudioDecoder::CreateDecoderForInputSource(InputSource *inputSourc
 			delete decoder, decoder = nullptr;
 		}
 	}
-#endif
 	if(nullptr == decoder && LibsndfileDecoder::HandlesFilesWithExtension(pathExtension)) {
 		decoder = new LibsndfileDecoder(inputSource);
 		if(AutomaticallyOpenDecoders() && !decoder->Open(error)) {
 			decoder->mInputSource = nullptr;
 			delete decoder, decoder = nullptr;
 		}
 	}
+#endif
 	if(nullptr == decoder && CoreAudioDecoder::HandlesFilesWithExtension(pathExtension)) {
 		decoder = new CoreAudioDecoder(inputSource);
 		if(AutomaticallyOpenDecoders() && !decoder->Open(error)) {

diff --git a/SFBAudioEngine.xcodeproj/project.pbxproj b/SFBAudioEngine.xcodeproj/project.pbxproj
@@ -66,7 +66,6 @@
 		32AEB29F1409B227001F9A60 /* LoopableRegionDecoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 32E6AB991096C81200DA998D /* LoopableRegionDecoder.cpp */; };
 		32AEB2A01409B22A001F9A60 /* CoreAudioDecoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 322B5C1E108BC70600CA9BDE /* CoreAudioDecoder.cpp */; };
 		32AEB2A11409B22D001F9A60 /* FLACDecoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 325560291092A38F00580566 /* FLACDecoder.cpp */; };
-		32AEB2A21409B232001F9A60 /* LibsndfileDecoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 32F6274D13A52AA7004EC204 /* LibsndfileDecoder.cpp */; };
 		32AEB2A51409B25C001F9A60 /* MPEGDecoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 32E7374210B90C9A00094C8A /* MPEGDecoder.cpp */; };
 		32AEB2A71409B25C001F9A60 /* OggSpeexDecoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3258AE3212DF8FDF00ADA052 /* OggSpeexDecoder.cpp */; };
 		32AEB2A81409B25C001F9A60 /* OggVorbisDecoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 32E7376C10B913AE00094C8A /* OggVorbisDecoder.cpp */; };
@@ -994,7 +993,7 @@
 		29B97313FDCFA39411CA2CEA /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0430;
+				LastUpgradeCheck = 0450;
 				ORGANIZATIONNAME = sbooth.org;
 			};
 			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "SFBAudioEngine" */;
@@ -1066,7 +1065,6 @@
 				32AEB29F1409B227001F9A60 /* LoopableRegionDecoder.cpp in Sources */,
 				32AEB2A01409B22A001F9A60 /* CoreAudioDecoder.cpp in Sources */,
 				32AEB2A11409B22D001F9A60 /* FLACDecoder.cpp in Sources */,
-				32AEB2A21409B232001F9A60 /* LibsndfileDecoder.cpp in Sources */,
 				32AEB2A51409B25C001F9A60 /* MPEGDecoder.cpp in Sources */,
 				32AEB2A71409B25C001F9A60 /* OggSpeexDecoder.cpp in Sources */,
 				32AEB2A81409B25C001F9A60 /* OggVorbisDecoder.cpp in Sources */,
@@ -1230,6 +1228,7 @@
 			baseConfigurationReference = 322B5B2D108BA69F00CA9BDE /* Debug.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -1257,6 +1256,7 @@
 			baseConfigurationReference = 322B5B2E108BA69F00CA9BDE /* Release.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1424,6 +1424,7 @@
 			baseConfigurationReference = 322B5B2D108BA69F00CA9BDE /* Debug.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
@@ -1449,6 +1450,7 @@
 			baseConfigurationReference = 322B5B2E108BA69F00CA9BDE /* Release.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				COMBINE_HIDPI_IMAGES = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;