libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-10-07 22:33:27 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

Rename rarch_ to retro_

Browse Source
This commit is contained in:
twinaphex 2016-02-09 17:47:04 +01:00
parent 0378463130
commit 08eb091610
11 changed files with 84 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
menu/cbs/menu_cbs_ok.c
View File

@ -1630,7 +1630,7 @@ static int generic_action_ok_network(const char *path,
settings_t *settings = config_get_ptr();
unsigned type_id2 = 0;
const char *url_label = NULL;
rarch_task_callback_t callback = NULL;
retro_task_callback_t callback = NULL;
bool refresh = true;
menu_entries_ctl(MENU_ENTRIES_CTL_SET_REFRESH, &refresh);

2
tasks/task_content.c
View File

@ -25,7 +25,7 @@
bool rarch_task_push_content_load_default(
const char *core_path, const char *fullpath,
bool persist, enum rarch_core_type type,
rarch_task_callback_t cb, void *user_data)
retro_task_callback_t cb, void *user_data)
{
enum event_command cmd = EVENT_CMD_NONE;

6
tasks/task_database.c
View File

@ -517,7 +517,7 @@ static void rarch_main_data_db_cleanup_state(
db_state->buf = NULL;
}
static void rarch_dbscan_task_handler(rarch_task_t *task)
static void rarch_dbscan_task_handler(retro_task_t *task)
{
db_handle_t *db = (db_handle_t*)task->state;
database_info_handle_t *dbinfo = db->handle;
@ -587,9 +587,9 @@ task_finished:
}
bool rarch_task_push_dbscan(const char *fullpath,
bool directory, rarch_task_callback_t cb)
bool directory, retro_task_callback_t cb)
{
rarch_task_t *t = (rarch_task_t*)calloc(1, sizeof(*t));
retro_task_t *t = (retro_task_t*)calloc(1, sizeof(*t));
db_handle_t *db = (db_handle_t*)calloc(1, sizeof(db_handle_t));
if (!t || !db)

17
tasks/task_decompress.c
View File

@ -131,10 +131,9 @@ error:
return 0;
}
static void rarch_task_decompress_handler_finished(rarch_task_t *task,
static void rarch_task_decompress_handler_finished(retro_task_t *task,
decompress_state_t *dec)
{
task->finished = true;
if (!task->error && task->cancelled)
@ -159,7 +158,7 @@ static void rarch_task_decompress_handler_finished(rarch_task_t *task,
free(dec);
}
static void rarch_task_decompress_handler(rarch_task_t *task)
static void rarch_task_decompress_handler(retro_task_t *task)
{
bool retdec = false;
decompress_state_t *dec = (decompress_state_t*)task->state;
@ -178,7 +177,7 @@ static void rarch_task_decompress_handler(rarch_task_t *task)
}
}
static void rarch_task_decompress_handler_target_file(rarch_task_t *task)
static void rarch_task_decompress_handler_target_file(retro_task_t *task)
{
bool retdec;
decompress_state_t *dec = (decompress_state_t*)task->state;
@ -197,7 +196,7 @@ static void rarch_task_decompress_handler_target_file(rarch_task_t *task)
}
}
static void rarch_task_decompress_handler_subdir(rarch_task_t *task)
static void rarch_task_decompress_handler_subdir(retro_task_t *task)
{
bool retdec;
decompress_state_t *dec = (decompress_state_t*)task->state;
@ -217,7 +216,7 @@ static void rarch_task_decompress_handler_subdir(rarch_task_t *task)
}
static bool rarch_task_decompress_finder(
rarch_task_t *task, void *user_data)
retro_task_t *task, void *user_data)
{
decompress_state_t *dec = (decompress_state_t*)task->state;
@ -233,13 +232,13 @@ bool rarch_task_push_decompress(
const char *target_file,
const char *subdir,
const char *valid_ext,
rarch_task_callback_t cb,
retro_task_callback_t cb,
void *user_data)
{
task_finder_data_t find_data;
char tmp[PATH_MAX_LENGTH];
decompress_state_t *s = NULL;
rarch_task_t *t = NULL;
retro_task_t *t = NULL;
bool is_compressed = false;
if (string_is_empty(target_dir) || string_is_empty(source_file))
@ -287,7 +286,7 @@ bool rarch_task_push_decompress(
s->valid_ext = valid_ext ? strdup(valid_ext) : NULL;
s->zlib.type = ZLIB_TRANSFER_INIT;
t = (rarch_task_t*)calloc(1, sizeof(*t));
t = (retro_task_t*)calloc(1, sizeof(*t));
if (!t)
goto error;

12
tasks/task_file_transfer.c
View File

@ -84,7 +84,7 @@ typedef struct nbio_handle
#include "../menu/menu_driver.h"
#ifdef HAVE_RPNG
static void rarch_task_file_load_handler(rarch_task_t *task);
static void rarch_task_file_load_handler(retro_task_t *task);
static int cb_image_menu_upload_generic(void *data, size_t len)
{
nbio_handle_t *nbio = (nbio_handle_t*)data;
@ -314,11 +314,11 @@ static int cb_nbio_image_menu_boxart(void *data, size_t len)
#endif
bool rarch_task_push_image_load(const char *fullpath,
const char *type, rarch_task_callback_t cb, void *user_data)
const char *type, retro_task_callback_t cb, void *user_data)
{
#if defined(HAVE_RPNG) && defined(HAVE_MENU)
rarch_task_t *t;
nbio_handle_t *nbio;
nbio_handle_t *nbio = NULL;
retro_task_t *t = NULL;
uint32_t cb_type_hash = 0;
struct nbio_t* handle = NULL;
@ -351,7 +351,7 @@ bool rarch_task_push_image_load(const char *fullpath,
nbio_begin_read(handle);
t = (rarch_task_t*)calloc(1, sizeof(*t));
t = (retro_task_t*)calloc(1, sizeof(*t));
if (!t)
{
@ -407,7 +407,7 @@ static int rarch_main_data_nbio_iterate_parse(nbio_handle_t *nbio)
return 0;
}
static void rarch_task_file_load_handler(rarch_task_t *task)
static void rarch_task_file_load_handler(retro_task_t *task)
{
nbio_handle_t *nbio = (nbio_handle_t*)task->state;
nbio_image_handle_t *image = nbio ? &nbio->image : NULL;

12
tasks/task_http.c
View File

@ -109,7 +109,7 @@ static int cb_http_conn_default(void *data_, size_t len)
* Returns: 0 when finished, -1 when we should continue
* with the transfer on the next frame.
**/
static int rarch_main_data_http_iterate_transfer(rarch_task_t *task)
static int rarch_main_data_http_iterate_transfer(retro_task_t *task)
{
http_handle_t *http = (http_handle_t*)task->state;
size_t pos = 0, tot = 0;
@ -123,7 +123,7 @@ static int rarch_main_data_http_iterate_transfer(rarch_task_t *task)
return 0;
}
static void rarch_task_http_transfer_handler(rarch_task_t *task)
static void rarch_task_http_transfer_handler(retro_task_t *task)
{
http_handle_t *http = (http_handle_t*)task->state;
http_transfer_data_t *data;
@ -192,7 +192,7 @@ task_finished:
free(http);
}
static bool rarch_task_http_finder(rarch_task_t *task, void *user_data)
static bool rarch_task_http_finder(retro_task_t *task, void *user_data)
{
http_handle_t *http = (http_handle_t*)task->state;
const char *handle_url = NULL;
@ -211,12 +211,12 @@ static bool rarch_task_http_finder(rarch_task_t *task, void *user_data)
}
bool rarch_task_push_http_transfer(const char *url, const char *type,
rarch_task_callback_t cb, void *user_data)
retro_task_callback_t cb, void *user_data)
{
char tmp[PATH_MAX_LENGTH];
task_finder_data_t find_data;
struct http_connection_t *conn = NULL;
rarch_task_t *t = NULL;
retro_task_t *t = NULL;
http_handle_t *http = NULL;
if (string_is_empty(url))
@ -249,7 +249,7 @@ bool rarch_task_push_http_transfer(const char *url, const char *type,
strlcpy(http->connection.elem1, type, sizeof(http->connection.elem1));
http->status = HTTP_STATUS_CONNECTION_TRANSFER;
t = (rarch_task_t*)calloc(1, sizeof(*t));
t = (retro_task_t*)calloc(1, sizeof(*t));
if (!t)
goto error;

10
tasks/task_overlay.c
View File

@ -623,7 +623,7 @@ error:
loader->state = OVERLAY_STATUS_DEFERRED_ERROR;
}
static void rarch_task_overlay_handler(rarch_task_t *task)
static void rarch_task_overlay_handler(retro_task_t *task)
{
overlay_loader_t *loader = (overlay_loader_t*)task->state;
overlay_task_data_t *data;
@ -691,9 +691,9 @@ task_finished:
static bool rarch_task_push_overlay_load(const char *overlay_path,
rarch_task_callback_t cb, void *user_data)
retro_task_callback_t cb, void *user_data)
{
rarch_task_t *t = NULL;
retro_task_t *t = NULL;
config_file_t *conf = NULL;
overlay_loader_t *loader = (overlay_loader_t*)calloc(1, sizeof(*loader));
@ -722,7 +722,7 @@ static bool rarch_task_push_overlay_load(const char *overlay_path,
loader->state = OVERLAY_STATUS_DEFERRED_LOAD;
loader->pos_increment = (loader->size / 4) ? (loader->size / 4) : 4;
t = (rarch_task_t*)calloc(1, sizeof(*t));
t = (retro_task_t*)calloc(1, sizeof(*t));
if (!t)
goto error;
@ -752,7 +752,7 @@ error:
}
bool rarch_task_push_overlay_load_default(
rarch_task_callback_t cb, void *user_data)
retro_task_callback_t cb, void *user_data)
{
settings_t *settings = config_get_ptr();
bool osk_enable =

62
tasks/tasks.c
View File

@ -26,17 +26,17 @@
typedef struct
{
rarch_task_t *front;
rarch_task_t *back;
retro_task_t *front;
retro_task_t *back;
} task_queue_t;
struct rarch_task_impl
struct retro_task_impl
{
void (*push_running)(rarch_task_t *);
void (*push_running)(retro_task_t *);
void (*reset)(void);
void (*wait)(void);
void (*gather)(void);
bool (*find)(rarch_task_finder_t, void*);
bool (*find)(retro_task_finder_t, void*);
void (*init)(void);
void (*deinit)(void);
};
@ -44,7 +44,7 @@ struct rarch_task_impl
static task_queue_t tasks_running = {NULL, NULL};
static task_queue_t tasks_finished = {NULL, NULL};
static void task_queue_put(task_queue_t *queue, rarch_task_t *task)
static void task_queue_put(task_queue_t *queue, retro_task_t *task)
{
task->next = NULL;
@ -56,9 +56,9 @@ static void task_queue_put(task_queue_t *queue, rarch_task_t *task)
queue->back = task;
}
static rarch_task_t *task_queue_get(task_queue_t *queue)
static retro_task_t *task_queue_get(task_queue_t *queue)
{
rarch_task_t *task = queue->front;
retro_task_t *task = queue->front;
if (task)
{
@ -69,9 +69,9 @@ static rarch_task_t *task_queue_get(task_queue_t *queue)
return task;
}
static void rarch_task_internal_gather(void)
static void retro_task_internal_gather(void)
{
rarch_task_t *task = NULL;
retro_task_t *task = NULL;
while ((task = task_queue_get(&tasks_finished)) != NULL)
{
push_task_progress(task);
@ -89,16 +89,16 @@ static void rarch_task_internal_gather(void)
}
}
static void regular_push_running(rarch_task_t *task)
static void regular_push_running(retro_task_t *task)
{
task_queue_put(&tasks_running, task);
}
static void regular_gather(void)
{
rarch_task_t *task = NULL;
rarch_task_t *queue = NULL;
rarch_task_t *next = NULL;
retro_task_t *task = NULL;
retro_task_t *queue = NULL;
retro_task_t *next = NULL;
while ((task = task_queue_get(&tasks_running)) != NULL)
{
@ -119,7 +119,7 @@ static void regular_gather(void)
regular_push_running(task);
}
rarch_task_internal_gather();
retro_task_internal_gather();
}
static void regular_wait(void)
@ -130,7 +130,7 @@ static void regular_wait(void)
static void regular_reset(void)
{
rarch_task_t *task = tasks_running.front;
retro_task_t *task = tasks_running.front;
for (; task; task = task->next)
task->cancelled = true;
@ -144,9 +144,9 @@ static void regular_deinit(void)
{
}
static bool regular_find(rarch_task_finder_t func, void *user_data)
static bool regular_find(retro_task_finder_t func, void *user_data)
{
rarch_task_t *task = tasks_running.front;
retro_task_t *task = tasks_running.front;
for (; task; task = task->next)
{
@ -157,7 +157,7 @@ static bool regular_find(rarch_task_finder_t func, void *user_data)
return false;
}
static struct rarch_task_impl impl_regular = {
static struct retro_task_impl impl_regular = {
regular_push_running,
regular_reset,
regular_wait,
@ -174,7 +174,7 @@ static scond_t *worker_cond = NULL;
static sthread_t *worker_thread = NULL;
static bool worker_continue = true; /* use running_lock when touching it */
static void threaded_push_running(rarch_task_t *task)
static void threaded_push_running(retro_task_t *task)
{
slock_lock(running_lock);
task_queue_put(&tasks_running, task);
@ -184,7 +184,7 @@ static void threaded_push_running(rarch_task_t *task)
static void threaded_gather(void)
{
rarch_task_t *task = NULL;
retro_task_t *task = NULL;
slock_lock(running_lock);
for (task = tasks_running.front; task; task = task->next)
@ -193,7 +193,7 @@ static void threaded_gather(void)
slock_unlock(running_lock);
slock_lock(finished_lock);
rarch_task_internal_gather();
retro_task_internal_gather();
slock_unlock(finished_lock);
}
@ -213,7 +213,7 @@ static void threaded_wait(void)
static void threaded_reset(void)
{
rarch_task_t *task = NULL;
retro_task_t *task = NULL;
slock_lock(running_lock);
for (task = tasks_running.front; task; task = task->next)
@ -227,9 +227,9 @@ static void threaded_worker(void *userdata)
for (;;)
{
rarch_task_t *queue = NULL;
rarch_task_t *task = NULL;
rarch_task_t *next = NULL;
retro_task_t *queue = NULL;
retro_task_t *task = NULL;
retro_task_t *next = NULL;
/* pop all into a local queue,
* tasks are in the reverse order here. */
@ -272,9 +272,9 @@ static void threaded_worker(void *userdata)
slock_unlock(running_lock);
}
static bool threaded_find(rarch_task_finder_t func, void *user_data)
static bool threaded_find(retro_task_finder_t func, void *user_data)
{
rarch_task_t *task = NULL;
retro_task_t *task = NULL;
slock_lock(running_lock);
for (task = tasks_running.front; task; task = task->next)
@ -319,7 +319,7 @@ static void threaded_deinit(void)
finished_lock = NULL;
}
static struct rarch_task_impl impl_threaded = {
static struct retro_task_impl impl_threaded = {
threaded_push_running,
threaded_reset,
threaded_wait,
@ -332,7 +332,7 @@ static struct rarch_task_impl impl_threaded = {
bool task_ctl(enum task_ctl_state state, void *data)
{
static struct rarch_task_impl *impl_current = NULL;
static struct retro_task_impl *impl_current = NULL;
static bool task_threaded_enable = false;
switch (state)
@ -393,7 +393,7 @@ bool task_ctl(enum task_ctl_state state, void *data)
{
/* The lack of NULL checks in the following functions
* is proposital to ensure correct control flow by the users. */
rarch_task_t *task = (rarch_task_t*)data;
retro_task_t *task = (retro_task_t*)data;
impl_current->push_running(task);
break;
}

20
tasks/tasks.h
View File

@ -79,13 +79,13 @@ enum task_ctl_state
TASK_CTL_IS_THREADED
};
typedef struct rarch_task rarch_task_t;
typedef void (*rarch_task_callback_t)(void *task_data,
typedef struct retro_task retro_task_t;
typedef void (*retro_task_callback_t)(void *task_data,
void *user_data, const char *error);
typedef void (*rarch_task_handler_t)(rarch_task_t *task);
typedef void (*retro_task_handler_t)(retro_task_t *task);
typedef bool (*rarch_task_finder_t)(rarch_task_t *task,
typedef bool (*retro_task_finder_t)(retro_task_t *task,
void *userdata);
typedef struct
@ -93,12 +93,12 @@ typedef struct
char *source_file;
} decompress_task_data_t;
struct rarch_task
struct retro_task
{
rarch_task_handler_t handler;
retro_task_handler_t handler;
/* always called from the main loop */
rarch_task_callback_t callback;
retro_task_callback_t callback;
/* set to true by the handler to signal
* the task has finished executing. */
@ -129,16 +129,16 @@ struct rarch_task
char *title;
/* don't touch this. */
rarch_task_t *next;
retro_task_t *next;
};
typedef struct task_finder_data
{
rarch_task_finder_t func;
retro_task_finder_t func;
void *userdata;
} task_finder_data_t;
void push_task_progress(rarch_task_t *task);
void push_task_progress(retro_task_t *task);
bool task_ctl(enum task_ctl_state state, void *data);

2
tasks/tasks_internal.c
View File

@ -35,7 +35,7 @@ static void task_msg_queue_pushf(unsigned prio, unsigned duration,
runloop_msg_queue_push(buf, prio, duration, flush);
}
void push_task_progress(rarch_task_t *task)
void push_task_progress(retro_task_t *task)
{
if (task->title)
{

20
tasks/tasks_internal.h
View File

@ -34,20 +34,20 @@ typedef struct {
} http_transfer_data_t;
bool rarch_task_push_http_transfer(const char *url, const char *type,
rarch_task_callback_t cb, void *userdata);
retro_task_callback_t cb, void *userdata);
#endif
bool rarch_task_push_image_load(const char *fullpath, const char *type,
rarch_task_callback_t cb, void *userdata);
retro_task_callback_t cb, void *userdata);
#ifdef HAVE_LIBRETRODB
bool rarch_task_push_dbscan(const char *fullpath,
bool directory, rarch_task_callback_t cb);
bool directory, retro_task_callback_t cb);
#endif
#ifdef HAVE_OVERLAY
bool rarch_task_push_overlay_load_default(
rarch_task_callback_t cb, void *user_data);
retro_task_callback_t cb, void *user_data);
#endif
int find_first_data_track(const char* cue_path,
@ -66,12 +66,16 @@ bool rarch_task_push_decompress(
const char *target_file,
const char *subdir,
const char *valid_ext,
rarch_task_callback_t cb, void *user_data);
retro_task_callback_t cb,
void *user_data);
bool rarch_task_push_content_load_default(
const char *core_path, const char *fullpath,
bool persist, enum rarch_core_type type,
rarch_task_callback_t cb, void *user_data);
const char *core_path,
const char *fullpath,
bool persist,
enum rarch_core_type type,
retro_task_callback_t cb,
void *user_data);
#ifdef __cplusplus
}