mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-01 07:13:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request from libretro/master

Browse Source 
Update fork
This commit is contained in:
Weedy Weed Smoker 2019-05-04 03:23:59 +07:00 committed by GitHub
commit 869b47ead3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 73 additions and 22 deletions
cheevos-new
cheevos.c
cheevos
cheevos.c
command.c
gfx
video_driver.c
menu
drivers
rgui.c
widgets
menu_widgets.c
pkg/apple
RetroArch.xcodeproj
project.pbxproj
RetroArch_Metal.xcodeproj
project.pbxproj
RetroArch_OSX107.xcodeproj
project.pbxproj
RetroArch_iOS10.xcodeproj
project.pbxproj
RetroArch_iOS10_static.xcodeproj
project.pbxproj
RetroArch_iOS11.xcodeproj
project.pbxproj
RetroArch_iOS11_static.xcodeproj
project.pbxproj
RetroArch_iOS6.xcodeproj
project.pbxproj
RetroArch_iOS8.xcodeproj
project.pbxproj
RetroArch_iOS9.xcodeproj
project.pbxproj
retroarch.c
tasks
task_screenshot.c

2
cheevos-new/cheevos.c

@ -505,7 +505,7 @@ static void rcheevos_award(rcheevos_cheevo_t* cheevo, int mode)
/* Show the OSD message. */
#if defined(HAVE_MENU) && defined(HAVE_MENU_WIDGETS)
if (!video_driver_has_widgets() || !menu_widgets_push_achievement(cheevo->info->title, cheevo->info->badge))
if (!menu_widgets_push_achievement(cheevo->info->title, cheevo->info->badge))
#endif
{
snprintf(buffer, sizeof(buffer), "Achievement Unlocked: %s", cheevo->info->title);

2
cheevos/cheevos.c

@ -1658,7 +1658,7 @@ static void cheevos_test_cheevo_set(const cheevoset_t *set)
cheevo->id, cheevo->title, cheevo->description);
#if defined(HAVE_MENU) && defined(HAVE_MENU_WIDGETS)
if (!video_driver_has_widgets() || !menu_widgets_push_achievement(cheevo->title, cheevo->badge))
if (!menu_widgets_push_achievement(cheevo->title, cheevo->badge))
#endif
{
char msg[256];

15
command.c

@ -988,7 +988,7 @@ static void command_event_set_volume(float gain)
new_volume);
#if defined(HAVE_MENU) && defined(HAVE_MENU_WIDGETS)
if (!video_driver_has_widgets() || !menu_widgets_volume_update_and_show())
if (!menu_widgets_volume_update_and_show())
#endif
runloop_msg_queue_push(msg, 1, 180, true, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
@ -2141,7 +2141,7 @@ TODO: Add a setting for these tweaks */
}
#if defined(HAVE_MENU) && defined(HAVE_MENU_WIDGETS)
if (!video_driver_has_widgets() || !menu_widgets_volume_update_and_show())
if (!menu_widgets_volume_update_and_show())
#endif
runloop_msg_queue_push(msg, 1, 180, true, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
@ -2531,11 +2531,11 @@ TODO: Add a setting for these tweaks */
command_event(CMD_EVENT_AUDIO_STOP, NULL);
#if defined(HAVE_MENU) && defined(HAVE_MENU_WIDGETS)
if (!video_driver_has_widgets() || !menu_widgets_set_paused(is_paused))
if (!menu_widgets_set_paused(is_paused))
#endif
runloop_msg_queue_push(msg_hash_to_str(MSG_PAUSED), 1,
1, true,
NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
runloop_msg_queue_push(msg_hash_to_str(MSG_PAUSED), 1,
1, true,
NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
if (!is_idle)
video_driver_cached_frame();
@ -2548,8 +2548,7 @@ TODO: Add a setting for these tweaks */
else
{
#if defined(HAVE_MENU) && defined(HAVE_MENU_WIDGETS)
if (video_driver_has_widgets())
menu_widgets_set_paused(is_paused);
menu_widgets_set_paused(is_paused);
#endif
RARCH_LOG("%s\n", msg_hash_to_str(MSG_UNPAUSED));
command_event(CMD_EVENT_AUDIO_START, NULL);

4
gfx/video_driver.c

@ -2497,10 +2497,12 @@ void video_driver_frame(const void *data, unsigned width,
/* Display the FPS, with a higher priority. */
if (video_info.fps_show || video_info.framecount_show)
{
#if defined(HAVE_MENU) && defined(HAVE_MENU_WIDGETS)
if (!video_driver_has_widgets() || !menu_widgets_set_fps_text(video_info.fps_text))
if (!menu_widgets_set_fps_text(video_info.fps_text))
#endif
runloop_msg_queue_push(video_info.fps_text, 2, 1, true, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
}
/* trigger set resolution*/
if (video_info.crt_switch_resolution)

6
menu/drivers/rgui.c

@ -37,6 +37,10 @@
#include "../../config.h"
#endif
#if defined(HAVE_MENU_WIDGETS)
#include "../widgets/menu_widgets.h"
#endif
#include "../../playlist.h"
#include "../../frontend/frontend_driver.h"
@ -3866,7 +3870,7 @@ static void *rgui_init(void **userdata, bool video_is_threaded)
* but for extra safety we will only permit menu widget
* additions when the current gfx driver reports that it
* has widget support */
rgui->widgets_supported = video_driver_has_widgets();
rgui->widgets_supported = menu_widgets_ready();
if (rgui->widgets_supported)
{

3
menu/widgets/menu_widgets.c

@ -1730,6 +1730,9 @@ void menu_widgets_context_reset(bool is_threaded)
unsigned video_info_width;
if (!menu_widgets_inited)
return;
video_driver_get_size(&video_info_width, NULL);
/* Textures paths */

2
pkg/apple/RetroArch.xcodeproj/project.pbxproj

@ -523,6 +523,7 @@
"-DHAVE_STB_FONT",
"-DHAVE_RGUI",
"-DHAVE_MENU",
"-DHAVE_MENU_WIDGETS",
"-DOSX",
"-DHAVE_OPENGL",
"-DHAVE_CC_RESAMPLER",
@ -589,6 +590,7 @@
"-DHAVE_STB_FONT",
"-DHAVE_RGUI",
"-DHAVE_MENU",
"-DHAVE_MENU_WIDGETS",
"-DOSX",
"-DHAVE_OPENGL",
"-DHAVE_CC_RESAMPLER",

2
pkg/apple/RetroArch_Metal.xcodeproj/project.pbxproj

@ -1633,7 +1633,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "make -C ${SRCBASE} -f Makefile.apple HAVE_MENU=1 HAVE_QT=1 MOC=${QT_INSTALL}/bin/moc generate\n";
shellScript = "make -C ${SRCBASE} -f Makefile.apple HAVE_MENU=1 HAVE_MENU_WIDGETS=1 HAVE_QT=1 MOC=${QT_INSTALL}/bin/moc generate\n";
};
/* End PBXShellScriptBuildPhase section */

2
pkg/apple/RetroArch_OSX107.xcodeproj/project.pbxproj

@ -575,6 +575,7 @@
"-DHAVE_STB_FONT",
"-DHAVE_RGUI",
"-DHAVE_MENU",
"-DHAVE_MENU_WIDGETS",
"-DOSX",
"-DHAVE_OPENGL_CORE",
"-DHAVE_CC_RESAMPLER",
@ -647,6 +648,7 @@
"-DHAVE_STB_FONT",
"-DHAVE_RGUI",
"-DHAVE_MENU",
"-DHAVE_MENU_WIDGETS",
"-DOSX",
"-DHAVE_OPENGL_CORE",
"-DHAVE_CC_RESAMPLER",

5
pkg/apple/RetroArch_iOS10.xcodeproj/project.pbxproj

@ -345,6 +345,7 @@
"-DHAVE_IMAGEVIEWER",
"-DHAVE_RGUI",
"-DHAVE_MENU",
"-DHAVE_MENU_WIDGETS",
"-DHAVE_LIBRETRODB",
"-DIOS",
"-DHAVE_OPENGL",
@ -432,6 +433,7 @@
"-DHAVE_IMAGEVIEWER",
"-DHAVE_RGUI",
"-DHAVE_MENU",
"-DHAVE_MENU_WIDGETS",
"-DHAVE_LIBRETRODB",
"-DIOS",
"-DHAVE_OPENGL",
@ -485,6 +487,7 @@
"-DHAVE_IMAGEVIEWER",
"-DHAVE_RGUI",
"-DHAVE_MENU",
"-DHAVE_MENU_WIDGETS",
"-DHAVE_LIBRETRODB",
"-DIOS",
"-DHAVE_OPENGL",
@ -572,6 +575,7 @@
"-DHAVE_IMAGEVIEWER",
"-DHAVE_RGUI",
"-DHAVE_MENU",
"-DHAVE_MENU_WIDGETS",
"-DHAVE_LIBRETRODB",
"-DIOS",
"-DHAVE_DYNAMIC",
@ -643,6 +647,7 @@
"-DHAVE_IMAGEVIEWER",
"-DHAVE_RGUI",
"-DHAVE_MENU",
"-DHAVE_MENU_WIDGETS",
"-DHAVE_LIBRETRODB",
"-DIOS",
"-DHAVE_DYNAMIC",

5
pkg/apple/RetroArch_iOS10_static.xcodeproj/project.pbxproj

@ -353,6 +353,7 @@
"-DHAVE_IMAGEVIEWER",
"-DHAVE_RGUI",
"-DHAVE_MENU",
"-DHAVE_MENU_WIDGETS",
"-DHAVE_LIBRETRODB",
"-DIOS",
"-DHAVE_OPENGL",
@ -439,6 +440,7 @@
"-DHAVE_IMAGEVIEWER",
"-DHAVE_RGUI",
"-DHAVE_MENU",
"-DHAVE_MENU_WIDGETS",
"-DHAVE_LIBRETRODB",
"-DIOS",
"-DHAVE_OPENGL",
@ -491,6 +493,7 @@
"-DHAVE_IMAGEVIEWER",
"-DHAVE_RGUI",
"-DHAVE_MENU",
"-DHAVE_MENU_WIDGETS",
"-DHAVE_LIBRETRODB",
"-DIOS",
"-DHAVE_OPENGL",
@ -577,6 +580,7 @@
"-DHAVE_IMAGEVIEWER",
"-DHAVE_RGUI",
"-DHAVE_MENU",
"-DHAVE_MENU_WIDGETS",
"-DHAVE_LIBRETRODB",
"-DIOS",
"-DHAVE_OPENGL",
@ -647,6 +651,7 @@
"-DHAVE_IMAGEVIEWER",
"-DHAVE_RGUI",
"-DHAVE_MENU",
"-DHAVE_MENU_WIDGETS",
"-DHAVE_LIBRETRODB",
"-DIOS",
"-DHAVE_OPENGL",

6
pkg/apple/RetroArch_iOS11.xcodeproj/project.pbxproj

@ -600,6 +600,7 @@
"-DHAVE_IMAGEVIEWER",
"-DHAVE_RGUI",
"-DHAVE_MENU",
"-DHAVE_MENU_WIDGETS",
"-DHAVE_LIBRETRODB",
"-DIOS",
"-DHAVE_OPENGL",
@ -688,6 +689,7 @@
"-DHAVE_IMAGEVIEWER",
"-DHAVE_RGUI",
"-DHAVE_MENU",
"-DHAVE_MENU_WIDGETS",
"-DHAVE_LIBRETRODB",
"-DIOS",
"-DHAVE_OPENGL",
@ -804,6 +806,7 @@
"-DHAVE_IMAGEVIEWER",
"-DHAVE_RGUI",
"-DHAVE_MENU",
"-DHAVE_MENU_WIDGETS",
"-DHAVE_LIBRETRODB",
"-DIOS",
"-DHAVE_OPENGL",
@ -918,6 +921,7 @@
"-DHAVE_IMAGEVIEWER",
"-DHAVE_RGUI",
"-DHAVE_MENU",
"-DHAVE_MENU_WIDGETS",
"-DHAVE_LIBRETRODB",
"-DIOS",
"-DHAVE_OPENGL",
@ -1005,6 +1009,7 @@
"-DHAVE_IMAGEVIEWER",
"-DHAVE_RGUI",
"-DHAVE_MENU",
"-DHAVE_MENU_WIDGETS",
"-DHAVE_LIBRETRODB",
"-DIOS",
"-DHAVE_DYNAMIC",
@ -1076,6 +1081,7 @@
"-DHAVE_IMAGEVIEWER",
"-DHAVE_RGUI",
"-DHAVE_MENU",
"-DHAVE_MENU_WIDGETS",
"-DHAVE_LIBRETRODB",
"-DIOS",
"-DHAVE_DYNAMIC",

5
pkg/apple/RetroArch_iOS11_static.xcodeproj/project.pbxproj

@ -353,6 +353,7 @@
"-DHAVE_IMAGEVIEWER",
"-DHAVE_RGUI",
"-DHAVE_MENU",
"-DHAVE_MENU_WIDGETS",
"-DHAVE_LIBRETRODB",
"-DIOS",
"-DHAVE_OPENGL",
@ -439,6 +440,7 @@
"-DHAVE_IMAGEVIEWER",
"-DHAVE_RGUI",
"-DHAVE_MENU",
"-DHAVE_MENU_WIDGETS",
"-DHAVE_LIBRETRODB",
"-DIOS",
"-DHAVE_OPENGL",
@ -491,6 +493,7 @@
"-DHAVE_IMAGEVIEWER",
"-DHAVE_RGUI",
"-DHAVE_MENU",
"-DHAVE_MENU_WIDGETS",
"-DHAVE_LIBRETRODB",
"-DIOS",
"-DHAVE_OPENGL",
@ -577,6 +580,7 @@
"-DHAVE_IMAGEVIEWER",
"-DHAVE_RGUI",
"-DHAVE_MENU",
"-DHAVE_MENU_WIDGETS",
"-DHAVE_LIBRETRODB",
"-DIOS",
"-DHAVE_OPENGL",
@ -647,6 +651,7 @@
"-DHAVE_IMAGEVIEWER",
"-DHAVE_RGUI",
"-DHAVE_MENU",
"-DHAVE_MENU_WIDGETS",
"-DHAVE_LIBRETRODB",
"-DIOS",
"-DHAVE_OPENGL",

5
pkg/apple/RetroArch_iOS6.xcodeproj/project.pbxproj

@ -357,6 +357,7 @@
"-DHAVE_IMAGEVIEWER",
"-DHAVE_RGUI",
"-DHAVE_MENU",
"-DHAVE_MENU_WIDGETS",
"-DHAVE_LIBRETRODB",
"-DIOS",
"-DHAVE_OPENGL",
@ -440,6 +441,7 @@
"-DHAVE_IMAGEVIEWER",
"-DHAVE_RGUI",
"-DHAVE_MENU",
"-DHAVE_MENU_WIDGETS",
"-DHAVE_LIBRETRODB",
"-DIOS",
"-DHAVE_OPENGL",
@ -490,6 +492,7 @@
"-DHAVE_IMAGEVIEWER",
"-DHAVE_RGUI",
"-DHAVE_MENU",
"-DHAVE_MENU_WIDGETS",
"-DHAVE_LIBRETRODB",
"-DIOS",
"-DHAVE_OPENGL",
@ -573,6 +576,7 @@
"-DHAVE_IMAGEVIEWER",
"-DHAVE_RGUI",
"-DHAVE_MENU",
"-DHAVE_MENU_WIDGETS",
"-DHAVE_LIBRETRODB",
"-DIOS",
"-DHAVE_DYNAMIC",
@ -643,6 +647,7 @@
"-DHAVE_IMAGEVIEWER",
"-DHAVE_RGUI",
"-DHAVE_MENU",
"-DHAVE_MENU_WIDGETS",
"-DHAVE_LIBRETRODB",
"-DIOS",
"-DHAVE_DYNAMIC",

5
pkg/apple/RetroArch_iOS8.xcodeproj/project.pbxproj

@ -359,6 +359,7 @@
"-DHAVE_IMAGEVIEWER",
"-DHAVE_RGUI",
"-DHAVE_MENU",
"-DHAVE_MENU_WIDGETS",
"-DHAVE_LIBRETRODB",
"-DIOS",
"-DHAVE_DYNAMIC",
@ -429,6 +430,7 @@
"-DHAVE_IMAGEVIEWER",
"-DHAVE_RGUI",
"-DHAVE_MENU",
"-DHAVE_MENU_WIDGETS",
"-DHAVE_LIBRETRODB",
"-DIOS",
"-DHAVE_DYNAMIC",
@ -505,6 +507,7 @@
"-DHAVE_IMAGEVIEWER",
"-DHAVE_RGUI",
"-DHAVE_MENU",
"-DHAVE_MENU_WIDGETS",
"-DHAVE_LIBRETRODB",
"-DIOS",
"-DHAVE_OPENGL",
@ -591,6 +594,7 @@
"-DHAVE_IMAGEVIEWER",
"-DHAVE_RGUI",
"-DHAVE_MENU",
"-DHAVE_MENU_WIDGETS",
"-DHAVE_LIBRETRODB",
"-DIOS",
"-DHAVE_OPENGL",
@ -643,6 +647,7 @@
"-DHAVE_IMAGEVIEWER",
"-DHAVE_RGUI",
"-DHAVE_MENU",
"-DHAVE_MENU_WIDGETS",
"-DHAVE_LIBRETRODB",
"-DIOS",
"-DHAVE_OPENGL",

5
pkg/apple/RetroArch_iOS9.xcodeproj/project.pbxproj

@ -375,6 +375,7 @@
"-DHAVE_IMAGEVIEWER",
"-DHAVE_RGUI",
"-DHAVE_MENU",
"-DHAVE_MENU_WIDGETS",
"-DHAVE_LIBRETRODB",
"-DIOS",
"-DHAVE_OPENGL",
@ -460,6 +461,7 @@
"-DHAVE_IMAGEVIEWER",
"-DHAVE_RGUI",
"-DHAVE_MENU",
"-DHAVE_MENU_WIDGETS",
"-DHAVE_LIBRETRODB",
"-DIOS",
"-DHAVE_OPENGL",
@ -511,6 +513,7 @@
"-DHAVE_IMAGEVIEWER",
"-DHAVE_RGUI",
"-DHAVE_MENU",
"-DHAVE_MENU_WIDGETS",
"-DHAVE_LIBRETRODB",
"-DIOS",
"-DHAVE_OPENGL",
@ -597,6 +600,7 @@
"-DHAVE_IMAGEVIEWER",
"-DHAVE_RGUI",
"-DHAVE_MENU",
"-DHAVE_MENU_WIDGETS",
"-DHAVE_LIBRETRODB",
"-DIOS",
"-DHAVE_DYNAMIC",
@ -667,6 +671,7 @@
"-DHAVE_IMAGEVIEWER",
"-DHAVE_RGUI",
"-DHAVE_MENU",
"-DHAVE_MENU_WIDGETS",
"-DHAVE_LIBRETRODB",
"-DIOS",
"-DHAVE_DYNAMIC",

15
retroarch.c

@ -584,6 +584,7 @@ static bool driver_update_system_av_info(const struct retro_system_av_info *info
void drivers_init(int flags)
{
bool video_is_threaded = false;
settings_t *settings = config_get_ptr();
#ifdef HAVE_MENU
/* By default, we want the menu to persist through driver reinits. */
@ -635,7 +636,8 @@ void drivers_init(int flags)
#ifdef HAVE_MENU
#ifdef HAVE_MENU_WIDGETS
if (video_driver_has_widgets())
if (settings->bools.menu_enable_widgets
&& video_driver_has_widgets())
{
menu_widgets_init(video_is_threaded);
menu_widgets_context_reset(video_is_threaded);
@ -3154,7 +3156,7 @@ void runloop_task_msg_queue_push(retro_task_t *task, const char *msg,
bool flush)
{
#if defined(HAVE_MENU) && defined(HAVE_MENU_WIDGETS)
if (!video_driver_has_widgets() || !menu_widgets_task_msg_queue_push(task, msg, prio, duration, flush))
if (!menu_widgets_task_msg_queue_push(task, msg, prio, duration, flush))
#endif
runloop_msg_queue_push(msg, prio, duration, flush, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
}
@ -3171,9 +3173,10 @@ void runloop_msg_queue_push(const char *msg,
rarch_environment_cb(RETRO_ENVIRONMENT_GET_TARGET_REFRESH_RATE, &target_hz);
if (video_driver_has_widgets() && menu_widgets_msg_queue_push(msg,
if (menu_widgets_msg_queue_push(msg,
duration / target_hz * 1000, title, icon, category, prio, flush))
return;
#endif
#ifdef HAVE_THREADS
@ -4057,7 +4060,7 @@ static enum runloop_state runloop_check_state(
if (runloop_fastmotion)
{
#if defined(HAVE_MENU) && defined(HAVE_MENU_WIDGETS)
if (!video_driver_has_widgets() || !menu_widgets_set_fast_forward(true))
if (!menu_widgets_set_fast_forward(true))
#endif
runloop_msg_queue_push(
msg_hash_to_str(MSG_FAST_FORWARD), 1, 1, false, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
@ -4159,7 +4162,7 @@ static enum runloop_state runloop_check_state(
settings->uints.rewind_granularity, runloop_paused, s, sizeof(s), &t);
#if defined(HAVE_MENU) && defined(HAVE_MENU_WIDGETS)
if (!video_driver_has_widgets())
if (!menu_widgets_ready())
#endif
if (rewinding)
runloop_msg_queue_push(s, 0, t, true, NULL,
@ -4205,7 +4208,7 @@ static enum runloop_state runloop_check_state(
video_driver_cached_frame();
#if defined(HAVE_MENU) && defined(HAVE_MENU_WIDGETS)
if (!video_driver_has_widgets())
if (!menu_widgets_ready())
{
#endif
if (state_manager_frame_is_reversed())

6
tasks/task_screenshot.c

@ -157,7 +157,7 @@ static void task_screenshot_handler(retro_task_t *task)
/* If menu widgets are enabled, state is freed
in the callback after the notification
is displayed */
if (!video_driver_has_widgets())
if (!menu_widgets_ready())
#endif
free(state);
return;
@ -202,7 +202,7 @@ static void task_screenshot_callback(retro_task_t *task,
{
screenshot_task_state_t *state = (screenshot_task_state_t*)task->state;
if (!video_driver_has_widgets())
if (!menu_widgets_ready())
return;
if (state && !state->silence)
@ -320,7 +320,7 @@ static bool screenshot_dump(
if (use_thread)
{
#if defined(HAVE_MENU) && defined(HAVE_MENU_WIDGETS)
if (video_driver_has_widgets())
if (menu_widgets_ready())
task_free_title(task);
else
#endif