Revert "ui: Support controller peripherals and XMU devices (xemu-proj…

…ect#1315)"

This reverts commit 03f40b1.

Revert "ui: Warn user about no output when AV Pack set to "None""

This reverts commit 800eb46.

Revert "ui: Use only one option for settings window (xemu-project#1122)"

This reverts commit b605381.

config_spec.yml

@@ -25,27 +25,6 @@ input:
     port2: string
     port3: string
     port4: string
-  peripherals:
-    port1:
-      peripheral_type_0: integer
-      peripheral_param_0: string
-      peripheral_type_1: integer
-      peripheral_param_1: string
-    port2:
-      peripheral_type_0: integer
-      peripheral_param_0: string
-      peripheral_type_1: integer
-      peripheral_param_1: string
-    port3:
-      peripheral_type_0: integer
-      peripheral_param_0: string
-      peripheral_type_1: integer
-      peripheral_param_1: string
-    port4:
-      peripheral_type_0: integer
-      peripheral_param_0: string
-      peripheral_type_1: integer
-      peripheral_param_1: string
   gamecontrollerdb_path: string
   auto_bind:
     type: bool

data/meson.build

@@ -1,6 +1,5 @@
 pfiles = [
   'controller_mask.png',
-  'xmu_mask.png',
   'logo_sdf.png',
   'xemu_64x64.png',
   'abxy.ttf',

ui/meson.build

@@ -47,7 +47,7 @@ endif
 xemu_ss.add(when: 'CONFIG_LINUX', if_true: [gtk, files('xemu-os-utils-linux.c')])
 xemu_ss.add(when: 'CONFIG_WIN32', if_true: files('xemu-os-utils-windows.c'))
 xemu_ss.add(when: 'CONFIG_DARWIN', if_true: files('xemu-os-utils-macos.m'))
-xemu_ss.add(imgui, implot, stb_image, noc, sdl, opengl, openssl, fa, fpng, json, httplib, fatx)
+xemu_ss.add(imgui, implot, stb_image, noc, sdl, opengl, openssl, fa, fpng, json, httplib)
 
 softmmu_ss.add_all(xemu_ss)
 

ui/thirdparty/meson.build

@@ -62,6 +62,3 @@ fpng = declare_dependency(include_directories: 'fpng', link_with: libfpng)
 
 json = declare_dependency(include_directories: 'json')
 httplib = declare_dependency(include_directories: 'httplib')
-
-libfatx = static_library('fatx', sources: 'fatx/fatx.c')
-fatx = declare_dependency(include_directories: 'fatx', link_with: libfatx)

ui/thirdparty/noc_file_dialog/noc_file_dialog.h

@@ -285,9 +285,6 @@ const char *noc_file_dialog_open(int flags,
     ofn.lpstrInitialDir = initialDir;
     ofn.Flags = OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST | OFN_NOCHANGEDIR;
 
-    if (flags & NOC_FILE_DIALOG_OVERWRITE_CONFIRMATION)
-        ofn.Flags |= OFN_OVERWRITEPROMPT;
-
     if (flags & NOC_FILE_DIALOG_OPEN) {
         ret = GetOpenFileNameW(&ofn);
     } else {