mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-01 04:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor

Browse Source
This commit is contained in:
twinaphex 2016-02-03 15:47:57 +01:00
parent cca999ecc7
commit f9f0d4abb6
3 changed files with 47 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
menu/cbs/menu_cbs_deferred_push.c
View File

@ -299,50 +299,6 @@ static int deferred_push_disk_options(menu_displaylist_info_t *info)
} }
#ifdef HAVE_NETWORKING #ifdef HAVE_NETWORKING
/* HACK - we have to find some way to pass state inbetween
* function pointer callback functions that don't necessarily
* call each other. */
char *core_buf;
size_t core_len;
void cb_net_generic(void *task_data, void *user_data, const char *err)
{
bool refresh = false;
http_transfer_data_t *data = (http_transfer_data_t*)task_data;
if (core_buf)
free(core_buf);
core_buf = NULL;
core_len = 0;
if (!data || err)
goto finish;
core_buf = (char*)malloc((data->len+1) * sizeof(char));
if (!core_buf)
goto finish;
memcpy(core_buf, data->data, data->len * sizeof(char));
core_buf[data->len] = '\0';
core_len = data->len;
finish:
refresh = true;
menu_entries_ctl(MENU_ENTRIES_CTL_UNSET_REFRESH, &refresh);
if (err)
RARCH_ERR("Download failed: %s\n", err);
if (data)
{
if (data->data)
free(data->data);
free(data);
}
}
static void cb_decompressed(void *task_data, void *user_data, const char *err) static void cb_decompressed(void *task_data, void *user_data, const char *err)
{ {
decompress_task_data_t *dec = (decompress_task_data_t*)task_data; decompress_task_data_t *dec = (decompress_task_data_t*)task_data;
@ -371,9 +327,6 @@ static void cb_decompressed(void *task_data, void *user_data, const char *err)
/* expects http_transfer_t*, menu_file_transfer_t* */ /* expects http_transfer_t*, menu_file_transfer_t* */
void cb_generic_download(void *task_data, void *user_data, const char *err) void cb_generic_download(void *task_data, void *user_data, const char *err)
#if 0
(void *data, size_t len, const char *dir_path)
#endif
{ {
char output_path[PATH_MAX_LENGTH]; char output_path[PATH_MAX_LENGTH];
char shaderdir[PATH_MAX_LENGTH]; char shaderdir[PATH_MAX_LENGTH];

46
menu/cbs/menu_cbs_ok.c
View File

@ -51,8 +51,52 @@ char detect_content_path[PATH_MAX_LENGTH];
unsigned rdb_entry_start_game_selection_ptr, rpl_entry_selection_ptr; unsigned rdb_entry_start_game_selection_ptr, rpl_entry_selection_ptr;
size_t hack_shader_pass = 0; size_t hack_shader_pass = 0;
#ifdef HAVE_NETWORKING
/* HACK - we have to find some way to pass state inbetween
* function pointer callback functions that don't necessarily
* call each other. */
char *core_buf;
size_t core_len;
/* defined in menu_cbs_deferred_push */ /* defined in menu_cbs_deferred_push */
void cb_net_generic(void *task_data, void *user_data, const char *err); void cb_net_generic(void *task_data, void *user_data, const char *err)
{
bool refresh = false;
http_transfer_data_t *data = (http_transfer_data_t*)task_data;
if (core_buf)
free(core_buf);
core_buf = NULL;
core_len = 0;
if (!data || err)
goto finish;
core_buf = (char*)malloc((data->len+1) * sizeof(char));
if (!core_buf)
goto finish;
memcpy(core_buf, data->data, data->len * sizeof(char));
core_buf[data->len] = '\0';
core_len = data->len;
finish:
refresh = true;
menu_entries_ctl(MENU_ENTRIES_CTL_UNSET_REFRESH, &refresh);
if (err)
RARCH_ERR("Download failed: %s\n", err);
if (data)
{
if (data->data)
free(data->data);
free(data);
}
}
#endif
int generic_action_ok_displaylist_push(const char *path, int generic_action_ok_displaylist_push(const char *path,
const char *label, unsigned type, size_t idx, size_t entry_idx, const char *label, unsigned type, size_t idx, size_t entry_idx,

5
menu/menu_cbs.h
View File

@ -204,9 +204,8 @@ bool menu_playlist_find_associated_core(const char *path, char *s, size_t len);
#ifdef HAVE_NETWORKING #ifdef HAVE_NETWORKING
void cb_net_generic(void *task_data, void *user_data, const char *err); typedef struct
{
typedef struct {
uint32_t type_hash; uint32_t type_hash;
char path[PATH_MAX_LENGTH]; char path[PATH_MAX_LENGTH];
} menu_file_transfer_t; } menu_file_transfer_t;