Merge branch 'libretro:master' into webos

Author: cscd98

config.def.h

@@ -662,6 +662,8 @@
 #ifdef HAVE_OZONE
 /* Ozone colour theme: 1 == Basic Black */
 #define DEFAULT_OZONE_COLOR_THEME 1
+#define DEFAULT_OZONE_PADDING_FACTOR 1.0f
+#define DEFAULT_OZONE_HEADER_SEPARATOR 1
 #define DEFAULT_OZONE_COLLAPSE_SIDEBAR false
 #define DEFAULT_OZONE_SCROLL_CONTENT_METADATA false
 #define DEFAULT_OZONE_THUMBNAIL_SCALE_FACTOR 1.0f

configuration.c

@@ -1693,6 +1693,9 @@ static struct config_path_setting *populate_settings_path(
 #ifdef HAVE_XMB
    SETTING_PATH("xmb_font",                      settings->paths.path_menu_xmb_font, false, NULL, true);
 #endif
+#ifdef HAVE_OZONE
+   SETTING_PATH("ozone_font",                    settings->paths.path_menu_ozone_font, false, NULL, true);
+#endif
 #endif /* HAVE_MENU */
 
 #ifdef HAVE_OVERLAY
@@ -2301,6 +2304,7 @@ static struct config_float_setting *populate_settings_float(
 #endif
 #ifdef HAVE_OZONE
    SETTING_FLOAT("ozone_thumbnail_scale_factor", &settings->floats.ozone_thumbnail_scale_factor, true, DEFAULT_OZONE_THUMBNAIL_SCALE_FACTOR, false);
+   SETTING_FLOAT("ozone_padding_factor",         &settings->floats.ozone_padding_factor, true, DEFAULT_OZONE_PADDING_FACTOR, false);
 #endif
 #endif /* HAVE_MENU */
 
@@ -2447,6 +2451,7 @@ static struct config_uint_setting *populate_settings_uint(
 #endif
 #ifdef HAVE_OZONE
    SETTING_UINT("ozone_menu_color_theme",        &settings->uints.menu_ozone_color_theme, true, DEFAULT_OZONE_COLOR_THEME, false);
+   SETTING_UINT("ozone_header_separator",        &settings->uints.menu_ozone_header_separator, true, DEFAULT_OZONE_HEADER_SEPARATOR, false);
 #endif
 #endif /* HAVE_MENU */
 
@@ -2915,6 +2920,9 @@ void config_set_defaults(void *data)
 #ifdef HAVE_XMB
    *settings->paths.path_menu_xmb_font            = '\0';
 #endif
+#ifdef HAVE_OZONE
+   *settings->paths.path_menu_ozone_font          = '\0';
+#endif
 
    configuration_set_string(settings,
          settings->arrays.discord_app_id,
@@ -3520,6 +3528,7 @@ static config_file_t *open_default_config_file(void)
       goto error;
 
    path_set(RARCH_PATH_CONFIG, conf_path);
+   path_set(RARCH_PATH_CONFIG_DEFAULT, conf_path);
 
    return conf;
 
@@ -4001,7 +4010,10 @@ static bool config_load_file(global_t *global,
             DEFAULT_MIDI_OUTPUT);
 
    /* History playlists must stay in default config path */
-   path_config = g_defaults.path_config;
+   if (!path_is_empty(RARCH_PATH_CONFIG_DEFAULT))
+      path_config = path_get(RARCH_PATH_CONFIG_DEFAULT);
+   else
+      path_config = path_get(RARCH_PATH_CONFIG);
 
    if (string_is_empty(settings->paths.path_content_favorites))
       strlcpy(settings->paths.directory_content_favorites, "default",
@@ -5348,6 +5360,9 @@ bool config_save_file(const char *path)
    config_set_path(conf, "xmb_font",
          !string_is_empty(settings->paths.path_menu_xmb_font)
          ? settings->paths.path_menu_xmb_font : "");
+   config_set_path(conf, "ozone_font",
+         !string_is_empty(settings->paths.path_menu_ozone_font)
+         ? settings->paths.path_menu_ozone_font : "");
 #endif
 
    /* String settings  */

configuration.h

@@ -305,6 +305,7 @@ typedef struct settings
       unsigned menu_materialui_thumbnail_view_landscape;
       unsigned menu_materialui_landscape_layout_optimization;
       unsigned menu_ozone_color_theme;
+      unsigned menu_ozone_header_separator;
       unsigned menu_font_color_red;
       unsigned menu_font_color_green;
       unsigned menu_font_color_blue;
@@ -417,6 +418,7 @@ typedef struct settings
       float menu_ticker_speed;
       float menu_rgui_particle_effect_speed;
       float menu_screensaver_animation_speed;
+      float ozone_padding_factor;
       float ozone_thumbnail_scale_factor;
 
       float cheevos_appearance_padding_h;
@@ -576,6 +578,7 @@ typedef struct settings
       char bundle_assets_src[PATH_MAX_LENGTH];
       char bundle_assets_dst[PATH_MAX_LENGTH];
       char path_menu_xmb_font[PATH_MAX_LENGTH];
+      char path_menu_ozone_font[PATH_MAX_LENGTH];
       char path_cheat_database[PATH_MAX_LENGTH];
       char path_content_database[PATH_MAX_LENGTH];
       char path_overlay[PATH_MAX_LENGTH];

frontend/drivers/platform_win32.c

@@ -291,7 +291,6 @@ static size_t frontend_win32_get_os(char *s, size_t len, int *major, int *minor)
    char str_ProductName[64]        = {0};
    char str_DisplayVersion[64]     = {0};
    char str_LCUVer[64]             = {0};
-   char str_CurrentBuild[64]       = {0};
    DWORD key_type                  = 0; /* null pointer */
    DWORD data_size                 = 0;
    long reg_read_result;
@@ -917,6 +916,7 @@ static bool frontend_win32_set_fork(enum frontend_fork fork_mode)
 #endif
 
 #if defined(_WIN32) && !defined(_XBOX)
+#if 0
 static const char *accessibility_win_language_id(const char* language)
 {
    if (string_is_equal(language,"en"))
@@ -981,6 +981,7 @@ static const char *accessibility_win_language_id(const char* language)
       return "405";
    return "";
 }
+#endif
 
 static const char *accessibility_win_language_code(const char* language)
 {
@@ -1164,10 +1165,10 @@ static bool accessibility_speak_windows(int speed,
    char cmd[512];
    const char *voice      = get_user_language_iso639_1(true);
    const char *language   = accessibility_win_language_code(voice);
+#if 0
    const char *langid     = accessibility_win_language_id(voice);
-   bool res               = false;
-   const char* speeds[10] = {"-10", "-7.5", "-5", "-2.5", "0", "2", "4", "6", "8", "10"};
-   size_t nbytes_cmd      = 0;
+#endif
+   const char *speeds[10] = {"-10", "-7.5", "-5", "-2.5", "0", "2", "4", "6", "8", "10"};
    if (speed < 1)
       speed               = 1;
    else if (speed > 10)
@@ -1184,8 +1185,8 @@ static bool accessibility_speak_windows(int speed,
 
    if (g_plat_win32_flags & PLAT_WIN32_FLAG_USE_POWERSHELL)
    {
-      const char * template_lang = "powershell.exe -NoProfile -WindowStyle Hidden -Command \"Add-Type -AssemblyName System.Speech; $synth = New-Object System.Speech.Synthesis.SpeechSynthesizer; $synth.SelectVoice(\\\"%s\\\"); $synth.Rate = %s; $synth.Speak($input);\"";
-      const char * template_nolang = "powershell.exe -NoProfile -WindowStyle Hidden -Command \"Add-Type -AssemblyName System.Speech; $synth = New-Object System.Speech.Synthesis.SpeechSynthesizer; $synth.Rate = %s; $synth.Speak($input);\"";
+      const char *template_lang = "powershell.exe -NoProfile -WindowStyle Hidden -Command \"Add-Type -AssemblyName System.Speech; $synth = New-Object System.Speech.Synthesis.SpeechSynthesizer; $synth.SelectVoice(\\\"%s\\\"); $synth.Rate = %s; $synth.Speak($input);\"";
+      const char *template_nolang = "powershell.exe -NoProfile -WindowStyle Hidden -Command \"Add-Type -AssemblyName System.Speech; $synth = New-Object System.Speech.Synthesis.SpeechSynthesizer; $synth.Rate = %s; $synth.Speak($input);\"";
       if (language && language[0] != '\0')
          snprintf(cmd, sizeof(cmd), template_lang, language, speeds[speed-1]);
       else

gfx/common/d3d9_common.c

@@ -1340,7 +1340,6 @@ void d3d9_calculate_rect(d3d9_video_t *d3d,
       bool force_full,
       bool allow_rotate)
 {
-   float device_aspect   = (float)*width / *height;
    settings_t *settings  = config_get_ptr();
    bool video_scale_integer    = settings->bools.video_scale_integer;
    struct video_viewport vp;
@@ -1376,7 +1375,6 @@ void d3d9_calculate_rect(d3d9_video_t *d3d,
 void d3d9_set_rotation(void *data, unsigned rot)
 {
    d3d9_video_t        *d3d = (d3d9_video_t*)data;
-   struct video_ortho ortho = {0, 1, 0, 1, -1, 1};
 
    if (!d3d)
       return;
@@ -1466,7 +1464,6 @@ static bool d3d9_overlay_load(void *data,
       const void *image_data, unsigned num_images)
 {
    unsigned i, y;
-   overlay_t *new_overlays            = NULL;
    d3d9_video_t *d3d                  = (d3d9_video_t*)data;
    const struct texture_image *images = (const struct texture_image*)
       image_data;

gfx/common/win32_common.c

@@ -723,7 +723,6 @@ static LRESULT win32_menu_loop(HWND owner, WPARAM wparam)
             char win32_file[PATH_MAX_LENGTH] = {0};
             settings_t *settings    = config_get_ptr();
             char    *title_cp       = NULL;
-            size_t converted        = 0;
             const char *extensions  = "Libretro core (.dll)\0*.dll\0All Files\0*.*\0\0";
             const char *title       = msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CORE_LIST);
             const char *initial_dir = settings->paths.directory_libretro;
@@ -762,7 +761,6 @@ static LRESULT win32_menu_loop(HWND owner, WPARAM wparam)
             char win32_file[PATH_MAX_LENGTH] = {0};
             char *title_cp          = NULL;
             wchar_t *title_wide     = NULL;
-            size_t converted        = 0;
             const char *extensions  = "All Files (*.*)\0*.*\0\0";
             const char *title       = msg_hash_to_str(
                   MENU_ENUM_LABEL_VALUE_LOAD_CONTENT_LIST);
@@ -1088,10 +1086,7 @@ static LRESULT CALLBACK wnd_proc_common(
          }
          break;
       case WM_COMMAND:
-         {
-            settings_t *settings     = config_get_ptr();
-            win32_menu_loop(main_window.hwnd, wparam);
-         }
+         win32_menu_loop(main_window.hwnd, wparam);
          break;
    }
    return 0;

gfx/display_servers/dispserv_win32.c

@@ -152,7 +152,6 @@ static bool win32_display_server_set_window_opacity(
 {
 #ifdef HAVE_WINDOW_TRANSP
    HWND              hwnd = win32_get_window();
-   dispserv_win32_t *serv = (dispserv_win32_t*)data;
    /* Set window transparency on Windows 2000 and above */
    if (opacity < 100)
    {

gfx/drivers/d3d9hlsl.c

@@ -294,7 +294,6 @@ static void gfx_display_d3d9_hlsl_draw_pipeline(
       gfx_display_t *p_disp,
       void *data, unsigned video_width, unsigned video_height)
 {
-   static float t                    = 0;
    video_coord_array_t *ca           = NULL;
 
    if (!draw)

gfx/drivers/gdi_gfx.c

@@ -489,7 +489,6 @@ static void *gdi_init(const video_info_t *video,
       input_driver_t **input, void **input_data)
 {
    unsigned full_x, full_y;
-   void *ctx_data                       = NULL;
    unsigned mode_width = 0, mode_height = 0;
    unsigned win_width  = 0, win_height  = 0;
    unsigned temp_width = 0, temp_height = 0;
@@ -901,7 +900,6 @@ static void gdi_set_video_mode(void *data, unsigned width, unsigned height,
 static uintptr_t gdi_load_texture(void *video_data, void *data,
       bool threaded, enum texture_filter_type filter_type)
 {
-   void *tmpdata               = NULL;
    gdi_texture_t *texture      = NULL;
    struct texture_image *image = (struct texture_image*)data;
 

gfx/drivers/gl1.c

@@ -1211,9 +1211,6 @@ static void gl1_set_viewport(gl1_t *gl1,
       bool force_full, bool allow_rotate)
 {
    settings_t *settings     = config_get_ptr();
-   unsigned height          = gl1->video_height;
-   int x                    = 0;
-   int y                    = 0;
    float device_aspect      = (float)vp_width / vp_height;
 
    if (gl1->ctx_driver->translate_aspect)
@@ -2125,7 +2122,6 @@ static uintptr_t gl1_load_texture(void *video_data, void *data,
 #ifdef HAVE_THREADS
    if (threaded)
    {
-      gl1_t                   *gl1 = (gl1_t*)video_data;
       custom_command_method_t func = video_texture_load_wrap_gl1;
 
       return video_thread_texture_handle(data, func);