mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-23 19:21:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Only display CRT SwitchRes settings if video display server is

Browse Source 
implemented
This commit is contained in:
twinaphex 2018-10-24 04:49:53 +02:00
parent 183aede716
commit 07c45cadd1
4 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.md
View File

@ -6,6 +6,7 @@
- LOCALIZATION: Update Italian translation. - LOCALIZATION: Update Italian translation.
- LOCALIZATION: Update Simplified Chinese translation. - LOCALIZATION: Update Simplified Chinese translation.
- LOCALIZATION: Update Japanese translation. - LOCALIZATION: Update Japanese translation.
- MENU: Only show CRT SwitchRes if video display server is implemented (Windows/Linux for now)
- MENU: User Interface -> Appearance -> 'Menu Font Green/Blue Color' settings now work properly. - MENU: User Interface -> Appearance -> 'Menu Font Green/Blue Color' settings now work properly.
- SCANNER: Fix GDI disc scanning. - SCANNER: Fix GDI disc scanning.
- SWITCH/LIBNX: Improve touch scaling calculation. - SWITCH/LIBNX: Improve touch scaling calculation.

9
gfx/video_display_server.c
View File

@ -21,7 +21,14 @@
#include "../verbosity.h" #include "../verbosity.h"
static const video_display_server_t *current_display_server = NULL; static const video_display_server_t *current_display_server = NULL;
static void *current_display_server_data = NULL; static void *current_display_server_data = NULL;
const char *video_display_server_get_ident(void)
{
if (!current_display_server)
return "null";
return current_display_server->ident;
}
void* video_display_server_init(void) void* video_display_server_init(void)
{ {

2
gfx/video_display_server.h
View File

@ -52,6 +52,8 @@ bool video_display_server_switch_resolution(
const char *video_display_server_get_output_options(void); const char *video_display_server_get_output_options(void);
const char *video_display_server_get_ident(void);
extern const video_display_server_t dispserv_win32; extern const video_display_server_t dispserv_win32;
extern const video_display_server_t dispserv_x11; extern const video_display_server_t dispserv_x11;
extern const video_display_server_t dispserv_null; extern const video_display_server_t dispserv_null;

8
menu/menu_displaylist.c
View File

@ -78,6 +78,7 @@
#include "../frontend/frontend_driver.h" #include "../frontend/frontend_driver.h"
#include "../ui/ui_companion_driver.h" #include "../ui/ui_companion_driver.h"
#include "../gfx/video_driver.h" #include "../gfx/video_driver.h"
#include "../gfx/video_display_server.h"
#include "../config.features.h" #include "../config.features.h"
#include "../version_git.h" #include "../version_git.h"
#include "../input/input_driver.h" #include "../input/input_driver.h"
@ -6513,9 +6514,10 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, menu_displaylist
break; break;
case DISPLAYLIST_VIDEO_SETTINGS_LIST: case DISPLAYLIST_VIDEO_SETTINGS_LIST:
menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list);
menu_displaylist_parse_settings_enum(menu, info, if (!string_is_equal(video_display_server_get_ident(), "null"))
MENU_ENUM_LABEL_CRT_SWITCHRES_SETTINGS, menu_displaylist_parse_settings_enum(menu, info,
PARSE_ACTION, false); MENU_ENUM_LABEL_CRT_SWITCHRES_SETTINGS,
PARSE_ACTION, false);
menu_displaylist_parse_settings_enum(menu, info, menu_displaylist_parse_settings_enum(menu, info,
MENU_ENUM_LABEL_SUSPEND_SCREENSAVER_ENABLE, MENU_ENUM_LABEL_SUSPEND_SCREENSAVER_ENABLE,
PARSE_ONLY_BOOL, false); PARSE_ONLY_BOOL, false);