Skip to content

Commit 42577ff

Browse files
committed
Take out msg_hash_to_str from some files
1 parent c34a1cc commit 42577ff

2 files changed

Lines changed: 13 additions & 11 deletions

File tree

frontend/drivers/platform_unix.c

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@
8585
#include "../../defaults.h"
8686
#include "../../msg_hash.h"
8787
#include "../../paths.h"
88+
#include "../../intl/msg_hash_lbl_str.h"
8889
#include "../../retroarch.h"
8990
#include "../../verbosity.h"
9091

@@ -657,7 +658,7 @@ JNIEXPORT void JNICALL Java_com_retroarch_browser_retroactivity_RetroActivityCom
657658
generic_action_ok_displaylist_push(
658659
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_FILE_BROWSER_OPEN_PICKER),
659660
serialized_path,
660-
msg_hash_to_str(MENU_ENUM_LABEL_FAVORITES),
661+
MENU_ENUM_LABEL_FAVORITES_STR,
661662
MENU_SETTING_ACTION,
662663
0,
663664
0,
@@ -2456,19 +2457,19 @@ static int frontend_unix_parse_drive_list(void *data, bool load_content)
24562457
#elif defined(WEBOS)
24572458
if (path_is_directory("/media/developer/temp"))
24582459
menu_entries_append(list, "/media/developer/temp",
2459-
msg_hash_to_str(MENU_ENUM_LABEL_FILE_DETECT_CORE_LIST_PUSH_DIR),
2460+
MENU_ENUM_LABEL_FILE_DETECT_CORE_LIST_PUSH_DIR_STR,
24602461
enum_idx,
24612462
FILE_TYPE_DIRECTORY, 0, 0, NULL);
24622463

24632464
if (path_is_directory("/media/internal"))
24642465
menu_entries_append(list, "/media/internal",
2465-
msg_hash_to_str(MENU_ENUM_LABEL_FILE_DETECT_CORE_LIST_PUSH_DIR),
2466+
MENU_ENUM_LABEL_FILE_DETECT_CORE_LIST_PUSH_DIR_STR,
24662467
enum_idx,
24672468
FILE_TYPE_DIRECTORY, 0, 0, NULL);
24682469

24692470
if (path_is_directory("/tmp/usb"))
24702471
menu_entries_append(list, "/tmp/usb",
2471-
msg_hash_to_str(MENU_ENUM_LABEL_FILE_DETECT_CORE_LIST_PUSH_DIR),
2472+
MENU_ENUM_LABEL_FILE_DETECT_CORE_LIST_PUSH_DIR_STR,
24722473
enum_idx,
24732474
FILE_TYPE_DIRECTORY, 0, 0, NULL);
24742475
#else
@@ -2506,35 +2507,35 @@ static int frontend_unix_parse_drive_list(void *data, bool load_content)
25062507
if (!string_is_empty(base_path))
25072508
{
25082509
menu_entries_append(list, base_path,
2509-
msg_hash_to_str(MENU_ENUM_LABEL_FILE_DETECT_CORE_LIST_PUSH_DIR),
2510+
MENU_ENUM_LABEL_FILE_DETECT_CORE_LIST_PUSH_DIR_STR,
25102511
enum_idx,
25112512
FILE_TYPE_DIRECTORY, 0, 0, NULL);
25122513
}
25132514
if (!string_is_empty(home))
25142515
{
25152516
menu_entries_append(list, home,
2516-
msg_hash_to_str(MENU_ENUM_LABEL_FILE_DETECT_CORE_LIST_PUSH_DIR),
2517+
MENU_ENUM_LABEL_FILE_DETECT_CORE_LIST_PUSH_DIR_STR,
25172518
enum_idx,
25182519
FILE_TYPE_DIRECTORY, 0, 0, NULL);
25192520
}
25202521
if (path_is_directory(udisks_media_path))
25212522
{
25222523
menu_entries_append(list, udisks_media_path,
2523-
msg_hash_to_str(MENU_ENUM_LABEL_FILE_DETECT_CORE_LIST_PUSH_DIR),
2524+
MENU_ENUM_LABEL_FILE_DETECT_CORE_LIST_PUSH_DIR_STR,
25242525
enum_idx,
25252526
FILE_TYPE_DIRECTORY, 0, 0, NULL);
25262527
}
25272528
if (path_is_directory("/media"))
25282529
{
25292530
menu_entries_append(list, "/media",
2530-
msg_hash_to_str(MENU_ENUM_LABEL_FILE_DETECT_CORE_LIST_PUSH_DIR),
2531+
MENU_ENUM_LABEL_FILE_DETECT_CORE_LIST_PUSH_DIR_STR,
25312532
enum_idx,
25322533
FILE_TYPE_DIRECTORY, 0, 0, NULL);
25332534
}
25342535
if (path_is_directory("/mnt"))
25352536
{
25362537
menu_entries_append(list, "/mnt",
2537-
msg_hash_to_str(MENU_ENUM_LABEL_FILE_DETECT_CORE_LIST_PUSH_DIR),
2538+
MENU_ENUM_LABEL_FILE_DETECT_CORE_LIST_PUSH_DIR_STR,
25382539
enum_idx,
25392540
FILE_TYPE_DIRECTORY, 0, 0, NULL);
25402541
}
@@ -2547,7 +2548,7 @@ static int frontend_unix_parse_drive_list(void *data, bool load_content)
25472548
#endif
25482549
{
25492550
menu_entries_append(list, "/",
2550-
msg_hash_to_str(MENU_ENUM_LABEL_FILE_DETECT_CORE_LIST_PUSH_DIR),
2551+
MENU_ENUM_LABEL_FILE_DETECT_CORE_LIST_PUSH_DIR_STR,
25512552
enum_idx,
25522553
FILE_TYPE_DIRECTORY, 0, 0, NULL);
25532554
}

frontend/drivers/platform_win32.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
#include "../../paths.h"
5454
#include "../../msg_hash.h"
5555
#include "../../verbosity.h"
56+
#include "../../intl/msg_hash_lbl_str.h"
5657
#include "../../ui/drivers/ui_win32.h"
5758

5859
#include "platform_win32.h"
@@ -771,7 +772,7 @@ static int frontend_win32_parse_drive_list(void *data, bool load_content)
771772
if (drives & (1 << i))
772773
menu_entries_append(list,
773774
drive,
774-
msg_hash_to_str(MENU_ENUM_LABEL_FILE_DETECT_CORE_LIST_PUSH_DIR),
775+
MENU_ENUM_LABEL_FILE_DETECT_CORE_LIST_PUSH_DIR_STR,
775776
enum_idx,
776777
FILE_TYPE_DIRECTORY, 0, 0, NULL);
777778
}

0 commit comments

Comments
 (0)