ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(iOS) Fix ios_logger_override.h issues; fix crash when closing a game with TV Mode enabled; remove unneded code block introduced by previous commit

This commit is contained in:
meancoot 2013-12-09 19:18:48 -05:00
parent 4358aea595
commit 5e0a35b6aa
3 changed files with 14 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
apple/common/main.m
View File

@ -39,11 +39,14 @@ void apple_run_core(NSString* core, const char* file)
if (!apple_is_running) if (!apple_is_running)
{ {
#ifndef OSX #ifndef OSX
char basedir[256]; if (core && file)
fill_pathname_basedir(basedir, file, sizeof(basedir)); {
if (file && access(basedir, R_OK | W_OK | X_OK)) char basedir[256];
apple_display_alert(@"The directory containing the selected file has limited permissions. This may " fill_pathname_basedir(basedir, file, sizeof(basedir));
"prevent zipped content from loading, and will cause some cores to not function.", 0); if (access(basedir, R_OK | W_OK | X_OK))
apple_display_alert(@"The directory containing the selected file has limited permissions. This may "
"prevent zipped content from loading, and will cause some cores to not function.", 0);
}
#endif #endif
[apple_platform loadingCore:core withFile:file]; [apple_platform loadingCore:core withFile:file];

7
apple/iOS/platform.m
View File

@ -61,13 +61,6 @@ const void* apple_get_frontend_settings(void)
if (settings[0].type == ST_NONE) if (settings[0].type == ST_NONE)
{ {
const char* btoptions = "none|icade|keyboard";
if (is_ios_7())
btoptions = "none|icade";
else if (btstack_try_load())
btoptions = "none|icade|keyboard|btstack";
settings[0] = setting_data_group_setting(ST_GROUP, "Frontend Settings"); settings[0] = setting_data_group_setting(ST_GROUP, "Frontend Settings");
settings[1] = setting_data_group_setting(ST_SUB_GROUP, "Frontend"); settings[1] = setting_data_group_setting(ST_SUB_GROUP, "Frontend");
settings[2] = setting_data_bool_setting("ios_use_file_log", "Enable File Logging", settings[2] = setting_data_bool_setting("ios_use_file_log", "Enable File Logging",

36
logger/ios_logger_override.h
View File

@ -25,7 +25,7 @@ static inline void RARCH_LOG_V(const char *tag, const char *fmt, va_list ap)
aslmsg msg = asl_new(ASL_TYPE_MSG); aslmsg msg = asl_new(ASL_TYPE_MSG);
asl_set(msg, ASL_KEY_READ_UID, "-1"); asl_set(msg, ASL_KEY_READ_UID, "-1");
if (tag) if (tag)
asl_log(NULL, msg, ASL_LEVEL_NOTICE, tag); asl_log(NULL, msg, ASL_LEVEL_NOTICE, "%s", tag);
asl_vlog(NULL, msg, ASL_LEVEL_NOTICE, fmt, ap); asl_vlog(NULL, msg, ASL_LEVEL_NOTICE, fmt, ap);
asl_free(msg); asl_free(msg);
} }
@ -40,15 +40,7 @@ static inline void RARCH_LOG(const char *fmt, ...)
static inline void RARCH_LOG_OUTPUT_V(const char *tag, const char *fmt, va_list ap) static inline void RARCH_LOG_OUTPUT_V(const char *tag, const char *fmt, va_list ap)
{ {
va_list ap; RARCH_LOG_V(tag, fmt, ap);
va_start(ap, fmt);
aslmsg msg = asl_new(ASL_TYPE_MSG);
asl_set(msg, ASL_KEY_READ_UID, "-1");
if (tag)
asl_log(NULL, msg, ASL_LEVEL_NOTICE, tag);
asl_vlog(NULL, msg, ASL_LEVEL_NOTICE, fmt, ap);
asl_free(msg);
va_end(ap);
} }
static inline void RARCH_LOG_OUTPUT(const char *fmt, ...) static inline void RARCH_LOG_OUTPUT(const char *fmt, ...)
@ -59,17 +51,9 @@ static inline void RARCH_LOG_OUTPUT(const char *fmt, ...)
va_end(ap); va_end(ap);
} }
static inline void RARCH_WARN_V(const char *tag, const char *fmt, ...) static inline void RARCH_WARN_V(const char *tag, const char *fmt, va_list ap)
{ {
va_list ap; RARCH_LOG_V(tag, fmt, ap);
va_start(ap, fmt);
aslmsg msg = asl_new(ASL_TYPE_MSG);
asl_set(msg, ASL_KEY_READ_UID, "-1");
if (tag)
asl_log(NULL, msg, ASL_LEVEL_NOTICE, tag);
asl_vlog(NULL, msg, ASL_LEVEL_NOTICE, fmt, ap);
asl_free(msg);
va_end(ap);
} }
static inline void RARCH_WARN(const char *fmt, ...) static inline void RARCH_WARN(const char *fmt, ...)
@ -80,17 +64,9 @@ static inline void RARCH_WARN(const char *fmt, ...)
va_end(ap); va_end(ap);
} }
static inline void RARCH_ERR_V(const char *tag, const char *fmt, ...) static inline void RARCH_ERR_V(const char *tag, const char *fmt, va_list ap)
{ {
va_list ap; RARCH_LOG_V(tag, fmt, ap);
va_start(ap, fmt);
aslmsg msg = asl_new(ASL_TYPE_MSG);
asl_set(msg, ASL_KEY_READ_UID, "-1");
if (tag)
asl_log(NULL, msg, ASL_LEVEL_NOTICE, tag);
asl_vlog(NULL, msg, ASL_LEVEL_NOTICE, fmt, ap);
asl_free(msg);
va_end(ap);
} }
static inline void RARCH_ERR(const char *fmt, ...) static inline void RARCH_ERR(const char *fmt, ...)