libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-23 16:09:47 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

Merge runloop and runloop_data.c

Browse Source
This commit is contained in:
twinaphex 2015-11-30 15:35:57 +01:00
parent b5481d8b7c
commit 4e0a4150b5
20 changed files with 38 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.common
View File

@ -122,7 +122,6 @@ OBJ += frontend/frontend.o \
intl/msg_hash_pt.o \
intl/msg_hash_us.o \
runloop.o \
runloop_data.o \
tasks/tasks.o \
tasks/task_file_transfer.o \
content.o \

2
command_event.c
View File

@ -34,7 +34,7 @@
#endif
#include "verbosity.h"
#include "runloop_data.h"
#include "runloop.h"
#include "configuration.h"
#include "input/input_remapping.h"

1
frontend/drivers/platform_emscripten.c
View File

@ -24,7 +24,6 @@
#include "../frontend.h"
#include "../../retroarch.h"
#include "../../runloop.h"
#include "../../runloop_data.h"
#include "../frontend_driver.h"
static void emscripten_mainloop(void)

1
frontend/frontend.c
View File

@ -28,7 +28,6 @@
#include "../driver.h"
#include "../retroarch.h"
#include "../runloop.h"
#include "../runloop_data.h"
#include "../verbosity.h"
#define MAX_ARGS 32

1
griffin/griffin.c
View File

@ -703,7 +703,6 @@ RETROARCH
#include "../libretro_version_1.c"
#include "../retroarch.c"
#include "../runloop.c"
#include "../runloop_data.c"
#include "../system.c"
#include "../tasks/tasks.c"

1
menu/cbs/menu_cbs_ok.c
View File

@ -24,7 +24,6 @@
#include "../menu_hash.h"
#include "../../general.h"
#include "../../runloop_data.h"
#include "../../tasks/tasks.h"
#include "../../input/input_remapping.h"
#include "../../system.h"

2
menu/cbs/menu_cbs_scan.c
View File

@ -21,7 +21,7 @@
#include "../menu_entry.h"
#include "../menu_setting.h"
#include "../../runloop_data.h"
#include "../../runloop.h"
#include "../../tasks/tasks.h"
#ifndef BIND_ACTION_SCAN

2
menu/cbs/menu_cbs_select.c
View File

@ -18,7 +18,7 @@
#include "../menu_cbs.h"
#include "../menu_setting.h"
#include "../../runloop_data.h"
#include "../../runloop.h"
#ifndef BIND_ACTION_SELECT
#define BIND_ACTION_SELECT(cbs, name) \

1
menu/drivers/materialui.c
View File

@ -38,7 +38,6 @@
#include "../../configuration.h"
#include "../../runloop.h"
#include "../../runloop_data.h"
#include "../../verbosity.h"
#include "../../tasks/tasks.h"

1
menu/drivers/xmb.c
View File

@ -45,7 +45,6 @@
#include "../../file_ext.h"
#include "../../runloop.h"
#include "../../runloop_data.h"
#include "../../tasks/tasks.h"
#ifndef XMB_THEME

2
menu/drivers/zarch.c
View File

@ -40,7 +40,7 @@
#include "../menu_entry.h"
#include "../menu_display.h"
#include "../menu_hash.h"
#include "../../runloop_data.h"
#include "../../runloop.h"
#include "../../gfx/font_driver.h"

1
menu/menu.c
View File

@ -24,7 +24,6 @@
#include "../general.h"
#include "../frontend/frontend.h"
#include "../runloop_data.h"
static void menu_environment_get(int *argc, char *argv[],
void *args, void *params_data)

2
retroarch.c
View File

@ -44,7 +44,7 @@
#include "libretro_version_1.h"
#include "configuration.h"
#include "general.h"
#include "runloop_data.h"
#include "runloop.h"
#include "tasks/tasks.h"
#include "performance.h"
#include "cheats.h"

23
runloop.c
View File

