From 3fc56dbe4ad7e9deaeaef8c209a68e1de986f6fa Mon Sep 17 00:00:00 2001 From: "SND\\weimingzhi_cp" Date: Sat, 19 Feb 2011 02:25:15 +0000 Subject: -Reverted some changes to make the code build again on Tiger. -Removed x86_64 from Deployment configuration. -macosx: Use SDL for sound plugin, removed Carbon backend. -(MaddTheSane)Fixed memory leaks (Patch #8427). git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@63548 e17a0e51-4ae3-4d35-97c3-1a29b211df97 --- .../SDL/src/file/cocoa/SDL_rwopsbundlesupport.h | 9 +++++ .../SDL/src/file/cocoa/SDL_rwopsbundlesupport.m | 45 ++++++++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 macosx/plugins/Common/SDL/src/file/cocoa/SDL_rwopsbundlesupport.h create mode 100644 macosx/plugins/Common/SDL/src/file/cocoa/SDL_rwopsbundlesupport.m (limited to 'macosx/plugins/Common/SDL/src/file/cocoa') diff --git a/macosx/plugins/Common/SDL/src/file/cocoa/SDL_rwopsbundlesupport.h b/macosx/plugins/Common/SDL/src/file/cocoa/SDL_rwopsbundlesupport.h new file mode 100644 index 00000000..6929904c --- /dev/null +++ b/macosx/plugins/Common/SDL/src/file/cocoa/SDL_rwopsbundlesupport.h @@ -0,0 +1,9 @@ +#ifdef __APPLE__ + +#include + +#ifndef SDL_rwopsbundlesupport_h +#define SDL_rwopsbundlesupport_h +FILE* SDL_OpenFPFromBundleOrFallback(const char *file, const char *mode); +#endif +#endif diff --git a/macosx/plugins/Common/SDL/src/file/cocoa/SDL_rwopsbundlesupport.m b/macosx/plugins/Common/SDL/src/file/cocoa/SDL_rwopsbundlesupport.m new file mode 100644 index 00000000..39b4c0e9 --- /dev/null +++ b/macosx/plugins/Common/SDL/src/file/cocoa/SDL_rwopsbundlesupport.m @@ -0,0 +1,45 @@ +#ifdef __APPLE__ +#import + +#include "SDL_rwopsbundlesupport.h" + +/* For proper OS X applications, the resources are contained inside the application bundle. + So the strategy is to first check the application bundle for the file, then fallback to the current working directory. + Note: One additional corner-case is if the resource is in a framework's resource bundle instead of the app. + We might want to use bundle identifiers, e.g. org.libsdl.sdl to get the bundle for the framework, + but we would somehow need to know what the bundle identifiers we need to search are. + Also, note the bundle layouts are different for iPhone and Mac. +*/ +FILE* SDL_OpenFPFromBundleOrFallback(const char *file, const char *mode) +{ + FILE* fp = NULL; + + // If the file mode is writable, skip all the bundle stuff because generally the bundle is read-only. + if(strcmp("r", mode) && strcmp("rb", mode)) + { + return fopen(file, mode); + } + + NSAutoreleasePool* autorelease_pool = [[NSAutoreleasePool alloc] init]; + + + NSFileManager* file_manager = [NSFileManager defaultManager]; + NSString* resource_path = [[NSBundle mainBundle] resourcePath]; + + NSString* ns_string_file_component = [file_manager stringWithFileSystemRepresentation:file length:strlen(file)]; + + NSString* full_path_with_file_to_try = [resource_path stringByAppendingPathComponent:ns_string_file_component]; + if([file_manager fileExistsAtPath:full_path_with_file_to_try]) + { + fp = fopen([full_path_with_file_to_try fileSystemRepresentation], mode); + } + else + { + fp = fopen(file, mode); + } + + [autorelease_pool drain]; + + return fp; +} +#endif -- cgit v1.2.3