diff --git a/Audio/Chain/ConverterNode.m b/Audio/Chain/ConverterNode.m index 1b168c917..5a1d41e7f 100644 --- a/Audio/Chain/ConverterNode.m +++ b/Audio/Chain/ConverterNode.m @@ -1244,10 +1244,7 @@ static float db_to_scale(float db) } if (!presetUrl) { - CFURLRef appUrlRef = CFBundleCopyResourceURL(CFBundleGetMainBundle(), CFSTR("gsx"), CFSTR("wv"), NULL); - if (appUrlRef) - presetUrl = (__bridge NSURL *) appUrlRef; - CFRelease(appUrlRef); + presetUrl = [[NSBundle mainBundle] URLForResource:@"gsx" withExtension:@"wv"]; if (![HeadphoneFilter validateImpulseFile:presetUrl]) presetUrl = nil; } diff --git a/Plugins/AdPlug/AdPlug/AdPlugDecoder.mm b/Plugins/AdPlug/AdPlug/AdPlugDecoder.mm index afd812a5f..127df03b8 100755 --- a/Plugins/AdPlug/AdPlug/AdPlugDecoder.mm +++ b/Plugins/AdPlug/AdPlug/AdPlugDecoder.mm @@ -23,20 +23,15 @@ static CAdPlugDatabase * g_database = NULL; + (void)initialize { if (!g_database) { - CFURLRef appUrlRef = CFBundleCopyResourceURL(CFBundleGetBundleWithIdentifier(CFSTR("net.kode54.AdPlug")), CFSTR("adplug"), CFSTR("db"), NULL); + NSURL * dbUrl = [[NSBundle bundleWithIdentifier:@"net.kode54.AdPlug"] URLForResource:@"adplug" withExtension:@"db"]; - CFStringRef macPath = CFURLCopyFileSystemPath(appUrlRef, kCFURLPOSIXPathStyle); - - NSString *dbPath = (__bridge NSString *) macPath; + NSString *dbPath = [dbUrl path]; if (dbPath) { g_database = new CAdPlugDatabase; g_database->load([dbPath UTF8String]); CAdPlug::set_database( g_database ); - - CFRelease(macPath); - CFRelease(appUrlRef); } } } diff --git a/Window/AUPlayerView.m b/Window/AUPlayerView.m index 8416394c8..5b7de2064 100644 --- a/Window/AUPlayerView.m +++ b/Window/AUPlayerView.m @@ -136,11 +136,9 @@ static void loadPresets() { if ([equalizer_presets_processed count]) return; - CFURLRef appUrlRef = CFBundleCopyResourceURL(CFBundleGetMainBundle(), CFSTR("Cog.q1"), CFSTR("json"), NULL); + NSURL * url = [[NSBundle mainBundle] URLForResource:@"Cog.q1" withExtension:@"json"]; - CFStringRef macPath = CFURLCopyFileSystemPath(appUrlRef, kCFURLPOSIXPathStyle); - - NSFileHandle * fileHandle = [NSFileHandle fileHandleForReadingAtPath:(__bridge NSString *)macPath]; + NSFileHandle * fileHandle = [NSFileHandle fileHandleForReadingAtPath:[url path]]; if (fileHandle) { NSError *err; NSData *data; @@ -235,8 +233,6 @@ static void loadPresets() json_value_free(equalizer_presets); equalizer_presets = NULL; } - CFRelease(macPath); - CFRelease(appUrlRef); } void equalizerApplyGenre(AudioUnit au, NSString *genre) {