@ -36,11 +36,11 @@
#include "performance.h"
#include "retroarch.h"
#include "runloop.h"
#include "runloop_data.h"
#include "audio/audio_driver.h"
#include "msg_hash.h"
#include "tasks/tasks.h"
#include "input/input_keyboard.h"
#include "input/input_driver.h"
#include "ui/ui_companion_driver.h"
@ -1182,3 +1182,24 @@ end:
return 0;
}
void rarch_main_data_deinit(void)
{
rarch_task_deinit();
}
void rarch_main_data_iterate(void)
{
rarch_task_check();
}
void rarch_main_data_clear_state(void)
{
rarch_main_data_deinit();
rarch_task_init();
}
void data_runloop_osd_msg(const char *msg, size_t len)
{
rarch_main_msg_queue_push(msg, 1, 10, true);
}

8
runloop.h
View File

@ -352,6 +352,14 @@ const char *rarch_main_msg_queue_pull(void);
bool rarch_main_ctl(enum rarch_main_ctl_state state, void *data);
typedef int (*transfer_cb_t)(void *data, size_t len);
void rarch_main_data_clear_state(void);
void rarch_main_data_iterate(void);
void rarch_main_data_deinit(void);
#ifdef __cplusplus
}
#endif

42
runloop_data.c
View File

@ -1,42 +0,0 @@
/* RetroArch - A frontend for libretro.
* Copyright (C) 2011-2015 - Daniel De Matteis
*
* RetroArch is free software: you can redistribute it and/or modify it under the terms
* of the GNU General Public License as published by the Free Software Found-
* ation, either version 3 of the License, or (at your option) any later version.
*
* RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along with RetroArch.
* If not, see <http://www.gnu.org/licenses/>.
*/
#include <compat/strl.h>
#include "runloop_data.h"
#include "runloop.h"
#include "tasks/tasks.h"
void rarch_main_data_deinit(void)
{
rarch_task_deinit();
}
void rarch_main_data_iterate(void)
{
rarch_task_check();
}
void rarch_main_data_clear_state(void)
{
rarch_main_data_deinit();
rarch_task_init();
}
void data_runloop_osd_msg(const char *msg, size_t len)
{
rarch_main_msg_queue_push(msg, 1, 10, true);
}

37
runloop_data.h
View File

@ -1,37 +0,0 @@
/* RetroArch - A frontend for libretro.
* Copyright (C) 2011-2015 - Daniel De Matteis
*
* RetroArch is free software: you can redistribute it and/or modify it under the terms
* of the GNU General Public License as published by the Free Software Found-
* ation, either version 3 of the License, or (at your option) any later version.
*
* RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along with RetroArch.
* If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __RETROARCH_DATA_RUNLOOP_H
#define __RETROARCH_DATA_RUNLOOP_H
#include <retro_miscellaneous.h>
#ifdef __cplusplus
extern "C" {
#endif
typedef int (*transfer_cb_t)(void *data, size_t len);
void rarch_main_data_clear_state(void);
void rarch_main_data_iterate(void);
void rarch_main_data_deinit(void);
#ifdef __cplusplus
}
#endif
#endif

2
tasks/tasks.h
View File

@ -21,7 +21,7 @@
#include <queues/message_queue.h>
#include "../runloop_data.h"
#include "../runloop.h"
#define MAX_TOKEN_LEN 255

2
ui/drivers/ui_cocoa.m
View File

@ -28,7 +28,7 @@
#include "../../input/drivers/cocoa_input.h"
#include "../../input/drivers_keyboard/keyboard_event_apple.h"
#include "../../frontend/frontend.h"
#include "../../runloop_data.h"
#include "../../runloop.h"
static id apple_platform;

2
ui/drivers/ui_cocoatouch.m
View File

@ -30,7 +30,7 @@
#include "../../retroarch.h"
#include "../../frontend/frontend.h"
#include "../../runloop_data.h"
#include "../../runloop.h"
static char msg_old[PATH_MAX_LENGTH];
static id apple_platform;