mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-08 06:40:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9821 from BarryJRowe/master

Browse Source 
Removed narrator for emscripten case.
This commit is contained in:
Twinaphex 2019-12-05 10:27:04 +01:00 committed by GitHub
commit 1ea82b8b5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
retroarch.c
View File

@ -28970,7 +28970,8 @@ bool accessibility_speak(const char* speak_text)
} }
#if defined(__APPLE__) && defined(__MACH__) #if defined(__APPLE__) && defined(__MACH__) && !defined(EMSCRIPTEN)
static char* accessibility_mac_language_code(const char* language) static char* accessibility_mac_language_code(const char* language)
{ {
if (string_is_equal(language,"en")) if (string_is_equal(language,"en"))
@ -29113,7 +29114,8 @@ static bool accessibility_speak_macos(
} }
#endif #endif
#if defined(_WIN32) && !defined(_XBOX) && !defined(__WINRT__) #if defined(_WIN32) && !defined(_XBOX) && !defined(__WINRT__) && !defined(EMSCRIPTEN)
static char *accessibility_win_language_code(const char* language) static char *accessibility_win_language_code(const char* language)
{ {
if (string_is_equal(language,"en")) if (string_is_equal(language,"en"))
@ -29179,9 +29181,7 @@ static char *accessibility_win_language_code(const char* language)
else else
return ""; return "";
} }
#endif
#if defined(_WIN32) && !defined(_XBOX) && !defined(__WINRT__)
PROCESS_INFORMATION pi; PROCESS_INFORMATION pi;
bool pi_set = false; bool pi_set = false;
@ -29261,7 +29261,9 @@ static bool accessibility_speak_windows(
} }
#endif #endif
#if defined(__linux__) || defined(__unix__) #if (defined(__linux__) || defined(__unix__)) && !defined(EMSCRIPTEN)
bool is_narrator_running_linux(void) bool is_narrator_running_linux(void)
{ {
if (kill(speak_pid, 0) == 0) if (kill(speak_pid, 0) == 0)
@ -29269,8 +29271,6 @@ bool is_narrator_running_linux(void)
return false; return false;
} }
bool accessibility_speak_linux( bool accessibility_speak_linux(
const char* speak_text, const char* language, int priority) const char* speak_text, const char* language, int priority)
{ {
@ -29343,13 +29343,13 @@ bool accessibility_speak_priority(const char* speak_text, int priority)
if (is_accessibility_enabled()) if (is_accessibility_enabled())
{ {
#if defined(_WIN32) && !defined(_XBOX) && !defined(__WINRT__) #if defined(_WIN32) && !defined(_XBOX) && !defined(__WINRT__) && !defined(EMSCRIPTEN)
voice = get_user_language_iso639_1(true); voice = get_user_language_iso639_1(true);
return accessibility_speak_windows(speak_text, voice, priority); return accessibility_speak_windows(speak_text, voice, priority);
#elif defined(__APPLE__) && defined(__MACH__) #elif defined(__APPLE__) && defined(__MACH__) && !defined(EMSCRIPTEN)
voice = get_user_language_iso639_1(false); voice = get_user_language_iso639_1(false);
return accessibility_speak_macos(speak_text, voice, priority); return accessibility_speak_macos(speak_text, voice, priority);
#elif defined(__linux__) || defined(__unix__) #elif (defined(__linux__) || defined(__unix__)) && !defined(EMSCRIPTEN)
voice = get_user_language_iso639_1(true); voice = get_user_language_iso639_1(true);
return accessibility_speak_linux(speak_text, voice, priority); return accessibility_speak_linux(speak_text, voice, priority);
#endif #endif
@ -29372,11 +29372,11 @@ bool is_narrator_running(void)
{ {
if (is_accessibility_enabled()) if (is_accessibility_enabled())
{ {
#if defined(_WIN32) && !defined(_XBOX) && !defined(__WINRT__) #if defined(_WIN32) && !defined(_XBOX) && !defined(__WINRT__) && !defined(EMSCRIPTEN)
return is_narrator_running_windows(); return is_narrator_running_windows();
#elif defined(__APPLE__) && defined(__MACH__) #elif defined(__APPLE__) && defined(__MACH__) && !defined(EMSCRIPTEN)
return is_narrator_running_macos(); return is_narrator_running_macos();
#elif defined(__linux__) || defined(__unix__) #elif (defined(__linux__) || defined(__unix__)) && !defined(EMSCRIPTEN)
return is_narrator_running_linux(); return is_narrator_running_linux();
#endif #endif
} }