Skip to content
This repository has been archived by the owner on Jan 3, 2019. It is now read-only.

Commit

Permalink
Clean up PR #594
Browse files Browse the repository at this point in the history
  • Loading branch information
@dinkypumpkin
dinkypumpkin committed Oct 11, 2016
1 parent 5fefc0b commit 30b5520
Show file tree
Hide file tree
Showing 27 changed files with 727 additions and 959 deletions.
6 changes: 3 additions & 3 deletions AppController.h
100755 → 100644
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@
IBOutlet NSArrayController *tvFormatController;
IBOutlet NSArrayController *radioFormatController;
IBOutlet NSArrayController *itvFormatController;
IBOutlet NSButton *itvTVCheckbox;
IBOutlet NSPanel *prefsPanel;

//Scheduling a Start
Expand Down Expand Up @@ -126,12 +125,13 @@
//ITV Cache
BOOL updatingITVIndex;
BOOL updatingBBCIndex;
IBOutlet NSButton *newITVCacheButton;
BOOL forceITVUpdateInProgress;
IBOutlet NSToolbarItem *showNewProgrammes;
IBOutlet NSMenuItem *showNewProgrammesMenuItem;
IBOutlet NSTextField *itvProgressText;
IBOutlet NSMenuItem *forceITVUpdateMenuItem;

//New Programmes History
NSWindow *newProgrammesWindow;
}
@property IBOutlet NSProgressIndicator *itvProgressIndicator;

Expand Down
310 changes: 151 additions & 159 deletions AppController.m
100755 → 100644
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion DownloadHistoryController.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ -(IBAction)showHistoryWindow:(id)sender
else
{
NSAlert *alert = [NSAlert alertWithMessageText:@"Download History cannot be edited while downloads are running."
defaultButton:nil alternateButton:nil otherButton:nil informativeTextWithFormat:nil];
defaultButton:nil alternateButton:nil otherButton:nil informativeTextWithFormat:@""];
[alert runModal];
}
}
Expand Down
857 changes: 441 additions & 416 deletions MainMenu.xib → English.lproj/MainMenu.xib
100755 → 100644
View file

Large diffs are not rendered by default.

Empty file modified ExtendedShowInformationController.m
100755 → 100644
View file
Empty file.
22 changes: 0 additions & 22 deletions Get iPlayer Automator/Images.xcassets/ITV.imageset/Contents.json
View file

This file was deleted.

Binary file removed Get iPlayer Automator/Images.xcassets/ITV.imageset/forward_button-1.png
View file
Binary file not shown.
Binary file removed Get iPlayer Automator/Images.xcassets/ITV.imageset/forward_button.png
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion GetITVListings.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@

+(NewProgrammeHistory*)sharedInstance;
-(id)init;
-(void)addToNewProgrammeHistory:(NSString *)name andTVChannel:(NSString *)tvChannel andNetworkName:(NSString *)netwokrName;
-(void)addToNewProgrammeHistory:(NSString *)name andTVChannel:(NSString *)tvChannel andNetworkName:(NSString *)networkName;
-(void)flushHistoryToDisk;
-(NSMutableArray *)getHistoryArray;

