diff --git a/Audio/AudioPlayer.m b/Audio/AudioPlayer.m index 4567738c6..e9e8d40a4 100644 --- a/Audio/AudioPlayer.m +++ b/Audio/AudioPlayer.m @@ -25,6 +25,8 @@ outputLaunched = NO; chainQueue = [[NSMutableArray alloc] init]; + + [[PluginController sharedPluginController] setup]; } return self; diff --git a/Audio/Plugin.h b/Audio/Plugin.h index 8be87d07d..56a85e453 100644 --- a/Audio/Plugin.h +++ b/Audio/Plugin.h @@ -1,19 +1,4 @@ -/* - Are defines really appropriate for this? - We want something easily insertable into a dictionary. - Maybe should extern these, and shove the instances in PluginController.m, but will that cause linking problems? -*/ - -#define kCogSource @"CogSource" -#define kCogContainer @"CogContainer" -#define kCogDecoder @"CogDecoder" -#define kCogMetadataReader @"CogMetadataReader" -#define kCogPropertiesReader @"CogPropertiesReader" - -@protocol CogPlugin -//Dictionary containing classname/plugintype pairs. ex: @"VorbisDecoder": kCogDecoder, @"VorbisPropertiesRaeder": kCogPropertiesReader -+ (NSDictionary *)pluginInfo; -@end +//Plugins! HOORAY! @protocol CogSource + (NSArray *)schemes; //http, file, etc @@ -63,11 +48,20 @@ @end @protocol CogPluginController +- (NSDictionary *)sources; +- (NSDictionary *)containers; +- (NSDictionary *)metadataReaders; + +- (NSDictionary *)propertiesReadersByExtension; +- (NSDictionary *)propertiesReadersByMimeType; + +- (NSDictionary *)decodersByExtension; +- (NSDictionary *)decodersByMimeType; + - (id) audioSourceForURL:(NSURL *)url; - (NSArray *) urlsForContainerURL:(NSURL *)url; - (NSDictionary *) metadataForURL:(NSURL *)url; - (NSDictionary *) propertiesForURL:(NSURL *)url; - - (id) audioDecoderForSource:(id)source; @end diff --git a/Audio/PluginController.h b/Audio/PluginController.h index 947e61d36..bd88d19ef 100644 --- a/Audio/PluginController.h +++ b/Audio/PluginController.h @@ -16,6 +16,8 @@ NSMutableDictionary *decodersByExtension; NSMutableDictionary *decodersByMimeType; + + BOOL isSetup; } + (PluginController *)sharedPluginController; //Use this to get the instance. @@ -32,14 +34,4 @@ - (void)setupMetadataReader:(NSString *)className; - (void)setupPropertiesReader:(NSString *)className; -- (NSDictionary *)sources; -- (NSDictionary *)containers; -- (NSDictionary *)metadataReaders; - -- (NSDictionary *)propertiesReadersByExtension; -- (NSDictionary *)propertiesReadersByMimeType; - -- (NSDictionary *)decodersByExtension; -- (NSDictionary *)decodersByMimeType; - @end diff --git a/Audio/PluginController.m b/Audio/PluginController.m index e2f5c96e2..8fee5f278 100644 --- a/Audio/PluginController.m +++ b/Audio/PluginController.m @@ -75,12 +75,43 @@ static PluginController *sharedPluginController = nil; - (void)setup { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - [self loadPlugins]; - [self printPluginInfo]; + if (isSetup == NO) { + isSetup = YES; + + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(bundleDidLoad:) name:NSBundleDidLoadNotification object:nil]; - [pool release]; + [self loadPlugins]; + [self printPluginInfo]; + } +} + +- (void)bundleDidLoad:(NSNotification *)notification +{ + NSString *className; + NSArray *classNames = [[notification userInfo] objectForKey:@"NSLoadedClasses"]; + NSEnumerator *e = [classNames objectEnumerator]; + while (className = [e nextObject]) + { + Class bundleClass = NSClassFromString(className); + if ([bundleClass conformsToProtocol:@protocol(CogContainer)]) { + [self setupContainer:className]; + } + else if ([bundleClass conformsToProtocol:@protocol(CogDecoder)]) { + [self setupDecoder:className]; + } + else if ([bundleClass conformsToProtocol:@protocol(CogMetadataReader)]) { + [self setupMetadataReader:className]; + } + else if ([bundleClass conformsToProtocol:@protocol(CogPropertiesReader)]) { + [self setupPropertiesReader:className]; + } + else if ([bundleClass conformsToProtocol:@protocol(CogSource)]) { + [self setupSource:className]; + } + else { + NSLog(@"Unknown plugin type!!"); + } + } } - (void)loadPluginsAtPath:(NSString *)path @@ -99,39 +130,7 @@ static PluginController *sharedPluginController = nil; if ([[pname pathExtension] isEqualToString:@"bundle"]) { NSBundle *b = [NSBundle bundleWithPath:ppath]; - if (b) - { - Class plugin = [b principalClass]; - - if ([plugin respondsToSelector:@selector(pluginInfo)]) - { - //PluginInfo is a dictionary that contains keys/values like pluginClass,classType...ex: VorbisDecoder, Decoder - NSDictionary *pluginInfo = [plugin pluginInfo]; - NSEnumerator *e = [pluginInfo keyEnumerator]; - id className; - while (className = [e nextObject]) { - id pluginType = [pluginInfo objectForKey:className]; - if ([pluginType isEqualToString:kCogContainer]) { - [self setupContainer:className]; - } - else if ([pluginType isEqualToString:kCogDecoder]) { - [self setupDecoder:className]; - } - else if ([pluginType isEqualToString:kCogMetadataReader]) { - [self setupMetadataReader:className]; - } - else if ([pluginType isEqualToString:kCogPropertiesReader]) { - [self setupPropertiesReader:className]; - } - else if ([pluginType isEqualToString:kCogSource]) { - [self setupSource:className]; - } - else { - NSLog(@"Unknown plugin type!!"); - } - } - } - } + [b load]; } } } @@ -356,13 +355,3 @@ static PluginController *sharedPluginController = nil; @end -//This is called when the framework is loaded. -void __attribute__ ((constructor)) InitializePlugins(void) { - static BOOL wasInitialized = NO; - if (!wasInitialized) { - // safety in case we get called twice. - [[PluginController sharedPluginController] setup]; - - wasInitialized = YES; - } -} diff --git a/Plugins/CoreAudio/CoreAudio.xcodeproj/project.pbxproj b/Plugins/CoreAudio/CoreAudio.xcodeproj/project.pbxproj index 08c1bcef7..eb9b711df 100644 --- a/Plugins/CoreAudio/CoreAudio.xcodeproj/project.pbxproj +++ b/Plugins/CoreAudio/CoreAudio.xcodeproj/project.pbxproj @@ -7,7 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 17ADB19A0B97937600257CA2 /* CoreAudioPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 17ADB1990B97937600257CA2 /* CoreAudioPlugin.m */; }; 17C93E740B8FF192008627D6 /* CoreAudioDecoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 17C93E730B8FF192008627D6 /* CoreAudioDecoder.m */; }; 17C93EAC0B8FF3CE008627D6 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 17C93EAB0B8FF3CE008627D6 /* CoreAudio.framework */; }; 17C93EB30B8FF3E1008627D6 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 17C93EB20B8FF3E1008627D6 /* AudioToolbox.framework */; }; @@ -19,8 +18,6 @@ 089C167FFE841241C02AAC07 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = ""; }; 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; 177FCFCA0B90C9A10011C3B5 /* Plugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Plugin.h; path = ../../Audio/Plugin.h; sourceTree = SOURCE_ROOT; }; - 17ADB1980B97937600257CA2 /* CoreAudioPlugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CoreAudioPlugin.h; sourceTree = ""; }; - 17ADB1990B97937600257CA2 /* CoreAudioPlugin.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = CoreAudioPlugin.m; sourceTree = ""; }; 17C93E720B8FF192008627D6 /* CoreAudioDecoder.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CoreAudioDecoder.h; sourceTree = ""; }; 17C93E730B8FF192008627D6 /* CoreAudioDecoder.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = CoreAudioDecoder.m; sourceTree = ""; }; 17C93EAB0B8FF3CE008627D6 /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = /System/Library/Frameworks/CoreAudio.framework; sourceTree = ""; }; @@ -78,8 +75,6 @@ isa = PBXGroup; children = ( 177FCFCA0B90C9A10011C3B5 /* Plugin.h */, - 17ADB1980B97937600257CA2 /* CoreAudioPlugin.h */, - 17ADB1990B97937600257CA2 /* CoreAudioPlugin.m */, 17C93E720B8FF192008627D6 /* CoreAudioDecoder.h */, 17C93E730B8FF192008627D6 /* CoreAudioDecoder.m */, ); @@ -174,7 +169,6 @@ buildActionMask = 2147483647; files = ( 17C93E740B8FF192008627D6 /* CoreAudioDecoder.m in Sources */, - 17ADB19A0B97937600257CA2 /* CoreAudioPlugin.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/Plugins/CoreAudio/CoreAudioPlugin.h b/Plugins/CoreAudio/CoreAudioPlugin.h deleted file mode 100644 index 324b378b8..000000000 --- a/Plugins/CoreAudio/CoreAudioPlugin.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// CoreAudio.h -// CoreAudio -// -// Created by Vincent Spader on 2/21/07. -// Copyright 2007 __MyCompanyName__. All rights reserved. -// - -#import -#import "Plugin.h" - -@interface CoreAudioPlugin : NSObject -{ - -} - -@end diff --git a/Plugins/CoreAudio/CoreAudioPlugin.m b/Plugins/CoreAudio/CoreAudioPlugin.m deleted file mode 100644 index 02376f1b0..000000000 --- a/Plugins/CoreAudio/CoreAudioPlugin.m +++ /dev/null @@ -1,22 +0,0 @@ -// -// CoreAudio.m -// CoreAudio -// -// Created by Vincent Spader on 2/21/07. -// Copyright 2007 __MyCompanyName__. All rights reserved. -// - -#import "CoreAudioPlugin.h" -#import "CoreAudioDecoder.h" - -@implementation CoreAudioPlugin - -+ (NSDictionary *)pluginInfo -{ - return [NSDictionary dictionaryWithObjectsAndKeys: - kCogDecoder, [CoreAudioDecoder className], - nil - ]; -} - -@end diff --git a/Plugins/CoreAudio/Info.plist b/Plugins/CoreAudio/Info.plist index 7997fbfa9..f3de5f74d 100644 --- a/Plugins/CoreAudio/Info.plist +++ b/Plugins/CoreAudio/Info.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 NSPrincipalClass - CoreAudioPlugin + diff --git a/Plugins/CueSheet/CueSheet.m b/Plugins/CueSheet/CueSheet.m index 4233cb85d..57489a6bf 100644 --- a/Plugins/CueSheet/CueSheet.m +++ b/Plugins/CueSheet/CueSheet.m @@ -172,6 +172,31 @@ track = @"01"; } + NSFileManager *fm = [NSFileManager defaultManager]; + NSURL *url = [self urlForPath:path relativeTo:filename]; + if ([url isFileURL] && ![fm fileExistsAtPath:[url absoluteString]] && ![[[url absoluteString] pathExtension] compare:@"wav"]) { + //creator fogot to edit cue... happens + NSString* originalURL = [url path]; + + NSString *ext; + NSEnumerator *e = [[NSClassFromString(@"PluginController") decodersByExtension] objectEnumerator]; + while (ext = [e nextObject]) + { + NSMutableString* newURL = [originalURL mutableCopy]; + [newURL replaceOccurrencesOfString:@"wav" withString:ext options:(NSAnchoredSearch | NSBackwardsSearch) range:NSMakeRange(0, [newURL length])]; + + NSLog(@"Trying: %@", newURL); + + if ([fm fileExistsAtPath:newURL]) + { + url = [NSURL fileURLWithPath:newURL]; + [newURL release]; + + break; + } + [newURL release]; + } + } //Need to add basePath, and convert to URL [entries addObject: [CueSheetTrack trackWithURL:[self urlForPath:path relativeTo:filename] diff --git a/Plugins/CueSheet/CueSheet.xcodeproj/project.pbxproj b/Plugins/CueSheet/CueSheet.xcodeproj/project.pbxproj index 5389b1d92..2e6497832 100644 --- a/Plugins/CueSheet/CueSheet.xcodeproj/project.pbxproj +++ b/Plugins/CueSheet/CueSheet.xcodeproj/project.pbxproj @@ -10,7 +10,6 @@ 17DA346E0CC04FCD0003F6B2 /* CueSheetMetadataReader.m in Sources */ = {isa = PBXBuildFile; fileRef = 17DA346D0CC04FCD0003F6B2 /* CueSheetMetadataReader.m */; }; 8D5B49B0048680CD000E48DA /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C167DFE841241C02AAC07 /* InfoPlist.strings */; }; 8D5B49B4048680CD000E48DA /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */; }; - 8E8D42190CBB0F3C00135C1B /* CueSheetPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E8D42180CBB0F3C00135C1B /* CueSheetPlugin.m */; }; 8E8D42260CBB0F5800135C1B /* CueSheetContainer.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E8D42250CBB0F5800135C1B /* CueSheetContainer.m */; }; 8E8D42370CBB0F9800135C1B /* CueSheetDecoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E8D42360CBB0F9800135C1B /* CueSheetDecoder.m */; }; 8E8D424D0CBB11C600135C1B /* CueSheet.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E8D424C0CBB11C600135C1B /* CueSheet.m */; }; @@ -27,8 +26,6 @@ 32DBCF630370AF2F00C91783 /* CueSheet_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CueSheet_Prefix.pch; sourceTree = ""; }; 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.xml; path = Info.plist; sourceTree = ""; }; - 8E8D42170CBB0F3C00135C1B /* CueSheetPlugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CueSheetPlugin.h; sourceTree = ""; }; - 8E8D42180CBB0F3C00135C1B /* CueSheetPlugin.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CueSheetPlugin.m; sourceTree = ""; }; 8E8D42240CBB0F5800135C1B /* CueSheetContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CueSheetContainer.h; sourceTree = ""; }; 8E8D42250CBB0F5800135C1B /* CueSheetContainer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CueSheetContainer.m; sourceTree = ""; }; 8E8D42350CBB0F9800135C1B /* CueSheetDecoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CueSheetDecoder.h; sourceTree = ""; }; @@ -87,8 +84,6 @@ isa = PBXGroup; children = ( 8E8D423C0CBB0FF600135C1B /* Plugin.h */, - 8E8D42170CBB0F3C00135C1B /* CueSheetPlugin.h */, - 8E8D42180CBB0F3C00135C1B /* CueSheetPlugin.m */, 8E8D42240CBB0F5800135C1B /* CueSheetContainer.h */, 8E8D42250CBB0F5800135C1B /* CueSheetContainer.m */, 8E8D42350CBB0F9800135C1B /* CueSheetDecoder.h */, @@ -189,7 +184,6 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 8E8D42190CBB0F3C00135C1B /* CueSheetPlugin.m in Sources */, 8E8D42260CBB0F5800135C1B /* CueSheetContainer.m in Sources */, 8E8D42370CBB0F9800135C1B /* CueSheetDecoder.m in Sources */, 8E8D424D0CBB11C600135C1B /* CueSheet.m in Sources */, diff --git a/Plugins/CueSheet/CueSheetPlugin.h b/Plugins/CueSheet/CueSheetPlugin.h deleted file mode 100644 index 4c3daa532..000000000 --- a/Plugins/CueSheet/CueSheetPlugin.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// CueSheetPlugin.h -// CueSheet -// -// Created by Zaphod Beeblebrox on 10/8/07. -// Copyright 2007 __MyCompanyName__. All rights reserved. -// - -#import - -#import "Plugin.h" - -@interface CueSheetPlugin : NSObject { - -} - -@end diff --git a/Plugins/CueSheet/CueSheetPlugin.m b/Plugins/CueSheet/CueSheetPlugin.m deleted file mode 100644 index 34dbd6ff1..000000000 --- a/Plugins/CueSheet/CueSheetPlugin.m +++ /dev/null @@ -1,26 +0,0 @@ -// -// CueSheetPlugin.m -// CueSheet -// -// Created by Zaphod Beeblebrox on 10/8/07. -// Copyright 2007 __MyCompanyName__. All rights reserved. -// - -#import "CueSheetPlugin.h" - -#import "CueSheetContainer.h" -#import "CueSheetDecoder.h" -#import "CueSheetMetadataReader.h" - -@implementation CueSheetPlugin - -+ (NSDictionary *)pluginInfo -{ - return [NSDictionary dictionaryWithObjectsAndKeys: - kCogContainer, [CueSheetContainer className], - kCogDecoder, [CueSheetDecoder className], - kCogMetadataReader, [CueSheetMetadataReader className], - nil]; -} - -@end diff --git a/Plugins/CueSheet/Info.plist b/Plugins/CueSheet/Info.plist index 2d541574c..f3de5f74d 100644 --- a/Plugins/CueSheet/Info.plist +++ b/Plugins/CueSheet/Info.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 NSPrincipalClass - CueSheetPlugin + diff --git a/Plugins/Dumb/Dumb.xcodeproj/project.pbxproj b/Plugins/Dumb/Dumb.xcodeproj/project.pbxproj index a5a0e1cdd..04e2e46d6 100644 --- a/Plugins/Dumb/Dumb.xcodeproj/project.pbxproj +++ b/Plugins/Dumb/Dumb.xcodeproj/project.pbxproj @@ -8,7 +8,6 @@ /* Begin PBXBuildFile section */ 17C8F6950CBEE846008D969D /* DumbDecoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 17C8F68F0CBEE846008D969D /* DumbDecoder.m */; }; - 17C8F6960CBEE846008D969D /* DumbPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 17C8F6910CBEE846008D969D /* DumbPlugin.m */; }; 17C8F69F0CBEE85F008D969D /* Dumb.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17C8F69E0CBEE857008D969D /* Dumb.framework */; }; 17C8F70D0CBEEC87008D969D /* Plugin.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17C8F70C0CBEEC87008D969D /* Plugin.h */; }; 17C8F7B90CBEF380008D969D /* Dumb.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 17C8F69E0CBEE857008D969D /* Dumb.framework */; }; @@ -57,8 +56,6 @@ 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; 17C8F68E0CBEE846008D969D /* DumbDecoder.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DumbDecoder.h; sourceTree = ""; }; 17C8F68F0CBEE846008D969D /* DumbDecoder.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = DumbDecoder.m; sourceTree = ""; }; - 17C8F6900CBEE846008D969D /* DumbPlugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DumbPlugin.h; sourceTree = ""; }; - 17C8F6910CBEE846008D969D /* DumbPlugin.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = DumbPlugin.m; sourceTree = ""; }; 17C8F6990CBEE857008D969D /* Dumb.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Dumb.xcodeproj; path = ../../Frameworks/Dumb/Dumb.xcodeproj; sourceTree = SOURCE_ROOT; }; 17C8F70C0CBEEC87008D969D /* Plugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Plugin.h; path = ../../Audio/Plugin.h; sourceTree = SOURCE_ROOT; }; 17DA363B0CC0600E0003F6B2 /* DumbMetadataReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DumbMetadataReader.h; sourceTree = ""; }; @@ -116,8 +113,6 @@ isa = PBXGroup; children = ( 17C8F70C0CBEEC87008D969D /* Plugin.h */, - 17C8F6900CBEE846008D969D /* DumbPlugin.h */, - 17C8F6910CBEE846008D969D /* DumbPlugin.m */, 17C8F68E0CBEE846008D969D /* DumbDecoder.h */, 17C8F68F0CBEE846008D969D /* DumbDecoder.m */, 17DA363B0CC0600E0003F6B2 /* DumbMetadataReader.h */, @@ -240,7 +235,6 @@ buildActionMask = 2147483647; files = ( 17C8F6950CBEE846008D969D /* DumbDecoder.m in Sources */, - 17C8F6960CBEE846008D969D /* DumbPlugin.m in Sources */, 17DA363E0CC0600E0003F6B2 /* DumbMetadataReader.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/Plugins/Dumb/DumbPlugin.h b/Plugins/Dumb/DumbPlugin.h deleted file mode 100644 index 82dd0054b..000000000 --- a/Plugins/Dumb/DumbPlugin.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// DumbPlugin.h -// GME -// -// Created by Vincent Spader on 10/11/07. -// Copyright 2007 __MyCompanyName__. All rights reserved. -// - -#import - -#import "Plugin.h" - -@interface DumbPlugin : NSObject { - -} - -@end diff --git a/Plugins/Dumb/DumbPlugin.m b/Plugins/Dumb/DumbPlugin.m deleted file mode 100644 index 4114cd465..000000000 --- a/Plugins/Dumb/DumbPlugin.m +++ /dev/null @@ -1,24 +0,0 @@ -// -// DumbPlugin.m -// GME -// -// Created by Vincent Spader on 10/11/07. -// Copyright 2007 __MyCompanyName__. All rights reserved. -// - -#import "DumbPlugin.h" - -#import "DumbDecoder.h" -#import "DumbMetadataReader.h" - -@implementation DumbPlugin - -+ (NSDictionary *)pluginInfo -{ - return [NSDictionary dictionaryWithObjectsAndKeys: - kCogDecoder, [DumbDecoder className], - kCogMetadataReader, [DumbMetadataReader className], - nil]; -} - -@end diff --git a/Plugins/Dumb/Info.plist b/Plugins/Dumb/Info.plist index 485d03096..f3de5f74d 100644 --- a/Plugins/Dumb/Info.plist +++ b/Plugins/Dumb/Info.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 NSPrincipalClass - DumbPlugin + diff --git a/Plugins/FileSource/FileSource.xcodeproj/project.pbxproj b/Plugins/FileSource/FileSource.xcodeproj/project.pbxproj index c4b39a2b6..0ee507576 100644 --- a/Plugins/FileSource/FileSource.xcodeproj/project.pbxproj +++ b/Plugins/FileSource/FileSource.xcodeproj/project.pbxproj @@ -7,7 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 17ADB3FF0B979A4600257CA2 /* FileSourcePlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 17ADB3FE0B979A4600257CA2 /* FileSourcePlugin.m */; }; 17ADB41A0B979AEB00257CA2 /* FileSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 17ADB4190B979AEB00257CA2 /* FileSource.m */; }; 8D5B49B4048680CD000E48DA /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */; }; /* End PBXBuildFile section */ @@ -16,8 +15,6 @@ 089C1672FE841209C02AAC07 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = ""; }; 089C167FFE841241C02AAC07 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = ""; }; 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; - 17ADB3FD0B979A4600257CA2 /* FileSourcePlugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileSourcePlugin.h; sourceTree = ""; }; - 17ADB3FE0B979A4600257CA2 /* FileSourcePlugin.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FileSourcePlugin.m; sourceTree = ""; }; 17ADB4080B979A8A00257CA2 /* Plugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Plugin.h; path = ../../Audio/Plugin.h; sourceTree = SOURCE_ROOT; }; 17ADB4180B979AEB00257CA2 /* FileSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileSource.h; sourceTree = ""; }; 17ADB4190B979AEB00257CA2 /* FileSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FileSource.m; sourceTree = ""; }; @@ -72,8 +69,6 @@ isa = PBXGroup; children = ( 17ADB4080B979A8A00257CA2 /* Plugin.h */, - 17ADB3FD0B979A4600257CA2 /* FileSourcePlugin.h */, - 17ADB3FE0B979A4600257CA2 /* FileSourcePlugin.m */, 17ADB4180B979AEB00257CA2 /* FileSource.h */, 17ADB4190B979AEB00257CA2 /* FileSource.m */, ); @@ -165,7 +160,6 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 17ADB3FF0B979A4600257CA2 /* FileSourcePlugin.m in Sources */, 17ADB41A0B979AEB00257CA2 /* FileSource.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/Plugins/FileSource/FileSourcePlugin.h b/Plugins/FileSource/FileSourcePlugin.h deleted file mode 100644 index e5f2210ea..000000000 --- a/Plugins/FileSource/FileSourcePlugin.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// FileSourcePlugin.h -// FileSource -// -// Created by Vincent Spader on 3/1/07. -// Copyright 2007 __MyCompanyName__. All rights reserved. -// - -#import - -#import "Plugin.h" - -@interface FileSourcePlugin : NSObject -{ - -} - -@end diff --git a/Plugins/FileSource/FileSourcePlugin.m b/Plugins/FileSource/FileSourcePlugin.m deleted file mode 100644 index a3f0c1a6b..000000000 --- a/Plugins/FileSource/FileSourcePlugin.m +++ /dev/null @@ -1,23 +0,0 @@ -// -// FileSourcePlugin.m -// FileSource -// -// Created by Vincent Spader on 3/1/07. -// Copyright 2007 __MyCompanyName__. All rights reserved. -// - -#import "FileSourcePlugin.h" -#import "FileSource.h" - -@implementation FileSourcePlugin - -+ (NSDictionary *)pluginInfo -{ - return [NSDictionary dictionaryWithObjectsAndKeys: - kCogSource, [FileSource className], - nil - ]; -} - - -@end diff --git a/Plugins/FileSource/Info.plist b/Plugins/FileSource/Info.plist index ad674b62f..f3de5f74d 100644 --- a/Plugins/FileSource/Info.plist +++ b/Plugins/FileSource/Info.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 NSPrincipalClass - FileSourcePlugin + diff --git a/Plugins/Flac/Flac.xcodeproj/project.pbxproj b/Plugins/Flac/Flac.xcodeproj/project.pbxproj index d71a3749a..2b37233bf 100644 --- a/Plugins/Flac/Flac.xcodeproj/project.pbxproj +++ b/Plugins/Flac/Flac.xcodeproj/project.pbxproj @@ -8,8 +8,6 @@ /* Begin PBXBuildFile section */ 177FCFC20B90C9960011C3B5 /* Plugin.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 177FCFC10B90C9960011C3B5 /* Plugin.h */; }; - 17ADB1B40B9793A600257CA2 /* FlacPlugin.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17ADB1B20B9793A600257CA2 /* FlacPlugin.h */; }; - 17ADB1B50B9793A600257CA2 /* FlacPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 17ADB1B30B9793A600257CA2 /* FlacPlugin.m */; }; 17C93F080B8FF67A008627D6 /* FlacDecoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 17C93F040B8FF67A008627D6 /* FlacDecoder.m */; }; 17F5643C0C3BDC820019975C /* FLAC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 17F564220C3BDC460019975C /* FLAC.framework */; }; 17F5643F0C3BDC840019975C /* FLAC.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17F564220C3BDC460019975C /* FLAC.framework */; }; @@ -42,7 +40,6 @@ files = ( 17F5643F0C3BDC840019975C /* FLAC.framework in CopyFiles */, 177FCFC20B90C9960011C3B5 /* Plugin.h in CopyFiles */, - 17ADB1B40B9793A600257CA2 /* FlacPlugin.h in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -53,8 +50,6 @@ 089C167FFE841241C02AAC07 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = ""; }; 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; 177FCFC10B90C9960011C3B5 /* Plugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Plugin.h; path = ../../Audio/Plugin.h; sourceTree = SOURCE_ROOT; }; - 17ADB1B20B9793A600257CA2 /* FlacPlugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FlacPlugin.h; sourceTree = ""; }; - 17ADB1B30B9793A600257CA2 /* FlacPlugin.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = FlacPlugin.m; sourceTree = ""; }; 17C93F030B8FF67A008627D6 /* FlacDecoder.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FlacDecoder.h; sourceTree = ""; }; 17C93F040B8FF67A008627D6 /* FlacDecoder.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = FlacDecoder.m; sourceTree = ""; }; 17F5641A0C3BDC460019975C /* flac.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = flac.xcodeproj; path = ../../Frameworks/FLAC/flac.xcodeproj; sourceTree = SOURCE_ROOT; }; @@ -110,8 +105,6 @@ isa = PBXGroup; children = ( 177FCFC10B90C9960011C3B5 /* Plugin.h */, - 17ADB1B20B9793A600257CA2 /* FlacPlugin.h */, - 17ADB1B30B9793A600257CA2 /* FlacPlugin.m */, 17C93F030B8FF67A008627D6 /* FlacDecoder.h */, 17C93F040B8FF67A008627D6 /* FlacDecoder.m */, ); @@ -231,7 +224,6 @@ buildActionMask = 2147483647; files = ( 17C93F080B8FF67A008627D6 /* FlacDecoder.m in Sources */, - 17ADB1B50B9793A600257CA2 /* FlacPlugin.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/Plugins/Flac/FlacPlugin.h b/Plugins/Flac/FlacPlugin.h deleted file mode 100644 index 3d9461536..000000000 --- a/Plugins/Flac/FlacPlugin.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// MusepackCodec.h -// Musepack -// -// Created by Vincent Spader on 2/21/07. -// Copyright 2007 __MyCompanyName__. All rights reserved. -// - -#import -#import "Plugin.h" - -@interface FlacPlugin : NSObject -{ - -} - -@end diff --git a/Plugins/Flac/FlacPlugin.m b/Plugins/Flac/FlacPlugin.m deleted file mode 100644 index 0c7a5cee3..000000000 --- a/Plugins/Flac/FlacPlugin.m +++ /dev/null @@ -1,23 +0,0 @@ -// -// MusepackCodec.m -// MusepackCodec -// -// Created by Vincent Spader on 2/21/07. -// Copyright 2007 __MyCompanyName__. All rights reserved. -// - -#import "FlacPlugin.h" -#import "FlacDecoder.h" - -@implementation FlacPlugin - -+ (NSDictionary *)pluginInfo -{ - return [NSDictionary dictionaryWithObjectsAndKeys: - kCogDecoder, [FlacDecoder className], - nil - ]; -} - - -@end diff --git a/Plugins/Flac/Info.plist b/Plugins/Flac/Info.plist index 59c5deaaf..f3de5f74d 100644 --- a/Plugins/Flac/Info.plist +++ b/Plugins/Flac/Info.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 NSPrincipalClass - FlacPlugin + diff --git a/Plugins/GME/GME.xcodeproj/project.pbxproj b/Plugins/GME/GME.xcodeproj/project.pbxproj index 75cc89fd7..0518bc63f 100644 --- a/Plugins/GME/GME.xcodeproj/project.pbxproj +++ b/Plugins/GME/GME.xcodeproj/project.pbxproj @@ -14,8 +14,6 @@ 17C8F3440CBED3BE008D969D /* GameDecoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 17C8F33E0CBED3BE008D969D /* GameDecoder.m */; }; 17C8F3480CBED3C7008D969D /* Plugin.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17C8F3470CBED3C7008D969D /* Plugin.h */; }; 17C8F3C30CBED649008D969D /* GME.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 17C8F3370CBED393008D969D /* GME.framework */; }; - 17C8F3E00CBEDBE0008D969D /* GamePlugin.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17C8F3DE0CBEDBE0008D969D /* GamePlugin.h */; }; - 17C8F3E10CBEDBE0008D969D /* GamePlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 17C8F3DF0CBEDBE0008D969D /* GamePlugin.m */; }; 17DA34BA0CC052030003F6B2 /* GameMetadataReader.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17DA34B80CC052030003F6B2 /* GameMetadataReader.h */; }; 17DA34BB0CC052030003F6B2 /* GameMetadataReader.m in Sources */ = {isa = PBXBuildFile; fileRef = 17DA34B90CC052030003F6B2 /* GameMetadataReader.m */; }; 8D5B49B0048680CD000E48DA /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C167DFE841241C02AAC07 /* InfoPlist.strings */; }; @@ -50,7 +48,6 @@ 17C8F3410CBED3BE008D969D /* GameContainer.h in CopyFiles */, 17C8F3430CBED3BE008D969D /* GameDecoder.h in CopyFiles */, 17C8F3480CBED3C7008D969D /* Plugin.h in CopyFiles */, - 17C8F3E00CBEDBE0008D969D /* GamePlugin.h in CopyFiles */, 17DA34BA0CC052030003F6B2 /* GameMetadataReader.h in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 0; @@ -68,8 +65,6 @@ 17C8F33D0CBED3BE008D969D /* GameDecoder.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = GameDecoder.h; sourceTree = ""; }; 17C8F33E0CBED3BE008D969D /* GameDecoder.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = GameDecoder.m; sourceTree = ""; }; 17C8F3470CBED3C7008D969D /* Plugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Plugin.h; path = ../../Audio/Plugin.h; sourceTree = SOURCE_ROOT; }; - 17C8F3DE0CBEDBE0008D969D /* GamePlugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GamePlugin.h; sourceTree = ""; }; - 17C8F3DF0CBEDBE0008D969D /* GamePlugin.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GamePlugin.m; sourceTree = ""; }; 17DA34B80CC052030003F6B2 /* GameMetadataReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GameMetadataReader.h; sourceTree = ""; }; 17DA34B90CC052030003F6B2 /* GameMetadataReader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GameMetadataReader.m; sourceTree = ""; }; 32DBCF630370AF2F00C91783 /* GME_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GME_Prefix.pch; sourceTree = ""; }; @@ -125,8 +120,6 @@ isa = PBXGroup; children = ( 17C8F3470CBED3C7008D969D /* Plugin.h */, - 17C8F3DE0CBEDBE0008D969D /* GamePlugin.h */, - 17C8F3DF0CBEDBE0008D969D /* GamePlugin.m */, 17C8F33B0CBED3BE008D969D /* GameContainer.h */, 17C8F33C0CBED3BE008D969D /* GameContainer.m */, 17C8F33D0CBED3BE008D969D /* GameDecoder.h */, @@ -252,7 +245,6 @@ files = ( 17C8F3420CBED3BE008D969D /* GameContainer.m in Sources */, 17C8F3440CBED3BE008D969D /* GameDecoder.m in Sources */, - 17C8F3E10CBEDBE0008D969D /* GamePlugin.m in Sources */, 17DA34BB0CC052030003F6B2 /* GameMetadataReader.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/Plugins/GME/GamePlugin.h b/Plugins/GME/GamePlugin.h deleted file mode 100644 index 81f8bb33e..000000000 --- a/Plugins/GME/GamePlugin.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// GamePlugin.h -// GME -// -// Created by Vincent Spader on 10/11/07. -// Copyright 2007 __MyCompanyName__. All rights reserved. -// - -#import - -#import "Plugin.h" - -@interface GamePlugin : NSObject { - -} - -@end diff --git a/Plugins/GME/GamePlugin.m b/Plugins/GME/GamePlugin.m deleted file mode 100644 index b3d1b32e6..000000000 --- a/Plugins/GME/GamePlugin.m +++ /dev/null @@ -1,26 +0,0 @@ -// -// GamePlugin.m -// GME -// -// Created by Vincent Spader on 10/11/07. -// Copyright 2007 __MyCompanyName__. All rights reserved. -// - -#import "GamePlugin.h" - -#import "GameContainer.h" -#import "GameDecoder.h" -#import "GameMetadataReader.h" - -@implementation GamePlugin - -+ (NSDictionary *)pluginInfo -{ - return [NSDictionary dictionaryWithObjectsAndKeys: - kCogContainer, [GameContainer className], - kCogDecoder, [GameDecoder className], - kCogMetadataReader, [GameMetadataReader className], - nil]; -} - -@end diff --git a/Plugins/GME/Info.plist b/Plugins/GME/Info.plist index d5041bcae..f3de5f74d 100644 --- a/Plugins/GME/Info.plist +++ b/Plugins/GME/Info.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 NSPrincipalClass - GamePlugin + diff --git a/Plugins/HTTPSource/HTTPSource.xcodeproj/project.pbxproj b/Plugins/HTTPSource/HTTPSource.xcodeproj/project.pbxproj index a0f7c444d..ac11f56aa 100644 --- a/Plugins/HTTPSource/HTTPSource.xcodeproj/project.pbxproj +++ b/Plugins/HTTPSource/HTTPSource.xcodeproj/project.pbxproj @@ -9,7 +9,6 @@ /* Begin PBXBuildFile section */ 176A6E470CC272E8000F60DE /* Semaphore.m in Sources */ = {isa = PBXBuildFile; fileRef = 176A6E450CC272E8000F60DE /* Semaphore.m */; }; 17ADB6100B97A74800257CA2 /* HTTPSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 17ADB60D0B97A74800257CA2 /* HTTPSource.m */; }; - 17ADB6110B97A74800257CA2 /* HTTPSourcePlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 17ADB60F0B97A74800257CA2 /* HTTPSourcePlugin.m */; }; 8D5B49B4048680CD000E48DA /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */; }; /* End PBXBuildFile section */ @@ -21,8 +20,6 @@ 176A6E450CC272E8000F60DE /* Semaphore.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = Semaphore.m; sourceTree = ""; }; 17ADB60C0B97A74800257CA2 /* HTTPSource.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = HTTPSource.h; sourceTree = ""; }; 17ADB60D0B97A74800257CA2 /* HTTPSource.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = HTTPSource.m; sourceTree = ""; }; - 17ADB60E0B97A74800257CA2 /* HTTPSourcePlugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = HTTPSourcePlugin.h; sourceTree = ""; }; - 17ADB60F0B97A74800257CA2 /* HTTPSourcePlugin.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = HTTPSourcePlugin.m; sourceTree = ""; }; 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 = ""; }; 8D5B49B6048680CD000E48DA /* HTTPSource.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = HTTPSource.bundle; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -77,8 +74,6 @@ 17ADB6340B97A8B400257CA2 /* Plugin.h */, 17ADB60C0B97A74800257CA2 /* HTTPSource.h */, 17ADB60D0B97A74800257CA2 /* HTTPSource.m */, - 17ADB60E0B97A74800257CA2 /* HTTPSourcePlugin.h */, - 17ADB60F0B97A74800257CA2 /* HTTPSourcePlugin.m */, 176A6E410CC272E8000F60DE /* Utils */, ); name = Classes; @@ -180,7 +175,6 @@ buildActionMask = 2147483647; files = ( 17ADB6100B97A74800257CA2 /* HTTPSource.m in Sources */, - 17ADB6110B97A74800257CA2 /* HTTPSourcePlugin.m in Sources */, 176A6E470CC272E8000F60DE /* Semaphore.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/Plugins/HTTPSource/HTTPSourcePlugin.h b/Plugins/HTTPSource/HTTPSourcePlugin.h deleted file mode 100644 index 57703fd70..000000000 --- a/Plugins/HTTPSource/HTTPSourcePlugin.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// HTTPSourcePlugin.h -// HTTPSource -// -// Created by Vincent Spader on 3/1/07. -// Copyright 2007 __MyCompanyName__. All rights reserved. -// - -#import - -#import "Plugin.h" - -@interface HTTPSourcePlugin : NSObject -{ - -} - -@end diff --git a/Plugins/HTTPSource/HTTPSourcePlugin.m b/Plugins/HTTPSource/HTTPSourcePlugin.m deleted file mode 100644 index 82f760d29..000000000 --- a/Plugins/HTTPSource/HTTPSourcePlugin.m +++ /dev/null @@ -1,23 +0,0 @@ -// -// HTTPSourcePlugin.m -// FileSource -// -// Created by Vincent Spader on 3/1/07. -// Copyright 2007 __MyCompanyName__. All rights reserved. -// - -#import "HTTPSourcePlugin.h" -#import "HTTPSource.h" - -@implementation HTTPSourcePlugin - -+ (NSDictionary *)pluginInfo -{ - return [NSDictionary dictionaryWithObjectsAndKeys: - kCogSource, [HTTPSource className], - nil - ]; -} - - -@end diff --git a/Plugins/HTTPSource/Info.plist b/Plugins/HTTPSource/Info.plist index a6170715e..f3de5f74d 100644 --- a/Plugins/HTTPSource/Info.plist +++ b/Plugins/HTTPSource/Info.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 NSPrincipalClass - HTTPSourcePlugin + diff --git a/Plugins/M3u/Info.plist b/Plugins/M3u/Info.plist index c8d20cdec..f3de5f74d 100644 --- a/Plugins/M3u/Info.plist +++ b/Plugins/M3u/Info.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 NSPrincipalClass - M3uPlugin + diff --git a/Plugins/M3u/M3u.xcodeproj/project.pbxproj b/Plugins/M3u/M3u.xcodeproj/project.pbxproj index d6266db0b..80084c245 100644 --- a/Plugins/M3u/M3u.xcodeproj/project.pbxproj +++ b/Plugins/M3u/M3u.xcodeproj/project.pbxproj @@ -9,7 +9,6 @@ /* Begin PBXBuildFile section */ 8D5B49B0048680CD000E48DA /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C167DFE841241C02AAC07 /* InfoPlist.strings */; }; 8D5B49B4048680CD000E48DA /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */; }; - 8E8D40220CBAFF3900135C1B /* M3uPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E8D40210CBAFF3900135C1B /* M3uPlugin.m */; }; 8E8D40290CBAFF4300135C1B /* M3uContainer.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E8D40280CBAFF4300135C1B /* M3uContainer.m */; }; /* End PBXBuildFile section */ @@ -22,8 +21,6 @@ 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.xml; path = Info.plist; sourceTree = ""; }; 8E8D401B0CBAFEF200135C1B /* Plugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Plugin.h; path = ../../Audio/Plugin.h; sourceTree = SOURCE_ROOT; }; - 8E8D40200CBAFF3900135C1B /* M3uPlugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = M3uPlugin.h; sourceTree = ""; }; - 8E8D40210CBAFF3900135C1B /* M3uPlugin.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = M3uPlugin.m; sourceTree = ""; }; 8E8D40270CBAFF4300135C1B /* M3uContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = M3uContainer.h; sourceTree = ""; }; 8E8D40280CBAFF4300135C1B /* M3uContainer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = M3uContainer.m; sourceTree = ""; }; D2F7E65807B2D6F200F64583 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = ""; }; @@ -75,8 +72,6 @@ isa = PBXGroup; children = ( 8E8D401B0CBAFEF200135C1B /* Plugin.h */, - 8E8D40200CBAFF3900135C1B /* M3uPlugin.h */, - 8E8D40210CBAFF3900135C1B /* M3uPlugin.m */, 8E8D40270CBAFF4300135C1B /* M3uContainer.h */, 8E8D40280CBAFF4300135C1B /* M3uContainer.m */, ); @@ -169,7 +164,6 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 8E8D40220CBAFF3900135C1B /* M3uPlugin.m in Sources */, 8E8D40290CBAFF4300135C1B /* M3uContainer.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/Plugins/M3u/M3uPlugin.h b/Plugins/M3u/M3uPlugin.h deleted file mode 100644 index 913f902b0..000000000 --- a/Plugins/M3u/M3uPlugin.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// M3uPlugin.h -// M3u -// -// Created by Zaphod Beeblebrox on 10/8/07. -// Copyright 2007 __MyCompanyName__. All rights reserved. -// - -#import - -#import "Plugin.h" - -@interface M3uPlugin : NSObject { - -} - -@end diff --git a/Plugins/M3u/M3uPlugin.m b/Plugins/M3u/M3uPlugin.m deleted file mode 100644 index 0a93987c9..000000000 --- a/Plugins/M3u/M3uPlugin.m +++ /dev/null @@ -1,20 +0,0 @@ -// -// M3uPlugin.m -// M3u -// -// Created by Zaphod Beeblebrox on 10/8/07. -// Copyright 2007 __MyCompanyName__. All rights reserved. -// - -#import "M3uPlugin.h" - -#import "M3uContainer.h" - -@implementation M3uPlugin - -+ (NSDictionary *)pluginInfo -{ - return [NSDictionary dictionaryWithObject:kCogContainer forKey:[M3uContainer className]]; -} - -@end diff --git a/Plugins/MAD/Info.plist b/Plugins/MAD/Info.plist index 9666d4342..caaae6f24 100644 --- a/Plugins/MAD/Info.plist +++ b/Plugins/MAD/Info.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 NSPrincipalClass - MADPlugin + diff --git a/Plugins/MAD/MAD.xcodeproj/project.pbxproj b/Plugins/MAD/MAD.xcodeproj/project.pbxproj index 0eb130dae..e8da73dd2 100644 --- a/Plugins/MAD/MAD.xcodeproj/project.pbxproj +++ b/Plugins/MAD/MAD.xcodeproj/project.pbxproj @@ -9,8 +9,6 @@ /* Begin PBXBuildFile section */ 170335470B8FC4EE00327265 /* MADDecoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 170335430B8FC4EE00327265 /* MADDecoder.m */; }; 177FCFBC0B90C98A0011C3B5 /* Plugin.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 177FCFBB0B90C98A0011C3B5 /* Plugin.h */; }; - 17ADB1D20B9793C500257CA2 /* MADPlugin.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17ADB1D00B9793C500257CA2 /* MADPlugin.h */; }; - 17ADB1D30B9793C500257CA2 /* MADPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 17ADB1D10B9793C500257CA2 /* MADPlugin.m */; }; 17F5648A0C3BDCEB0019975C /* ID3Tag.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 17F564690C3BDCB70019975C /* ID3Tag.framework */; }; 17F5648B0C3BDCEB0019975C /* MAD.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 17F564600C3BDCAC0019975C /* MAD.framework */; }; 17F5648E0C3BDCEE0019975C /* ID3Tag.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17F564690C3BDCB70019975C /* ID3Tag.framework */; }; @@ -59,7 +57,6 @@ 17F5648E0C3BDCEE0019975C /* ID3Tag.framework in CopyFiles */, 17F5648F0C3BDCEE0019975C /* MAD.framework in CopyFiles */, 177FCFBC0B90C98A0011C3B5 /* Plugin.h in CopyFiles */, - 17ADB1D20B9793C500257CA2 /* MADPlugin.h in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -72,8 +69,6 @@ 170335420B8FC4EE00327265 /* MADDecoder.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MADDecoder.h; sourceTree = ""; }; 170335430B8FC4EE00327265 /* MADDecoder.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MADDecoder.m; sourceTree = ""; }; 177FCFBB0B90C98A0011C3B5 /* Plugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Plugin.h; path = ../../Audio/Plugin.h; sourceTree = SOURCE_ROOT; }; - 17ADB1D00B9793C500257CA2 /* MADPlugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MADPlugin.h; sourceTree = ""; }; - 17ADB1D10B9793C500257CA2 /* MADPlugin.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MADPlugin.m; sourceTree = ""; }; 17F564580C3BDCAC0019975C /* MAD.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = MAD.xcodeproj; path = ../../Frameworks/MAD/MAD.xcodeproj; sourceTree = SOURCE_ROOT; }; 17F564610C3BDCB70019975C /* ID3Tag.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ID3Tag.xcodeproj; path = ../../Frameworks/ID3Tag/ID3Tag.xcodeproj; sourceTree = SOURCE_ROOT; }; 32DBCF630370AF2F00C91783 /* MAD_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MAD_Prefix.pch; sourceTree = ""; }; @@ -129,8 +124,6 @@ isa = PBXGroup; children = ( 177FCFBB0B90C98A0011C3B5 /* Plugin.h */, - 17ADB1D00B9793C500257CA2 /* MADPlugin.h */, - 17ADB1D10B9793C500257CA2 /* MADPlugin.m */, 170335420B8FC4EE00327265 /* MADDecoder.h */, 170335430B8FC4EE00327265 /* MADDecoder.m */, ); @@ -271,7 +264,6 @@ buildActionMask = 2147483647; files = ( 170335470B8FC4EE00327265 /* MADDecoder.m in Sources */, - 17ADB1D30B9793C500257CA2 /* MADPlugin.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/Plugins/MAD/MADPlugin.h b/Plugins/MAD/MADPlugin.h deleted file mode 100644 index b0f410f66..000000000 --- a/Plugins/MAD/MADPlugin.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// MusepackCodec.h -// Musepack -// -// Created by Vincent Spader on 2/21/07. -// Copyright 2007 __MyCompanyName__. All rights reserved. -// - -#import -#import "Plugin.h" - -@interface MADPlugin : NSObject -{ - -} - -@end diff --git a/Plugins/MAD/MADPlugin.m b/Plugins/MAD/MADPlugin.m deleted file mode 100644 index c1c77b92c..000000000 --- a/Plugins/MAD/MADPlugin.m +++ /dev/null @@ -1,22 +0,0 @@ -// -// MusepackCodec.m -// MusepackCodec -// -// Created by Vincent Spader on 2/21/07. -// Copyright 2007 __MyCompanyName__. All rights reserved. -// - -#import "MADPlugin.h" -#import "MADDecoder.h" - -@implementation MADPlugin - -+ (NSDictionary *)pluginInfo -{ - return [NSDictionary dictionaryWithObjectsAndKeys: - kCogDecoder, [MADDecoder className], - nil - ]; -} - -@end diff --git a/Plugins/MonkeysAudio/Info.plist b/Plugins/MonkeysAudio/Info.plist index 5b1281943..caaae6f24 100644 --- a/Plugins/MonkeysAudio/Info.plist +++ b/Plugins/MonkeysAudio/Info.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 NSPrincipalClass - MonkeysAudioPlugin + diff --git a/Plugins/MonkeysAudio/MonkeysAudio.xcodeproj/project.pbxproj b/Plugins/MonkeysAudio/MonkeysAudio.xcodeproj/project.pbxproj index e2774d2f8..22dd20933 100644 --- a/Plugins/MonkeysAudio/MonkeysAudio.xcodeproj/project.pbxproj +++ b/Plugins/MonkeysAudio/MonkeysAudio.xcodeproj/project.pbxproj @@ -9,8 +9,6 @@ /* Begin PBXBuildFile section */ 1745C2ED0B90BDD100A6768C /* MonkeysAudioDecoder.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1745C2E80B90BDD100A6768C /* MonkeysAudioDecoder.mm */; }; 177FCFB50B90C97E0011C3B5 /* Plugin.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 177FCFB40B90C97E0011C3B5 /* Plugin.h */; }; - 17ADB1E80B9793E300257CA2 /* MonkeysAudioPlugin.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17ADB1E60B9793E300257CA2 /* MonkeysAudioPlugin.h */; }; - 17ADB1E90B9793E300257CA2 /* MonkeysAudioPlugin.mm in Sources */ = {isa = PBXBuildFile; fileRef = 17ADB1E70B9793E300257CA2 /* MonkeysAudioPlugin.mm */; }; 17F564CC0C3BDDDB0019975C /* MAC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 17F562970C3BD9E10019975C /* MAC.framework */; }; 17F564CF0C3BDDDD0019975C /* MAC.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17F562970C3BD9E10019975C /* MAC.framework */; }; 8D5B49B4048680CD000E48DA /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */; }; @@ -44,7 +42,6 @@ files = ( 17F564CF0C3BDDDD0019975C /* MAC.framework in CopyFiles */, 177FCFB50B90C97E0011C3B5 /* Plugin.h in CopyFiles */, - 17ADB1E80B9793E300257CA2 /* MonkeysAudioPlugin.h in CopyFiles */, 8EB1E6F90B9B39AA008F9F45 /* SourceIO.h in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 0; @@ -58,8 +55,6 @@ 1745C2E70B90BDD100A6768C /* MonkeysAudioDecoder.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MonkeysAudioDecoder.h; sourceTree = ""; }; 1745C2E80B90BDD100A6768C /* MonkeysAudioDecoder.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = MonkeysAudioDecoder.mm; sourceTree = ""; }; 177FCFB40B90C97E0011C3B5 /* Plugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Plugin.h; path = ../../Audio/Plugin.h; sourceTree = SOURCE_ROOT; }; - 17ADB1E60B9793E300257CA2 /* MonkeysAudioPlugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MonkeysAudioPlugin.h; sourceTree = ""; }; - 17ADB1E70B9793E300257CA2 /* MonkeysAudioPlugin.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = MonkeysAudioPlugin.mm; sourceTree = ""; }; 17F5628F0C3BD9E10019975C /* MAC.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = MAC.xcodeproj; path = ../../Frameworks/MAC/MAC.xcodeproj; sourceTree = SOURCE_ROOT; }; 32DBCF630370AF2F00C91783 /* MonkeysAudio_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MonkeysAudio_Prefix.pch; sourceTree = ""; }; 8D5B49B6048680CD000E48DA /* MonkeysAudio.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MonkeysAudio.bundle; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -115,8 +110,6 @@ isa = PBXGroup; children = ( 177FCFB40B90C97E0011C3B5 /* Plugin.h */, - 17ADB1E60B9793E300257CA2 /* MonkeysAudioPlugin.h */, - 17ADB1E70B9793E300257CA2 /* MonkeysAudioPlugin.mm */, 1745C2E70B90BDD100A6768C /* MonkeysAudioDecoder.h */, 1745C2E80B90BDD100A6768C /* MonkeysAudioDecoder.mm */, 8EB1E6F80B9B39AA008F9F45 /* SourceIO.h */, @@ -238,7 +231,6 @@ buildActionMask = 2147483647; files = ( 1745C2ED0B90BDD100A6768C /* MonkeysAudioDecoder.mm in Sources */, - 17ADB1E90B9793E300257CA2 /* MonkeysAudioPlugin.mm in Sources */, 8EB1E6FD0B9B39D4008F9F45 /* SourceIO.mm in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/Plugins/MonkeysAudio/MonkeysAudioPlugin.h b/Plugins/MonkeysAudio/MonkeysAudioPlugin.h deleted file mode 100644 index eec5fe216..000000000 --- a/Plugins/MonkeysAudio/MonkeysAudioPlugin.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// MusepackCodec.h -// Musepack -// -// Created by Vincent Spader on 2/21/07. -// Copyright 2007 __MyCompanyName__. All rights reserved. -// - -#import -#import "Plugin.h" - -@interface MonkeysAudioPlugin : NSObject -{ - -} - -@end diff --git a/Plugins/MonkeysAudio/MonkeysAudioPlugin.mm b/Plugins/MonkeysAudio/MonkeysAudioPlugin.mm deleted file mode 100644 index 5aaa7bfc4..000000000 --- a/Plugins/MonkeysAudio/MonkeysAudioPlugin.mm +++ /dev/null @@ -1,23 +0,0 @@ -// -// MusepackCodec.m -// MusepackCodec -// -// Created by Vincent Spader on 2/21/07. -// Copyright 2007 __MyCompanyName__. All rights reserved. -// - -#import "MonkeysAudioPlugin.h" -#import "MonkeysAudioDecoder.h" - -@implementation MonkeysAudioPlugin - -+ (NSDictionary *)pluginInfo -{ - return [NSDictionary dictionaryWithObjectsAndKeys: - kCogDecoder, [MonkeysAudioDecoder className], - nil - ]; -} - - -@end diff --git a/Plugins/Musepack/Info.plist b/Plugins/Musepack/Info.plist index 0cb8efad1..f3de5f74d 100644 --- a/Plugins/Musepack/Info.plist +++ b/Plugins/Musepack/Info.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 NSPrincipalClass - MusepackPlugin + diff --git a/Plugins/Musepack/Musepack.xcodeproj/project.pbxproj b/Plugins/Musepack/Musepack.xcodeproj/project.pbxproj index c690966dc..e6248eee7 100644 --- a/Plugins/Musepack/Musepack.xcodeproj/project.pbxproj +++ b/Plugins/Musepack/Musepack.xcodeproj/project.pbxproj @@ -8,8 +8,6 @@ /* Begin PBXBuildFile section */ 1703330D0B8FB64500327265 /* MusepackDecoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 1703330A0B8FB64500327265 /* MusepackDecoder.m */; }; - 17ADB2020B9793FF00257CA2 /* MusepackPlugin.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17ADB2000B9793FF00257CA2 /* MusepackPlugin.h */; }; - 17ADB2030B9793FF00257CA2 /* MusepackPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 17ADB2010B9793FF00257CA2 /* MusepackPlugin.m */; }; 17F564B40C3BDD970019975C /* MPCDec.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 17F5625F0C3BD97C0019975C /* MPCDec.framework */; }; 17F564B70C3BDD990019975C /* MPCDec.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17F5625F0C3BD97C0019975C /* MPCDec.framework */; }; 8D5B49B4048680CD000E48DA /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */; }; @@ -41,7 +39,6 @@ dstSubfolderSpec = 10; files = ( 17F564B70C3BDD990019975C /* MPCDec.framework in CopyFiles */, - 17ADB2020B9793FF00257CA2 /* MusepackPlugin.h in CopyFiles */, 8E2B8B4B0B9B48D000F2D9E8 /* Plugin.h in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 0; @@ -54,8 +51,6 @@ 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; 170333090B8FB64500327265 /* MusepackDecoder.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MusepackDecoder.h; sourceTree = ""; }; 1703330A0B8FB64500327265 /* MusepackDecoder.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MusepackDecoder.m; sourceTree = ""; }; - 17ADB2000B9793FF00257CA2 /* MusepackPlugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MusepackPlugin.h; sourceTree = ""; }; - 17ADB2010B9793FF00257CA2 /* MusepackPlugin.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MusepackPlugin.m; sourceTree = ""; }; 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 = ""; }; 8D5B49B6048680CD000E48DA /* Musepack.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Musepack.bundle; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -110,8 +105,6 @@ isa = PBXGroup; children = ( 8E2B8B4A0B9B48D000F2D9E8 /* Plugin.h */, - 17ADB2000B9793FF00257CA2 /* MusepackPlugin.h */, - 17ADB2010B9793FF00257CA2 /* MusepackPlugin.m */, 170333090B8FB64500327265 /* MusepackDecoder.h */, 1703330A0B8FB64500327265 /* MusepackDecoder.m */, ); @@ -231,7 +224,6 @@ buildActionMask = 2147483647; files = ( 1703330D0B8FB64500327265 /* MusepackDecoder.m in Sources */, - 17ADB2030B9793FF00257CA2 /* MusepackPlugin.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/Plugins/Musepack/MusepackPlugin.h b/Plugins/Musepack/MusepackPlugin.h deleted file mode 100644 index 979fca1fa..000000000 --- a/Plugins/Musepack/MusepackPlugin.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// MusepackCodec.h -// Musepack -// -// Created by Vincent Spader on 2/21/07. -// Copyright 2007 __MyCompanyName__. All rights reserved. -// - -#import -#import "Plugin.h" - -@interface MusepackPlugin : NSObject -{ - -} - -@end diff --git a/Plugins/Musepack/MusepackPlugin.m b/Plugins/Musepack/MusepackPlugin.m deleted file mode 100644 index e6148b6ad..000000000 --- a/Plugins/Musepack/MusepackPlugin.m +++ /dev/null @@ -1,22 +0,0 @@ -// -// MusepackCodec.m -// MusepackCodec -// -// Created by Vincent Spader on 2/21/07. -// Copyright 2007 __MyCompanyName__. All rights reserved. -// - -#import "MusepackPlugin.h" -#import "MusepackDecoder.h" - -@implementation MusepackPlugin - -+ (NSDictionary *)pluginInfo -{ - return [NSDictionary dictionaryWithObjectsAndKeys: - kCogDecoder, [MusepackDecoder className], - nil - ]; -} - -@end diff --git a/Plugins/Pls/Info.plist b/Plugins/Pls/Info.plist index cd36cfb50..f3de5f74d 100644 --- a/Plugins/Pls/Info.plist +++ b/Plugins/Pls/Info.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 NSPrincipalClass - PlsPlugin + diff --git a/Plugins/Pls/Pls.xcodeproj/project.pbxproj b/Plugins/Pls/Pls.xcodeproj/project.pbxproj index 106b5aa93..f1eefeeeb 100644 --- a/Plugins/Pls/Pls.xcodeproj/project.pbxproj +++ b/Plugins/Pls/Pls.xcodeproj/project.pbxproj @@ -9,7 +9,6 @@ /* Begin PBXBuildFile section */ 8D5B49B0048680CD000E48DA /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C167DFE841241C02AAC07 /* InfoPlist.strings */; }; 8D5B49B4048680CD000E48DA /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */; }; - 8E8D41980CBB0C9F00135C1B /* PlsPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E8D41970CBB0C9F00135C1B /* PlsPlugin.m */; }; 8E8D41A10CBB0CA700135C1B /* PlsContainer.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E8D41A00CBB0CA700135C1B /* PlsContainer.m */; }; /* End PBXBuildFile section */ @@ -21,8 +20,6 @@ 32DBCF630370AF2F00C91783 /* Pls_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Pls_Prefix.pch; sourceTree = ""; }; 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.xml; path = Info.plist; sourceTree = ""; }; - 8E8D41960CBB0C9F00135C1B /* PlsPlugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlsPlugin.h; sourceTree = ""; }; - 8E8D41970CBB0C9F00135C1B /* PlsPlugin.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PlsPlugin.m; sourceTree = ""; }; 8E8D419F0CBB0CA700135C1B /* PlsContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlsContainer.h; sourceTree = ""; }; 8E8D41A00CBB0CA700135C1B /* PlsContainer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PlsContainer.m; sourceTree = ""; }; 8E8D41A50CBB0CBE00135C1B /* Plugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Plugin.h; path = ../../Audio/Plugin.h; sourceTree = SOURCE_ROOT; }; @@ -75,8 +72,6 @@ isa = PBXGroup; children = ( 8E8D41A50CBB0CBE00135C1B /* Plugin.h */, - 8E8D41960CBB0C9F00135C1B /* PlsPlugin.h */, - 8E8D41970CBB0C9F00135C1B /* PlsPlugin.m */, 8E8D419F0CBB0CA700135C1B /* PlsContainer.h */, 8E8D41A00CBB0CA700135C1B /* PlsContainer.m */, ); @@ -169,7 +164,6 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 8E8D41980CBB0C9F00135C1B /* PlsPlugin.m in Sources */, 8E8D41A10CBB0CA700135C1B /* PlsContainer.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/Plugins/Pls/PlsPlugin.h b/Plugins/Pls/PlsPlugin.h deleted file mode 100644 index f23c994a1..000000000 --- a/Plugins/Pls/PlsPlugin.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// PlsPlugin.h -// Pls -// -// Created by Zaphod Beeblebrox on 10/8/07. -// Copyright 2007 __MyCompanyName__. All rights reserved. -// - -#import - -#import "Plugin.h" - -@interface PlsPlugin : NSObject { - -} - -@end diff --git a/Plugins/Pls/PlsPlugin.m b/Plugins/Pls/PlsPlugin.m deleted file mode 100644 index 109571966..000000000 --- a/Plugins/Pls/PlsPlugin.m +++ /dev/null @@ -1,20 +0,0 @@ -// -// PlsPlugin.m -// Pls -// -// Created by Zaphod Beeblebrox on 10/8/07. -// Copyright 2007 __MyCompanyName__. All rights reserved. -// - -#import "PlsPlugin.h" - -#import "PlsContainer.h" - -@implementation PlsPlugin - -+ (NSDictionary *)pluginInfo -{ - return [NSDictionary dictionaryWithObject:kCogContainer forKey:[PlsContainer className]]; -} - -@end diff --git a/Plugins/Quicktime/Info.plist b/Plugins/Quicktime/Info.plist index 17159d330..f3de5f74d 100644 --- a/Plugins/Quicktime/Info.plist +++ b/Plugins/Quicktime/Info.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 NSPrincipalClass - QuicktimePlugin + diff --git a/Plugins/Quicktime/Quicktime.xcodeproj/project.pbxproj b/Plugins/Quicktime/Quicktime.xcodeproj/project.pbxproj index 84b44614c..6c77179c1 100644 --- a/Plugins/Quicktime/Quicktime.xcodeproj/project.pbxproj +++ b/Plugins/Quicktime/Quicktime.xcodeproj/project.pbxproj @@ -7,7 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 1727BFD10C1C94FD0084363D /* QuicktimePlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 1727BFD00C1C94FD0084363D /* QuicktimePlugin.m */; }; 1727BFDD0C1C95350084363D /* QuicktimeDecoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 1727BFDC0C1C95350084363D /* QuicktimeDecoder.m */; }; 1727C0670C1C97A00084363D /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1727C0660C1C97A00084363D /* AudioToolbox.framework */; }; 1727C0BE0C1C9E180084363D /* QuickTime.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1727C0BD0C1C9E180084363D /* QuickTime.framework */; }; @@ -20,8 +19,6 @@ 089C167FFE841241C02AAC07 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = ""; }; 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; 1727BFCE0C1C94E90084363D /* Plugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Plugin.h; path = ../../Audio/Plugin.h; sourceTree = SOURCE_ROOT; }; - 1727BFCF0C1C94FD0084363D /* QuicktimePlugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QuicktimePlugin.h; sourceTree = ""; }; - 1727BFD00C1C94FD0084363D /* QuicktimePlugin.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QuicktimePlugin.m; sourceTree = ""; }; 1727BFDB0C1C95350084363D /* QuicktimeDecoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QuicktimeDecoder.h; sourceTree = ""; }; 1727BFDC0C1C95350084363D /* QuicktimeDecoder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QuicktimeDecoder.m; sourceTree = ""; }; 1727C0660C1C97A00084363D /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = /System/Library/Frameworks/AudioToolbox.framework; sourceTree = ""; }; @@ -81,8 +78,6 @@ isa = PBXGroup; children = ( 1727BFCE0C1C94E90084363D /* Plugin.h */, - 1727BFCF0C1C94FD0084363D /* QuicktimePlugin.h */, - 1727BFD00C1C94FD0084363D /* QuicktimePlugin.m */, 1727BFDB0C1C95350084363D /* QuicktimeDecoder.h */, 1727BFDC0C1C95350084363D /* QuicktimeDecoder.m */, ); @@ -177,7 +172,6 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 1727BFD10C1C94FD0084363D /* QuicktimePlugin.m in Sources */, 1727BFDD0C1C95350084363D /* QuicktimeDecoder.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/Plugins/Quicktime/QuicktimePlugin.h b/Plugins/Quicktime/QuicktimePlugin.h deleted file mode 100644 index 0dc5019cc..000000000 --- a/Plugins/Quicktime/QuicktimePlugin.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// QuicktimePlugin.h -// Quicktime -// -// Created by Vincent Spader on 6/10/07. -// Copyright 2007 __MyCompanyName__. All rights reserved. -// - -#import -#import "Plugin.h" - -@interface QuicktimePlugin : NSObject { - -} - -@end diff --git a/Plugins/Quicktime/QuicktimePlugin.m b/Plugins/Quicktime/QuicktimePlugin.m deleted file mode 100644 index 734d69c32..000000000 --- a/Plugins/Quicktime/QuicktimePlugin.m +++ /dev/null @@ -1,22 +0,0 @@ -// -// QuicktimePlugin.m -// Quicktime -// -// Created by Vincent Spader on 6/10/07. -// Copyright 2007 __MyCompanyName__. All rights reserved. -// - -#import "QuicktimePlugin.h" -#import "QuicktimeDecoder.h" - -@implementation QuicktimePlugin - -+ (NSDictionary *)pluginInfo -{ - return [NSDictionary dictionaryWithObjectsAndKeys: - kCogDecoder, [QuicktimeDecoder className], - nil - ]; -} - -@end diff --git a/Plugins/Shorten/Info.plist b/Plugins/Shorten/Info.plist index 878fffb72..f3de5f74d 100644 --- a/Plugins/Shorten/Info.plist +++ b/Plugins/Shorten/Info.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 NSPrincipalClass - ShortenPlugin + diff --git a/Plugins/Shorten/Shorten.xcodeproj/project.pbxproj b/Plugins/Shorten/Shorten.xcodeproj/project.pbxproj index de870b559..e9201d211 100644 --- a/Plugins/Shorten/Shorten.xcodeproj/project.pbxproj +++ b/Plugins/Shorten/Shorten.xcodeproj/project.pbxproj @@ -9,8 +9,6 @@ /* Begin PBXBuildFile section */ 1745C4300B90C1DC00A6768C /* ShortenDecoder.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1745C42C0B90C1DC00A6768C /* ShortenDecoder.mm */; }; 177FCFAD0B90C96B0011C3B5 /* Plugin.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 177FCFAC0B90C96B0011C3B5 /* Plugin.h */; }; - 17ADB2240B97942800257CA2 /* ShortenPlugin.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17ADB2220B97942800257CA2 /* ShortenPlugin.h */; }; - 17ADB2250B97942800257CA2 /* ShortenPlugin.mm in Sources */ = {isa = PBXBuildFile; fileRef = 17ADB2230B97942800257CA2 /* ShortenPlugin.mm */; }; 17F564EE0C3BDE010019975C /* Shorten.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 17F563E50C3BDBF10019975C /* Shorten.framework */; }; 17F564EF0C3BDE030019975C /* Shorten.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17F563E50C3BDBF10019975C /* Shorten.framework */; }; 8D5B49B4048680CD000E48DA /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */; }; @@ -42,7 +40,6 @@ files = ( 17F564EF0C3BDE030019975C /* Shorten.framework in CopyFiles */, 177FCFAD0B90C96B0011C3B5 /* Plugin.h in CopyFiles */, - 17ADB2240B97942800257CA2 /* ShortenPlugin.h in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -55,8 +52,6 @@ 1745C42B0B90C1DC00A6768C /* ShortenDecoder.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ShortenDecoder.h; sourceTree = ""; }; 1745C42C0B90C1DC00A6768C /* ShortenDecoder.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = ShortenDecoder.mm; sourceTree = ""; }; 177FCFAC0B90C96B0011C3B5 /* Plugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Plugin.h; path = ../../Audio/Plugin.h; sourceTree = SOURCE_ROOT; }; - 17ADB2220B97942800257CA2 /* ShortenPlugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ShortenPlugin.h; sourceTree = ""; }; - 17ADB2230B97942800257CA2 /* ShortenPlugin.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = ShortenPlugin.mm; sourceTree = ""; }; 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 = ""; }; 8D5B49B6048680CD000E48DA /* Shorten.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Shorten.bundle; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -110,8 +105,6 @@ isa = PBXGroup; children = ( 177FCFAC0B90C96B0011C3B5 /* Plugin.h */, - 17ADB2220B97942800257CA2 /* ShortenPlugin.h */, - 17ADB2230B97942800257CA2 /* ShortenPlugin.mm */, 1745C42B0B90C1DC00A6768C /* ShortenDecoder.h */, 1745C42C0B90C1DC00A6768C /* ShortenDecoder.mm */, ); @@ -231,7 +224,6 @@ buildActionMask = 2147483647; files = ( 1745C4300B90C1DC00A6768C /* ShortenDecoder.mm in Sources */, - 17ADB2250B97942800257CA2 /* ShortenPlugin.mm in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/Plugins/Shorten/ShortenPlugin.h b/Plugins/Shorten/ShortenPlugin.h deleted file mode 100644 index 5364f5f78..000000000 --- a/Plugins/Shorten/ShortenPlugin.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// MusepackCodec.h -// Musepack -// -// Created by Vincent Spader on 2/21/07. -// Copyright 2007 __MyCompanyName__. All rights reserved. -// - -#import -#import "Plugin.h" - -@interface ShortenPlugin : NSObject -{ - -} - -@end diff --git a/Plugins/Shorten/ShortenPlugin.mm b/Plugins/Shorten/ShortenPlugin.mm deleted file mode 100644 index 78c6fd48c..000000000 --- a/Plugins/Shorten/ShortenPlugin.mm +++ /dev/null @@ -1,22 +0,0 @@ -// -// MusepackCodec.m -// MusepackCodec -// -// Created by Vincent Spader on 2/21/07. -// Copyright 2007 __MyCompanyName__. All rights reserved. -// - -#import "ShortenPlugin.h" -#import "ShortenDecoder.h" - -@implementation ShortenPlugin - -+ (NSDictionary *)pluginInfo -{ - return [NSDictionary dictionaryWithObjectsAndKeys: - kCogDecoder, [ShortenDecoder className], - nil - ]; -} - -@end diff --git a/Plugins/TagLib/Info.plist b/Plugins/TagLib/Info.plist index 7498c7054..f3de5f74d 100644 --- a/Plugins/TagLib/Info.plist +++ b/Plugins/TagLib/Info.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 NSPrincipalClass - TagLibPlugin + diff --git a/Plugins/TagLib/TagLib.xcodeproj/project.pbxproj b/Plugins/TagLib/TagLib.xcodeproj/project.pbxproj index 772d3fd1b..101cf224f 100644 --- a/Plugins/TagLib/TagLib.xcodeproj/project.pbxproj +++ b/Plugins/TagLib/TagLib.xcodeproj/project.pbxproj @@ -8,7 +8,6 @@ /* Begin PBXBuildFile section */ 177FCFA50B90C9600011C3B5 /* Plugin.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 177FCFA40B90C9600011C3B5 /* Plugin.h */; }; - 17C93FBC0B900538008627D6 /* TagLibPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 17C93FBB0B900538008627D6 /* TagLibPlugin.m */; }; 17C93FC30B90056C008627D6 /* TagLibMetadataReader.m in Sources */ = {isa = PBXBuildFile; fileRef = 17C93FC20B90056C008627D6 /* TagLibMetadataReader.m */; }; 17F563B40C3BDBB30019975C /* TagLib.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 17F563A60C3BDB8F0019975C /* TagLib.framework */; }; 17F563B60C3BDBB50019975C /* TagLib.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17F563A60C3BDB8F0019975C /* TagLib.framework */; }; @@ -51,8 +50,6 @@ 089C167FFE841241C02AAC07 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = ""; }; 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; 177FCFA40B90C9600011C3B5 /* Plugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Plugin.h; path = ../../Audio/Plugin.h; sourceTree = SOURCE_ROOT; }; - 17C93FBA0B900538008627D6 /* TagLibPlugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = TagLibPlugin.h; sourceTree = ""; }; - 17C93FBB0B900538008627D6 /* TagLibPlugin.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = TagLibPlugin.m; sourceTree = ""; }; 17C93FC10B90056C008627D6 /* TagLibMetadataReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TagLibMetadataReader.h; sourceTree = ""; }; 17C93FC20B90056C008627D6 /* TagLibMetadataReader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TagLibMetadataReader.m; sourceTree = ""; }; 17F563A00C3BDB8F0019975C /* TagLib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = TagLib.xcodeproj; path = ../../Frameworks/TagLib/TagLib.xcodeproj; sourceTree = SOURCE_ROOT; }; @@ -108,8 +105,6 @@ isa = PBXGroup; children = ( 177FCFA40B90C9600011C3B5 /* Plugin.h */, - 17C93FBA0B900538008627D6 /* TagLibPlugin.h */, - 17C93FBB0B900538008627D6 /* TagLibPlugin.m */, 17C93FC10B90056C008627D6 /* TagLibMetadataReader.h */, 17C93FC20B90056C008627D6 /* TagLibMetadataReader.m */, ); @@ -228,7 +223,6 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 17C93FBC0B900538008627D6 /* TagLibPlugin.m in Sources */, 17C93FC30B90056C008627D6 /* TagLibMetadataReader.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/Plugins/TagLib/TagLibPlugin.h b/Plugins/TagLib/TagLibPlugin.h deleted file mode 100644 index 6b2ec5cc6..000000000 --- a/Plugins/TagLib/TagLibPlugin.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// MusepackCodec.h -// Musepack -// -// Created by Vincent Spader on 2/21/07. -// Copyright 2007 __MyCompanyName__. All rights reserved. -// - -#import -#import "Plugin.h" - -@interface TagLibPlugin : NSObject -{ - -} - -@end diff --git a/Plugins/TagLib/TagLibPlugin.m b/Plugins/TagLib/TagLibPlugin.m deleted file mode 100644 index 56901e36d..000000000 --- a/Plugins/TagLib/TagLibPlugin.m +++ /dev/null @@ -1,22 +0,0 @@ -// -// MusepackCodec.m -// MusepackCodec -// -// Created by Vincent Spader on 2/21/07. -// Copyright 2007 __MyCompanyName__. All rights reserved. -// - -#import "TagLibPlugin.h" -#import "TagLibMetadataReader.h" - -@implementation TagLibPlugin - -+ (NSDictionary *)pluginInfo -{ - return [NSDictionary dictionaryWithObjectsAndKeys: - kCogMetadataReader, [TagLibMetadataReader className], - nil - ]; -} - -@end diff --git a/Plugins/Vorbis/Info.plist b/Plugins/Vorbis/Info.plist index 173d7ac06..f3de5f74d 100644 --- a/Plugins/Vorbis/Info.plist +++ b/Plugins/Vorbis/Info.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 NSPrincipalClass - VorbisPlugin + diff --git a/Plugins/Vorbis/Vorbis.xcodeproj/project.pbxproj b/Plugins/Vorbis/Vorbis.xcodeproj/project.pbxproj index 41977e5ca..4d00945ed 100644 --- a/Plugins/Vorbis/Vorbis.xcodeproj/project.pbxproj +++ b/Plugins/Vorbis/Vorbis.xcodeproj/project.pbxproj @@ -8,8 +8,6 @@ /* Begin PBXBuildFile section */ 177FCF9E0B90C9530011C3B5 /* Plugin.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 177FCF9D0B90C9530011C3B5 /* Plugin.h */; }; - 17ADB2480B97944D00257CA2 /* VorbisPlugin.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17ADB2460B97944D00257CA2 /* VorbisPlugin.h */; }; - 17ADB2490B97944D00257CA2 /* VorbisPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 17ADB2470B97944D00257CA2 /* VorbisPlugin.m */; }; 17C93D360B8FDA66008627D6 /* VorbisDecoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 17C93D340B8FDA66008627D6 /* VorbisDecoder.m */; }; 17F563820C3BDB670019975C /* Vorbis.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 17F562F70C3BDAAC0019975C /* Vorbis.framework */; }; 17F563850C3BDB6C0019975C /* Vorbis.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17F562F70C3BDAAC0019975C /* Vorbis.framework */; }; @@ -42,7 +40,6 @@ files = ( 17F563850C3BDB6C0019975C /* Vorbis.framework in CopyFiles */, 177FCF9E0B90C9530011C3B5 /* Plugin.h in CopyFiles */, - 17ADB2480B97944D00257CA2 /* VorbisPlugin.h in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -53,8 +50,6 @@ 089C167FFE841241C02AAC07 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = ""; }; 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; 177FCF9D0B90C9530011C3B5 /* Plugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Plugin.h; path = ../../Audio/Plugin.h; sourceTree = SOURCE_ROOT; }; - 17ADB2460B97944D00257CA2 /* VorbisPlugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = VorbisPlugin.h; sourceTree = ""; }; - 17ADB2470B97944D00257CA2 /* VorbisPlugin.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = VorbisPlugin.m; sourceTree = ""; }; 17C93D330B8FDA66008627D6 /* VorbisDecoder.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = VorbisDecoder.h; sourceTree = ""; }; 17C93D340B8FDA66008627D6 /* VorbisDecoder.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = VorbisDecoder.m; sourceTree = ""; }; 17F562EF0C3BDAAC0019975C /* Vorbis.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Vorbis.xcodeproj; path = ../../Frameworks/Vorbis/Vorbis.xcodeproj; sourceTree = SOURCE_ROOT; }; @@ -110,8 +105,6 @@ isa = PBXGroup; children = ( 177FCF9D0B90C9530011C3B5 /* Plugin.h */, - 17ADB2460B97944D00257CA2 /* VorbisPlugin.h */, - 17ADB2470B97944D00257CA2 /* VorbisPlugin.m */, 17C93D330B8FDA66008627D6 /* VorbisDecoder.h */, 17C93D340B8FDA66008627D6 /* VorbisDecoder.m */, ); @@ -231,7 +224,6 @@ buildActionMask = 2147483647; files = ( 17C93D360B8FDA66008627D6 /* VorbisDecoder.m in Sources */, - 17ADB2490B97944D00257CA2 /* VorbisPlugin.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/Plugins/Vorbis/VorbisPlugin.h b/Plugins/Vorbis/VorbisPlugin.h deleted file mode 100644 index 2b69a9236..000000000 --- a/Plugins/Vorbis/VorbisPlugin.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// MusepackCodec.h -// Musepack -// -// Created by Vincent Spader on 2/21/07. -// Copyright 2007 __MyCompanyName__. All rights reserved. -// - -#import -#import "Plugin.h" - -@interface VorbisPlugin : NSObject -{ - -} - -@end diff --git a/Plugins/Vorbis/VorbisPlugin.m b/Plugins/Vorbis/VorbisPlugin.m deleted file mode 100644 index 6e6213120..000000000 --- a/Plugins/Vorbis/VorbisPlugin.m +++ /dev/null @@ -1,22 +0,0 @@ -// -// MusepackCodec.m -// MusepackCodec -// -// Created by Vincent Spader on 2/21/07. -// Copyright 2007 __MyCompanyName__. All rights reserved. -// - -#import "VorbisPlugin.h" -#import "VorbisDecoder.h" - -@implementation VorbisPlugin - -+ (NSDictionary *)pluginInfo -{ - return [NSDictionary dictionaryWithObjectsAndKeys: - kCogDecoder, [VorbisDecoder className], - nil - ]; -} - -@end diff --git a/Plugins/WavPack/Info.plist b/Plugins/WavPack/Info.plist index 2d803f349..f3de5f74d 100644 --- a/Plugins/WavPack/Info.plist +++ b/Plugins/WavPack/Info.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 NSPrincipalClass - WavPackPlugin + diff --git a/Plugins/WavPack/WavPack.xcodeproj/project.pbxproj b/Plugins/WavPack/WavPack.xcodeproj/project.pbxproj index 1af3de2aa..400ff4095 100644 --- a/Plugins/WavPack/WavPack.xcodeproj/project.pbxproj +++ b/Plugins/WavPack/WavPack.xcodeproj/project.pbxproj @@ -8,7 +8,6 @@ /* Begin PBXBuildFile section */ 1745C4DA0B90C42500A6768C /* WavPackDecoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 1745C4D60B90C42500A6768C /* WavPackDecoder.m */; }; - 17ADB2630B97946600257CA2 /* WavPackPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 17ADB2610B97946600257CA2 /* WavPackPlugin.m */; }; 17F562D80C3BDA6C0019975C /* WavPack.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 17F562CA0C3BDA5A0019975C /* WavPack.framework */; }; 17F562DB0C3BDA6E0019975C /* WavPack.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17F562CA0C3BDA5A0019975C /* WavPack.framework */; }; 8D5B49B4048680CD000E48DA /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */; }; @@ -51,8 +50,6 @@ 1745C4D50B90C42500A6768C /* WavPackDecoder.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WavPackDecoder.h; sourceTree = ""; }; 1745C4D60B90C42500A6768C /* WavPackDecoder.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = WavPackDecoder.m; sourceTree = ""; }; 177FCF940B90C9450011C3B5 /* Plugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Plugin.h; path = ../../Audio/Plugin.h; sourceTree = SOURCE_ROOT; }; - 17ADB2600B97946600257CA2 /* WavPackPlugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WavPackPlugin.h; sourceTree = ""; }; - 17ADB2610B97946600257CA2 /* WavPackPlugin.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = WavPackPlugin.m; sourceTree = ""; }; 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 = ""; }; 8D5B49B6048680CD000E48DA /* WavPack.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = WavPack.bundle; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -106,8 +103,6 @@ isa = PBXGroup; children = ( 177FCF940B90C9450011C3B5 /* Plugin.h */, - 17ADB2600B97946600257CA2 /* WavPackPlugin.h */, - 17ADB2610B97946600257CA2 /* WavPackPlugin.m */, 1745C4D50B90C42500A6768C /* WavPackDecoder.h */, 1745C4D60B90C42500A6768C /* WavPackDecoder.m */, ); @@ -227,7 +222,6 @@ buildActionMask = 2147483647; files = ( 1745C4DA0B90C42500A6768C /* WavPackDecoder.m in Sources */, - 17ADB2630B97946600257CA2 /* WavPackPlugin.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/Plugins/WavPack/WavPackPlugin.h b/Plugins/WavPack/WavPackPlugin.h deleted file mode 100644 index c221b0dfc..000000000 --- a/Plugins/WavPack/WavPackPlugin.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// MusepackCodec.h -// Musepack -// -// Created by Vincent Spader on 2/21/07. -// Copyright 2007 __MyCompanyName__. All rights reserved. -// - -#import -#import "Plugin.h" - -@interface WavPackPlugin : NSObject -{ - -} - -@end diff --git a/Plugins/WavPack/WavPackPlugin.m b/Plugins/WavPack/WavPackPlugin.m deleted file mode 100644 index 255836111..000000000 --- a/Plugins/WavPack/WavPackPlugin.m +++ /dev/null @@ -1,22 +0,0 @@ -// -// MusepackCodec.m -// MusepackCodec -// -// Created by Vincent Spader on 2/21/07. -// Copyright 2007 __MyCompanyName__. All rights reserved. -// - -#import "WavPackPlugin.h" -#import "WavPackDecoder.h" - -@implementation WavPackPlugin - -+ (NSDictionary *)pluginInfo -{ - return [NSDictionary dictionaryWithObjectsAndKeys: - kCogDecoder, [WavPackDecoder className], - nil - ]; -} - -@end