From c536ea06a51cd1ab5ca5f6fa0c5a156235578fea Mon Sep 17 00:00:00 2001 From: vspader Date: Sun, 14 Oct 2007 17:31:20 +0000 Subject: [PATCH] Removed useless PropertiesReader classes. PluginController now uses the decoder if a properties reader class is not found. PropertiesReaders should still be created if performance can be improved if code is only reading properties. --- Audio/Chain/ConverterNode.m | 4 +- Audio/CogAudio.xcodeproj/project.pbxproj | 8 ---- Audio/Plugin.h | 4 +- Audio/PluginController.m | 29 ++++++++++--- .../CoreAudio.xcodeproj/project.pbxproj | 6 --- Plugins/CoreAudio/CoreAudioPlugin.m | 2 - Plugins/CoreAudio/CoreAudioPropertiesReader.h | 19 -------- Plugins/CoreAudio/CoreAudioPropertiesReader.m | 40 ----------------- .../CueSheet.xcodeproj/project.pbxproj | 6 --- Plugins/CueSheet/CueSheetPlugin.m | 2 - Plugins/CueSheet/CueSheetPropertiesReader.h | 18 -------- Plugins/CueSheet/CueSheetPropertiesReader.m | 40 ----------------- Plugins/Dumb/Dumb.xcodeproj/project.pbxproj | 6 --- Plugins/Dumb/DumbPlugin.m | 2 - Plugins/Dumb/DumbPropertiesReader.h | 18 -------- Plugins/Dumb/DumbPropertiesReader.m | 43 ------------------- Plugins/FileSource/FileSource.m | 5 --- Plugins/Flac/Flac.xcodeproj/project.pbxproj | 6 --- Plugins/Flac/FlacPlugin.m | 2 - Plugins/Flac/FlacPropertiesReader.h | 19 -------- Plugins/Flac/FlacPropertiesReader.m | 40 ----------------- Plugins/GME/GME.xcodeproj/project.pbxproj | 8 ---- Plugins/GME/GamePlugin.m | 2 - Plugins/GME/GamePropertiesReader.h | 18 -------- Plugins/GME/GamePropertiesReader.m | 43 ------------------- Plugins/HTTPSource/HTTPSource.h | 4 ++ Plugins/HTTPSource/HTTPSource.m | 31 ++++++++----- Plugins/MAD/MAD.xcodeproj/project.pbxproj | 6 --- Plugins/MAD/MADPlugin.m | 2 - Plugins/MAD/MADPropertiesReader.h | 19 -------- Plugins/MAD/MADPropertiesReader.m | 40 ----------------- .../MonkeysAudio.xcodeproj/project.pbxproj | 6 --- Plugins/MonkeysAudio/MonkeysAudioPlugin.mm | 2 - .../MonkeysAudioPropertiesReader.h | 19 -------- .../MonkeysAudioPropertiesReader.mm | 40 ----------------- .../Musepack.xcodeproj/project.pbxproj | 6 --- Plugins/Musepack/MusepackPlugin.m | 2 - Plugins/Musepack/MusepackPropertiesReader.h | 19 -------- Plugins/Musepack/MusepackPropertiesReader.m | 40 ----------------- .../Quicktime.xcodeproj/project.pbxproj | 6 --- Plugins/Quicktime/QuicktimePlugin.m | 2 - Plugins/Quicktime/QuicktimePropertiesReader.h | 16 ------- Plugins/Quicktime/QuicktimePropertiesReader.m | 40 ----------------- .../Shorten/Shorten.xcodeproj/project.pbxproj | 6 --- Plugins/Shorten/ShortenPlugin.mm | 2 - Plugins/Shorten/ShortenPropertiesReader.h | 19 -------- Plugins/Shorten/ShortenPropertiesReader.mm | 40 ----------------- .../Vorbis/Vorbis.xcodeproj/project.pbxproj | 6 --- Plugins/Vorbis/VorbisDecoder.m | 5 +++ Plugins/Vorbis/VorbisPlugin.m | 2 - Plugins/Vorbis/VorbisPropertiesReader.h | 19 -------- Plugins/Vorbis/VorbisPropertiesReader.m | 41 ------------------ .../WavPack/WavPack.xcodeproj/project.pbxproj | 6 --- Plugins/WavPack/WavPackPlugin.m | 2 - Plugins/WavPack/WavPackPropertiesReader.h | 19 -------- Plugins/WavPack/WavPackPropertiesReader.m | 40 ----------------- 56 files changed, 57 insertions(+), 840 deletions(-) delete mode 100644 Plugins/CoreAudio/CoreAudioPropertiesReader.h delete mode 100644 Plugins/CoreAudio/CoreAudioPropertiesReader.m delete mode 100755 Plugins/CueSheet/CueSheetPropertiesReader.h delete mode 100755 Plugins/CueSheet/CueSheetPropertiesReader.m delete mode 100755 Plugins/Dumb/DumbPropertiesReader.h delete mode 100755 Plugins/Dumb/DumbPropertiesReader.m delete mode 100644 Plugins/Flac/FlacPropertiesReader.h delete mode 100644 Plugins/Flac/FlacPropertiesReader.m delete mode 100755 Plugins/GME/GamePropertiesReader.h delete mode 100755 Plugins/GME/GamePropertiesReader.m delete mode 100644 Plugins/MAD/MADPropertiesReader.h delete mode 100644 Plugins/MAD/MADPropertiesReader.m delete mode 100644 Plugins/MonkeysAudio/MonkeysAudioPropertiesReader.h delete mode 100644 Plugins/MonkeysAudio/MonkeysAudioPropertiesReader.mm delete mode 100644 Plugins/Musepack/MusepackPropertiesReader.h delete mode 100644 Plugins/Musepack/MusepackPropertiesReader.m delete mode 100644 Plugins/Quicktime/QuicktimePropertiesReader.h delete mode 100644 Plugins/Quicktime/QuicktimePropertiesReader.m delete mode 100644 Plugins/Shorten/ShortenPropertiesReader.h delete mode 100644 Plugins/Shorten/ShortenPropertiesReader.mm delete mode 100644 Plugins/Vorbis/VorbisPropertiesReader.h delete mode 100644 Plugins/Vorbis/VorbisPropertiesReader.m delete mode 100644 Plugins/WavPack/WavPackPropertiesReader.h delete mode 100644 Plugins/WavPack/WavPackPropertiesReader.m diff --git a/Audio/Chain/ConverterNode.m b/Audio/Chain/ConverterNode.m index f9998bba6..78650162c 100644 --- a/Audio/Chain/ConverterNode.m +++ b/Audio/Chain/ConverterNode.m @@ -120,7 +120,7 @@ static OSStatus ACInputProc(AudioConverterRef inAudioConverter, UInt32* ioNumber stat = AudioConverterNew ( &inputFormat, &outputFormat, &converter); if (stat != noErr) { - DBLog(@"Error creating converter %i", stat); + NSLog(@"Error creating converter %i", stat); } if (inputFormat.mChannelsPerFrame == 1) @@ -130,7 +130,7 @@ static OSStatus ACInputProc(AudioConverterRef inAudioConverter, UInt32* ioNumber stat = AudioConverterSetProperty(converter,kAudioConverterChannelMap,sizeof(channelMap),channelMap); if (stat != noErr) { - DBLog(@"Error mapping channels %i", stat); + NSLog(@"Error mapping channels %i", stat); } } diff --git a/Audio/CogAudio.xcodeproj/project.pbxproj b/Audio/CogAudio.xcodeproj/project.pbxproj index d212c47f5..5c35d8864 100644 --- a/Audio/CogAudio.xcodeproj/project.pbxproj +++ b/Audio/CogAudio.xcodeproj/project.pbxproj @@ -28,8 +28,6 @@ 17D21CC70B8BE4BA00D1EBDE /* Status.h in Headers */ = {isa = PBXBuildFile; fileRef = 17D21C9E0B8BE4BA00D1EBDE /* Status.h */; settings = {ATTRIBUTES = (Public, ); }; }; 17D21CDF0B8BE5B400D1EBDE /* VirtualRingBuffer.h in Headers */ = {isa = PBXBuildFile; fileRef = 17D21CDA0B8BE5B400D1EBDE /* VirtualRingBuffer.h */; settings = {ATTRIBUTES = (Public, ); }; }; 17D21CE00B8BE5B400D1EBDE /* VirtualRingBuffer.m in Sources */ = {isa = PBXBuildFile; fileRef = 17D21CDB0B8BE5B400D1EBDE /* VirtualRingBuffer.m */; }; - 17D21CE10B8BE5B400D1EBDE /* DBLog.h in Headers */ = {isa = PBXBuildFile; fileRef = 17D21CDD0B8BE5B400D1EBDE /* DBLog.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 17D21CE20B8BE5B400D1EBDE /* DBLog.m in Sources */ = {isa = PBXBuildFile; fileRef = 17D21CDE0B8BE5B400D1EBDE /* DBLog.m */; }; 17D21CF30B8BE5EF00D1EBDE /* Semaphore.h in Headers */ = {isa = PBXBuildFile; fileRef = 17D21CF10B8BE5EF00D1EBDE /* Semaphore.h */; settings = {ATTRIBUTES = (Public, ); }; }; 17D21CF40B8BE5EF00D1EBDE /* Semaphore.m in Sources */ = {isa = PBXBuildFile; fileRef = 17D21CF20B8BE5EF00D1EBDE /* Semaphore.m */; }; 17D21DAD0B8BE76800D1EBDE /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 17D21DA90B8BE76800D1EBDE /* AudioToolbox.framework */; }; @@ -87,8 +85,6 @@ 17D21C9E0B8BE4BA00D1EBDE /* Status.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Status.h; sourceTree = ""; }; 17D21CDA0B8BE5B400D1EBDE /* VirtualRingBuffer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = VirtualRingBuffer.h; sourceTree = ""; }; 17D21CDB0B8BE5B400D1EBDE /* VirtualRingBuffer.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = VirtualRingBuffer.m; sourceTree = ""; }; - 17D21CDD0B8BE5B400D1EBDE /* DBLog.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DBLog.h; sourceTree = ""; }; - 17D21CDE0B8BE5B400D1EBDE /* DBLog.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = DBLog.m; sourceTree = ""; }; 17D21CF10B8BE5EF00D1EBDE /* Semaphore.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Semaphore.h; sourceTree = ""; }; 17D21CF20B8BE5EF00D1EBDE /* Semaphore.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = Semaphore.m; sourceTree = ""; }; 17D21DA90B8BE76800D1EBDE /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = /System/Library/Frameworks/AudioToolbox.framework; sourceTree = ""; }; @@ -261,8 +257,6 @@ 17D21CDC0B8BE5B400D1EBDE /* Utils */ = { isa = PBXGroup; children = ( - 17D21CDD0B8BE5B400D1EBDE /* DBLog.h */, - 17D21CDE0B8BE5B400D1EBDE /* DBLog.m */, 17D21CF10B8BE5EF00D1EBDE /* Semaphore.h */, 17D21CF20B8BE5EF00D1EBDE /* Semaphore.m */, ); @@ -300,7 +294,6 @@ 17D21CC50B8BE4BA00D1EBDE /* OutputCoreAudio.h in Headers */, 17D21CC70B8BE4BA00D1EBDE /* Status.h in Headers */, 17D21CDF0B8BE5B400D1EBDE /* VirtualRingBuffer.h in Headers */, - 17D21CE10B8BE5B400D1EBDE /* DBLog.h in Headers */, 17D21CF30B8BE5EF00D1EBDE /* Semaphore.h in Headers */, 17D21DC70B8BE79700D1EBDE /* CoreAudioUtils.h in Headers */, 17D21EBD0B8BF44000D1EBDE /* AudioPlayer.h in Headers */, @@ -375,7 +368,6 @@ 17D21CAA0B8BE4BA00D1EBDE /* OutputNode.m in Sources */, 17D21CC60B8BE4BA00D1EBDE /* OutputCoreAudio.m in Sources */, 17D21CE00B8BE5B400D1EBDE /* VirtualRingBuffer.m in Sources */, - 17D21CE20B8BE5B400D1EBDE /* DBLog.m in Sources */, 17D21CF40B8BE5EF00D1EBDE /* Semaphore.m in Sources */, 17D21DC80B8BE79700D1EBDE /* CoreAudioUtils.m in Sources */, 17D21EBE0B8BF44000D1EBDE /* AudioPlayer.m in Sources */, diff --git a/Audio/Plugin.h b/Audio/Plugin.h index e714a4a36..93fab3ec8 100644 --- a/Audio/Plugin.h +++ b/Audio/Plugin.h @@ -19,9 +19,9 @@ + (NSArray *)schemes; //http, file, etc - (NSURL *)url; +- (NSString *)mimeType; - (BOOL)open:(NSURL *)url; -- (NSDictionary *)properties; //Perhaps contains header info for HTTP stream, or path for a regular file. - (BOOL)seekable; - (BOOL)seek:(long)position whence:(int)whence; - (long)tell; @@ -36,6 +36,7 @@ @end @protocol CogDecoder ++ (NSArray *)mimeTypes; + (NSArray *)fileTypes; //mp3, ogg, etc //For KVO @@ -55,6 +56,7 @@ @protocol CogPropertiesReader + (NSArray *)fileTypes; ++ (NSArray *)mimeTypes; + (NSDictionary *)propertiesForSource:(id)source; @end diff --git a/Audio/PluginController.m b/Audio/PluginController.m index 95a480408..4a7c5cbc1 100644 --- a/Audio/PluginController.m +++ b/Audio/PluginController.m @@ -274,6 +274,8 @@ static PluginController *sharedPluginController = nil; } + +//If no properties reader is defined, use the decoder's properties. - (NSDictionary *)propertiesForURL:(NSURL *)url { NSString *ext = [[url path] pathExtension]; @@ -282,14 +284,27 @@ static PluginController *sharedPluginController = nil; if (![source open:url]) return nil; - Class propertiesReader = NSClassFromString([propertiesReaders objectForKey:[ext lowercaseString]]); + NSString *classString = [propertiesReaders objectForKey:[ext lowercaseString]]; + if (classString) + { + Class propertiesReader = NSClassFromString(classString); - NSDictionary *properties = [propertiesReader propertiesForSource:source]; - - [source close]; - - return properties; - + return [propertiesReader propertiesForSource:source]; + } + else + { + id decoder = [self audioDecoderForURL:url]; + if (![decoder open:source]) + { + return nil; + } + + NSDictionary *properties = [decoder properties]; + + [decoder close]; + + return properties; + } } @end diff --git a/Plugins/CoreAudio/CoreAudio.xcodeproj/project.pbxproj b/Plugins/CoreAudio/CoreAudio.xcodeproj/project.pbxproj index 628477d56..08c1bcef7 100644 --- a/Plugins/CoreAudio/CoreAudio.xcodeproj/project.pbxproj +++ b/Plugins/CoreAudio/CoreAudio.xcodeproj/project.pbxproj @@ -7,7 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 1745C21A0B90B7F800A6768C /* CoreAudioPropertiesReader.m in Sources */ = {isa = PBXBuildFile; fileRef = 1745C2190B90B7F800A6768C /* CoreAudioPropertiesReader.m */; }; 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 */; }; @@ -19,8 +18,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 = ""; }; - 1745C2180B90B7F800A6768C /* CoreAudioPropertiesReader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CoreAudioPropertiesReader.h; sourceTree = ""; }; - 1745C2190B90B7F800A6768C /* CoreAudioPropertiesReader.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = CoreAudioPropertiesReader.m; 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 = ""; }; @@ -85,8 +82,6 @@ 17ADB1990B97937600257CA2 /* CoreAudioPlugin.m */, 17C93E720B8FF192008627D6 /* CoreAudioDecoder.h */, 17C93E730B8FF192008627D6 /* CoreAudioDecoder.m */, - 1745C2180B90B7F800A6768C /* CoreAudioPropertiesReader.h */, - 1745C2190B90B7F800A6768C /* CoreAudioPropertiesReader.m */, ); name = Classes; sourceTree = ""; @@ -179,7 +174,6 @@ buildActionMask = 2147483647; files = ( 17C93E740B8FF192008627D6 /* CoreAudioDecoder.m in Sources */, - 1745C21A0B90B7F800A6768C /* CoreAudioPropertiesReader.m in Sources */, 17ADB19A0B97937600257CA2 /* CoreAudioPlugin.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/Plugins/CoreAudio/CoreAudioPlugin.m b/Plugins/CoreAudio/CoreAudioPlugin.m index e4690270d..02376f1b0 100644 --- a/Plugins/CoreAudio/CoreAudioPlugin.m +++ b/Plugins/CoreAudio/CoreAudioPlugin.m @@ -8,7 +8,6 @@ #import "CoreAudioPlugin.h" #import "CoreAudioDecoder.h" -#import "CoreAudioPropertiesReader.h" @implementation CoreAudioPlugin @@ -16,7 +15,6 @@ { return [NSDictionary dictionaryWithObjectsAndKeys: kCogDecoder, [CoreAudioDecoder className], - kCogPropertiesReader, [CoreAudioPropertiesReader className], nil ]; } diff --git a/Plugins/CoreAudio/CoreAudioPropertiesReader.h b/Plugins/CoreAudio/CoreAudioPropertiesReader.h deleted file mode 100644 index e360fa61a..000000000 --- a/Plugins/CoreAudio/CoreAudioPropertiesReader.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// MADPropertiesReader.h -// MAD -// -// Created by Vincent Spader on 2/24/07. -// Copyright 2007 __MyCompanyName__. All rights reserved. -// - -#import - -#import "Plugin.h" - - -@interface CoreAudioPropertiesReader : NSObject -{ - -} - -@end diff --git a/Plugins/CoreAudio/CoreAudioPropertiesReader.m b/Plugins/CoreAudio/CoreAudioPropertiesReader.m deleted file mode 100644 index 3839a47eb..000000000 --- a/Plugins/CoreAudio/CoreAudioPropertiesReader.m +++ /dev/null @@ -1,40 +0,0 @@ -// -// MADPropertiesReader.m -// MAD -// -// Created by Vincent Spader on 2/24/07. -// Copyright 2007 __MyCompanyName__. All rights reserved. -// - -#import "CoreAudioPropertiesReader.h" -#import "CoreAudioDecoder.h" - -@implementation CoreAudioPropertiesReader - -+ (NSDictionary *)propertiesForSource:(id)source -{ - NSDictionary *properties; - CoreAudioDecoder *decoder; - - decoder = [[CoreAudioDecoder alloc] init]; - if (![decoder open:source]) - { - [decoder release]; - return nil; - } - - properties = [decoder properties]; - - [decoder close]; - [decoder release]; - - return properties; -} - - -+ (NSArray *)fileTypes -{ - return [CoreAudioDecoder fileTypes]; -} - -@end diff --git a/Plugins/CueSheet/CueSheet.xcodeproj/project.pbxproj b/Plugins/CueSheet/CueSheet.xcodeproj/project.pbxproj index e029cf9f2..5389b1d92 100644 --- a/Plugins/CueSheet/CueSheet.xcodeproj/project.pbxproj +++ b/Plugins/CueSheet/CueSheet.xcodeproj/project.pbxproj @@ -8,7 +8,6 @@ /* Begin PBXBuildFile section */ 17DA346E0CC04FCD0003F6B2 /* CueSheetMetadataReader.m in Sources */ = {isa = PBXBuildFile; fileRef = 17DA346D0CC04FCD0003F6B2 /* CueSheetMetadataReader.m */; }; - 17F3BB680CBC560700864489 /* CueSheetPropertiesReader.m in Sources */ = {isa = PBXBuildFile; fileRef = 17F3BB670CBC560700864489 /* CueSheetPropertiesReader.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 */; }; @@ -25,8 +24,6 @@ 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; 17DA346C0CC04FCD0003F6B2 /* CueSheetMetadataReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CueSheetMetadataReader.h; sourceTree = ""; }; 17DA346D0CC04FCD0003F6B2 /* CueSheetMetadataReader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CueSheetMetadataReader.m; sourceTree = ""; }; - 17F3BB660CBC560700864489 /* CueSheetPropertiesReader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CueSheetPropertiesReader.h; sourceTree = ""; }; - 17F3BB670CBC560700864489 /* CueSheetPropertiesReader.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = CueSheetPropertiesReader.m; sourceTree = ""; }; 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 = ""; }; @@ -96,8 +93,6 @@ 8E8D42250CBB0F5800135C1B /* CueSheetContainer.m */, 8E8D42350CBB0F9800135C1B /* CueSheetDecoder.h */, 8E8D42360CBB0F9800135C1B /* CueSheetDecoder.m */, - 17F3BB660CBC560700864489 /* CueSheetPropertiesReader.h */, - 17F3BB670CBC560700864489 /* CueSheetPropertiesReader.m */, 17DA346C0CC04FCD0003F6B2 /* CueSheetMetadataReader.h */, 17DA346D0CC04FCD0003F6B2 /* CueSheetMetadataReader.m */, 8E8D424B0CBB11C600135C1B /* CueSheet.h */, @@ -199,7 +194,6 @@ 8E8D42370CBB0F9800135C1B /* CueSheetDecoder.m in Sources */, 8E8D424D0CBB11C600135C1B /* CueSheet.m in Sources */, 8E8D43570CBB1AE900135C1B /* CueSheetTrack.m in Sources */, - 17F3BB680CBC560700864489 /* CueSheetPropertiesReader.m in Sources */, 17DA346E0CC04FCD0003F6B2 /* CueSheetMetadataReader.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/Plugins/CueSheet/CueSheetPlugin.m b/Plugins/CueSheet/CueSheetPlugin.m index 577dc4e80..34dbd6ff1 100644 --- a/Plugins/CueSheet/CueSheetPlugin.m +++ b/Plugins/CueSheet/CueSheetPlugin.m @@ -10,7 +10,6 @@ #import "CueSheetContainer.h" #import "CueSheetDecoder.h" -#import "CueSheetPropertiesReader.h" #import "CueSheetMetadataReader.h" @implementation CueSheetPlugin @@ -20,7 +19,6 @@ return [NSDictionary dictionaryWithObjectsAndKeys: kCogContainer, [CueSheetContainer className], kCogDecoder, [CueSheetDecoder className], - kCogPropertiesReader, [CueSheetPropertiesReader className], kCogMetadataReader, [CueSheetMetadataReader className], nil]; } diff --git a/Plugins/CueSheet/CueSheetPropertiesReader.h b/Plugins/CueSheet/CueSheetPropertiesReader.h deleted file mode 100755 index ce4b32a4d..000000000 --- a/Plugins/CueSheet/CueSheetPropertiesReader.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// CueSheetPropertiesReader.h -// CueSheet -// -// Created by Vincent Spader on 10/08/07. -// Copyright 2007 __MyCompanyName__. All rights reserved. -// - -#import - -#import "Plugin.h" - -@interface CueSheetPropertiesReader : NSObject -{ - -} - -@end diff --git a/Plugins/CueSheet/CueSheetPropertiesReader.m b/Plugins/CueSheet/CueSheetPropertiesReader.m deleted file mode 100755 index 180931d27..000000000 --- a/Plugins/CueSheet/CueSheetPropertiesReader.m +++ /dev/null @@ -1,40 +0,0 @@ -// -// CueSheetPropertiesReader.m -// CueSheet -// -// Created by Vincent Spader on 10/08/07. -// Copyright 2007 __MyCompanyName__. All rights reserved. -// - -#import "CueSheetPropertiesReader.h" -#import "CueSheetDecoder.h" - -@implementation CueSheetPropertiesReader - -+ (NSDictionary *)propertiesForSource:(id)source -{ - NSDictionary *properties; - CueSheetDecoder *decoder; - - decoder = [[CueSheetDecoder alloc] init]; - if (![decoder open:source]) - { - [decoder release]; - return nil; - } - - properties = [decoder properties]; - - [decoder close]; - [decoder release]; - - return properties; -} - - -+ (NSArray *)fileTypes -{ - return [CueSheetDecoder fileTypes]; -} - -@end diff --git a/Plugins/Dumb/Dumb.xcodeproj/project.pbxproj b/Plugins/Dumb/Dumb.xcodeproj/project.pbxproj index 16f966f81..a5a0e1cdd 100644 --- a/Plugins/Dumb/Dumb.xcodeproj/project.pbxproj +++ b/Plugins/Dumb/Dumb.xcodeproj/project.pbxproj @@ -9,7 +9,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 */; }; - 17C8F6970CBEE846008D969D /* DumbPropertiesReader.m in Sources */ = {isa = PBXBuildFile; fileRef = 17C8F6930CBEE846008D969D /* DumbPropertiesReader.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 */; }; @@ -60,8 +59,6 @@ 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 = ""; }; - 17C8F6920CBEE846008D969D /* DumbPropertiesReader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DumbPropertiesReader.h; sourceTree = ""; }; - 17C8F6930CBEE846008D969D /* DumbPropertiesReader.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = DumbPropertiesReader.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 = ""; }; @@ -123,8 +120,6 @@ 17C8F6910CBEE846008D969D /* DumbPlugin.m */, 17C8F68E0CBEE846008D969D /* DumbDecoder.h */, 17C8F68F0CBEE846008D969D /* DumbDecoder.m */, - 17C8F6920CBEE846008D969D /* DumbPropertiesReader.h */, - 17C8F6930CBEE846008D969D /* DumbPropertiesReader.m */, 17DA363B0CC0600E0003F6B2 /* DumbMetadataReader.h */, 17DA363C0CC0600E0003F6B2 /* DumbMetadataReader.m */, ); @@ -246,7 +241,6 @@ files = ( 17C8F6950CBEE846008D969D /* DumbDecoder.m in Sources */, 17C8F6960CBEE846008D969D /* DumbPlugin.m in Sources */, - 17C8F6970CBEE846008D969D /* DumbPropertiesReader.m in Sources */, 17DA363E0CC0600E0003F6B2 /* DumbMetadataReader.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/Plugins/Dumb/DumbPlugin.m b/Plugins/Dumb/DumbPlugin.m index dfe5e50e4..4114cd465 100644 --- a/Plugins/Dumb/DumbPlugin.m +++ b/Plugins/Dumb/DumbPlugin.m @@ -9,7 +9,6 @@ #import "DumbPlugin.h" #import "DumbDecoder.h" -#import "DumbPropertiesReader.h" #import "DumbMetadataReader.h" @implementation DumbPlugin @@ -18,7 +17,6 @@ { return [NSDictionary dictionaryWithObjectsAndKeys: kCogDecoder, [DumbDecoder className], - kCogPropertiesReader, [DumbPropertiesReader className], kCogMetadataReader, [DumbMetadataReader className], nil]; } diff --git a/Plugins/Dumb/DumbPropertiesReader.h b/Plugins/Dumb/DumbPropertiesReader.h deleted file mode 100755 index 5aadfd6a4..000000000 --- a/Plugins/Dumb/DumbPropertiesReader.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// DumbPropertiesReader.h -// GME -// -// Created by Vincent Spader on 10/10/07. -// Copyright 2007 __MyCompanyName__. All rights reserved. -// - -#import - -#import "Plugin.h" - -@interface DumbPropertiesReader : NSObject -{ - -} - -@end diff --git a/Plugins/Dumb/DumbPropertiesReader.m b/Plugins/Dumb/DumbPropertiesReader.m deleted file mode 100755 index 9cea5d8e1..000000000 --- a/Plugins/Dumb/DumbPropertiesReader.m +++ /dev/null @@ -1,43 +0,0 @@ -// -// DumbPropertiesReader.m -// GME -// -// Created by Vincent Spader on 10/10/07. -// Copyright 2007 __MyCompanyName__. All rights reserved. -// - -#import "DumbPropertiesReader.h" -#import "DumbDecoder.h" - -@implementation DumbPropertiesReader - -+ (NSDictionary *)propertiesForSource:(id)source -{ - NSDictionary *properties; - DumbDecoder *decoder; - - decoder = [[DumbDecoder alloc] init]; - if (![decoder open:source]) - { - NSLog(@"Could not open"); - [decoder release]; - return nil; - } - - properties = [decoder properties]; - - NSLog(@"Properties! %@", properties); - - [decoder close]; - [decoder release]; - - return properties; -} - - -+ (NSArray *)fileTypes -{ - return [DumbDecoder fileTypes]; -} - -@end diff --git a/Plugins/FileSource/FileSource.m b/Plugins/FileSource/FileSource.m index 1d838678b..f4bf54e55 100644 --- a/Plugins/FileSource/FileSource.m +++ b/Plugins/FileSource/FileSource.m @@ -11,11 +11,6 @@ @implementation FileSource -- (BOOL)buffered -{ - return NO; -} - - (BOOL)open:(NSURL *)url { [self setURL:url]; diff --git a/Plugins/Flac/Flac.xcodeproj/project.pbxproj b/Plugins/Flac/Flac.xcodeproj/project.pbxproj index e738b7bb9..f2d8d09c9 100644 --- a/Plugins/Flac/Flac.xcodeproj/project.pbxproj +++ b/Plugins/Flac/Flac.xcodeproj/project.pbxproj @@ -7,7 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 1745C2C50B90BAC700A6768C /* FlacPropertiesReader.m in Sources */ = {isa = PBXBuildFile; fileRef = 1745C2C30B90BAC700A6768C /* FlacPropertiesReader.m */; }; 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 */; }; @@ -53,8 +52,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 = ""; }; - 1745C2C20B90BAC700A6768C /* FlacPropertiesReader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FlacPropertiesReader.h; sourceTree = ""; }; - 1745C2C30B90BAC700A6768C /* FlacPropertiesReader.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = FlacPropertiesReader.m; 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 = ""; }; @@ -117,8 +114,6 @@ 17ADB1B30B9793A600257CA2 /* FlacPlugin.m */, 17C93F030B8FF67A008627D6 /* FlacDecoder.h */, 17C93F040B8FF67A008627D6 /* FlacDecoder.m */, - 1745C2C20B90BAC700A6768C /* FlacPropertiesReader.h */, - 1745C2C30B90BAC700A6768C /* FlacPropertiesReader.m */, ); name = Classes; sourceTree = ""; @@ -236,7 +231,6 @@ buildActionMask = 2147483647; files = ( 17C93F080B8FF67A008627D6 /* FlacDecoder.m in Sources */, - 1745C2C50B90BAC700A6768C /* FlacPropertiesReader.m in Sources */, 17ADB1B50B9793A600257CA2 /* FlacPlugin.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/Plugins/Flac/FlacPlugin.m b/Plugins/Flac/FlacPlugin.m index 74e956098..0c7a5cee3 100644 --- a/Plugins/Flac/FlacPlugin.m +++ b/Plugins/Flac/FlacPlugin.m @@ -8,7 +8,6 @@ #import "FlacPlugin.h" #import "FlacDecoder.h" -#import "FlacPropertiesReader.h" @implementation FlacPlugin @@ -16,7 +15,6 @@ { return [NSDictionary dictionaryWithObjectsAndKeys: kCogDecoder, [FlacDecoder className], - kCogPropertiesReader, [FlacPropertiesReader className], nil ]; } diff --git a/Plugins/Flac/FlacPropertiesReader.h b/Plugins/Flac/FlacPropertiesReader.h deleted file mode 100644 index a61a4b30d..000000000 --- a/Plugins/Flac/FlacPropertiesReader.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// MADPropertiesReader.h -// MAD -// -// Created by Vincent Spader on 2/24/07. -// Copyright 2007 __MyCompanyName__. All rights reserved. -// - -#import - -#import "Plugin.h" - - -@interface FlacPropertiesReader : NSObject -{ - -} - -@end diff --git a/Plugins/Flac/FlacPropertiesReader.m b/Plugins/Flac/FlacPropertiesReader.m deleted file mode 100644 index 4babef88f..000000000 --- a/Plugins/Flac/FlacPropertiesReader.m +++ /dev/null @@ -1,40 +0,0 @@ -// -// MADPropertiesReader.m -// MAD -// -// Created by Vincent Spader on 2/24/07. -// Copyright 2007 __MyCompanyName__. All rights reserved. -// - -#import "FlacPropertiesReader.h" -#import "FlacDecoder.h" - -@implementation FlacPropertiesReader - -+ (NSDictionary *)propertiesForSource:(id)source -{ - NSDictionary *properties; - FlacDecoder *decoder; - - decoder = [[FlacDecoder alloc] init]; - if (![decoder open:source]) - { - [decoder release]; - return nil; - } - - properties = [decoder properties]; - - [decoder close]; - [decoder release]; - - return properties; -} - - -+ (NSArray *)fileTypes -{ - return [FlacDecoder fileTypes]; -} - -@end diff --git a/Plugins/GME/GME.xcodeproj/project.pbxproj b/Plugins/GME/GME.xcodeproj/project.pbxproj index 161914835..75cc89fd7 100644 --- a/Plugins/GME/GME.xcodeproj/project.pbxproj +++ b/Plugins/GME/GME.xcodeproj/project.pbxproj @@ -12,8 +12,6 @@ 17C8F3420CBED3BE008D969D /* GameContainer.m in Sources */ = {isa = PBXBuildFile; fileRef = 17C8F33C0CBED3BE008D969D /* GameContainer.m */; }; 17C8F3430CBED3BE008D969D /* GameDecoder.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17C8F33D0CBED3BE008D969D /* GameDecoder.h */; }; 17C8F3440CBED3BE008D969D /* GameDecoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 17C8F33E0CBED3BE008D969D /* GameDecoder.m */; }; - 17C8F3450CBED3BE008D969D /* GamePropertiesReader.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17C8F33F0CBED3BE008D969D /* GamePropertiesReader.h */; }; - 17C8F3460CBED3BE008D969D /* GamePropertiesReader.m in Sources */ = {isa = PBXBuildFile; fileRef = 17C8F3400CBED3BE008D969D /* GamePropertiesReader.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 */; }; @@ -51,7 +49,6 @@ 17C8F33A0CBED3B0008D969D /* GME.framework in CopyFiles */, 17C8F3410CBED3BE008D969D /* GameContainer.h in CopyFiles */, 17C8F3430CBED3BE008D969D /* GameDecoder.h in CopyFiles */, - 17C8F3450CBED3BE008D969D /* GamePropertiesReader.h in CopyFiles */, 17C8F3480CBED3C7008D969D /* Plugin.h in CopyFiles */, 17C8F3E00CBEDBE0008D969D /* GamePlugin.h in CopyFiles */, 17DA34BA0CC052030003F6B2 /* GameMetadataReader.h in CopyFiles */, @@ -70,8 +67,6 @@ 17C8F33C0CBED3BE008D969D /* GameContainer.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = GameContainer.m; sourceTree = ""; }; 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 = ""; }; - 17C8F33F0CBED3BE008D969D /* GamePropertiesReader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = GamePropertiesReader.h; sourceTree = ""; }; - 17C8F3400CBED3BE008D969D /* GamePropertiesReader.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = GamePropertiesReader.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 = ""; }; @@ -136,8 +131,6 @@ 17C8F33C0CBED3BE008D969D /* GameContainer.m */, 17C8F33D0CBED3BE008D969D /* GameDecoder.h */, 17C8F33E0CBED3BE008D969D /* GameDecoder.m */, - 17C8F33F0CBED3BE008D969D /* GamePropertiesReader.h */, - 17C8F3400CBED3BE008D969D /* GamePropertiesReader.m */, 17DA34B80CC052030003F6B2 /* GameMetadataReader.h */, 17DA34B90CC052030003F6B2 /* GameMetadataReader.m */, ); @@ -259,7 +252,6 @@ files = ( 17C8F3420CBED3BE008D969D /* GameContainer.m in Sources */, 17C8F3440CBED3BE008D969D /* GameDecoder.m in Sources */, - 17C8F3460CBED3BE008D969D /* GamePropertiesReader.m in Sources */, 17C8F3E10CBEDBE0008D969D /* GamePlugin.m in Sources */, 17DA34BB0CC052030003F6B2 /* GameMetadataReader.m in Sources */, ); diff --git a/Plugins/GME/GamePlugin.m b/Plugins/GME/GamePlugin.m index 4e3ebe7e4..b3d1b32e6 100644 --- a/Plugins/GME/GamePlugin.m +++ b/Plugins/GME/GamePlugin.m @@ -10,7 +10,6 @@ #import "GameContainer.h" #import "GameDecoder.h" -#import "GamePropertiesReader.h" #import "GameMetadataReader.h" @implementation GamePlugin @@ -20,7 +19,6 @@ return [NSDictionary dictionaryWithObjectsAndKeys: kCogContainer, [GameContainer className], kCogDecoder, [GameDecoder className], - kCogPropertiesReader, [GamePropertiesReader className], kCogMetadataReader, [GameMetadataReader className], nil]; } diff --git a/Plugins/GME/GamePropertiesReader.h b/Plugins/GME/GamePropertiesReader.h deleted file mode 100755 index 664e53819..000000000 --- a/Plugins/GME/GamePropertiesReader.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// GamePropertiesReader.h -// GME -// -// Created by Vincent Spader on 10/10/07. -// Copyright 2007 __MyCompanyName__. All rights reserved. -// - -#import - -#import "Plugin.h" - -@interface GamePropertiesReader : NSObject -{ - -} - -@end diff --git a/Plugins/GME/GamePropertiesReader.m b/Plugins/GME/GamePropertiesReader.m deleted file mode 100755 index d7f4ea156..000000000 --- a/Plugins/GME/GamePropertiesReader.m +++ /dev/null @@ -1,43 +0,0 @@ -// -// GamePropertiesReader.m -// GME -// -// Created by Vincent Spader on 10/10/07. -// Copyright 2007 __MyCompanyName__. All rights reserved. -// - -#import "GamePropertiesReader.h" -#import "GameDecoder.h" - -@implementation GamePropertiesReader - -+ (NSDictionary *)propertiesForSource:(id)source -{ - NSDictionary *properties; - GameDecoder *decoder; - - decoder = [[GameDecoder alloc] init]; - if (![decoder open:source]) - { - NSLog(@"Could not open"); - [decoder release]; - return nil; - } - - properties = [decoder properties]; - - NSLog(@"Properties! %@", properties); - - [decoder close]; - [decoder release]; - - return properties; -} - - -+ (NSArray *)fileTypes -{ - return [GameDecoder fileTypes]; -} - -@end diff --git a/Plugins/HTTPSource/HTTPSource.h b/Plugins/HTTPSource/HTTPSource.h index 3ac1f1a71..9e7223e4b 100644 --- a/Plugins/HTTPSource/HTTPSource.h +++ b/Plugins/HTTPSource/HTTPSource.h @@ -16,11 +16,15 @@ NSURLConnection *_connection; long _byteCount; + + BOOL _responseReceived; BOOL _connectionFinished; NSMutableData *_data; Semaphore *_sem; + NSString *_mimeType; + NSURL *_url; } diff --git a/Plugins/HTTPSource/HTTPSource.m b/Plugins/HTTPSource/HTTPSource.m index a1b23c798..4689cd007 100644 --- a/Plugins/HTTPSource/HTTPSource.m +++ b/Plugins/HTTPSource/HTTPSource.m @@ -15,12 +15,18 @@ { _url = [url copy]; + _responseReceived = YES; _connectionFinished = NO; _byteCount = 0; _data = [[NSMutableData alloc] init]; _sem = [[Semaphore alloc] init]; [NSThread detachNewThreadSelector:@selector(doConnection) toTarget:self withObject:nil]; + + //Wait for a response. + while (!_responseReceived && !_connectionFinished) { + [_sem wait]; + } NSLog(@"Connection opened!"); @@ -47,9 +53,9 @@ NSLog(@"Thread exit"); } -- (NSDictionary *)properties +- (NSString *)mimeType { - return nil; + return _mimeType; } - (BOOL)seekable @@ -78,10 +84,12 @@ if (amount > [_data length]) amount = [_data length]; - [_data getBytes:buffer length:amount]; + @synchronized (_data) { + [_data getBytes:buffer length:amount]; - //Remove the bytes - [_data replaceBytesInRange:NSMakeRange(0, amount) withBytes:NULL length:0]; + //Remove the bytes + [_data replaceBytesInRange:NSMakeRange(0, amount) withBytes:NULL length:0]; + } _byteCount += amount; @@ -138,11 +146,11 @@ -(void)connection:(NSURLConnection *)connection didReceiveResponse:(NSURLResponse *)response { - //May be called more than once. Mime-type may change. Will be called before didReceiveData - NSLog(@"Received response: %@", response); + NSLog(@"Received response: %@", [response MIMEType]); + _mimeType = [response MIMEType]; + _responseReceived = YES; - [_data release]; - _data = [[NSMutableData alloc] init]; + [_sem signal]; } -(NSCachedURLResponse *)connection:(NSURLConnection *)connection willCacheResponse:(NSCachedURLResponse *)cachedResponse @@ -172,7 +180,10 @@ - (void)connection:(NSURLConnection *)connection didReceiveData:(NSData *)data { - [_data appendData:data]; + @synchronized (_data) { + [_data appendData:data]; + } + [_sem signal]; } diff --git a/Plugins/MAD/MAD.xcodeproj/project.pbxproj b/Plugins/MAD/MAD.xcodeproj/project.pbxproj index 9c7af2cad..910c7f196 100644 --- a/Plugins/MAD/MAD.xcodeproj/project.pbxproj +++ b/Plugins/MAD/MAD.xcodeproj/project.pbxproj @@ -11,7 +11,6 @@ 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 */; }; - 17B618AF0B90997E00BC003F /* MADPropertiesReader.m in Sources */ = {isa = PBXBuildFile; fileRef = 17B618AD0B90997E00BC003F /* MADPropertiesReader.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 */; }; @@ -75,8 +74,6 @@ 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 = ""; }; - 17B618AC0B90997E00BC003F /* MADPropertiesReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MADPropertiesReader.h; sourceTree = ""; }; - 17B618AD0B90997E00BC003F /* MADPropertiesReader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MADPropertiesReader.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 = ""; }; @@ -136,8 +133,6 @@ 17ADB1D10B9793C500257CA2 /* MADPlugin.m */, 170335420B8FC4EE00327265 /* MADDecoder.h */, 170335430B8FC4EE00327265 /* MADDecoder.m */, - 17B618AC0B90997E00BC003F /* MADPropertiesReader.h */, - 17B618AD0B90997E00BC003F /* MADPropertiesReader.m */, ); name = Classes; sourceTree = ""; @@ -276,7 +271,6 @@ buildActionMask = 2147483647; files = ( 170335470B8FC4EE00327265 /* MADDecoder.m in Sources */, - 17B618AF0B90997E00BC003F /* MADPropertiesReader.m in Sources */, 17ADB1D30B9793C500257CA2 /* MADPlugin.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/Plugins/MAD/MADPlugin.m b/Plugins/MAD/MADPlugin.m index 40cd626a0..c1c77b92c 100644 --- a/Plugins/MAD/MADPlugin.m +++ b/Plugins/MAD/MADPlugin.m @@ -8,7 +8,6 @@ #import "MADPlugin.h" #import "MADDecoder.h" -#import "MADPropertiesReader.h" @implementation MADPlugin @@ -16,7 +15,6 @@ { return [NSDictionary dictionaryWithObjectsAndKeys: kCogDecoder, [MADDecoder className], - kCogPropertiesReader, [MADPropertiesReader className], nil ]; } diff --git a/Plugins/MAD/MADPropertiesReader.h b/Plugins/MAD/MADPropertiesReader.h deleted file mode 100644 index 066f0fbc0..000000000 --- a/Plugins/MAD/MADPropertiesReader.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// MADPropertiesReader.h -// MAD -// -// Created by Vincent Spader on 2/24/07. -// Copyright 2007 __MyCompanyName__. All rights reserved. -// - -#import - -#import "Plugin.h" - - -@interface MADPropertiesReader : NSObject -{ - -} - -@end diff --git a/Plugins/MAD/MADPropertiesReader.m b/Plugins/MAD/MADPropertiesReader.m deleted file mode 100644 index 298c83991..000000000 --- a/Plugins/MAD/MADPropertiesReader.m +++ /dev/null @@ -1,40 +0,0 @@ -// -// MADPropertiesReader.m -// MAD -// -// Created by Vincent Spader on 2/24/07. -// Copyright 2007 __MyCompanyName__. All rights reserved. -// - -#import "MADPropertiesReader.h" -#import "MADDecoder.h" - -@implementation MADPropertiesReader - -+ (NSDictionary *)propertiesForSource:(id)source -{ - NSDictionary *properties; - MADDecoder *decoder; - - decoder = [[MADDecoder alloc] init]; - if (![decoder open:source]) - { - [decoder release]; - return nil; - } - - properties = [decoder properties]; - - [decoder close]; - [decoder release]; - - return properties; -} - - -+ (NSArray *)fileTypes -{ - return [NSArray arrayWithObject:@"mp3"]; -} - -@end diff --git a/Plugins/MonkeysAudio/MonkeysAudio.xcodeproj/project.pbxproj b/Plugins/MonkeysAudio/MonkeysAudio.xcodeproj/project.pbxproj index 5f0750dad..ca97659df 100644 --- a/Plugins/MonkeysAudio/MonkeysAudio.xcodeproj/project.pbxproj +++ b/Plugins/MonkeysAudio/MonkeysAudio.xcodeproj/project.pbxproj @@ -8,7 +8,6 @@ /* Begin PBXBuildFile section */ 1745C2ED0B90BDD100A6768C /* MonkeysAudioDecoder.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1745C2E80B90BDD100A6768C /* MonkeysAudioDecoder.mm */; }; - 1745C2EE0B90BDD100A6768C /* MonkeysAudioPropertiesReader.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1745C2EA0B90BDD100A6768C /* MonkeysAudioPropertiesReader.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 */; }; @@ -58,8 +57,6 @@ 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; 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 = ""; }; - 1745C2E90B90BDD100A6768C /* MonkeysAudioPropertiesReader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MonkeysAudioPropertiesReader.h; sourceTree = ""; }; - 1745C2EA0B90BDD100A6768C /* MonkeysAudioPropertiesReader.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = MonkeysAudioPropertiesReader.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 = ""; }; @@ -122,8 +119,6 @@ 17ADB1E70B9793E300257CA2 /* MonkeysAudioPlugin.mm */, 1745C2E70B90BDD100A6768C /* MonkeysAudioDecoder.h */, 1745C2E80B90BDD100A6768C /* MonkeysAudioDecoder.mm */, - 1745C2E90B90BDD100A6768C /* MonkeysAudioPropertiesReader.h */, - 1745C2EA0B90BDD100A6768C /* MonkeysAudioPropertiesReader.mm */, 8EB1E6F80B9B39AA008F9F45 /* SourceIO.h */, 8EB1E6FC0B9B39D4008F9F45 /* SourceIO.mm */, ); @@ -243,7 +238,6 @@ buildActionMask = 2147483647; files = ( 1745C2ED0B90BDD100A6768C /* MonkeysAudioDecoder.mm in Sources */, - 1745C2EE0B90BDD100A6768C /* MonkeysAudioPropertiesReader.mm in Sources */, 17ADB1E90B9793E300257CA2 /* MonkeysAudioPlugin.mm in Sources */, 8EB1E6FD0B9B39D4008F9F45 /* SourceIO.mm in Sources */, ); diff --git a/Plugins/MonkeysAudio/MonkeysAudioPlugin.mm b/Plugins/MonkeysAudio/MonkeysAudioPlugin.mm index 4455e9d1b..5aaa7bfc4 100644 --- a/Plugins/MonkeysAudio/MonkeysAudioPlugin.mm +++ b/Plugins/MonkeysAudio/MonkeysAudioPlugin.mm @@ -8,7 +8,6 @@ #import "MonkeysAudioPlugin.h" #import "MonkeysAudioDecoder.h" -#import "MonkeysAudioPropertiesReader.h" @implementation MonkeysAudioPlugin @@ -16,7 +15,6 @@ { return [NSDictionary dictionaryWithObjectsAndKeys: kCogDecoder, [MonkeysAudioDecoder className], - kCogPropertiesReader, [MonkeysAudioPropertiesReader className], nil ]; } diff --git a/Plugins/MonkeysAudio/MonkeysAudioPropertiesReader.h b/Plugins/MonkeysAudio/MonkeysAudioPropertiesReader.h deleted file mode 100644 index e0f18cc53..000000000 --- a/Plugins/MonkeysAudio/MonkeysAudioPropertiesReader.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// MADPropertiesReader.h -// MAD -// -// Created by Vincent Spader on 2/24/07. -// Copyright 2007 __MyCompanyName__. All rights reserved. -// - -#import - -#import "Plugin.h" - - -@interface MonkeysAudioPropertiesReader : NSObject -{ - -} - -@end diff --git a/Plugins/MonkeysAudio/MonkeysAudioPropertiesReader.mm b/Plugins/MonkeysAudio/MonkeysAudioPropertiesReader.mm deleted file mode 100644 index bec0241b4..000000000 --- a/Plugins/MonkeysAudio/MonkeysAudioPropertiesReader.mm +++ /dev/null @@ -1,40 +0,0 @@ -// -// MADPropertiesReader.m -// MAD -// -// Created by Vincent Spader on 2/24/07. -// Copyright 2007 __MyCompanyName__. All rights reserved. -// - -#import "MonkeysAudioPropertiesReader.h" -#import "MonkeysAudioDecoder.h" - -@implementation MonkeysAudioPropertiesReader - -+ (NSDictionary *)propertiesForSource:(id)source -{ - NSDictionary *properties; - MonkeysAudioDecoder *decoder; - - decoder = [[MonkeysAudioDecoder alloc] init]; - if (![decoder open:source]) - { - [decoder release]; - return nil; - } - - properties = [decoder properties]; - - [decoder close]; - [decoder release]; - - return properties; -} - - -+ (NSArray *)fileTypes -{ - return [MonkeysAudioDecoder fileTypes]; -} - -@end diff --git a/Plugins/Musepack/Musepack.xcodeproj/project.pbxproj b/Plugins/Musepack/Musepack.xcodeproj/project.pbxproj index 5d8adb0e5..f8d296a4a 100644 --- a/Plugins/Musepack/Musepack.xcodeproj/project.pbxproj +++ b/Plugins/Musepack/Musepack.xcodeproj/project.pbxproj @@ -8,7 +8,6 @@ /* Begin PBXBuildFile section */ 1703330D0B8FB64500327265 /* MusepackDecoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 1703330A0B8FB64500327265 /* MusepackDecoder.m */; }; - 1745C1A40B90B57400A6768C /* MusepackPropertiesReader.m in Sources */ = {isa = PBXBuildFile; fileRef = 1745C1A20B90B57400A6768C /* MusepackPropertiesReader.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 */; }; @@ -55,8 +54,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 = ""; }; - 1745C1A10B90B57400A6768C /* MusepackPropertiesReader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MusepackPropertiesReader.h; sourceTree = ""; }; - 1745C1A20B90B57400A6768C /* MusepackPropertiesReader.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MusepackPropertiesReader.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; }; @@ -117,8 +114,6 @@ 17ADB2010B9793FF00257CA2 /* MusepackPlugin.m */, 170333090B8FB64500327265 /* MusepackDecoder.h */, 1703330A0B8FB64500327265 /* MusepackDecoder.m */, - 1745C1A10B90B57400A6768C /* MusepackPropertiesReader.h */, - 1745C1A20B90B57400A6768C /* MusepackPropertiesReader.m */, ); name = Classes; sourceTree = ""; @@ -236,7 +231,6 @@ buildActionMask = 2147483647; files = ( 1703330D0B8FB64500327265 /* MusepackDecoder.m in Sources */, - 1745C1A40B90B57400A6768C /* MusepackPropertiesReader.m in Sources */, 17ADB2030B9793FF00257CA2 /* MusepackPlugin.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/Plugins/Musepack/MusepackPlugin.m b/Plugins/Musepack/MusepackPlugin.m index 25cab2dd0..e6148b6ad 100644 --- a/Plugins/Musepack/MusepackPlugin.m +++ b/Plugins/Musepack/MusepackPlugin.m @@ -8,7 +8,6 @@ #import "MusepackPlugin.h" #import "MusepackDecoder.h" -#import "MusepackPropertiesReader.h" @implementation MusepackPlugin @@ -16,7 +15,6 @@ { return [NSDictionary dictionaryWithObjectsAndKeys: kCogDecoder, [MusepackDecoder className], - kCogPropertiesReader, [MusepackPropertiesReader className], nil ]; } diff --git a/Plugins/Musepack/MusepackPropertiesReader.h b/Plugins/Musepack/MusepackPropertiesReader.h deleted file mode 100644 index 8eaa609ff..000000000 --- a/Plugins/Musepack/MusepackPropertiesReader.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// MADPropertiesReader.h -// MAD -// -// Created by Vincent Spader on 2/24/07. -// Copyright 2007 __MyCompanyName__. All rights reserved. -// - -#import - -#import "Plugin.h" - - -@interface MusepackPropertiesReader : NSObject -{ - -} - -@end diff --git a/Plugins/Musepack/MusepackPropertiesReader.m b/Plugins/Musepack/MusepackPropertiesReader.m deleted file mode 100644 index f4e104272..000000000 --- a/Plugins/Musepack/MusepackPropertiesReader.m +++ /dev/null @@ -1,40 +0,0 @@ -// -// MADPropertiesReader.m -// MAD -// -// Created by Vincent Spader on 2/24/07. -// Copyright 2007 __MyCompanyName__. All rights reserved. -// - -#import "MusepackPropertiesReader.h" -#import "MusepackDecoder.h" - -@implementation MusepackPropertiesReader - -+ (NSDictionary *)propertiesForSource:(id)source -{ - NSDictionary *properties; - MusepackDecoder *decoder; - - decoder = [[MusepackDecoder alloc] init]; - if (![decoder open:source]) - { - [decoder release]; - return nil; - } - - properties = [decoder properties]; - - [decoder close]; - [decoder release]; - - return properties; -} - - -+ (NSArray *)fileTypes -{ - return [NSArray arrayWithObject:@"mpc"]; -} - -@end diff --git a/Plugins/Quicktime/Quicktime.xcodeproj/project.pbxproj b/Plugins/Quicktime/Quicktime.xcodeproj/project.pbxproj index 442346ca5..84b44614c 100644 --- a/Plugins/Quicktime/Quicktime.xcodeproj/project.pbxproj +++ b/Plugins/Quicktime/Quicktime.xcodeproj/project.pbxproj @@ -9,7 +9,6 @@ /* 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 */; }; - 1727BFE60C1C956F0084363D /* QuicktimePropertiesReader.m in Sources */ = {isa = PBXBuildFile; fileRef = 1727BFE50C1C956F0084363D /* QuicktimePropertiesReader.m */; }; 1727C0670C1C97A00084363D /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1727C0660C1C97A00084363D /* AudioToolbox.framework */; }; 1727C0BE0C1C9E180084363D /* QuickTime.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1727C0BD0C1C9E180084363D /* QuickTime.framework */; }; 1727C2E50C1CA97C0084363D /* QTKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1727C2E40C1CA97C0084363D /* QTKit.framework */; }; @@ -25,8 +24,6 @@ 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 = ""; }; - 1727BFE40C1C956F0084363D /* QuicktimePropertiesReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QuicktimePropertiesReader.h; sourceTree = ""; }; - 1727BFE50C1C956F0084363D /* QuicktimePropertiesReader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QuicktimePropertiesReader.m; sourceTree = ""; }; 1727C0660C1C97A00084363D /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = /System/Library/Frameworks/AudioToolbox.framework; sourceTree = ""; }; 1727C0BD0C1C9E180084363D /* QuickTime.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuickTime.framework; path = /System/Library/Frameworks/QuickTime.framework; sourceTree = ""; }; 1727C2E40C1CA97C0084363D /* QTKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QTKit.framework; path = /System/Library/Frameworks/QTKit.framework; sourceTree = ""; }; @@ -88,8 +85,6 @@ 1727BFD00C1C94FD0084363D /* QuicktimePlugin.m */, 1727BFDB0C1C95350084363D /* QuicktimeDecoder.h */, 1727BFDC0C1C95350084363D /* QuicktimeDecoder.m */, - 1727BFE40C1C956F0084363D /* QuicktimePropertiesReader.h */, - 1727BFE50C1C956F0084363D /* QuicktimePropertiesReader.m */, ); name = Classes; sourceTree = ""; @@ -184,7 +179,6 @@ files = ( 1727BFD10C1C94FD0084363D /* QuicktimePlugin.m in Sources */, 1727BFDD0C1C95350084363D /* QuicktimeDecoder.m in Sources */, - 1727BFE60C1C956F0084363D /* QuicktimePropertiesReader.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/Plugins/Quicktime/QuicktimePlugin.m b/Plugins/Quicktime/QuicktimePlugin.m index 639e238c7..734d69c32 100644 --- a/Plugins/Quicktime/QuicktimePlugin.m +++ b/Plugins/Quicktime/QuicktimePlugin.m @@ -8,7 +8,6 @@ #import "QuicktimePlugin.h" #import "QuicktimeDecoder.h" -#import "QuicktimePropertiesReader.h" @implementation QuicktimePlugin @@ -16,7 +15,6 @@ { return [NSDictionary dictionaryWithObjectsAndKeys: kCogDecoder, [QuicktimeDecoder className], - kCogPropertiesReader, [QuicktimePropertiesReader className], nil ]; } diff --git a/Plugins/Quicktime/QuicktimePropertiesReader.h b/Plugins/Quicktime/QuicktimePropertiesReader.h deleted file mode 100644 index 9a457c24f..000000000 --- a/Plugins/Quicktime/QuicktimePropertiesReader.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// QuicktimePropertiesReader.h -// Quicktime -// -// Created by Vincent Spader on 6/10/07. -// Copyright 2007 __MyCompanyName__. All rights reserved. -// - -#import -#import "Plugin.h" - -@interface QuicktimePropertiesReader : NSObject { - -} - -@end diff --git a/Plugins/Quicktime/QuicktimePropertiesReader.m b/Plugins/Quicktime/QuicktimePropertiesReader.m deleted file mode 100644 index ffa952bcd..000000000 --- a/Plugins/Quicktime/QuicktimePropertiesReader.m +++ /dev/null @@ -1,40 +0,0 @@ -// -// QuicktimePropertiesReader.m -// Quicktime -// -// Created by Vincent Spader on 6/10/07. -// Copyright 2007 __MyCompanyName__. All rights reserved. -// - -#import "QuicktimePropertiesReader.h" -#import "QuicktimeDecoder.h" - -@implementation QuicktimePropertiesReader - - -+ (NSDictionary *)propertiesForSource:(id)source -{ - NSDictionary *properties; - QuicktimeDecoder *decoder; - - decoder = [[QuicktimeDecoder alloc] init]; - if (![decoder open:source]) - { - return nil; - } - - properties = [decoder properties]; - - [decoder close]; - - return properties; -} - - -+ (NSArray *)fileTypes -{ - return [QuicktimeDecoder fileTypes]; -} - - -@end diff --git a/Plugins/Shorten/Shorten.xcodeproj/project.pbxproj b/Plugins/Shorten/Shorten.xcodeproj/project.pbxproj index 5414df976..3dca07517 100644 --- a/Plugins/Shorten/Shorten.xcodeproj/project.pbxproj +++ b/Plugins/Shorten/Shorten.xcodeproj/project.pbxproj @@ -8,7 +8,6 @@ /* Begin PBXBuildFile section */ 1745C4300B90C1DC00A6768C /* ShortenDecoder.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1745C42C0B90C1DC00A6768C /* ShortenDecoder.mm */; }; - 1745C4310B90C1DC00A6768C /* ShortenPropertiesReader.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1745C42E0B90C1DC00A6768C /* ShortenPropertiesReader.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 */; }; @@ -55,8 +54,6 @@ 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; 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 = ""; }; - 1745C42D0B90C1DC00A6768C /* ShortenPropertiesReader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ShortenPropertiesReader.h; sourceTree = ""; }; - 1745C42E0B90C1DC00A6768C /* ShortenPropertiesReader.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = ShortenPropertiesReader.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 = ""; }; @@ -117,8 +114,6 @@ 17ADB2230B97942800257CA2 /* ShortenPlugin.mm */, 1745C42B0B90C1DC00A6768C /* ShortenDecoder.h */, 1745C42C0B90C1DC00A6768C /* ShortenDecoder.mm */, - 1745C42D0B90C1DC00A6768C /* ShortenPropertiesReader.h */, - 1745C42E0B90C1DC00A6768C /* ShortenPropertiesReader.mm */, ); name = Classes; sourceTree = ""; @@ -236,7 +231,6 @@ buildActionMask = 2147483647; files = ( 1745C4300B90C1DC00A6768C /* ShortenDecoder.mm in Sources */, - 1745C4310B90C1DC00A6768C /* ShortenPropertiesReader.mm in Sources */, 17ADB2250B97942800257CA2 /* ShortenPlugin.mm in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/Plugins/Shorten/ShortenPlugin.mm b/Plugins/Shorten/ShortenPlugin.mm index 9f960edc3..78c6fd48c 100644 --- a/Plugins/Shorten/ShortenPlugin.mm +++ b/Plugins/Shorten/ShortenPlugin.mm @@ -8,7 +8,6 @@ #import "ShortenPlugin.h" #import "ShortenDecoder.h" -#import "ShortenPropertiesReader.h" @implementation ShortenPlugin @@ -16,7 +15,6 @@ { return [NSDictionary dictionaryWithObjectsAndKeys: kCogDecoder, [ShortenDecoder className], - kCogPropertiesReader, [ShortenPropertiesReader className], nil ]; } diff --git a/Plugins/Shorten/ShortenPropertiesReader.h b/Plugins/Shorten/ShortenPropertiesReader.h deleted file mode 100644 index b83ae4b74..000000000 --- a/Plugins/Shorten/ShortenPropertiesReader.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// MADPropertiesReader.h -// MAD -// -// Created by Vincent Spader on 2/24/07. -// Copyright 2007 __MyCompanyName__. All rights reserved. -// - -#import - -#import "Plugin.h" - - -@interface ShortenPropertiesReader : NSObject -{ - -} - -@end diff --git a/Plugins/Shorten/ShortenPropertiesReader.mm b/Plugins/Shorten/ShortenPropertiesReader.mm deleted file mode 100644 index 18f27cd06..000000000 --- a/Plugins/Shorten/ShortenPropertiesReader.mm +++ /dev/null @@ -1,40 +0,0 @@ -// -// MADPropertiesReader.m -// MAD -// -// Created by Vincent Spader on 2/24/07. -// Copyright 2007 __MyCompanyName__. All rights reserved. -// - -#import "ShortenPropertiesReader.h" -#import "ShortenDecoder.h" - -@implementation ShortenPropertiesReader - -+ (NSDictionary *)propertiesForSource:(id)source -{ - NSDictionary *properties; - ShortenDecoder *decoder; - - decoder = [[ShortenDecoder alloc] init]; - if (![decoder open:source]) - { - [decoder release]; - return nil; - } - - properties = [decoder properties]; - - [decoder close]; - [decoder release]; - - return properties; -} - - -+ (NSArray *)fileTypes -{ - return [ShortenDecoder fileTypes]; -} - -@end diff --git a/Plugins/Vorbis/Vorbis.xcodeproj/project.pbxproj b/Plugins/Vorbis/Vorbis.xcodeproj/project.pbxproj index e2ef3d087..ece0245fd 100644 --- a/Plugins/Vorbis/Vorbis.xcodeproj/project.pbxproj +++ b/Plugins/Vorbis/Vorbis.xcodeproj/project.pbxproj @@ -7,7 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 1745C2840B90B9F200A6768C /* VorbisPropertiesReader.m in Sources */ = {isa = PBXBuildFile; fileRef = 1745C2820B90B9F200A6768C /* VorbisPropertiesReader.m */; }; 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 */; }; @@ -53,8 +52,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 = ""; }; - 1745C2810B90B9F200A6768C /* VorbisPropertiesReader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = VorbisPropertiesReader.h; sourceTree = ""; }; - 1745C2820B90B9F200A6768C /* VorbisPropertiesReader.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = VorbisPropertiesReader.m; 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 = ""; }; @@ -117,8 +114,6 @@ 17ADB2470B97944D00257CA2 /* VorbisPlugin.m */, 17C93D330B8FDA66008627D6 /* VorbisDecoder.h */, 17C93D340B8FDA66008627D6 /* VorbisDecoder.m */, - 1745C2810B90B9F200A6768C /* VorbisPropertiesReader.h */, - 1745C2820B90B9F200A6768C /* VorbisPropertiesReader.m */, ); name = Classes; sourceTree = ""; @@ -236,7 +231,6 @@ buildActionMask = 2147483647; files = ( 17C93D360B8FDA66008627D6 /* VorbisDecoder.m in Sources */, - 1745C2840B90B9F200A6768C /* VorbisPropertiesReader.m in Sources */, 17ADB2490B97944D00257CA2 /* VorbisPlugin.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/Plugins/Vorbis/VorbisDecoder.m b/Plugins/Vorbis/VorbisDecoder.m index 61752dd03..2ca15f35e 100644 --- a/Plugins/Vorbis/VorbisDecoder.m +++ b/Plugins/Vorbis/VorbisDecoder.m @@ -136,6 +136,11 @@ long sourceTell(void *datasource) nil]; } ++ (NSArray *)mimeTypes +{ + return [NSArray arrayWithObjects:@"application/ogg", @"application/x-ogg", nil]; +} + + (NSArray *)fileTypes { return [NSArray arrayWithObjects:@"ogg",nil]; diff --git a/Plugins/Vorbis/VorbisPlugin.m b/Plugins/Vorbis/VorbisPlugin.m index 2cd25833b..6e6213120 100644 --- a/Plugins/Vorbis/VorbisPlugin.m +++ b/Plugins/Vorbis/VorbisPlugin.m @@ -8,7 +8,6 @@ #import "VorbisPlugin.h" #import "VorbisDecoder.h" -#import "VorbisPropertiesReader.h" @implementation VorbisPlugin @@ -16,7 +15,6 @@ { return [NSDictionary dictionaryWithObjectsAndKeys: kCogDecoder, [VorbisDecoder className], - kCogPropertiesReader, [VorbisPropertiesReader className], nil ]; } diff --git a/Plugins/Vorbis/VorbisPropertiesReader.h b/Plugins/Vorbis/VorbisPropertiesReader.h deleted file mode 100644 index 905bf68cd..000000000 --- a/Plugins/Vorbis/VorbisPropertiesReader.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// MADPropertiesReader.h -// MAD -// -// Created by Vincent Spader on 2/24/07. -// Copyright 2007 __MyCompanyName__. All rights reserved. -// - -#import - -#import "Plugin.h" - - -@interface VorbisPropertiesReader : NSObject -{ - -} - -@end diff --git a/Plugins/Vorbis/VorbisPropertiesReader.m b/Plugins/Vorbis/VorbisPropertiesReader.m deleted file mode 100644 index 5f120b90a..000000000 --- a/Plugins/Vorbis/VorbisPropertiesReader.m +++ /dev/null @@ -1,41 +0,0 @@ -// -// MADPropertiesReader.m -// MAD -// -// Created by Vincent Spader on 2/24/07. -// Copyright 2007 __MyCompanyName__. All rights reserved. -// - -#import "VorbisPropertiesReader.h" -#import "VorbisDecoder.h" - -@implementation VorbisPropertiesReader - -+ (NSDictionary *)propertiesForSource:(id)source -{ - NSDictionary *properties; - VorbisDecoder *decoder; - - decoder = [[VorbisDecoder alloc] init]; - if (![decoder open:source]) - { - [decoder release]; - return nil; - } - - properties = [decoder properties]; - - [decoder close]; - [decoder release]; - NSLog(@"RELEASING"); - - return properties; -} - - -+ (NSArray *)fileTypes -{ - return [VorbisDecoder fileTypes]; -} - -@end diff --git a/Plugins/WavPack/WavPack.xcodeproj/project.pbxproj b/Plugins/WavPack/WavPack.xcodeproj/project.pbxproj index 8c369d2eb..0affd1267 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 */; }; - 1745C4DB0B90C42500A6768C /* WavPackPropertiesReader.m in Sources */ = {isa = PBXBuildFile; fileRef = 1745C4D80B90C42500A6768C /* WavPackPropertiesReader.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 */; }; @@ -51,8 +50,6 @@ 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; 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 = ""; }; - 1745C4D70B90C42500A6768C /* WavPackPropertiesReader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WavPackPropertiesReader.h; sourceTree = ""; }; - 1745C4D80B90C42500A6768C /* WavPackPropertiesReader.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = WavPackPropertiesReader.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 = ""; }; @@ -113,8 +110,6 @@ 17ADB2610B97946600257CA2 /* WavPackPlugin.m */, 1745C4D50B90C42500A6768C /* WavPackDecoder.h */, 1745C4D60B90C42500A6768C /* WavPackDecoder.m */, - 1745C4D70B90C42500A6768C /* WavPackPropertiesReader.h */, - 1745C4D80B90C42500A6768C /* WavPackPropertiesReader.m */, ); name = Classes; sourceTree = ""; @@ -232,7 +227,6 @@ buildActionMask = 2147483647; files = ( 1745C4DA0B90C42500A6768C /* WavPackDecoder.m in Sources */, - 1745C4DB0B90C42500A6768C /* WavPackPropertiesReader.m in Sources */, 17ADB2630B97946600257CA2 /* WavPackPlugin.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/Plugins/WavPack/WavPackPlugin.m b/Plugins/WavPack/WavPackPlugin.m index 89d66fa19..255836111 100644 --- a/Plugins/WavPack/WavPackPlugin.m +++ b/Plugins/WavPack/WavPackPlugin.m @@ -8,7 +8,6 @@ #import "WavPackPlugin.h" #import "WavPackDecoder.h" -#import "WavPackPropertiesReader.h" @implementation WavPackPlugin @@ -16,7 +15,6 @@ { return [NSDictionary dictionaryWithObjectsAndKeys: kCogDecoder, [WavPackDecoder className], - kCogPropertiesReader, [WavPackPropertiesReader className], nil ]; } diff --git a/Plugins/WavPack/WavPackPropertiesReader.h b/Plugins/WavPack/WavPackPropertiesReader.h deleted file mode 100644 index 380883dc7..000000000 --- a/Plugins/WavPack/WavPackPropertiesReader.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// MADPropertiesReader.h -// MAD -// -// Created by Vincent Spader on 2/24/07. -// Copyright 2007 __MyCompanyName__. All rights reserved. -// - -#import - -#import "Plugin.h" - - -@interface WavPackPropertiesReader : NSObject -{ - -} - -@end diff --git a/Plugins/WavPack/WavPackPropertiesReader.m b/Plugins/WavPack/WavPackPropertiesReader.m deleted file mode 100644 index d2bf3bf7c..000000000 --- a/Plugins/WavPack/WavPackPropertiesReader.m +++ /dev/null @@ -1,40 +0,0 @@ -// -// MADPropertiesReader.m -// MAD -// -// Created by Vincent Spader on 2/24/07. -// Copyright 2007 __MyCompanyName__. All rights reserved. -// - -#import "WavPackPropertiesReader.h" -#import "WavPackDecoder.h" - -@implementation WavPackPropertiesReader - -+ (NSDictionary *)propertiesForSource:(id)source -{ - NSDictionary *properties; - WavPackDecoder *decoder; - - decoder = [[WavPackDecoder alloc] init]; - if (![decoder open:source]) - { - [decoder release]; - return nil; - } - - properties = [decoder properties]; - - [decoder close]; - [decoder release]; - - return properties; -} - - -+ (NSArray *)fileTypes -{ - return [WavPackDecoder fileTypes]; -} - -@end