Expand Down
8 changes: 4 additions & 4 deletions GetITVListings.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -646,7 +646,7 @@ -(BOOL)createTodayProgrammeArray
if ( !todayProgrammeArray.count ) {
[logger addToLog:@"No programmes found on www.itv.com/hub/shows"];

NSAlert *noProgs = [NSAlert alertWithMessageText:@"No prgogrammes were found on www.itv.com/hub/shows"
NSAlert *noProgs = [NSAlert alertWithMessageText:@"No programmes were found on www.itv.com/hub/shows"
defaultButton:@"OK"
alternateButton:nil
otherButton:nil
Expand Down Expand Up @@ -680,7 +680,7 @@ @implementation ProgrammeData
- (id)initWithName:(NSString *)name andPID:(NSString *)pid andURL:(NSString *)url andNUMBEREPISODES:(int)numberEpisodes andDATELASTAIRED:(NSTimeInterval)timeIntDateLastAired;
{
self.programmeName = name;
[self fixProgrammeName];
//[self fixProgrammeName];
self.productionId = pid;
self.programmeURL = url;
self.numberEpisodes = numberEpisodes;
Expand Down Expand Up @@ -801,10 +801,10 @@ -(id)init
return self;
}

-(void)addToNewProgrammeHistory:(NSString *)name andTVChannel:(NSString *)tvChannel andNetworkName:(NSString *)netwokrName
-(void)addToNewProgrammeHistory:(NSString *)name andTVChannel:(NSString *)tvChannel andNetworkName:(NSString *)networkName
{
itemsAdded = true;
ProgrammeHistoryObject *newEntry = [[ProgrammeHistoryObject alloc]initWithName:name andTVChannel:tvChannel andDateFound:dateFound andSortKey:timeIntervalSince1970UTC andNetworkName:netwokrName];
ProgrammeHistoryObject *newEntry = [[ProgrammeHistoryObject alloc]initWithName:name andTVChannel:tvChannel andDateFound:dateFound andSortKey:timeIntervalSince1970UTC andNetworkName:networkName];
[programmeHistoryArray addObject:newEntry];
}

Expand Down
41 changes: 23 additions & 18 deletions Get_iPlayer GUI.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,28 +10,27 @@
392628B11C999B1A0033CF84 /* EmptyToStringTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 392628B01C999B1A0033CF84 /* EmptyToStringTransformer.m */; };
392A41A4169735340053DEA5 /* HTTPProxy.m in Sources */ = {isa = PBXBuildFile; fileRef = 392A41A3169735340053DEA5 /* HTTPProxy.m */; };
393D1DEE18A5BBB500F27880 /* RSRTVArrayController.m in Sources */ = {isa = PBXBuildFile; fileRef = 393D1DED18A5BBB500F27880 /* RSRTVArrayController.m */; };
396FDA611DA98179003F3F57 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 396FDA5F1DA98179003F3F57 /* MainMenu.xib */; };
3975484D1622504F00470DD1 /* ttml2srt.py in Resources */ = {isa = PBXBuildFile; fileRef = 3975484C1622504F00470DD1 /* ttml2srt.py */; };
398516A716D1A02500EBB4CE /* Body2 in Resources */ = {isa = PBXBuildFile; fileRef = 398516A616D1A02500EBB4CE /* Body2 */; };
39879DAF16904B9F0050CA7D /* GTMNSString+HTML.m in Sources */ = {isa = PBXBuildFile; fileRef = 39879DAC16904B9F0050CA7D /* GTMNSString+HTML.m */; };
39879DB016904B9F0050CA7D /* NSString+HTML.m in Sources */ = {isa = PBXBuildFile; fileRef = 39879DAE16904B9F0050CA7D /* NSString+HTML.m */; };
39ABB9C017FCCD9300B5D519 /* Growl.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = D93AD85317DC9D6E00458B1C /* Growl.framework */; };
39AE5F5E1D329E390019E5EF /* rtmpdump in CopyFiles */ = {isa = PBXBuildFile; fileRef = 39AE5F5C1D3294C40019E5EF /* rtmpdump */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
39D52EA81DAAFD450033C4ED /* NPHistoryWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 39D52EA71DAAFD450033C4ED /* NPHistoryWindowController.m */; };
39D7C1BD1874AD7400B78698 /* StringTrimFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 39D7C1BC1874AD7400B78698 /* StringTrimFormatter.m */; };
39D7C1C01874AD9D00B78698 /* NilToStringTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 39D7C1BF1874AD9D00B78698 /* NilToStringTransformer.m */; };
39FD5E9619D370BD006BC47B /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 39FD5E9519D370BD006BC47B /* Images.xcassets */; };
8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
8D11072D0486CEB800E47090 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; settings = {ATTRIBUTES = (); }; };
8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
BF382ECF1D73C18C00BAF106 /* Release X Doco.rtf in Resources */ = {isa = PBXBuildFile; fileRef = BF382ECE1D73C18C00BAF106 /* Release X Doco.rtf */; };
BF382ED21D73C23400BAF106 /* AppController.m in Sources */ = {isa = PBXBuildFile; fileRef = BF382ED11D73C23400BAF106 /* AppController.m */; };
BF382ED41D73C26800BAF106 /* ExtendedShowInformationController.m in Sources */ = {isa = PBXBuildFile; fileRef = BF382ED31D73C26800BAF106 /* ExtendedShowInformationController.m */; };
BF382ED71D73C2A400BAF106 /* GetiPlayerArguments.m in Sources */ = {isa = PBXBuildFile; fileRef = BF382ED61D73C2A400BAF106 /* GetiPlayerArguments.m */; };
BF382ED91D73C2C700BAF106 /* GiASearch.m in Sources */ = {isa = PBXBuildFile; fileRef = BF382ED81D73C2C700BAF106 /* GiASearch.m */; };
BF382EDB1D73C2E700BAF106 /* Programme.m in Sources */ = {isa = PBXBuildFile; fileRef = BF382EDA1D73C2E700BAF106 /* Programme.m */; };
BF382EDE1D73C30400BAF106 /* GetITVListings.m in Sources */ = {isa = PBXBuildFile; fileRef = BF382EDD1D73C30400BAF106 /* GetITVListings.m */; };
BF382EE11D73C31600BAF106 /* ITVHistoryWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = BF382EE01D73C31600BAF106 /* ITVHistoryWindowController.m */; };
BF382EE31D73C36300BAF106 /* ITVHistoryWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = BF382EE21D73C36300BAF106 /* ITVHistoryWindow.xib */; };
BF382EE51D73C37B00BAF106 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = BF382EE41D73C37B00BAF106 /* MainMenu.xib */; };
BF382EE31D73C36300BAF106 /* NPHistoryWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = BF382EE21D73C36300BAF106 /* NPHistoryWindow.xib */; };
D904F04A1009F22E00D60BBF /* get_iplayer.pl in Resources */ = {isa = PBXBuildFile; fileRef = D904F0491009F22E00D60BBF /* get_iplayer.pl */; };
D914BC59100C9F0100F7E68E /* ScriptingBridge.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D914BC58100C9F0100F7E68E /* ScriptingBridge.framework */; };
D914BD29100CBFA900F7E68E /* BBCDownload.m in Sources */ = {isa = PBXBuildFile; fileRef = D914BD28100CBFA900F7E68E /* BBCDownload.m */; };
Expand Down Expand Up @@ -156,6 +155,7 @@
392A41A3169735340053DEA5 /* HTTPProxy.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTTPProxy.m; sourceTree = "<group>"; };
393D1DEC18A5BBB500F27880 /* RSRTVArrayController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RSRTVArrayController.h; sourceTree = "<group>"; };
393D1DED18A5BBB500F27880 /* RSRTVArrayController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RSRTVArrayController.m; sourceTree = "<group>"; };
396FDA601DA98179003F3F57 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/MainMenu.xib; sourceTree = "<group>"; };
3975484C1622504F00470DD1 /* ttml2srt.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = ttml2srt.py; sourceTree = "<group>"; };
398516A616D1A02500EBB4CE /* Body2 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Body2; sourceTree = "<group>"; };
39879DAB16904B9F0050CA7D /* GTMNSString+HTML.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "GTMNSString+HTML.h"; sourceTree = "<group>"; };
Expand All @@ -164,14 +164,15 @@
39879DAE16904B9F0050CA7D /* NSString+HTML.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+HTML.m"; sourceTree = "<group>"; };
39AE5F5C1D3294C40019E5EF /* rtmpdump */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; path = rtmpdump; sourceTree = "<group>"; };
39BCA3391877080F007115F2 /* id3v2 */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; path = id3v2; sourceTree = "<group>"; };
39D52EA61DAAFD450033C4ED /* NPHistoryWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NPHistoryWindowController.h; sourceTree = "<group>"; };
39D52EA71DAAFD450033C4ED /* NPHistoryWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NPHistoryWindowController.m; sourceTree = "<group>"; };
39D7C1BB1874AD7400B78698 /* StringTrimFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StringTrimFormatter.h; sourceTree = "<group>"; };
39D7C1BC1874AD7400B78698 /* StringTrimFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = StringTrimFormatter.m; sourceTree = "<group>"; };
39D7C1BE1874AD9D00B78698 /* NilToStringTransformer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NilToStringTransformer.h; sourceTree = "<group>"; };
39D7C1BF1874AD9D00B78698 /* NilToStringTransformer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NilToStringTransformer.m; sourceTree = "<group>"; };
39FD5E9519D370BD006BC47B /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = "Get iPlayer Automator/Images.xcassets"; sourceTree = "<group>"; };
8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
8D1107320486CEB800E47090 /* Get iPlayer Automator.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Get iPlayer Automator.app"; sourceTree = BUILT_PRODUCTS_DIR; };
BF382ECE1D73C18C00BAF106 /* Release X Doco.rtf */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.rtf; path = "Release X Doco.rtf"; sourceTree = "<group>"; };
BF382ED01D73C21500BAF106 /* AppController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppController.h; sourceTree = "<group>"; };
BF382ED11D73C23400BAF106 /* AppController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppController.m; sourceTree = "<group>"; };
BF382ED31D73C26800BAF106 /* ExtendedShowInformationController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ExtendedShowInformationController.m; sourceTree = "<group>"; };
Expand All @@ -181,10 +182,7 @@
BF382EDA1D73C2E700BAF106 /* Programme.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Programme.m; sourceTree = "<group>"; };
BF382EDC1D73C2FB00BAF106 /* GetITVListings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GetITVListings.h; sourceTree = "<group>"; };
BF382EDD1D73C30400BAF106 /* GetITVListings.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GetITVListings.m; sourceTree = "<group>"; };
BF382EDF1D73C30E00BAF106 /* ITVHistoryWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ITVHistoryWindowController.h; sourceTree = "<group>"; };
BF382EE01D73C31600BAF106 /* ITVHistoryWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ITVHistoryWindowController.m; sourceTree = "<group>"; };
BF382EE21D73C36300BAF106 /* ITVHistoryWindow.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ITVHistoryWindow.xib; sourceTree = "<group>"; };
BF382EE41D73C37B00BAF106 /* MainMenu.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MainMenu.xib; sourceTree = "<group>"; };
BF382EE21D73C36300BAF106 /* NPHistoryWindow.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NPHistoryWindow.xib; sourceTree = "<group>"; };
D904F0491009F22E00D60BBF /* get_iplayer.pl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.perl; name = get_iplayer.pl; path = ../get_iplayer.pl; sourceTree = "<group>"; };
D904F422100B077600D60BBF /* Programme.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Programme.h; sourceTree = "<group>"; };
D914BC2E100C9DEF00F7E68E /* Safari.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Safari.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -369,7 +367,6 @@
isa = PBXGroup;
children = (
D9B6DB97196D938300161ECB /* Interface2.xib */,
BF382ECE1D73C18C00BAF106 /* Release X Doco.rtf */,
D9CCF52E10259DED009205BE /* Features.rtf */,
D9F97FE9198EBA73006494A3 /* Categories */,
080E96DDFE201D6D7F000001 /* Classes */,
Expand Down Expand Up @@ -408,8 +405,8 @@
8D1107310486CEB800E47090 /* Info.plist */,
D9CCF3CB1023485A009205BE /* dsa_pub.pem */,
089C165CFE840E0CC02AAC07 /* InfoPlist.strings */,
BF382EE41D73C37B00BAF106 /* MainMenu.xib */,
BF382EE21D73C36300BAF106 /* ITVHistoryWindow.xib */,
396FDA5F1DA98179003F3F57 /* MainMenu.xib */,
BF382EE21D73C36300BAF106 /* NPHistoryWindow.xib */,
D9CCF54B1025AAF9009205BE /* Growl Registration Ticket.growlRegDict */,
DFFF196613E96288007B52AC /* ReasonsForFailure.plist */,
D9CDC9E7186B8F2B0003A4E2 /* GetiPlayerAutomator.sdef */,
Expand Down Expand Up @@ -569,10 +566,10 @@
D9B6DB9B196D9BE600161ECB /* Controllers */ = {
isa = PBXGroup;
children = (
39D52EA61DAAFD450033C4ED /* NPHistoryWindowController.h */,
39D52EA71DAAFD450033C4ED /* NPHistoryWindowController.m */,
BF382EDC1D73C2FB00BAF106 /* GetITVListings.h */,
BF382EDD1D73C30400BAF106 /* GetITVListings.m */,
BF382EDF1D73C30E00BAF106 /* ITVHistoryWindowController.h */,
BF382EE01D73C31600BAF106 /* ITVHistoryWindowController.m */,
393D1DEC18A5BBB500F27880 /* RSRTVArrayController.h */,
393D1DED18A5BBB500F27880 /* RSRTVArrayController.m */,
BF382ED01D73C21500BAF106 /* AppController.h */,
Expand Down Expand Up @@ -670,6 +667,7 @@
hasScannedForEncodings = 1;
knownRegions = (
en,
English,
);
mainGroup = 29B97314FDCFA39411CA2CEA /* Get_iPlayer GUI */;
projectDirPath = "";
Expand All @@ -688,16 +686,15 @@
files = (
39FD5E9619D370BD006BC47B /* Images.xcassets in Resources */,
D9F66963102C5DC500A9449B /* GetOperaURL.applescript in Resources */,
BF382ECF1D73C18C00BAF106 /* Release X Doco.rtf in Resources */,
D9F668DB102C560500A9449B /* GetFireFoxURL.applescript in Resources */,
D9F66955102C5D1200A9449B /* GetCaminoURL.applescript in Resources */,
BF382EE51D73C37B00BAF106 /* MainMenu.xib in Resources */,
396FDA611DA98179003F3F57 /* MainMenu.xib in Resources */,
8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */,
D904F04A1009F22E00D60BBF /* get_iplayer.pl in Resources */,
D9CCF3CC1023485A009205BE /* dsa_pub.pem in Resources */,
D9CCF54C1025AAF9009205BE /* Growl Registration Ticket.growlRegDict in Resources */,
D941D9511025DB2B0012A75F /* JRFeedbackProvider.strings in Resources */,
BF382EE31D73C36300BAF106 /* ITVHistoryWindow.xib in Resources */,
BF382EE31D73C36300BAF106 /* NPHistoryWindow.xib in Resources */,
D941D9521025DB2B0012A75F /* JRFeedbackProvider.xib in Resources */,
D9A4509D102FF8090011E175 /* Credits.html in Resources */,
D9A450A4102FFDC00011E175 /* LICENSE.txt in Resources */,
Expand Down Expand Up @@ -755,7 +752,6 @@
D941D95F1025DB580012A75F /* JRFeedbackController.m in Sources */,
D97D9426106DBB68006ECD39 /* TVFormat.m in Sources */,
D97D9427106DBB68006ECD39 /* RadioFormat.m in Sources */,
BF382EE11D73C31600BAF106 /* ITVHistoryWindowController.m in Sources */,
D9F97FE5198E9043006494A3 /* GetCurrentWebpage.m in Sources */,
D9CDC9EC186B90A90003A4E2 /* ASDownloadShows.m in Sources */,
D92687C51087F81F000E8132 /* DownloadHistoryController.m in Sources */,
Expand All @@ -770,6 +766,7 @@
D921C9B9149BBE9F004CB558 /* ASIFormDataRequest.m in Sources */,
BF382EDB1D73C2E700BAF106 /* Programme.m in Sources */,
D9C1D0F01993BBE00034465E /* GetiPlayerProxy.m in Sources */,
39D52EA81DAAFD450033C4ED /* NPHistoryWindowController.m in Sources */,
BF382ED41D73C26800BAF106 /* ExtendedShowInformationController.m in Sources */,
D921C9BA149BBE9F004CB558 /* ASIHTTPRequest.m in Sources */,
D921C9BB149BBE9F004CB558 /* ASIInputStream.m in Sources */,
Expand Down Expand Up @@ -822,6 +819,14 @@
name = InfoPlist.strings;
sourceTree = "<group>";
};
396FDA5F1DA98179003F3F57 /* MainMenu.xib */ = {
isa = PBXVariantGroup;
children = (
396FDA601DA98179003F3F57 /* English */,
);
name = MainMenu.xib;
sourceTree = "<group>";
};
D941D94D1025DB2B0012A75F /* JRFeedbackProvider.strings */ = {
isa = PBXVariantGroup;
children = (
Expand Down
Empty file modified GetiPlayerArguments.h
100755 → 100644
View file
Empty file.
4 changes: 0 additions & 4 deletions GetiPlayerArguments.m
100755 → 100644
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,8 @@ - (NSString *)typeArgumentForCacheUpdate:(BOOL)forCacheUpdate andIncludeITV:(BOO
NSMutableString *typeArgument = [[NSMutableString alloc] initWithString:@"--type="];
if ([[[NSUserDefaults standardUserDefaults] valueForKey:@"CacheBBC_TV"] isEqualTo:@YES])
[typeArgument appendString:@"tv,"];

/* type 'itv' when creating porgramme cache as that is no longer done by getiPlayer */

if ( [[[NSUserDefaults standardUserDefaults] valueForKey:@"CacheITV_TV"] isEqualTo:@YES] && includeITV )
[typeArgument appendString:@"itv,"];

if ([[[NSUserDefaults standardUserDefaults] valueForKey:@"CacheBBC_Radio"] isEqualTo:@YES])
[typeArgument appendString:@"radio,"];
if ([[[NSUserDefaults standardUserDefaults] valueForKey:@"CacheBBC_Podcasts"] isEqualTo:@YES])
Expand Down
Empty file modified GiASearch.m
100755 → 100644
View file
Empty file.
Loading

0 comments on commit 30b5520

Please sign in to comment.