chris/Cog
2
1
Fork 0
Code Issues 65 Pull requests Projects Releases Packages Wiki Activity Actions

Migrate DUMB plug-in to use ARC.

Browse source
This commit is contained in:
Chris Moeller 2016-05-03 00:58:19 -07:00
parent 21c948212b
commit 80aa1b7e25
3 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Plugins/Dumb/Dumb.xcodeproj/project.pbxproj
View file

@ -421,6 +421,7 @@
1DEB913F08733D840010E9CD /* Debug */ = { 1DEB913F08733D840010E9CD /* Debug */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
CLANG_ENABLE_OBJC_ARC = YES;
GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1"; GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1";
GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES; GCC_WARN_UNUSED_VARIABLE = YES;
@ -436,6 +437,7 @@
1DEB914008733D840010E9CD /* Release */ = { 1DEB914008733D840010E9CD /* Release */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
CLANG_ENABLE_OBJC_ARC = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES; GCC_WARN_UNUSED_VARIABLE = YES;

25
Plugins/Dumb/DumbContainer.m
View file

@ -13,6 +13,16 @@
#import "Logging.h" #import "Logging.h"
@interface DumbCallbackData : NSObject
{
@public NSString * baseUrl;
@public NSMutableArray * tracks;
}
@end
@implementation DumbCallbackData
@end
@implementation DumbContainer @implementation DumbContainer
+ (NSArray *)fileTypes + (NSArray *)fileTypes
@ -30,15 +40,10 @@
return 1.0f; return 1.0f;
} }
struct callbackData
{
NSString * baseUrl;
NSMutableArray * tracks;
};
int scanCallback(void *data, int startOrder, long length) int scanCallback(void *data, int startOrder, long length)
{ {
struct callbackData * cbData = ( struct callbackData * ) data; NSObject* _cbData = (__bridge NSObject *)(data);
DumbCallbackData * cbData = (id) _cbData;
[cbData->tracks addObject:[NSURL URLWithString:[cbData->baseUrl stringByAppendingFormat:@"#%i", startOrder]]]; [cbData->tracks addObject:[NSURL URLWithString:[cbData->baseUrl stringByAppendingFormat:@"#%i", startOrder]]];
@ -95,9 +100,11 @@ int scanCallback(void *data, int startOrder, long length)
dumbfile_close(df); dumbfile_close(df);
if ( duh ) { if ( duh ) {
struct callbackData data = { [url absoluteString], tracks }; DumbCallbackData * data = [[DumbCallbackData alloc] init];
data->baseUrl = [url absoluteString];
data->tracks = tracks;
dumb_it_scan_for_playable_orders( duh_get_it_sigdata( duh ), scanCallback, &data ); dumb_it_scan_for_playable_orders( duh_get_it_sigdata( duh ), scanCallback, (__bridge void *)data );
} }
} }

2
Plugins/Dumb/DumbDecoder.m
View file

@ -341,8 +341,6 @@ int callbackLoop(void *data)
- (void)setSource:(id<CogSource>)s - (void)setSource:(id<CogSource>)s
{ {
[s retain];
[source release];
source = s; source = s;
} }