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

Merge pull request #8961 from jdgleaver/core-association-array-length

Browse Source 
Increase size of playlist core association arrays
This commit is contained in:
Twinaphex 2019-06-12 22:03:47 +02:00 committed by GitHub
commit 5fbdda6d38
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configuration.h
View File

@ -557,8 +557,8 @@ typedef struct settings
char audio_device[255];
char camera_device[255];
char playlist_names[PATH_MAX_LENGTH];
char playlist_cores[PATH_MAX_LENGTH];
char playlist_names[8192];
char playlist_cores[8192];
char bundle_assets_src[PATH_MAX_LENGTH];
char bundle_assets_dst[PATH_MAX_LENGTH];
char bundle_assets_dst_subdir[PATH_MAX_LENGTH];

7
menu/cbs/menu_cbs_left.c
View File

@ -368,16 +368,15 @@ static int action_left_video_resolution(unsigned type, const char *label,
static int playlist_association_left(unsigned type, const char *label,
bool wraparound)
{
unsigned i;
char core_path[PATH_MAX_LENGTH];
char new_playlist_cores[PATH_MAX_LENGTH];
int next, found, current = 0;
size_t i, next, found, current = 0;
core_info_t *info = NULL;
struct string_list *stnames = NULL;
struct string_list *stcores = NULL;
settings_t *settings = config_get_ptr();
const char *path = path_basename(label);
core_info_list_t *list = NULL;
char core_path[PATH_MAX_LENGTH];
char new_playlist_cores[sizeof(settings->arrays.playlist_cores) / sizeof(settings->arrays.playlist_cores[0])];
core_info_get_list(&list);

4
menu/cbs/menu_cbs_right.c
View File

@ -389,8 +389,6 @@ static int action_right_video_resolution(unsigned type, const char *label,
static int playlist_association_right(unsigned type, const char *label,
bool wraparound)
{
char core_path[PATH_MAX_LENGTH];
char new_playlist_cores[PATH_MAX_LENGTH];
size_t i, next, found, current = 0;
core_info_t *info = NULL;
struct string_list *stnames = NULL;
@ -398,6 +396,8 @@ static int playlist_association_right(unsigned type, const char *label,
core_info_list_t *list = NULL;
settings_t *settings = config_get_ptr();
const char *path = path_basename(label);
char core_path[PATH_MAX_LENGTH];
char new_playlist_cores[sizeof(settings->arrays.playlist_cores) / sizeof(settings->arrays.playlist_cores[0])];
core_info_get_list(&list);
if (!list)

4
menu/cbs/menu_cbs_start.c
View File

@ -224,13 +224,13 @@ static int action_start_core_setting(unsigned type,
static int action_start_playlist_association(unsigned type, const char *label)
{
int found;
char new_playlist_cores[PATH_MAX_LENGTH];
struct string_list *stnames = NULL;
struct string_list *stcores = NULL;
core_info_list_t *list = NULL;
settings_t *settings = config_get_ptr();
const char *path = path_basename(label);
int found;
char new_playlist_cores[sizeof(settings->arrays.playlist_cores) / sizeof(settings->arrays.playlist_cores[0])];
core_info_get_list(&list);
if (!list)

4
menu/menu_displaylist.c
View File

@ -2574,8 +2574,8 @@ static void menu_displaylist_parse_playlist_associations(
if (str_list && str_list->size)
{
unsigned i;
char new_playlist_names[PATH_MAX_LENGTH];
char new_playlist_cores[PATH_MAX_LENGTH];
char new_playlist_names[sizeof(settings->arrays.playlist_names) / sizeof(settings->arrays.playlist_names[0])];
char new_playlist_cores[sizeof(settings->arrays.playlist_cores) / sizeof(settings->arrays.playlist_cores[0])];
struct string_list *stnames = string_split(settings->arrays.playlist_names, ";");
struct string_list *stcores = string_split(settings->arrays.playlist_cores, ";");

4
ui/drivers/qt/qt_playlist.cpp
View File

@ -765,8 +765,8 @@ void MainWindow::onPlaylistWidgetContextMenuRequested(const QPoint&)
int j = 0;
size_t found = 0;
const char *currentPlaylistFileNameData = NULL;
char new_playlist_names[PATH_MAX_LENGTH];
char new_playlist_cores[PATH_MAX_LENGTH];
char new_playlist_names[sizeof(settings->arrays.playlist_names) / sizeof(settings->arrays.playlist_names[0])];
char new_playlist_cores[sizeof(settings->arrays.playlist_cores) / sizeof(settings->arrays.playlist_cores[0])];
bool specialPlaylist = false;
bool foundHiddenPlaylist = false;