libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2025-01-19 15:28:25 +00:00
Code Issues Actions 25 Packages Projects Releases Wiki Activity

move msg_queue_pushf to tasks/tasks.c

Browse Source
This commit is contained in:
twinaphex 2015-11-30 23:24:11 +01:00
parent 22d64ae3dc
commit 809f8da955
3 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
runloop.c
View File

@ -132,17 +132,6 @@ void rarch_main_msg_queue_push(const char *msg, unsigned prio, unsigned duration
}
}
void rarch_main_msg_queue_pushf(unsigned prio, unsigned duration,
bool flush, const char *fmt, ...)
{
char buf[1024];
va_list ap;
va_start(ap, fmt);
vsnprintf(buf, sizeof(buf), fmt, ap);
va_end(ap);
rarch_main_msg_queue_push(buf, prio, duration, flush);
}
static void rarch_main_msg_queue_free(void)
{
if (!g_msg_queue)

3
runloop.h
View File

@ -318,9 +318,6 @@ int rarch_main_iterate(unsigned *sleep_ms);
void rarch_main_msg_queue_push(const char *msg, unsigned prio,
unsigned duration, bool flush);
void rarch_main_msg_queue_pushf(unsigned prio, unsigned duration,
bool flush, const char *fmt, ...);
void rarch_main_msg_queue_push_new(uint32_t hash, unsigned prio,
unsigned duration, bool flush);

21
tasks/tasks.c
View File

@ -1,5 +1,5 @@
#include <stdlib.h>
#include <stdarg.h>
#include "../general.h"
#include "../verbosity.h"
@ -54,6 +54,17 @@ static rarch_task_t *task_queue_get(task_queue_t *queue)
return task;
}
void task_msg_queue_pushf(unsigned prio, unsigned duration,
bool flush, const char *fmt, ...)
{
char buf[1024];
va_list ap;
va_start(ap, fmt);
vsnprintf(buf, sizeof(buf), fmt, ap);
va_end(ap);
rarch_main_msg_queue_push(buf, prio, duration, flush);
}
static void push_task_progress(rarch_task_t *task)
{
if (task->title)
@ -61,17 +72,17 @@ static void push_task_progress(rarch_task_t *task)
if (task->finished)
{
if (task->error)
rarch_main_msg_queue_pushf(1, 60, true, "%s: %s",
task_msg_queue_pushf(1, 60, true, "%s: %s",
msg_hash_to_str(MSG_TASK_FAILED), task->title);
else
rarch_main_msg_queue_pushf(1, 60, true, "100%%: %s", task->title);
task_msg_queue_pushf(1, 60, true, "100%%: %s", task->title);
}
else
{
if (task->progress >= 0 && task->progress <= 100)
rarch_main_msg_queue_pushf(1, 60, true, "%i%%: %s", task->progress, task->title);
task_msg_queue_pushf(1, 60, true, "%i%%: %s", task->progress, task->title);
else
rarch_main_msg_queue_pushf(1, 60, true, "%s...", task->title);
task_msg_queue_pushf(1, 60, true, "%s...", task->title);
}
}
}