Commit 1ab06740 authored by Felix Paul Kühne's avatar Felix Paul Kühne

Upgrade code-base to ARC

parent ff0c2d1e
......@@ -85,7 +85,7 @@
_node = (xmlNodePtr)theDoc;
NSAssert(_node->_private == NULL, @"TODO");
_node->_private = self; // Note. NOT retained (TODO think more about _private usage)
_node->_private = (__bridge void *)(self); // Note. NOT retained (TODO think more about _private usage)
if (xpathObject)
xmlXPathFreeObject (xpathObject);
......@@ -110,7 +110,6 @@
if (theError != NULL)
{
[self release];
self = NULL;
}
}
......@@ -138,7 +137,7 @@
if (theDoc != NULL)
{
_node = (xmlNodePtr)theDoc;
_node->_private = self; // Note. NOT retained (TODO think more about _private usage)
_node->_private = (__bridge void *)(self); // Note. NOT retained (TODO think more about _private usage)
}
else
{
......@@ -153,7 +152,6 @@
if (theError != NULL)
{
[self release];
self = NULL;
}
}
......
......@@ -66,7 +66,7 @@
{
_node = (xmlNodePtr)theDoc;
NSAssert(_node->_private == NULL, @"TODO");
_node->_private = self; // Note. NOT retained (TODO think more about _private usage)
_node->_private = (__bridge void *)(self); // Note. NOT retained (TODO think more about _private usage)
}
else
{
......@@ -85,7 +85,6 @@
if (theError != NULL)
{
[self release];
self = NULL;
}
}
......@@ -129,7 +128,7 @@
if (theDoc != NULL && xmlDocGetRootElement(theDoc) != NULL)
{
_node = (xmlNodePtr)theDoc;
_node->_private = self; // Note. NOT retained (TODO think more about _private usage)
_node->_private = (__bridge void *)(self); // Note. NOT retained (TODO think more about _private usage)
}
else
{
......@@ -147,7 +146,6 @@
if (theError != NULL)
{
[self release];
self = NULL;
}
}
......@@ -181,22 +179,20 @@
{
// Fix for #35 http://code.google.com/p/touchcode/issues/detail?id=35 -- clear up the node objects first (inside a pool so I _know_ they're cleared) and then freeing the document
NSAutoreleasePool *thePool = [[NSAutoreleasePool alloc] init];
@autoreleasepool {
for (CXMLNode *theNode in nodePool)
{
[theNode invalidate];
}
[nodePool release];
nodePool = NULL;
[thePool release];
}
//
xmlUnlinkNode(_node);
xmlFreeDoc((xmlDocPtr)_node);
_node = NULL;
[super dealloc];
}
//- (NSString *)characterEncoding;
......@@ -251,7 +247,7 @@
int buffersize;
xmlDocDumpFormatMemory((xmlDocPtr)(self->_node), &xmlbuff, &buffersize, 1);
NSString *dump = [[[NSString alloc] initWithBytes:xmlbuff length:buffersize encoding:NSUTF8StringEncoding] autorelease];
NSString *dump = [[NSString alloc] initWithBytes:xmlbuff length:buffersize encoding:NSUTF8StringEncoding];
xmlFree(xmlbuff);
[result appendString:dump];
......
......@@ -163,7 +163,7 @@
- (NSArray *)namespaces
{
NSMutableArray *theNamespaces = [[[NSMutableArray alloc] init] autorelease];
NSMutableArray *theNamespaces = [[NSMutableArray alloc] init];
xmlNsPtr theCurrentNamespace = _node->nsDef;
while (theCurrentNamespace != NULL)
......@@ -172,7 +172,6 @@
NSString *theURI = @((const char *)theCurrentNamespace->href);
CXMLNamespaceNode *theNode = [[CXMLNamespaceNode alloc] initWithPrefix:thePrefix URI:theURI parentElement:self];
[theNamespaces addObject:theNode];
[theNode release];
theCurrentNamespace = theCurrentNamespace->next;
}
......@@ -191,7 +190,7 @@
{
NSString *thePrefixString = theCurrentNamespace->prefix ? @((const char *)theCurrentNamespace->prefix) : @"";
NSString *theURI = @((const char *)theCurrentNamespace->href);
return [[[CXMLNamespaceNode alloc] initWithPrefix:thePrefixString URI:theURI parentElement:self] autorelease];
return [[CXMLNamespaceNode alloc] initWithPrefix:thePrefixString URI:theURI parentElement:self];
}
theCurrentNamespace = theCurrentNamespace->next;
}
......@@ -214,7 +213,7 @@
{
NSString *thePrefix = theCurrentNamespace->prefix ? @((const char *)theCurrentNamespace->prefix) : @"";
NSString *theURI = @((const char *)theCurrentNamespace->href);
return [[[CXMLNamespaceNode alloc] initWithPrefix:thePrefix URI:theURI parentElement:self] autorelease];
return [[CXMLNamespaceNode alloc] initWithPrefix:thePrefix URI:theURI parentElement:self];
}
theCurrentNamespace = theCurrentNamespace->next;
}
......
......@@ -50,11 +50,10 @@
- (void) dealloc
{
[_prefix release], _prefix = nil;
[_uri release], _uri = nil;
_prefix = nil;
_uri = nil;
_parent = nil; // Parent not retained
[super dealloc];
}
#pragma mark -
......@@ -69,12 +68,12 @@
- (NSString *)name
{
return _prefix ? [[_prefix copy] autorelease] : @"";
return _prefix ? [_prefix copy] : @"";
}
- (NSString *)stringValue
{
return _uri ? [[_uri copy] autorelease] : @"";
return _uri ? [_uri copy] : @"";
}
- (NSUInteger)index
......
......@@ -50,7 +50,6 @@ static int MyXmlOutputCloseCallback(void * context);
{
[self invalidate];
//
[super dealloc];
}
- (id)copyWithZone:(NSZone *)zone;
......@@ -58,7 +57,7 @@ static int MyXmlOutputCloseCallback(void * context);
#pragma unused (zone)
xmlNodePtr theNewNode = xmlCopyNode(_node, 1);
CXMLNode *theNode = [[[self class] alloc] initWithLibXMLNode:theNewNode freeOnDealloc:YES];
theNewNode->_private = theNode;
theNewNode->_private = (__bridge void *)(theNode);
return(theNode);
}
......@@ -95,7 +94,7 @@ return((CXMLNodeKind)_node->type); // TODO this isn't 100% accurate!
if (_node->type == XML_ATTRIBUTE_NODE)
return @((const char *)_node->children->content);
NSMutableString *theStringValue = [[[NSMutableString alloc] init] autorelease];
NSMutableString *theStringValue = [[NSMutableString alloc] init];
for (CXMLNode *child in [self children])
{
......@@ -131,7 +130,7 @@ return(N);
{
NSAssert(_node != NULL, @"CXMLNode does not have attached libxml2 _node.");
return(_node->doc->_private);
return(__bridge CXMLDocument *)((_node->doc->_private));
}
- (CXMLNode *)parent
......@@ -141,7 +140,7 @@ NSAssert(_node != NULL, @"CXMLNode does not have attached libxml2 _node.");
if (_node->parent == NULL)
return(NULL);
else
return (_node->parent->_private);
return (__bridge CXMLNode *)((_node->parent->_private));
}
- (NSUInteger)childCount
......@@ -293,15 +292,15 @@ return([self XMLStringWithOptions:0]);
{
#pragma unused (options)
NSMutableData *theData = [[[NSMutableData alloc] init] autorelease];
NSMutableData *theData = [[NSMutableData alloc] init];
xmlOutputBufferPtr theOutputBuffer = xmlOutputBufferCreateIO(MyXmlOutputWriteCallback, MyXmlOutputCloseCallback, theData, NULL);
xmlOutputBufferPtr theOutputBuffer = xmlOutputBufferCreateIO(MyXmlOutputWriteCallback, MyXmlOutputCloseCallback, (__bridge void *)(theData), NULL);
xmlNodeDumpOutput(theOutputBuffer, _node->doc, _node, 0, 0, "utf-8");
xmlOutputBufferFlush(theOutputBuffer);
NSString *theString = [[[NSString alloc] initWithData:theData encoding:NSUTF8StringEncoding] autorelease];
NSString *theString = [[NSString alloc] initWithData:theData encoding:NSUTF8StringEncoding];
xmlOutputBufferClose(theOutputBuffer);
......@@ -356,7 +355,7 @@ return(theResult);
static int MyXmlOutputWriteCallback(void * context, const char * buffer, int len)
{
NSMutableData *theData = context;
NSMutableData *theData = (__bridge NSMutableData *)(context);
[theData appendBytes:buffer length:len];
return(len);
}
......
......@@ -56,7 +56,7 @@ if (inLibXMLNode == NULL)
return nil;
if (inLibXMLNode->_private)
return(inLibXMLNode->_private);
return(__bridge id)(inLibXMLNode->_private);
Class theClass = [CXMLNode class];
switch (inLibXMLNode->type)
......@@ -77,19 +77,19 @@ switch (inLibXMLNode->type)
return(NULL);
}
CXMLNode *theNode = [[[theClass alloc] initWithLibXMLNode:inLibXMLNode freeOnDealloc:infreeOnDealloc] autorelease];
CXMLNode *theNode = [[theClass alloc] initWithLibXMLNode:inLibXMLNode freeOnDealloc:infreeOnDealloc];
if (inLibXMLNode->doc != NULL)
{
CXMLDocument *theXMLDocument = inLibXMLNode->doc->_private;
CXMLDocument *theXMLDocument = (__bridge CXMLDocument *)(inLibXMLNode->doc->_private);
if (theXMLDocument != NULL)
{
NSAssert([theXMLDocument isKindOfClass:[CXMLDocument class]] == YES, @"TODO");
[[theXMLDocument nodePool] addObject:theNode];
theNode->_node->_private = theNode;
theNode->_node->_private = (__bridge void *)(theNode);
}
}
return(theNode);
......@@ -104,7 +104,7 @@ return(_node);
{
if (_node)
{
if (_node->_private == self)
if (_node->_private == (__bridge void *)(self))
_node->_private = NULL;
if (_freeNodeOnRelease)
......
......@@ -43,7 +43,7 @@
{
xmlDocPtr theDocumentNode = xmlNewDoc((const xmlChar *)"1.0");
NSAssert(theDocumentNode != NULL, @"xmlNewDoc failed");
CXMLDocument *theDocument = [[[CXMLDocument alloc] initWithLibXMLNode:(xmlNodePtr)theDocumentNode freeOnDealloc:NO] autorelease];
CXMLDocument *theDocument = [[CXMLDocument alloc] initWithLibXMLNode:(xmlNodePtr)theDocumentNode freeOnDealloc:NO];
return(theDocument);
}
......@@ -52,7 +52,7 @@ return(theDocument);
xmlDocPtr theDocumentNode = xmlNewDoc((const xmlChar *)"1.0");
NSAssert(theDocumentNode != NULL, @"xmlNewDoc failed");
xmlDocSetRootElement(theDocumentNode, element.node);
CXMLDocument *theDocument = [[[CXMLDocument alloc] initWithLibXMLNode:(xmlNodePtr)theDocumentNode freeOnDealloc:NO] autorelease];
CXMLDocument *theDocument = [[CXMLDocument alloc] initWithLibXMLNode:(xmlNodePtr)theDocumentNode freeOnDealloc:NO];
[theDocument.nodePool addObject:element];
return(theDocument);
}
......@@ -60,7 +60,7 @@ return(theDocument);
+ (id)elementWithName:(NSString *)name
{
xmlNodePtr theElementNode = xmlNewNode(NULL, (const xmlChar *)[name UTF8String]);
CXMLElement *theElement = [[[CXMLElement alloc] initWithLibXMLNode:(xmlNodePtr)theElementNode freeOnDealloc:NO] autorelease];
CXMLElement *theElement = [[CXMLElement alloc] initWithLibXMLNode:(xmlNodePtr)theElementNode freeOnDealloc:NO];
return(theElement);
}
......@@ -70,28 +70,28 @@ xmlNodePtr theElementNode = xmlNewNode(NULL, (const xmlChar *)[name UTF8String])
xmlNsPtr theNSNode = xmlNewNs(theElementNode, (const xmlChar *)[URI UTF8String], NULL);
theElementNode->ns = theNSNode;
CXMLElement *theElement = [[[CXMLElement alloc] initWithLibXMLNode:(xmlNodePtr)theElementNode freeOnDealloc:NO] autorelease];
CXMLElement *theElement = [[CXMLElement alloc] initWithLibXMLNode:(xmlNodePtr)theElementNode freeOnDealloc:NO];
return(theElement);
}
+ (id)elementWithName:(NSString *)name stringValue:(NSString *)string
{
xmlNodePtr theElementNode = xmlNewNode(NULL, (const xmlChar *)[name UTF8String]);
CXMLElement *theElement = [[[CXMLElement alloc] initWithLibXMLNode:(xmlNodePtr)theElementNode freeOnDealloc:NO] autorelease];
CXMLElement *theElement = [[CXMLElement alloc] initWithLibXMLNode:(xmlNodePtr)theElementNode freeOnDealloc:NO];
theElement.stringValue = string;
return(theElement);
}
+ (id)namespaceWithName:(NSString *)name stringValue:(NSString *)stringValue
{
return [[[CXMLNamespaceNode alloc] initWithPrefix:name URI:stringValue parentElement:nil] autorelease];
return [[CXMLNamespaceNode alloc] initWithPrefix:name URI:stringValue parentElement:nil];
}
+ (id)processingInstructionWithName:(NSString *)name stringValue:(NSString *)stringValue;
{
xmlNodePtr theNode = xmlNewPI((const xmlChar *)[name UTF8String], (const xmlChar *)[stringValue UTF8String]);
NSAssert(theNode != NULL, @"xmlNewPI failed");
CXMLNode *theNodeObject = [[[CXMLNode alloc] initWithLibXMLNode:theNode freeOnDealloc:NO] autorelease];
CXMLNode *theNodeObject = [[CXMLNode alloc] initWithLibXMLNode:theNode freeOnDealloc:NO];
return(theNodeObject);
}
......
......@@ -30,7 +30,7 @@
NSURLConnection *_connection;
NSMutableData *_data;
NSArray *_results;
id<MLMovieInfoGrabberDelegate> _delegate;
id<MLMovieInfoGrabberDelegate> __weak _delegate;
#if HAVE_BLOCK
void (^_block)(NSError *);
#else
......@@ -38,11 +38,11 @@
#endif
}
@property (readwrite, assign) id<MLMovieInfoGrabberDelegate> delegate;
@property (readwrite, weak) id<MLMovieInfoGrabberDelegate> delegate;
#if !HAVE_BLOCK
@property (readwrite, retain) id userData;
@property (readwrite, strong) id userData;
#endif
@property (readonly, retain) NSArray *results;
@property (readonly, strong) NSArray *results;
- (void)lookUpForTitle:(NSString *)title;
#if HAVE_BLOCK
......
......@@ -31,18 +31,18 @@
MLURLConnection *_connection;
NSDictionary *_results;
NSArray *_episodesResults;
id<MLTVShowEpisodesInfoGrabberDelegate> _delegate;
id<MLTVShowEpisodesInfoGrabberDelegate> __weak _delegate;
void (^_block)();
#if !HAVE_BLOCK
id _userData;
#endif
}
@property (readwrite, assign) id<MLTVShowEpisodesInfoGrabberDelegate> delegate;
@property (readonly, retain) NSArray *episodesResults;
@property (readonly, retain) NSDictionary *results;
@property (readwrite, weak) id<MLTVShowEpisodesInfoGrabberDelegate> delegate;
@property (readonly, strong) NSArray *episodesResults;
@property (readonly, strong) NSDictionary *results;
#if !HAVE_BLOCK
@property (readwrite, retain) id userData;
@property (readwrite, strong) id userData;
#endif
- (void)lookUpForShowID:(NSString *)id;
......
......@@ -30,16 +30,16 @@
NSMutableData *_data;
NSArray *_results;
void (^_block)();
id<MLTVShowInfoGrabberDelegate> _delegate;
id<MLTVShowInfoGrabberDelegate> __weak _delegate;
#if !HAVE_BLOCK
id _userData;
#endif
}
@property (readwrite, assign) id<MLTVShowInfoGrabberDelegate> delegate;
@property (readonly, retain) NSArray *results;
@property (readwrite, weak) id<MLTVShowInfoGrabberDelegate> delegate;
@property (readonly, strong) NSArray *results;
#if !HAVE_BLOCK
@property (readwrite, retain) id userData;
@property (readwrite, strong) id userData;
#endif
- (void)lookUpForTitle:(NSString *)title;
......
......@@ -35,9 +35,9 @@
#endif
}
@property (readonly, retain) NSData *data;
@property (readwrite, retain) id userObject;
@property (readwrite, retain) id<MLURLConnectionDelegate> delegate;
@property (readonly, strong) NSData *data;
@property (readwrite, strong) id userObject;
@property (readwrite, strong) id<MLURLConnectionDelegate> delegate;
#if HAVE_BLOCK
+ (id)runConnectionWithURL:(NSURL *)url andBlock:(void (^)(MLURLConnection *connection, NSError *error))block;
......
......@@ -30,11 +30,11 @@
+ (NSArray *)allAlbums;
+ (MLAlbum *)albumWithName:(NSString *)name;
@property (nonatomic, retain) NSString *name;
@property (nonatomic, retain) NSString *releaseYear;
@property (nonatomic, retain) NSSet *tracks;
@property (nonatomic, retain, readonly) NSSet *unreadTracks;
@property (nonatomic, readonly) NSArray *sortedTracks;
@property (nonatomic, strong) NSString *name;
@property (nonatomic, strong) NSString *releaseYear;
@property (nonatomic, strong) NSSet *tracks;
@property (nonatomic, strong, readonly) NSSet *unreadTracks;
@property (weak, nonatomic, readonly) NSArray *sortedTracks;
- (void)removeTrack:(MLAlbumTrack *)track;
- (void)removeTrackWithNumber:(NSNumber *)trackNumber;
......
......@@ -32,14 +32,14 @@
+ (MLAlbumTrack *)trackWithAlbum:(id)album trackNumber:(NSNumber *)trackNumber createIfNeeded:(BOOL)createIfNeeded;
+ (MLAlbumTrack *)trackWithAlbumName:(NSString *)albumName trackNumber:(NSNumber *)trackNumber createIfNeeded:(BOOL)createIfNeeded wasCreated:(BOOL *)wasCreated;
@property (nonatomic, retain) NSNumber *unread;
@property (nonatomic, retain) NSString *artist;
@property (nonatomic, retain) NSString *genre;
@property (nonatomic, retain) NSString *title;
@property (nonatomic, retain) NSNumber *trackNumber;
@property (nonatomic, retain) MLAlbum *album;
@property (nonatomic, retain) NSSet *files;
@property (nonatomic, strong) NSNumber *unread;
@property (nonatomic, strong) NSString *artist;
@property (nonatomic, strong) NSString *genre;
@property (nonatomic, strong) NSString *title;
@property (nonatomic, strong) NSNumber *trackNumber;
@property (nonatomic, strong) MLAlbum *album;
@property (nonatomic, strong) NSSet *files;
@end
......
......@@ -46,36 +46,36 @@ extern NSString *kMLFileTypeAudio;
- (BOOL)isAlbumTrack;
- (BOOL)isSupportedAudioFile;
@property (nonatomic, retain) NSNumber *seasonNumber;
@property (nonatomic, retain) NSNumber *remainingTime;
@property (nonatomic, retain) NSString *releaseYear;
@property (nonatomic, retain) NSNumber *lastPosition;
@property (nonatomic, retain) NSNumber *lastSubtitleTrack;
@property (nonatomic, retain) NSNumber *lastAudioTrack;
@property (nonatomic, retain) NSNumber *playCount;
@property (nonatomic, retain) NSString *artworkURL;
@property (nonatomic, retain) NSString *url;
@property (nonatomic, retain) NSString *type;
@property (nonatomic, retain) NSString *title;
@property (nonatomic, retain) NSString *shortSummary;
@property (nonatomic, retain) NSNumber *currentlyWatching;
@property (nonatomic, retain) NSNumber *episodeNumber;
@property (nonatomic, retain) NSNumber *unread;
@property (nonatomic, retain) NSNumber *hasFetchedInfo;
@property (nonatomic, retain) NSNumber *noOnlineMetaData;
@property (nonatomic, retain) MLShowEpisode *showEpisode;
@property (nonatomic, retain) NSSet *labels;
@property (nonatomic, retain) NSSet *tracks;
@property (nonatomic, retain) NSNumber *isOnDisk;
@property (nonatomic, retain) NSNumber *duration;
@property (nonatomic, retain) NSString *artist;
@property (nonatomic, retain) NSString *album;
@property (nonatomic, retain) NSNumber *albumTrackNumber;
@property (nonatomic, retain) NSNumber *folderTrackNumber;
@property (nonatomic, retain) NSString *genre;
@property (nonatomic, retain) MLAlbumTrack *albumTrack;
@property (nonatomic, retain) UIImage *computedThumbnail;
@property (nonatomic, strong) NSNumber *seasonNumber;
@property (nonatomic, strong) NSNumber *remainingTime;
@property (nonatomic, strong) NSString *releaseYear;
@property (nonatomic, strong) NSNumber *lastPosition;
@property (nonatomic, strong) NSNumber *lastSubtitleTrack;
@property (nonatomic, strong) NSNumber *lastAudioTrack;
@property (nonatomic, strong) NSNumber *playCount;
@property (nonatomic, strong) NSString *artworkURL;
@property (nonatomic, strong) NSString *url;
@property (nonatomic, strong) NSString *type;
@property (nonatomic, strong) NSString *title;
@property (nonatomic, strong) NSString *shortSummary;
@property (nonatomic, strong) NSNumber *currentlyWatching;
@property (nonatomic, strong) NSNumber *episodeNumber;
@property (nonatomic, strong) NSNumber *unread;
@property (nonatomic, strong) NSNumber *hasFetchedInfo;
@property (nonatomic, strong) NSNumber *noOnlineMetaData;
@property (nonatomic, strong) MLShowEpisode *showEpisode;
@property (nonatomic, strong) NSSet *labels;
@property (nonatomic, strong) NSSet *tracks;
@property (nonatomic, strong) NSNumber *isOnDisk;
@property (nonatomic, strong) NSNumber *duration;
@property (nonatomic, strong) NSString *artist;
@property (nonatomic, strong) NSString *album;
@property (nonatomic, strong) NSNumber *albumTrackNumber;
@property (nonatomic, strong) NSNumber *folderTrackNumber;
@property (nonatomic, strong) NSString *genre;
@property (nonatomic, strong) MLAlbumTrack *albumTrack;
@property (nonatomic, strong) UIImage *computedThumbnail;
@property (nonatomic, assign) BOOL isSafe;
@property (nonatomic, assign) BOOL isBeingParsed;
@property (nonatomic, assign) BOOL thumbnailTimeouted;
......
......@@ -34,8 +34,8 @@
+ (NSArray *)allLabels;
- (NSArray *)sortedFolderItems;
@property (nonatomic, retain) NSString * name;
@property (nonatomic, retain) NSSet* files;
@property (nonatomic, strong) NSString * name;
@property (nonatomic, strong) NSSet* files;
@end
......
......@@ -33,7 +33,7 @@
}
@property (readonly) BOOL libraryNeedsUpgrade;
@property (nonatomic, retain) id delegate;
@property (nonatomic, strong) id delegate;
+ (id)sharedMediaLibrary;
......
......@@ -34,15 +34,15 @@
+ (NSArray *)allShows;
+ (MLShow *)showWithName:(NSString *)name;
@property (nonatomic, retain) NSString *theTVDBID;
@property (nonatomic, retain) NSString *shortSummary;
@property (nonatomic, retain) NSString *artworkURL;
@property (nonatomic, retain) NSString *name;
@property (nonatomic, retain) NSString *releaseYear;
@property (nonatomic, retain) NSNumber *lastSyncDate;
@property (nonatomic, retain) NSSet *episodes;
@property (nonatomic, readonly) NSArray *sortedEpisodes;
@property (nonatomic, retain, readonly) NSSet *unreadEpisodes;
@property (nonatomic, strong) NSString *theTVDBID;
@property (nonatomic, strong) NSString *shortSummary;
@property (nonatomic, strong) NSString *artworkURL;
@property (nonatomic, strong) NSString *name;
@property (nonatomic, strong) NSString *releaseYear;
@property (nonatomic, strong) NSNumber *lastSyncDate;
@property (nonatomic, strong) NSSet *episodes;
@property (weak, nonatomic, readonly) NSArray *sortedEpisodes;
@property (nonatomic, strong, readonly) NSSet *unreadEpisodes;
- (void)removeEpisode:(MLShowEpisode*)episode;
- (void)removeEpisodeWithSeasonNumber:(NSNumber *)seasonNumber andEpisodeNumber:(NSNumber *)episodeNumber;
......
......@@ -36,17 +36,17 @@
+ (MLShowEpisode *)episodeWithShowName:(NSString *)showName episodeNumber:(NSNumber *)episodeNumber seasonNumber:(NSNumber *)seasonNumber
createIfNeeded:(BOOL)createIfNeeded wasCreated:(BOOL *)wasCreated;
@property (nonatomic, retain) NSNumber *unread;
@property (nonatomic, retain) NSString *theTVDBID;
@property (nonatomic, retain) NSString *shortSummary;
@property (nonatomic, retain) NSNumber *shouldBeDisplayed;
@property (nonatomic, retain) NSNumber *episodeNumber;
@property (nonatomic, retain) NSNumber *seasonNumber;
@property (nonatomic, retain) NSNumber *lastSyncDate;
@property (nonatomic, retain) NSString *artworkURL;
@property (nonatomic, retain) NSString *name;
@property (nonatomic, retain) MLShow *show;
@property (nonatomic, retain) NSSet *files;
@property (nonatomic, strong) NSNumber *unread;
@property (nonatomic, strong) NSString *theTVDBID;
@property (nonatomic, strong) NSString *shortSummary;
@property (nonatomic, strong) NSNumber *shouldBeDisplayed;
@property (nonatomic, strong) NSNumber *episodeNumber;
@property (nonatomic, strong) NSNumber *seasonNumber;
@property (nonatomic, strong) NSNumber *lastSyncDate;
@property (nonatomic, strong) NSString *artworkURL;
@property (nonatomic, strong) NSString *name;
@property (nonatomic, strong) MLShow *show;
@property (nonatomic, strong) NSSet *files;
@end
......
......@@ -338,7 +338,7 @@
7D0EF496170883940003ED47 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0460;
LastUpgradeCheck = 0510;
ORGANIZATIONNAME = VideoLAN;
};
buildConfigurationList = 7D0EF499170883940003ED47 /* Build configuration list for PBXProject "MediaLibraryKit" */;
......@@ -402,7 +402,7 @@
7D0EF4AA170883940003ED47 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ALWAYS_SEARCH_USER_PATHS = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_WARN_CONSTANT_CONVERSION = YES;
......@@ -422,6 +422,11 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = (
"$(inherited)",
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
"/Users/fkuehne/Desktop/videolan/gits/ios3/ImportedSources/VLCKit/build/Release-iphonesimulator/include/MobileVLCKit/**",
);
IPHONEOS_DEPLOYMENT_TARGET = 5.1;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
......@@ -431,7 +436,7 @@
7D0EF4AB170883940003ED47 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ALWAYS_SEARCH_USER_PATHS = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_WARN_CONSTANT_CONVERSION = YES;
......@@ -444,6 +449,11 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = (
"$(inherited)",
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
"/Users/fkuehne/Desktop/videolan/gits/ios3/ImportedSources/VLCKit/build/Release-iphonesimulator/include/MobileVLCKit/**",
);
IPHONEOS_DEPLOYMENT_TARGET = 5.1;
SDKROOT = iphoneos;
VALIDATE_PRODUCT = YES;
......@@ -453,7 +463,7 @@
7D0EF4AD170883940003ED47 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
CLANG_ENABLE_OBJC_ARC = YES;
DSTROOT = /tmp/MediaLibraryKit.dst;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = MediaLibraryKit_Prefix.pch;
......@@ -472,7 +482,7 @@
7D0EF4AE170883940003ED47 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
CLANG_ENABLE_OBJC_ARC = YES;
DSTROOT = /tmp/MediaLibraryKit.dst;
ENABLE_NS_ASSERTIONS = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
......