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

More CXX_BUILD buildfixes

This commit is contained in:
twinaphex 2019-07-15 08:24:43 +02:00
parent 8660994765
commit f5dc1b653d
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
menu/menu_displaylist.c
View File

@ -5015,7 +5015,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
menu_entries_append_enum(info->list, menu_entries_append_enum(info->list,
system, system,
"", "",
0, MSG_UNKNOWN,
FILE_TYPE_NONE, 0, 0); FILE_TYPE_NONE, 0, 0);
} }
@ -5033,7 +5033,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
menu_entries_append_enum(info->list, menu_entries_append_enum(info->list,
serial, serial,
"", "",
0, MSG_UNKNOWN,
FILE_TYPE_NONE, 0, 0); FILE_TYPE_NONE, 0, 0);
} }
@ -5048,7 +5048,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
menu_entries_append_enum(info->list, menu_entries_append_enum(info->list,
atip_string, atip_string,
"", "",
0, MSG_UNKNOWN,
FILE_TYPE_NONE, 0, 0); FILE_TYPE_NONE, 0, 0);
} }
@ -5060,18 +5060,18 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
menu_entries_append_enum(info->list, menu_entries_append_enum(info->list,
tracks_string, tracks_string,
"", "",
0, MSG_UNKNOWN,
FILE_TYPE_NONE, 0, 0); FILE_TYPE_NONE, 0, 0);
} }
{ {
int i; unsigned i;
for (i = 0; i < toc->num_tracks; i++) for (i = 0; i < toc->num_tracks; i++)
{ {
char track_string[16] = {"Track "}; char track_string[16] = {"Track "};
char mode_string[16] = {" - Mode: "}; char mode_string[16] = {" - Mode: "};
char size_string[32] = {" - Size: "}; char size_string[32] = {" - Size: "};
char length_string[32] = {" - Length: "}; char length_string[32] = {" - Length: "};
snprintf(track_string + strlen(track_string), sizeof(track_string) - strlen(track_string), "%d:", i + 1); snprintf(track_string + strlen(track_string), sizeof(track_string) - strlen(track_string), "%d:", i + 1);
@ -5079,7 +5079,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
menu_entries_append_enum(info->list, menu_entries_append_enum(info->list,
track_string, track_string,
"", "",
0, MSG_UNKNOWN,
FILE_TYPE_NONE, 0, 0); FILE_TYPE_NONE, 0, 0);
if (toc->track[i].audio) if (toc->track[i].audio)
@ -5090,7 +5090,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
menu_entries_append_enum(info->list, menu_entries_append_enum(info->list,
mode_string, mode_string,
"", "",
0, MSG_UNKNOWN,
FILE_TYPE_NONE, 0, 0); FILE_TYPE_NONE, 0, 0);
snprintf(size_string + strlen(size_string), sizeof(size_string) - strlen(size_string), "%.1f MB", toc->track[i].track_bytes / 1000.0 / 1000.0); snprintf(size_string + strlen(size_string), sizeof(size_string) - strlen(size_string), "%.1f MB", toc->track[i].track_bytes / 1000.0 / 1000.0);
@ -5098,7 +5098,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
menu_entries_append_enum(info->list, menu_entries_append_enum(info->list,
size_string, size_string,
"", "",
0, MSG_UNKNOWN,
FILE_TYPE_NONE, 0, 0); FILE_TYPE_NONE, 0, 0);
{ {
@ -5113,7 +5113,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
menu_entries_append_enum(info->list, menu_entries_append_enum(info->list,
length_string, length_string,
"", "",
0, MSG_UNKNOWN,
FILE_TYPE_NONE, 0, 0); FILE_TYPE_NONE, 0, 0);
} }
} }

3
retroarch.c
View File

@ -3389,8 +3389,7 @@ bool rarch_environment_cb(unsigned cmd, void *data)
RARCH_LOG("Environ GET_INPUT_DEVICE_CAPABILITIES.\n"); RARCH_LOG("Environ GET_INPUT_DEVICE_CAPABILITIES.\n");
if (!current_input->get_capabilities || !current_input_data) if (!current_input->get_capabilities || !current_input_data)
return false; return false;
else *mask = input_driver_get_capabilities();
*mask = input_driver_get_capabilities();
break; break;
} }