Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Makefile.common
Original file line number Diff line number Diff line change
Expand Up @@ -411,6 +411,7 @@ OBJ += \
$(LIBRETRO_COMM_DIR)/time/rtime.o \
manual_content_scan.o \
tasks/task_database.o \
network/screenscraper_meta.o \
disk_control_interface.o

ifeq ($(HAVE_CONFIGFILE), 1)
Expand Down Expand Up @@ -2465,6 +2466,8 @@ ifeq ($(HAVE_NETWORKING), 1)
tasks/task_netplay_lan_scan.o \
tasks/task_netplay_nat_traversal.o \
tasks/task_pl_thumbnail_download.o \
network/screenscraper.o \
tasks/task_screenscraper.o \
tasks/task_netplay_find_content.o

ifeq ($(HAVE_EMSCRIPTEN), 1)
Expand Down
7 changes: 7 additions & 0 deletions config.def.h
Original file line number Diff line number Diff line change
Expand Up @@ -739,6 +739,8 @@
#define DEFAULT_OZONE_COLLAPSE_SIDEBAR false
#define DEFAULT_OZONE_SHOW_SIDEBAR true
#define DEFAULT_OZONE_SCROLL_CONTENT_METADATA false
/* 0 == OZONE_METADATA_SCROLL_HORIZONTAL, i.e. upstream behaviour */
#define DEFAULT_OZONE_METADATA_SCROLL_STYLE 0
#define DEFAULT_OZONE_THUMBNAIL_SCALE_FACTOR 1.0f
#define DEFAULT_OZONE_FONT_SCALE 0
#define DEFAULT_OZONE_FONT_SCALE_FACTOR_GLOBAL 1.0f
Expand Down Expand Up @@ -1582,6 +1584,11 @@

#define DEFAULT_NETWORK_ON_DEMAND_THUMBNAILS false

/* Default state for the classic thumbnail media types */
#define DEFAULT_SCREENSCRAPER_MEDIA_ON true
/* Default state for the extended media types (videos, manuals, ...) */
#define DEFAULT_SCREENSCRAPER_MEDIA_OFF false

/* Number of entries that will be kept in content history playlist file. */
#define DEFAULT_CONTENT_HISTORY_SIZE 200

