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

> broken commit

launcher/options.h

@@ -18,19 +18,26 @@ namespace launcher {
             PCBID,
             Player1Card,
             Player2Card,
+            Player1PinMacro,
+            Player2PinMacro,
             WindowedMode,
             InjectHook,
+            EarlyInjectHook,
             ExecuteScript,
             CaptureCursor,
             ShowCursor,
             DisplayAdapter,
-            GraphicsForceRefresh,
             GraphicsForceSingleAdapter,
+            GraphicsForceRefresh,
+            FullscreenResolution,
+            FullscreenOrientationFlip,
             Graphics9On12,
+            spice2x_Dx9On12,
             NoLegacy,
             RichPresence,
             SmartEAmusement,
             EAmusementMaintenance,
+            spice2x_EAmusementMaintenance,
             AdapterNetwork,
             AdapterSubnet,
             DisableNetworkFixes,
@@ -41,12 +48,18 @@ namespace launcher {
             VREnable,
             DisableOverlay,
             spice2x_FpsAutoShow,
+            spice2x_FpsOpposite,
             spice2x_SubScreenAutoShow,
             spice2x_IOPanelAutoShow,
             spice2x_KeypadAutoShow,
             LoadIIDXModule,
             IIDXCameraOrderFlip,
             IIDXDisableCameras,
+            IIDXCamHook,
+            IIDXCamHookRatio,
+            IIDXCamHookOverride,
+            IIDXCamHookTopId,
+            IIDXCamHookFrontId,
             IIDXSoundOutputDevice,
             IIDXAsioDriver,
             IIDXBIO2FW,
@@ -101,9 +114,15 @@ namespace launcher {
             LoadChargeMachineModule,
             LoadOngakuParadiseModule,
             LoadBusouShinkiModule,
+            LoadCCJModule,
+            LoadQKSModule,
+            LoadMFGModule,
+            LoadMusecaModule,
             PathToModules,
             ScreenshotFolder,
             ConfigurationPath,
+            ScreenResizeConfigPath,
+            PatchManagerConfigPath,
             IntelSDEFolder,
             PathToEa3Config,
             PathToAppConfig,
@@ -128,21 +147,27 @@ namespace launcher {
             ForceTouchEmulation,
             InvertTouchCoordinates,
             DisableTouchCardInsert,
+            spice2x_TouchCardInsert,
             ICCAReaderPort,
             ICCAReaderPortToggle,
             CardIOHIDReaderSupport,
             CardIOHIDReaderOrderFlip,
+            CardIOHIDReaderOrderToggle,
             HIDSmartCard,
             HIDSmartCardOrderFlip,
             HIDSmartCardOrderToggle,
+            HIDSmartCardIdConvert,
             SextetStreamPort,
             EnableBemaniTools5API,
             RealtimeProcessPriority,
             spice2x_ProcessPriority,
             spice2x_ProcessAffinity,
+            spice2x_ProcessorEfficiencyClass,
             HeapSize,
             DisableGSyncDetection,
+            spice2x_NvapiProfile,
             DisableAudioHooks,
+            spice2x_DisableVolumeHook,
             AudioBackend,
             AsioDriverId,
             AudioDummy,
@@ -165,17 +190,59 @@ namespace launcher {
             DisableDebugHooks,
             DisableAvsVfsDriveMountRedirection,
             OutputPEB,
+            DumpSystemInfo,
+            QKSArgs,
+            CCJArgs,
+            CCJMouseTrackball,
+            CCJMouseTrackballWithToggle,
+            CCJTrackballSensitivity,
+            MFGArgs,
+            MFGCabType,
+            MFGNoIO,
             spice2x_LightsOverallBrightness,
             spice2x_WindowBorder,
             spice2x_WindowSize,
             spice2x_WindowPosition,
             spice2x_WindowAlwaysOnTop,
+            WindowForceScaling,
+            spice2x_IIDXWindowedSubscreenSize,
+            spice2x_IIDXWindowedSubscreenPosition,
             spice2x_JubeatLegacyTouch,
             spice2x_RBTouchScale,
+            spice2x_AsioForceUnload,
+            spice2x_IIDXNoESpec,
+            spice2x_IIDXWindowedTDJ,
+            spice2x_DRSDisableTouch,
+            spice2x_DRSTransposeTouch,
+            spice2x_IIDXNativeTouch,
+            spice2x_IIDXNoSub,
+            spice2x_IIDXEmulateSubscreenKeypadTouch,
+            spice2x_AutoCard,
+            spice2x_LowLatencySharedAudio,
+            spice2x_TapeLedAlgorithm,
+            spice2x_NoNVAPI,
+            spice2x_NoD3D9DeviceHook,
+            spice2x_SDVXNoSub,
+            SDVXFullscreenLandscape,
+            spice2x_EnableSMXStage,
+            spice2x_EnableSMXDedicab,
+            IIDXRecQuality,
+            MidiAlgoVer,
+            MidiNoteSustain,
+            NostalgiaPoke,
+            ForceBackBufferCount,
+        };
+
+        enum class OptionsCategory {
+            Everything,
+            Basic,
+            Advanced,
+            Dev,
+            API
         };
     }
 
-    const std::vector<std::string> &get_categories(bool advanced);
+    const std::vector<std::string> &get_categories(Options::OptionsCategory category);
     const std::vector<OptionDefinition> &get_option_definitions();
     std::unique_ptr<std::vector<Option>> parse_options(int argc, char *argv[]);
     std::vector<Option> merge_options(const std::vector<Option> &options, const std::vector<Option> &overrides);