diff --git a/AppController.m b/AppController.m index dd009b37..6dfa4775 100644 --- a/AppController.m +++ b/AppController.m @@ -73,7 +73,6 @@ - (id)init { defaultValues[@"XBMC_naming"] = @NO; defaultValues[@"KeepSeriesFor"] = @"30"; defaultValues[@"RemoveOldSeries"] = @NO; - defaultValues[@"AudioDescribed"] = @NO; defaultValues[@"QuickCache"] = @YES; defaultValues[@"TagShows"] = @YES; // TODO: remove 4oD @@ -81,9 +80,19 @@ - (id)init { defaultValues[@"Cache4oD_TV"] = @NO; defaultValues[@"TestProxy"] = @YES; defaultValues[@"ShowDownloadedInSearch"] = @YES; + + defaultValues[@"AudioDescribedNew"] = @NO; + defaultValues[@"SignedNew"] = @NO; [[NSUserDefaults standardUserDefaults] registerDefaults:defaultValues]; defaultValues = nil; + + //Migrate old AudioDescribed option + if ([[NSUserDefaults standardUserDefaults] objectForKey:@"AudioDescribed"]) { + [[NSUserDefaults standardUserDefaults] setObject:@YES forKey:@"AudioDescribedNew"]; + [[NSUserDefaults standardUserDefaults] setObject:@YES forKey:@"SignedNew"]; + [[NSUserDefaults standardUserDefaults] removeObjectForKey:@"AudioDescribed"]; + } //Make sure Application Support folder exists NSString *folder = @"~/Library/Application Support/Get iPlayer Automator/"; diff --git a/BBCDownload.m b/BBCDownload.m index 64578750..5c2a8d32 100644 --- a/BBCDownload.m +++ b/BBCDownload.m @@ -83,12 +83,13 @@ - (id)initWithProgramme:(Programme *)tempShow tvFormats:(NSArray *)tvFormatList getArg = @"--pid"; NSString *searchArg = [[NSString alloc] initWithFormat:@"%@", [show pid]]; - //AudioDescribed - NSString *versionArg; - if ([[[NSUserDefaults standardUserDefaults] valueForKey:@"AudioDescribed"] boolValue]) - versionArg = @"--versions=audiodescribed,signed,default"; - else - versionArg = @"--versions=default"; + //AudioDescribed & Signed + NSMutableString *versionArg = [NSMutableString stringWithString:@"--versions="]; + if ([[[NSUserDefaults standardUserDefaults] valueForKey:@"AudioDescribedNew"] boolValue]) + [versionArg appendString:@"audiodescribed,"]; + if ([[[NSUserDefaults standardUserDefaults] valueForKey:@"SignedNew"] boolValue]) + [versionArg appendString:@"signed,"]; + [versionArg appendString:@"default"]; //We don't want this to refresh now! NSString *cacheExpiryArg = @"-e604800000000"; diff --git a/English.lproj/MainMenu.xib b/English.lproj/MainMenu.xib index 03ec7976..9e9987de 100644 --- a/English.lproj/MainMenu.xib +++ b/English.lproj/MainMenu.xib @@ -515,11 +515,11 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA - + - + @@ -568,7 +568,7 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA - + @@ -606,7 +606,7 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA - + @@ -711,7 +711,7 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA - + @@ -1621,21 +1621,21 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA - + @@ -1678,6 +1678,17 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA +