diff options
Diffstat (limited to 'src/osd/osdcore.cpp')
| -rw-r--r-- | src/osd/osdcore.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/osd/osdcore.cpp b/src/osd/osdcore.cpp index 51a9aaf207c..f5860416381 100644 --- a/src/osd/osdcore.cpp +++ b/src/osd/osdcore.cpp @@ -6,7 +6,7 @@ #include <chrono> #if defined(SDLMAME_ANDROID) -#include <SDL2/SDL.h> +#include <android/log.h> #endif #ifdef _WIN32 @@ -66,7 +66,7 @@ void osd_output::pop(osd_output *delegate) void osd_vprintf_error(util::format_argument_pack<std::ostream> const &args) { #if defined(SDLMAME_ANDROID) - SDL_LogMessage(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_ERROR, "%s", util::string_format(args).c_str()); + __android_log_write(ANDROID_LOG_ERROR, "%s", util::string_format(args).c_str()); #else if (m_ptr >= 0) m_stack[m_ptr]->output_callback(OSD_OUTPUT_CHANNEL_ERROR, args); #endif @@ -81,7 +81,7 @@ void osd_vprintf_error(util::format_argument_pack<std::ostream> const &args) void osd_vprintf_warning(util::format_argument_pack<std::ostream> const &args) { #if defined(SDLMAME_ANDROID) - SDL_LogMessage(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_ERROR, "%s", util::string_format(args).c_str()); + __android_log_write(ANDROID_LOG_WARN, "%s", util::string_format(args).c_str()); #else if (m_ptr >= 0) m_stack[m_ptr]->output_callback(OSD_OUTPUT_CHANNEL_WARNING, args); #endif @@ -96,7 +96,7 @@ void osd_vprintf_warning(util::format_argument_pack<std::ostream> const &args) void osd_vprintf_info(util::format_argument_pack<std::ostream> const &args) { #if defined(SDLMAME_ANDROID) - SDL_LogMessage(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO, "%s", util::string_format(args).c_str()); + __android_log_write(ANDROID_LOG_INFO, "%s", util::string_format(args).c_str()); #else if (m_ptr >= 0) m_stack[m_ptr]->output_callback(OSD_OUTPUT_CHANNEL_INFO, args); #endif @@ -111,7 +111,7 @@ void osd_vprintf_info(util::format_argument_pack<std::ostream> const &args) void osd_vprintf_verbose(util::format_argument_pack<std::ostream> const &args) { #if defined(SDLMAME_ANDROID) - SDL_LogMessage(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_VERBOSE, "%s", util::string_format(args).c_str()); + __android_log_write( ANDROID_LOG_VERBOSE, "%s", util::string_format(args).c_str()); #else if (m_ptr >= 0) m_stack[m_ptr]->output_callback(OSD_OUTPUT_CHANNEL_VERBOSE, args); #endif @@ -126,7 +126,7 @@ void osd_vprintf_verbose(util::format_argument_pack<std::ostream> const &args) void osd_vprintf_debug(util::format_argument_pack<std::ostream> const &args) { #if defined(SDLMAME_ANDROID) - SDL_LogMessage(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_DEBUG, "%s", util::string_format(args).c_str()); + __android_log_write(ANDROID_LOG_DEBUG, "%s", util::string_format(args).c_str()); #else if (m_ptr >= 0) m_stack[m_ptr]->output_callback(OSD_OUTPUT_CHANNEL_DEBUG, args); #endif @@ -139,7 +139,7 @@ void osd_vprintf_debug(util::format_argument_pack<std::ostream> const &args) osd_ticks_t osd_ticks() { -#ifdef WIN32 +#ifdef _WIN32 LARGE_INTEGER val; QueryPerformanceCounter(&val); return val.QuadPart; @@ -155,7 +155,7 @@ osd_ticks_t osd_ticks() osd_ticks_t osd_ticks_per_second() { -#ifdef WIN32 +#ifdef _WIN32 LARGE_INTEGER val; QueryPerformanceFrequency(&val); return val.QuadPart; @@ -170,7 +170,7 @@ osd_ticks_t osd_ticks_per_second() void osd_sleep(osd_ticks_t duration) { -#ifdef WIN32 +#ifdef _WIN32 // sleep_for appears to oversleep on Windows with gcc 8 Sleep(duration / (osd_ticks_per_second() / 1000)); #else @@ -190,7 +190,7 @@ void osd_sleep(osd_ticks_t duration) std::vector<std::string> osd_get_command_line(int argc, char *argv[]) { std::vector<std::string> results; -#ifdef WIN32 +#ifdef _WIN32 { // Get the command line from Windows int count; @@ -206,7 +206,7 @@ std::vector<std::string> osd_get_command_line(int argc, char *argv[]) LocalFree(wide_args); } -#else // !WIN32 +#else // !_WIN32 { // for non Windows platforms, we are assuming that arguments are // already UTF-8; we just need to convert to std::vector<std::string> @@ -214,6 +214,6 @@ std::vector<std::string> osd_get_command_line(int argc, char *argv[]) for (int i = 0; i < argc; i++) results.emplace_back(argv[i]); } -#endif // WIN32 +#endif // _WIN32 return results; } |