Expand Down
14 changes: 14 additions & 0 deletions configuration.c
Original file line number Diff line number Diff line change
Expand Up @@ -1637,6 +1637,10 @@ static struct config_array_setting *populate_settings_array(
#endif

#ifdef HAVE_NETWORKING
SETTING_ARRAY("screenscraper_username", settings->arrays.screenscraper_username, false, NULL, true);
SETTING_ARRAY("screenscraper_password", settings->arrays.screenscraper_password, false, NULL, true);
SETTING_ARRAY("screenscraper_devid", settings->arrays.screenscraper_devid, false, NULL, true);
SETTING_ARRAY("screenscraper_devpassword", settings->arrays.screenscraper_devpassword, false, NULL, true);
SETTING_ARRAY("netplay_mitm_server", settings->arrays.netplay_mitm_server, false, NULL, true);
#ifdef HAVE_CLOUDSYNC
SETTING_ARRAY("webdav_url", settings->arrays.webdav_url, false, NULL, true);
Expand Down Expand Up @@ -1974,6 +1978,8 @@ static struct config_bool_setting *populate_settings_bool(
#include "settings/settings_def_widget_scale.h"
#endif
#include "settings/settings_def_cheevos_account.h"
#include "settings/settings_def_screenscraper.h"
#include "settings/settings_def_screenscraper_account.h"
#include "settings/settings_def_menu_show_restart.h"
#include "settings/settings_def_quit_restart.h"
#include "settings/settings_def_menu_throttle.h"
Expand Down Expand Up @@ -2686,6 +2692,8 @@ static struct config_float_setting *populate_settings_float(
#include "settings/settings_def_widget_scale.h"
#endif
#include "settings/settings_def_cheevos_account.h"
#include "settings/settings_def_screenscraper.h"
#include "settings/settings_def_screenscraper_account.h"
#include "settings/settings_def_menu_show_restart.h"
#include "settings/settings_def_quit_restart.h"
#include "settings/settings_def_menu_throttle.h"
Expand Down Expand Up @@ -3350,6 +3358,8 @@ static struct config_uint_setting *populate_settings_uint(
#include "settings/settings_def_widget_scale.h"
#endif
#include "settings/settings_def_cheevos_account.h"
#include "settings/settings_def_screenscraper.h"
#include "settings/settings_def_screenscraper_account.h"
#include "settings/settings_def_menu_show_restart.h"
#include "settings/settings_def_quit_restart.h"
#include "settings/settings_def_menu_throttle.h"
Expand Down Expand Up @@ -4062,6 +4072,8 @@ static struct config_int_setting *populate_settings_int(
#include "settings/settings_def_widget_scale.h"
#endif
#include "settings/settings_def_cheevos_account.h"
#include "settings/settings_def_screenscraper.h"
#include "settings/settings_def_screenscraper_account.h"
#include "settings/settings_def_menu_show_restart.h"
#include "settings/settings_def_quit_restart.h"
#include "settings/settings_def_menu_throttle.h"
Expand Down Expand Up @@ -4655,6 +4667,8 @@ static struct config_int_setting *populate_settings_int(
#include "settings/settings_def_widget_scale.h"
#endif
#include "settings/settings_def_cheevos_account.h"
#include "settings/settings_def_screenscraper.h"
#include "settings/settings_def_screenscraper_account.h"
#include "settings/settings_def_menu_show_restart.h"
#include "settings/settings_def_quit_restart.h"
#include "settings/settings_def_menu_throttle.h"
Expand Down
31 changes: 31 additions & 0 deletions configuration.h
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,12 @@ typedef struct settings
unsigned menu_timedate_date_separator;
unsigned gfx_thumbnails;
unsigned menu_left_thumbnails;
unsigned menu_dynamic_wallpaper_mode;
unsigned menu_dynamic_wallpaper_type;
unsigned screenscraper_region;
unsigned screenscraper_language;
unsigned screenscraper_quota_action;
unsigned screenscraper_primary_scraper;
unsigned menu_icon_thumbnails;
unsigned gfx_thumbnail_upscale_threshold;
unsigned menu_rgui_thumbnail_downscaler;
Expand All @@ -295,6 +301,9 @@ typedef struct settings
unsigned menu_ozone_header_icon;
unsigned menu_ozone_header_separator;
unsigned menu_ozone_font_scale;
/* enum ozone_metadata_scroll_style - how Ozone's content
* metadata panel presents the scraped synopsis */
unsigned ozone_metadata_scroll_style;
unsigned menu_font_color_red;
unsigned menu_font_color_green;
unsigned menu_font_color_blue;
Expand Down Expand Up @@ -764,6 +773,9 @@ typedef struct settings
bool menu_xmb_entry_icons;
bool menu_xmb_switch_icons;
bool menu_xmb_vertical_thumbnails;
/* Draws the scraped facts for the selected entry in place of
* the left thumbnail */
bool menu_xmb_show_metadata_panel;
bool menu_content_show_settings;
bool menu_content_show_favorites;
bool menu_content_show_favorites_first;
Expand Down Expand Up @@ -863,6 +875,21 @@ typedef struct settings
bool network_on_demand_thumbnails;
bool core_updater_auto_backup;

/* ScreenScraper */
bool screenscraper_media_boxarts;
bool screenscraper_media_snaps;
bool screenscraper_media_titles;
bool screenscraper_media_logos;
bool screenscraper_media_boxarts3d;
bool screenscraper_media_fanarts;
bool screenscraper_media_marquees;
bool screenscraper_media_videos;
bool screenscraper_media_manuals;
bool screenscraper_media_bezels;
bool screenscraper_metadata;
bool screenscraper_overwrite;
bool screenscraper_use_crc;

/* UI */
bool ui_menubar_enable;
bool ui_suspend_screensaver_enable;
Expand Down Expand Up @@ -1093,6 +1120,10 @@ typedef struct settings
char cheevos_username[32];
char cheevos_token[32];
char cheevos_leaderboards_enable[32];
char screenscraper_username[32];
char screenscraper_password[32];
char screenscraper_devid[32];
char screenscraper_devpassword[32];
char video_context_driver[32];
char audio_driver[32];
char audio_resampler[32];
Expand Down
Loading
Loading