Update to spice2x-25-04-25 (pre-apply)

> broken commit

cfg/screen_resize.h

@@ -2,6 +2,8 @@
 
 #include <memory>
 #include <string>
+#include <optional>
+#include <filesystem>
 #include "external/rapidjson/document.h"
 
 namespace cfg {
@@ -12,9 +14,19 @@ namespace cfg {
         ResizableFrame = 2
     };
 
+    struct fullscreen_setting {
+        int offset_x = 0;
+        int offset_y = 0;
+        float scale_x = 1.0;
+        float scale_y = 1.0;
+        bool keep_aspect_ratio = true;
+    };
+
+    extern std::optional<std::string> SCREEN_RESIZE_CFG_PATH_OVERRIDE;
+
     class ScreenResize {
     private:
-        std::string config_path;
+        std::filesystem::path config_path;
         // bool config_dirty = false;
 
         bool load_bool_value(rapidjson::Document& doc, std::string path, bool& value);
@@ -27,14 +39,10 @@ namespace cfg {
         ~ScreenResize();
         
         // full screen (directx) image settings
-        int offset_x = 0;
-        int offset_y = 0;
-        float scale_x = 1.0;
-        float scale_y = 1.0;
         bool enable_screen_resize = false;
+        int8_t screen_resize_current_scene = 0;
         bool enable_linear_filter = true;
-        bool keep_aspect_ratio = true;
-        bool centered = true;
+        fullscreen_setting scene_settings[4];
 
         // windowed mode sizing
         // Windows terminology: