Fixed the way plugin controller was setup and loaded.
Updated cuesheet to search for alternate types if wav is not there.CQTexperiment
parent
cc806285e0
commit
9a344922da
|
@ -25,8 +25,6 @@
|
||||||
outputLaunched = NO;
|
outputLaunched = NO;
|
||||||
|
|
||||||
chainQueue = [[NSMutableArray alloc] init];
|
chainQueue = [[NSMutableArray alloc] init];
|
||||||
|
|
||||||
[[PluginController sharedPluginController] setup];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return self;
|
return self;
|
||||||
|
|
|
@ -48,6 +48,8 @@
|
||||||
@end
|
@end
|
||||||
|
|
||||||
@protocol CogPluginController <NSObject>
|
@protocol CogPluginController <NSObject>
|
||||||
|
+ (id<CogPluginController>)sharedPluginController;
|
||||||
|
|
||||||
- (NSDictionary *)sources;
|
- (NSDictionary *)sources;
|
||||||
- (NSDictionary *)containers;
|
- (NSDictionary *)containers;
|
||||||
- (NSDictionary *)metadataReaders;
|
- (NSDictionary *)metadataReaders;
|
||||||
|
|
|
@ -20,8 +20,6 @@
|
||||||
BOOL isSetup;
|
BOOL isSetup;
|
||||||
}
|
}
|
||||||
|
|
||||||
+ (PluginController *)sharedPluginController; //Use this to get the instance.
|
|
||||||
|
|
||||||
- (void)setup;
|
- (void)setup;
|
||||||
- (void)printPluginInfo;
|
- (void)printPluginInfo;
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
//Start of singleton-related stuff.
|
//Start of singleton-related stuff.
|
||||||
static PluginController *sharedPluginController = nil;
|
static PluginController *sharedPluginController = nil;
|
||||||
|
|
||||||
+ (PluginController*)sharedPluginController
|
+ (id<CogPluginController>)sharedPluginController
|
||||||
{
|
{
|
||||||
@synchronized(self) {
|
@synchronized(self) {
|
||||||
if (sharedPluginController == nil) {
|
if (sharedPluginController == nil) {
|
||||||
|
@ -68,6 +68,8 @@ static PluginController *sharedPluginController = nil;
|
||||||
|
|
||||||
decodersByExtension = [[NSMutableDictionary alloc] init];
|
decodersByExtension = [[NSMutableDictionary alloc] init];
|
||||||
decodersByMimeType = [[NSMutableDictionary alloc] init];
|
decodersByMimeType = [[NSMutableDictionary alloc] init];
|
||||||
|
|
||||||
|
[self setup];
|
||||||
}
|
}
|
||||||
|
|
||||||
return self;
|
return self;
|
||||||
|
|
|
@ -179,7 +179,7 @@
|
||||||
NSString* originalURL = [url path];
|
NSString* originalURL = [url path];
|
||||||
|
|
||||||
NSString *ext;
|
NSString *ext;
|
||||||
NSEnumerator *e = [[NSClassFromString(@"PluginController") decodersByExtension] objectEnumerator];
|
NSEnumerator *e = [[[NSClassFromString(@"PluginController") sharedPluginController] decodersByExtension] objectEnumerator];
|
||||||
while (ext = [e nextObject])
|
while (ext = [e nextObject])
|
||||||
{
|
{
|
||||||
NSMutableString* newURL = [originalURL mutableCopy];
|
NSMutableString* newURL = [originalURL mutableCopy];
|
||||||
|
|
Loading…
Reference in New Issue