CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-15 23:06:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Take out runloop_t dependencies

Browse Source
This commit is contained in:
twinaphex 2015-08-03 20:03:14 +02:00
parent e43f54f7c1
commit bd6ee135e9
7 changed files with 44 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
audio/audio_driver.c
View File

@ -23,7 +23,6 @@
#include "../driver.h"
#include "../general.h"
#include "../retroarch.h"
#include "../runloop.h"
#include "../performance.h"
#ifndef AUDIO_BUFFER_FREE_SAMPLES_COUNT
@ -601,7 +600,7 @@ bool audio_driver_flush(const int16_t *data, size_t samples)
size_t output_size = sizeof(float);
struct resampler_data src_data = {0};
struct rarch_dsp_data dsp_data = {0};
runloop_t *runloop = rarch_main_get_ptr();
global_t *global = global_get_ptr();
driver_t *driver = driver_get_ptr();
const audio_driver_t *audio = driver ?
(const audio_driver_t*)driver->audio : NULL;
@ -617,7 +616,7 @@ bool audio_driver_flush(const int16_t *data, size_t samples)
driver->recording->push_audio(driver->recording_data, &ffemu_data);
}
if (runloop->is_paused || settings->audio.mute_enable)
if (global->is_paused || settings->audio.mute_enable)
return true;
if (!driver->audio_active || !audio_data.data)
return false;
@ -654,7 +653,7 @@ bool audio_driver_flush(const int16_t *data, size_t samples)
audio_driver_readjust_input_rate();
src_data.ratio = audio_data.src_ratio;
if (runloop->is_slowmotion)
if (global->is_slowmotion)
src_data.ratio *= settings->slowmotion_ratio;
RARCH_PERFORMANCE_INIT(resampler_proc);

12
command_event.c
View File

