mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-31 06:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11606 from Scrumplex/feat-run-media

Browse Source 
Also show /run/media or /run/media/$USER in drives list
This commit is contained in:
Autechre 2020-11-25 16:04:52 +01:00 committed by GitHub
commit 54eb22dd2b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
frontend/drivers/platform_unix.c
View File

@ -2063,8 +2063,10 @@ static int frontend_unix_parse_drive_list(void *data, bool load_content)
}
#else
char base_path[PATH_MAX] = {0};
char udisks_media_path[PATH_MAX] = {0};
const char *xdg = getenv("XDG_CONFIG_HOME");
const char *home = getenv("HOME");
const char *user = getenv("USER");
if (xdg)
{
@ -2081,6 +2083,13 @@ static int frontend_unix_parse_drive_list(void *data, bool load_content)
#endif
}
strlcpy(udisks_media_path, "/run/media", sizeof(udisks_media_path));
if (user)
{
strlcat(udisks_media_path, "/", sizeof(udisks_media_path));
strlcat(udisks_media_path, user, sizeof(udisks_media_path));
}
if(!string_is_empty(base_path))
{
menu_entries_append_enum(list, base_path,
@ -2095,6 +2104,13 @@ static int frontend_unix_parse_drive_list(void *data, bool load_content)
enum_idx,
FILE_TYPE_DIRECTORY, 0, 0);
}
if (path_is_directory(udisks_media_path))
{
menu_entries_append_enum(list, udisks_media_path,
msg_hash_to_str(MENU_ENUM_LABEL_FILE_DETECT_CORE_LIST_PUSH_DIR),
enum_idx,
FILE_TYPE_DIRECTORY, 0, 0);
}
if (path_is_directory("/media"))
{
menu_entries_append_enum(list, "/media",
@ -2653,13 +2669,13 @@ static bool accessibility_speak_unix(int speed,
/* parent process */
speak_pid = pid;
/* Tell the system that we'll ignore the exit status of the child
/* Tell the system that we'll ignore the exit status of the child
* process. This prevents zombie processes. */
signal(SIGCHLD,SIG_IGN);
}
else
{
/* child process: replace process with the espeak command */
{
/* child process: replace process with the espeak command */
char* cmd[] = { (char*) "espeak", NULL, NULL, NULL, NULL};
cmd[1] = voice_out;
cmd[2] = speed_out;