@ -19,8 +19,6 @@
#include "general.h"
#include "performance.h"
#include "runloop_data.h"
#include "runloop.h"
#include "dynamic.h"
#include "content.h"
#include "screenshot.h"
@ -28,6 +26,7 @@
#include "retroarch.h"
#include "dir_list_special.h"
#include "runloop_data.h"
#include "configuration.h"
#include "input/input_remapping.h"
@ -1025,7 +1024,6 @@ bool event_command(enum event_command cmd)
{
unsigned i = 0;
bool boolean = false;
runloop_t *runloop = rarch_main_get_ptr();
driver_t *driver = driver_get_ptr();
global_t *global = global_get_ptr();
settings_t *settings = config_get_ptr();
@ -1426,7 +1424,7 @@ bool event_command(enum event_command cmd)
#endif
break;
case EVENT_CMD_PAUSE_CHECKS:
if (runloop->is_paused)
if (global->is_paused)
{
RARCH_LOG("%s\n", msg_hash_to_str(MSG_PAUSED));
event_command(EVENT_CMD_AUDIO_STOP);
@ -1441,15 +1439,15 @@ bool event_command(enum event_command cmd)
}
break;
case EVENT_CMD_PAUSE_TOGGLE:
runloop->is_paused = !runloop->is_paused;
global->is_paused = !global->is_paused;
event_command(EVENT_CMD_PAUSE_CHECKS);
break;
case EVENT_CMD_UNPAUSE:
runloop->is_paused = false;
global->is_paused = false;
event_command(EVENT_CMD_PAUSE_CHECKS);
break;
case EVENT_CMD_PAUSE:
runloop->is_paused = true;
global->is_paused = true;
event_command(EVENT_CMD_PAUSE_CHECKS);
break;
case EVENT_CMD_MENU_PAUSE_LIBRETRO:

7
gfx/drivers/gl.c
View File

@ -31,7 +31,6 @@
#include <string.h>
#include "../../general.h"
#include "../../retroarch.h"
#include "../../runloop.h"
#include <math.h>
#ifdef HAVE_CONFIG_H
@ -1526,9 +1525,9 @@ static bool gl_frame(void *data, const void *frame,
{
unsigned width, height;
gl_t *gl = (gl_t*)data;
runloop_t *runloop = rarch_main_get_ptr();
driver_t *driver = driver_get_ptr();
settings_t *settings = config_get_ptr();
global_t *global = global_get_ptr();
uint64_t frame_count = video_driver_get_frame_count();
const struct font_renderer *font_driver = driver ? driver->font_osd_driver : NULL;
@ -1715,8 +1714,8 @@ static bool gl_frame(void *data, const void *frame,
/* Disable BFI during fast forward, slow-motion,
* and pause to prevent flicker. */
if (settings->video.black_frame_insertion &&
!driver->nonblock_state && !runloop->is_slowmotion
&& !runloop->is_paused)
!driver->nonblock_state && !global->is_slowmotion
&& !global->is_paused)
{
gfx_ctx_swap_buffers(gl);
glClear(GL_COLOR_BUFFER_BIT);

5
gfx/video_thread_wrapper.c
View File

@ -16,7 +16,6 @@
#include "video_thread_wrapper.h"
#include "../performance.h"
#include "../runloop.h"
#include <stdlib.h>
#include <string.h>
#include <limits.h>
@ -431,9 +430,9 @@ static bool thread_alive(void *data)
{
bool ret;
thread_video_t *thr = (thread_video_t*)data;
runloop_t *runloop = rarch_main_get_ptr();
global_t *global = global_get_ptr();
if (runloop->is_paused)
if (global->is_paused)
{
thread_packet_t pkt = { CMD_ALIVE };
thread_send_and_wait(thr, &pkt);

56
runloop.c
View File

@ -56,18 +56,18 @@ static struct global g_extern;
* Returns: true if libretro pause key was toggled, otherwise false.
**/
static bool check_pause(driver_t *driver, settings_t *settings,
runloop_t *runloop,
global_t *global,
bool pause_pressed, bool frameadvance_pressed)
{
static bool old_focus = true;
bool focus = true;
enum event_command cmd = EVENT_CMD_NONE;
bool old_is_paused = runloop ? runloop->is_paused : false;
bool old_is_paused = global ? global->is_paused : false;
const video_driver_t *video = driver ? (const video_driver_t*)driver->video :
NULL;
/* FRAMEADVANCE will set us into pause mode. */
pause_pressed |= !runloop->is_paused && frameadvance_pressed;
pause_pressed |= !global->is_paused && frameadvance_pressed;
if (settings->pause_nonactive)
focus = video->focus(driver->video_data);
@ -84,7 +84,7 @@ static bool check_pause(driver_t *driver, settings_t *settings,
if (cmd != EVENT_CMD_NONE)
event_command(cmd);
if (runloop->is_paused == old_is_paused)
if (global->is_paused == old_is_paused)
return false;
return true;
@ -157,7 +157,7 @@ static void check_stateslots(settings_t *settings,
* Checks if rewind toggle/hold was being pressed and/or held.
**/
static void check_rewind(settings_t *settings,
global_t *global, runloop_t *runloop, bool pressed)
global_t *global, bool pressed)
{
static bool first = true;
@ -186,7 +186,7 @@ static void check_rewind(settings_t *settings,
audio_driver_setup_rewind();
rarch_main_msg_queue_push_new(MSG_REWINDING, 0,
runloop->is_paused ? 1 : 30, true);
global->is_paused ? 1 : 30, true);
pretro_unserialize(buf, global->rewind.size);
if (global->bsv.movie)
@ -227,11 +227,11 @@ static void check_rewind(settings_t *settings,
* Checks if slowmotion toggle/hold was being pressed and/or held.
**/
static void check_slowmotion(settings_t *settings, global_t *global,
runloop_t *runloop, bool slowmotion_pressed)
bool slowmotion_pressed)
{
runloop->is_slowmotion = slowmotion_pressed;
global->is_slowmotion = slowmotion_pressed;
if (!runloop->is_slowmotion)
if (!global->is_slowmotion)
return;
if (settings->video.black_frame_insertion)
@ -443,13 +443,12 @@ static void do_state_check_menu_toggle(settings_t *settings, global_t *global)
* Returns: 0.
**/
static int do_pre_state_checks(settings_t *settings,
global_t *global, runloop_t *runloop,
event_cmd_state_t *cmd)
global_t *global, event_cmd_state_t *cmd)
{
if (cmd->overlay_next_pressed)
event_command(EVENT_CMD_OVERLAY_NEXT);
if (!runloop->is_paused || menu_driver_alive())
if (!global->is_paused || menu_driver_alive())
{
if (cmd->fullscreen_toggle)
event_command(EVENT_CMD_FULLSCREEN_TOGGLE);
@ -481,7 +480,7 @@ static int do_netplay_state_checks(
#endif
static int do_pause_state_checks(
runloop_t *runloop,
global_t *global,
bool pause_pressed,
bool frameadvance_pressed,
bool fullscreen_toggle_pressed,
@ -489,7 +488,7 @@ static int do_pause_state_checks(
{
bool check_is_oneshot = frameadvance_pressed || rewind_pressed;
if (!runloop->is_paused)
if (!global->is_paused)
return 0;
if (fullscreen_toggle_pressed)
@ -537,11 +536,11 @@ static int do_state_checks(driver_t *driver, settings_t *settings,
cmd->fullscreen_toggle);
#endif
check_pause(driver, settings, runloop,
check_pause(driver, settings, global,
cmd->pause_pressed, cmd->frameadvance_pressed);
if (do_pause_state_checks(
runloop,
global,
cmd->pause_pressed,
cmd->frameadvance_pressed,
cmd->fullscreen_toggle,
@ -559,9 +558,8 @@ static int do_state_checks(driver_t *driver, settings_t *settings,
else if (cmd->load_state_pressed)
event_command(EVENT_CMD_LOAD_STATE);
check_rewind(settings, global, runloop, cmd->rewind_pressed);
check_slowmotion(settings, global, runloop,
cmd->slowmotion_pressed);
check_rewind(settings, global, cmd->rewind_pressed);
check_slowmotion(settings, global, cmd->slowmotion_pressed);
if (cmd->movie_record)
check_movie(global);
@ -608,7 +606,7 @@ static int do_state_checks(driver_t *driver, settings_t *settings,
* Returns: 1 if any of the above conditions are true, otherwise 0.
**/
static INLINE int time_to_exit(driver_t *driver, global_t *global,
runloop_t *runloop, event_cmd_state_t *cmd)
event_cmd_state_t *cmd)
{
const video_driver_t *video = driver ? (const video_driver_t*)driver->video : NULL;
rarch_system_info_t *system = rarch_system_info_get_ptr();
@ -630,19 +628,19 @@ static INLINE int time_to_exit(driver_t *driver, global_t *global,
* Updates frame timing if frame timing callback is in use by the core.
**/
static void rarch_update_frame_time(driver_t *driver, settings_t *settings,
runloop_t *runloop)
global_t *global)
{
retro_time_t curr_time = rarch_get_time_usec();
rarch_system_info_t *system = rarch_system_info_get_ptr();
retro_time_t delta = curr_time - system->frame_time_last;
bool is_locked_fps = runloop->is_paused || driver->nonblock_state;
bool is_locked_fps = global->is_paused || driver->nonblock_state;
is_locked_fps |= !!driver->recording_data;
if (!system->frame_time_last || is_locked_fps)
delta = system->frame_time.reference;
if (!is_locked_fps && runloop->is_slowmotion)
if (!is_locked_fps && global->is_slowmotion)
delta /= settings->slowmotion_ratio;
system->frame_time_last = curr_time;
@ -792,13 +790,13 @@ static INLINE retro_input_t input_keys_pressed(driver_t *driver,
*
* Returns: always true (1).
**/
static bool input_flush(runloop_t *runloop, retro_input_t *input)
static bool input_flush(retro_input_t *input, global_t *global)
{
*input = 0;
/* If core was paused before entering menu, evoke
* pause toggle to wake it up. */
if (runloop->is_paused)
if (global->is_paused)
BIT64_SET(*input, RARCH_PAUSE_TOGGLE);
return true;
@ -1032,19 +1030,19 @@ int rarch_main_iterate(void)
last_input = input;
if (driver->flushing_input)
driver->flushing_input = (input) ? input_flush(runloop, &input) : false;
driver->flushing_input = (input) ? input_flush(&input, global) : false;
trigger_input = input & ~old_input;
rarch_main_cmd_get_state(&cmd, input, old_input, trigger_input);
if (time_to_exit(driver, global, runloop, &cmd))
if (time_to_exit(driver, global, &cmd))
return rarch_main_iterate_quit(settings, global);
if (system->frame_time.callback)
rarch_update_frame_time(driver, settings, runloop);
rarch_update_frame_time(driver, settings, global);
do_pre_state_checks(settings, global, runloop, &cmd);
do_pre_state_checks(settings, global, &cmd);
#ifdef HAVE_OVERLAY
rarch_main_iterate_linefeed_overlay(driver, settings);

4
runloop.h
View File

@ -37,10 +37,8 @@ extern "C" {
typedef struct runloop
{
/* Lifecycle state checks. */
bool is_paused;
bool is_idle;
bool ui_companion_is_on_foreground;
bool is_slowmotion;
struct
{
@ -62,6 +60,8 @@ typedef struct rarch_resolution
typedef struct global
{
bool is_slowmotion;
bool is_paused;
unsigned max_frames;
bool verbosity;

6
screenshot.c
View File

@ -38,7 +38,6 @@
#include "msg_hash.h"
#include "gfx/scaler/scaler.h"
#include "retroarch.h"
#include "runloop.h"
#include "screenshot.h"
#include "gfx/video_driver.h"
#include "gfx/video_viewport.h"
@ -260,7 +259,6 @@ bool take_screenshot(void)
bool viewport_read = false;
bool ret = true;
const char *msg = NULL;
runloop_t *runloop = rarch_main_get_ptr();
driver_t *driver = driver_get_ptr();
settings_t *settings = config_get_ptr();
global_t *global = global_get_ptr();
@ -332,9 +330,9 @@ bool take_screenshot(void)
msg = msg_hash_to_str(MSG_FAILED_TO_TAKE_SCREENSHOT);
}
rarch_main_msg_queue_push(msg, 1, runloop->is_paused ? 1 : 180, true);
rarch_main_msg_queue_push(msg, 1, global->is_paused ? 1 : 180, true);
if (runloop->is_paused)
if (global->is_paused)
video_driver_cached_frame();
return ret;