Merge pull request #8161 from yoshisuga/ios-cleanup

iOS/tvOS cleanup
Some more buildfixes
2026-11-09 11:41:35 -10:00 · 2019-02-03 21:18:57 +01:00 · 2019-02-03 21:18:34 +01:00 · 2019-02-03 09:11:29 -10:00 · 2019-02-03 20:10:28 +01:00 · 2019-02-03 09:00:22 -10:00
2363 changed files with 413551 additions and 60477 deletions
@@ -11,6 +11,8 @@
 .tmp
 .tmp.c
 .tmp.cxx
+.moc.h
+.moc.cpp
 config.log
 /.project
 /.externalToolBuilders/
@@ -53,7 +55,6 @@ DerivedData
 apple/tmp
 apple/*.mobileprovision
 apple/RetroArch_iOS.xcodeproj/project.xcworkspace/*
-menu/driverspzarch.c
 /Cg/
 /GL/
 /SDL/
@@ -74,6 +75,7 @@ libretro-super
 run.sh
 convert_rumble.awk
 *~
+assets

 # Wii U
 *.depend
@@ -119,7 +121,9 @@ wiiu/wut/elf2rpl/elf2rpl
 /media/libretrodb/

 pkg/apple/iOS/build/
-pkg/apple/iOS/modules/
+pkg/apple/build/
+ui/drivers/qt/moc_*
+ui/drivers/moc_*

 obj-unix/
 .vagrant/
@@ -151,3 +155,22 @@ retroarch.js.mem

 # only ignore .js files in the repo root
 /*.js
+
+# Switch
+*.d
+exefs/*
+retroarch_switch.pfs0
+retroarch_switch.lst
+retroarch_switch.nacp
+retroarch_switch.nro
+retroarch_switch.nso
+
+# Wayland
+gfx/common/wayland/idle-inhibit-unstable-v1.c
+gfx/common/wayland/idle-inhibit-unstable-v1.h
+gfx/common/wayland/xdg-shell-unstable-v6.c
+gfx/common/wayland/xdg-shell-unstable-v6.h
+gfx/common/wayland/xdg-decoration-unstable-v1.h
+gfx/common/wayland/xdg-decoration-unstable-v1.c
+gfx/common/wayland/xdg-shell.c
+gfx/common/wayland/xdg-shell.h
@@ -10,7 +10,9 @@ matrix:
            - g++-mingw-w64-i686
            - mingw-w64-i686-dev
      script:
-        - CROSS_COMPILE=i686-w64-mingw32- CFLAGS="-D_WIN32_WINNT=0x0501" ./configure --disable-d3d8 --disable-d3d9 --disable-d3d10 --disable-d3d11 --disable-d3d12 && make HAVE_ZLIB=1 HAVE_BUILTINZLIB=1 HAVE_RPNG=1
+        - ./configure --disable-d3d8 --disable-d3d9 --disable-d3d10 --disable-d3d11 --disable-d3d12 --enable-builtinzlib
+        - make
+      env: CROSS_COMPILE=i686-w64-mingw32- CFLAGS="-D_WIN32_WINNT=0x0501"
    - compiler: mingw-x64
      addons:
        apt:
@@ -18,22 +20,35 @@ matrix:
            - g++-mingw-w64-x86-64
            - mingw-w64-x86-64-dev
      script:
-        - CROSS_COMPILE=x86_64-w64-mingw32- CFLAGS="-D_WIN32_WINNT=0x0501" ./configure --disable-d3d8 --disable-d3d9 --disable-d3d10 --disable-d3d11 --disable-d3d12 && make HAVE_ZLIB=1 HAVE_BUILTINZLIB=1 HAVE_RPNG=1
+        - ./configure --disable-d3d8 --disable-d3d9 --disable-d3d10 --disable-d3d11 --disable-d3d12 --enable-builtinzlib
+        - make
+      env: CROSS_COMPILE=x86_64-w64-mingw32- CFLAGS="-D_WIN32_WINNT=0x0501"
    - compiler: gcc
+      # Install a more recent gcc than the default
+      before_install:
+        - sudo apt-get install -y g++-8
+      env: CC=gcc-8 CXX=g++-8
    - compiler: clang
-      addons:
-        # Install a more recent clang than the default
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-            - llvm-toolchain-precise-3.8
-          packages:
-            - clang-3.8
-      env: COMPILER_NAME=clang-3.8 CXX=clang++-3.8 CC=clang-3.8
+      # Install a more recent clang than the default
+      before_install:
+        - sudo apt-get install -y libstdc++-7-dev
+        - sudo apt-get install -y clang-6.0
+      env: CC=clang-6.0 CXX=clang++-6.0
    - os: osx
-      osx_image: xcode7.3
+      osx_image: xcode8
      script:
-          - xcodebuild -target RetroArch -configuration Release -project pkg/apple/RetroArch.xcodeproj
+        - xcodebuild -target RetroArch -configuration Release -project pkg/apple/RetroArch.xcodeproj
+    - os: osx
+      osx_image: xcode10.1
+      script:
+        - brew install --force-bottle qt5
+        - xcodebuild -target RetroArchQt -configuration Release -project pkg/apple/RetroArch_Metal.xcodeproj
+      deploy:
+        skip_cleanup: true
+        provider: script
+        script: bash travis_metal_deploy.sh
+        on:
+          branch: master

 script:
  - ./configure
@@ -46,16 +61,13 @@ env:
 addons:
  apt:
    packages:
-      - curl
-      - pkg-config
-      - libglu1-mesa-dev
-      - freeglut3-dev
-      - mesa-common-dev
-      - libsdl1.2-dev
-      - libsdl-image1.2-dev
-      - libsdl-mixer1.2-dev
-      - libsdl-ttf2.0-dev
+      - libsdl2-dev
      - libusb-1.0-0-dev
+      - qtbase5-dev
+      - qtdeclarative5-dev
+    sources:
+      - ubuntu-toolchain-r-test
+      - llvm-toolchain-trusty-6.0
  coverity_scan:
    project:
      name: "RetroArch"
@@ -29,7 +29,9 @@
            "includePath": [
                "/usr/include",
                "/usr/local/include",
-                "${workspaceRoot}"
+                "${workspaceRoot}",
+                "${workspaceFolder}/libretro-common/include",
+                "${workspaceRoot}/libretro-common/include"
            ],
            "defines": [],
            "intelliSenseMode": "clang-x64",
@@ -50,7 +52,8 @@
                "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/ucrt",
                "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/shared",
                "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/winrt",
-                "${workspaceRoot}"
+                "${workspaceRoot}",
+                "${workspaceFolder}/libretro-common/include"
            ],
            "defines": [
                "_DEBUG",
@@ -13,7 +13,7 @@
         "stopAtEntry": false,
         "cwd": "${workspaceFolder}",
         "environment": [],
-         "externalConsole": false,
+         "externalConsole": true,
         "MIMode": "gdb",
         "miDebuggerPath": "c:\\msys64\\mingw64\\bin\\gdb.exe",
         "setupCommands": [
@@ -7,6 +7,7 @@
   "terminal.integrated.cursorBlinking": true,

   "editor.tabSize": 3,
+   "editor.detectIndentation": false,
   "editor.renderWhitespace": "all",
   "editor.insertSpaces": true,
   "files.associations": {
@@ -14,6 +15,34 @@
      "*.in": "c",
      "*.rh": "c",
      "array": "c",
+      "file_stream.h": "c",
+      "driver.h": "c",
+      "iosfwd": "c",
+      "xlocbuf": "c",
+      "xmemory0": "c",
+      "ios": "c",
+      "list": "c",
+      "input_driver.h": "c",
+      "video_driver.h": "c",
+      "menu_driver.h": "c",
+      "file_path.h": "c",
+      "unordered_map": "c",
+      "unordered_set": "c",
+      "sstream": "cpp",
+      "hash_map": "c",
+      "hash_set": "c",
+      "initializer_list": "c",
+      "string_view": "c",
+      "utility": "c",
+      "menu_input.h": "c",
+      "tasks_internal.h": "c",
+      "ozone.h": "c",
+      "ozone_theme.h": "c",
+      "ozone_texture.h": "c",
+      "string_list.h": "c",
+      "core_info.h": "c"
+      "thread": "c",
+      "xlocale": "c"
   },
   "C_Cpp.dimInactiveRegions": false,
 }
@@ -4,12 +4,49 @@
   "version": "2.0.0",
   "tasks": [
      {
-         "taskName": "msys2-mingw64 build",
+         "label": "linux clean build",
+         "type": "shell",
+         "group": "build",
+         "command": "make clean && ./configure && make -j12"
+      },
+      {
+         "label": "linux clean",
+         "type": "shell",
+         "group": "build",
+         "command": "make clean"
+      },
+      {
+         "label": "linux build with debug symbols",
+         "type": "shell",
+         "group": "build",
+         "command": "DEBUG=1 make -j12"
+      },
+      {
+         "label": "linux build",
+         "type": "shell",
+         "group": "build",
+         "command": "make -j12"
+      },
+      {
+         "label": "linux build and run",
+         "type": "shell",
+         "group": "build",
+         "command": "make -j12 && ./retroarch -v"
+      },
+      {
+         "label": "linux build and run with debug symbols",
+         "type": "shell",
+         "group": "build",
+         "command": "DEBUG=1 make -j12 && ./retroarch -v"
+      },
+      {
+         "label": "msys2-mingw64 build",
         "type": "shell",

         "group": {
            "kind": "build",
-            "isDefault": true },
+            "isDefault": true 
+         },

         "command": "./configure; make -j2",
         "options": {
@@ -20,9 +57,9 @@
               ]
            }
         }
-      }
+      },
      {
-         "taskName": "msys2-mingw64 build with debug symbols",
+         "label": "msys2-mingw64 build with debug symbols",
         "type": "shell",

         "group": "build",
@@ -36,9 +73,9 @@
               ]
            }
         }
-      }
+      },
      {
-         "taskName": "msys2-mingw64 rebuild",
+         "label": "msys2-mingw64 rebuild",
         "type": "shell",

         "group": "build",
@@ -52,9 +89,9 @@
               ]
            }
         }
-      }
+      },
      {
-         "taskName": "msys2-mingw64 clean",
+         "label": "msys2-mingw64 clean",
         "type": "shell",

         "group": "build",
@@ -68,9 +105,9 @@
               ]
            }
         }
-      }
+      },
      {
-         "taskName": "msys2-mingw64 run",
+         "label": "msys2-mingw64 run",
         "type": "shell",

         "group": {
@@ -0,0 +1,96 @@
+diff --git a/gfx/drivers_context/wgl_ctx.c b/gfx/drivers_context/wgl_ctx.c
+index b90a8e40c3..e57c4df194 100644
+--- a/gfx/drivers_context/wgl_ctx.c
+++ b/gfx/drivers_context/wgl_ctx.c
+@@ -78,6 +78,47 @@
+ #ifndef WGL_CONTEXT_DEBUG_BIT_ARB
+ #define WGL_CONTEXT_DEBUG_BIT_ARB 0x0001
+ #endif
+
+#ifndef WGL_ACCELERATION_ARB
+#define WGL_ACCELERATION_ARB                    0x2003
+#endif
+
+#ifndef WGL_FULL_ACCELERATION_ARB
+#define WGL_FULL_ACCELERATION_ARB               0x2027
+#endif
+
+#ifndef WGL_DRAW_TO_WINDOW_ARB
+#define WGL_DRAW_TO_WINDOW_ARB                  0x2001
+#endif
+
+#ifndef WGL_DOUBLE_BUFFER_ARB
+#define WGL_DOUBLE_BUFFER_ARB                   0x2011
+#endif
+
+#ifndef WGL_RED_BITS_ARB
+#define WGL_RED_BITS_ARB                        0x2015
+#endif
+
+#ifndef WGL_GREEN_BITS_ARB
+#define WGL_GREEN_BITS_ARB                      0x2017
+#endif
+
+#ifndef WGL_BLUE_BITS_ARB
+#define WGL_BLUE_BITS_ARB                       0x2019
+#endif
+
+#ifndef WGL_ALPHA_BITS_ARB
+#define WGL_ALPHA_BITS_ARB                      0x201B
+#endif
+
+#ifndef WGL_PIXEL_TYPE_ARB
+#define WGL_PIXEL_TYPE_ARB                      0x2013
+#endif
+
+#ifndef WGL_TYPE_RGBA_ARB
+#define WGL_TYPE_RGBA_ARB                       0x202B
+#endif
+
+ #endif
+ 
+ #if defined(HAVE_OPENGL)
+@@ -313,6 +354,43 @@ static void create_gl_context(HWND hwnd, bool *quit)
+          RARCH_LOG("[WGL]: Adaptive VSync supported.\n");
+          wgl_adaptive_vsync = true;
+       }
+      if (wgl_has_extension("WGL_ARB_pixel_format", extensions))
+      {
+         BOOL (WINAPI * wglChoosePixelFormatARB)
+         (HDC hdc,
+                                 const int *piAttribIList,
+                                 const FLOAT *pfAttribFList,
+                                 UINT nMaxFormats,
+                                 int *piFormats,
+                                 UINT *nNumFormats);
+         UINT nMatchingFormats;
+         int index = 0;
+         int attribsDesired[] = {
+            WGL_DRAW_TO_WINDOW_ARB, 1,
+            WGL_ACCELERATION_ARB, WGL_FULL_ACCELERATION_ARB,
+            WGL_PIXEL_TYPE_ARB, WGL_TYPE_RGBA_ARB,
+            WGL_RED_BITS_ARB, 10,
+            WGL_GREEN_BITS_ARB, 10,
+            WGL_BLUE_BITS_ARB, 10,
+            WGL_ALPHA_BITS_ARB, 2,
+            WGL_DOUBLE_BUFFER_ARB, 1,
+            0,0
+         };
+         wglChoosePixelFormatARB = (BOOL (WINAPI *) (HDC, const int *,
+                  const FLOAT*, UINT, int*, UINT*))
+            gfx_ctx_wgl_get_proc_address("wglChoosePixelFormatARB");
+
+         RARCH_LOG("[WGL]: ARB pixel format supported.\n");
+
+         if (wglChoosePixelFormatARB(win32_hdc, attribsDesired,
+                  NULL, 1, &index, &nMatchingFormats))
+         {
+            if (nMatchingFormats == 0)
+            {
+               RARCH_WARN("No 10bpc WGL_ARB_pixel_formats found!\n");
+            }
+         }
+      }
+    }
+ }
+ #endif
@@ -25,6 +25,7 @@ Amiga1200Gamer (amigagamer)
 Andre Leiradella (leiradel)
 Andrés (fr500)
 Anthony J. Bentley (bentley)
+Antonio Jose Ramos Marquez (psxdev)
 AridRayne
 Arto Vainiolehto (arakerlu)
 asako (asakous)
@@ -94,6 +95,7 @@ FIX94
 Flame Sage (chris062689)
 flyinghead
 Francisco José García García (frangarcj)
+Francisco Javier Trujillo Mata (fjtrujy)
 GameDragon2k
 Garrett Brown (garbear)
 gblues
@@ -141,6 +143,7 @@ JuanVCS
 Justin Jacobs (dorkster)
 Justin Weiss (justinweiss)
 Ken Rossato (rossato)
+Krzysztof Haładyn (krzys_h)
 kurumushi
 kwyxz
 l3iggs
@@ -1,4 +1,120 @@
-# 1.7.4 (future)
+# 1.7.7 (future)
+
+# 1.7.6
+- ANDROID: Fix Xperia Play input binding.
+- CHEEVOS: Reset when hardcore mode is toggled.
+- CHEEVOS: Update the hashing methods to identify NES, SNES and Lynx games (more accurate and accepting headerless ROMs).
+- COMMON: Add new JSON playlist format.
+- COMMON: Fix playlist corruption when deleting items.
+- COMMON: Fix archive progress display calculation.
+- COMMON: Fix playlist entries appearing with previously used names.
+- COMMON: Fix screenshot filename with no core or content.
+- COMMON: Allow compiling without menu support.
+- CORE UPDATER: Allow sideloading cores from the menu.
+- CPU FILTERS: Add Normal2x filter.
+- CRT/LINUX: New Linux switching method partially implemented.
+- CRT/LINUX: Linux restore desktop resolution fixed.
+- CRT/LINUX: Monitor index switching and auto enumerate for output detection in Linux (still working on the windows method).
+- CRT/RASPBERRY PI: Initial support.
+- DATE: Add Date / Time style options.
+- DEBUGGING: Add an integrated crash handler for debug builds (see https://docs.libretro.com/tech/debugging)
+- DISCORD: Register the application name properly.
+- DISK CONTROL: Remember the last used folder / current active folder to make disk-swapping faster.
+- INPUT: Add new menu toggle (hold start button for 2 seconds)
+- INPUT: Fix arrow keys being incorrectly bound as numpad keys
+- INPUT/SDL: Flush the joypad events. Decreases cpu usage over time with the SDL joypad driver.
+- LOCALIZATION: Add Greek translation.
+- LOCALIZATION: Update German translation.
+- LOCALIZATION: Update Italian translation.
+- LOCALIZATION: Update Japanese translation.
+- LOCALIZATION: Update Simplified Chinese translation.
+- LOCALIZATION: Update Spanish translation.
+- MENU: New "ozone" menu driver.
+- MENU: Only show CRT SwitchRes if video display server is implemented (Windows/Linux for now)
+- MENU: User Interface -> Appearance -> 'Menu Font Green/Blue Color' settings now work properly.
+- MENU: Add option to enable in-menu sound effects.
+- MENU/D3D: Scissoring support (will be used for Ozone and menu widgets).
+- MENU/QT/WIMP: Allow building with MSVC2017.
+- MENU/QT/WIMP: Add detailed file browser table.
+- MENU/QT/WIMP: New grid view implementation that is faster and loads thumbnails on-demand.
+- MENU/QT/WIMP: Thumbnail drag and drop support.
+- MENU/RGUI: Overhaul custom theme interface + add wallpaper support.
+- MENU/RGUI: Thumbnail support and thumbnail downscaling.
+- MENU: Hide password values.
+- MENU/SOUNDS: Implement in-menu sound effects (not enabled by default for now, still experimental).
+- MIDI: Add a Linux ALSA driver for MIDI.
+- NETPLAY: Force fast-save-states when netplay is enabled.
+- NETPLAY: Allow quick joining subsystem lobbies.
+- OSX: Initial CoreAudio V3 audio driver (not yet used in release builds).
+- OSX: OpenGL 3.2 Core support for cores.
+- PS2: Initial PlayStation2 port.
+- PS4: Initial PlayStation4 port.
+- RECORDING: Implement recording options in the menu complete with quality profiles, streaming, and proper file naming
+- SCANNER: Fix GDI disc scanning.
+- SHADERS: Fix auto shader preset loading on D3D10, D3D11, D3D12
+- SUBSYSTEM: Allow more than 10 subsystems
+- SUBSYSTEM: Cores that use subsystem for complex scenarios can now load content without starting a regular content first
+- SUBSYSTEM: Remember the last used folder to make loading subsystem type content faster
+- SWITCH/LIBNX: Improve touch scaling calculation.
+- SWITCH: Proper button labels.
+- TVOS: Initial tvOS port.
+- VULKAN: Fix RGUI crashing at startup.
+- VULKAN/RGUI: Enable 'Menu Linear Filter' option.
+- VULKAN: Fix secondary screens in overlays not working.
+- WAYLAND: Implement idle-inhibit support (needed for screensaver suspend).
+- WAYLAND: Fix fullscreen toggle.
+- WIIU: Initial netplay peer-to-peer support. Network information working.
+- WINDOWS/WSA: Network Information info is blank until first network operation.
+- WINDOWS: Fix an ancient bug that caused wrong mappings for keyboard arrows.
+- WINDOWS: Remember window size and position if so desired.
+- WINDOWS: SSL/TLS connections now work properly.
+- WINDOWS: Fall back to GDI driver if no accelerated graphics driver is found.
+- UWP: Initial UWP port.
+- VFS: Update to version 3.
+- XBONE: Initial Xbox One port.
+- XMB/OZONE: Add more icons
+- XMB: Add Automatic Inverted theme
+- ???: Easter Egg
+
+# 1.7.5
+- CAMERA: Fix Video4Linux2 driver that broke years ago.
+- CONFIG: Add 'Reset To Defaults' setting in Configurations. Thi will reset your config file to defaults.
+- CHEATS: Add support for Rumble when increase or decrease by the rumble value.
+- CHEATS: Add cheat variables to allow for updating large portions of memory.
+- CHEEVOS: Prevent loading states before achievements are fully loaded.
+- CRT: New porches and interlaced bug fix.
+- CRT: New functionality, ability to switch between 15KHz and 31KHz, etc.
+- COMMON: Support for "OEM-102" key (usually '\' on Euro keyboards).
+- DISCORD: Add 'Ask To Join' Feature.
+- EMSCRIPTEN: Add stb_font support.
+- INPUT: Add new menu toggle combos 'L3 + R' and 'L + R' (useful for Switch).
+- IOS: Use safe area to account for notch for iPhone X and adjust main view.
+- LOCALIZATION: Update Portuguese / Brazilian translation.
+- LOCALIZATION: Update Japanese translation.
+- LOCALIZATION: Update Polish translation.
+- LOCALIZATION: Update Spanish translation.
+- MENU: Add dropdown lists for many settings.
+- MENU: Fix crash that could happen when changing core's options on Android.
+- MENU/QT/WIMP: Add option to rename playlists.
+- MENU/QT/WIMP: Add option to filter extensions inside archives when adding to a playlist.
+- MENU/QT/WIMP: Rename playlist entries with 2 single clicks.
+- MENU/QT/WIMP: Fix shader parameter checkboxes not working
+- METAL: Add screenshot support.
+- NETPLAY: Save lobby details received back from server after first announcement.
+- OPENGL/GLX: Implement Adaptive VSync - GLX_EXT_swap_control_tear.
+- OPENGL/WGL: Implement Adaptive VSync - WGL_EXT_swap_control_tear.
+- RUNAHEAD: Fix performance degradation that could happen over time (after approx. 30 mins). Fixed input IDs outside of range 0-35 causing slow performance in runahead.
+- SWITCH: Add stb_font support.
+- SWITCH: Add Retro Achievements support.
+- SWITCH: Add networking support.
+- SWITCH: Add touchscreen support.
+- SWITCH: Add OpenGL support.
+- SWITCH: Merging of RetroNX Nintendo Switch port, based on libnx SDK.
+- VULKAN: Fix race condition in threaded mailbox emulation.
+- VULKAN: Maintenance fixes.
+- WIIU: Fix menu lag when built with DevKitPro r32.
+
+# 1.7.4
 - ANDROID: Add sustained performance mode, can be turned on/off in Power Management settings menu.
 - ANDROID: Powerstate/battery level support.
 - CHEEVOS: Fix crash when scrolling Achievement List while Unofficial Achievements enabled (#6732).
@@ -16,26 +16,36 @@ include config.mk

 TARGET = retroarch

+OBJ :=
+LIBS :=
+DEF_FLAGS :=
+ASFLAGS :=
+DEFINES := -DHAVE_CONFIG_H -DRARCH_INTERNAL -D_FILE_OFFSET_BITS=64
+DEFINES += -DGLOBAL_CONFIG_DIR='"$(GLOBAL_CONFIG_DIR)"'
+
 OBJDIR_BASE := obj-unix

 ifeq ($(DEBUG), 1)
   OBJDIR := $(OBJDIR_BASE)/debug
+   CFLAGS ?= -O0 -g
+   CXXFLAGS ?= -O0 -g
+   DEFINES += -DDEBUG -D_DEBUG
 else
   OBJDIR := $(OBJDIR_BASE)/release
+   CFLAGS ?= -O3
+   CXXFLAGS ?= -O3
+   DEF_FLAGS += -ffast-math
 endif

-OBJ :=
-LIBS :=
-DEFINES := -DHAVE_CONFIG_H -DRARCH_INTERNAL -D_FILE_OFFSET_BITS=64
-DEFINES += -DGLOBAL_CONFIG_DIR='"$(GLOBAL_CONFIG_DIR)"'
-
 ifneq ($(findstring BSD,$(OS)),)
-   CFLAGS += -DBSD
+   DEF_FLAGS += -DBSD
   LDFLAGS += -L/usr/local/lib
+   UDEV_CFLAGS += -I/usr/local/include/libepoll-shim
+   UDEV_LIBS += -lepoll-shim
 endif

 ifneq ($(findstring DOS,$(OS)),)
-   CFLAGS += -march=i386
+   DEF_FLAGS += -march=i386
   LDFLAGS += -lemu
 endif

@@ -75,21 +85,19 @@ ifneq ($(V),1)
   Q := @
 endif

-ifeq ($(DEBUG), 1)
-   OPTIMIZE_FLAG = -O0 -g
-   DEFINES += -DDEBUG -D_DEBUG
-else
-   OPTIMIZE_FLAG = -O3 -ffast-math
+ifeq ($(HAVE_DRMINGW), 1)
+   DEF_FLAGS += -DHAVE_DRMINGW
+   LDFLAGS += $(DRMINGW_LIBS)
 endif

 ifneq ($(findstring Win32,$(OS)),)
   LDFLAGS += -mwindows
 endif

-CFLAGS   += -Wall $(OPTIMIZE_FLAG) $(INCLUDE_DIRS) -I. -Ideps -Ideps/stb
+DEF_FLAGS += -Wall $(INCLUDE_DIRS) -I. -Ideps -Ideps/stb

-APPEND_CFLAGS := $(CFLAGS)
-CXXFLAGS += $(APPEND_CFLAGS) -std=c++11 -D__STDC_CONSTANT_MACROS
+CFLAGS += $(DEF_FLAGS)
+CXXFLAGS += $(DEF_FLAGS) -std=c++11 -D__STDC_CONSTANT_MACROS
 OBJCFLAGS :=  $(CFLAGS) -D__STDC_CONSTANT_MACROS

 ifeq ($(HAVE_CXX), 1)
@@ -164,7 +172,7 @@ all: $(TARGET) config.mk
 $(MOC_SRC):
 	@$(if $(Q), $(shell echo echo MOC $<),)
 	$(eval MOC_TMP := $(patsubst %.h,%_moc.cpp,$@))
-	$(Q)$(MOC) -o $(MOC_TMP) $<
+	$(Q)QT_SELECT=$(QT_VERSION) $(MOC) -o $(MOC_TMP) $<

 $(foreach x,$(join $(addsuffix :,$(MOC_SRC)),$(MOC_HEADERS)),$(eval $x))

@@ -243,12 +251,18 @@ install: $(TARGET)
 	chmod 644 $(DESTDIR)$(MAN_DIR)/man6/retroarch.6
 	chmod 644 $(DESTDIR)$(MAN_DIR)/man6/retroarch-cg2glsl.6
 	chmod 644 $(DESTDIR)$(DATA_DIR)/pixmaps/retroarch.svg
-	@if test -d media/assets; then \
+	@if test -d media/assets && test $(HAVE_ASSETS); then \
 		echo "Installing media assets..."; \
-		mkdir -p $(DESTDIR)$(ASSETS_DIR)/assets/xmb; \
-		mkdir -p $(DESTDIR)$(ASSETS_DIR)/assets/glui; \
-		cp -r media/assets/xmb/ $(DESTDIR)$(ASSETS_DIR)/assets; \
-		cp -r media/assets/glui/ $(DESTDIR)$(ASSETS_DIR)/assets; \
+		mkdir -p $(DESTDIR)$(ASSETS_DIR)/assets; \
+		if test $(HAVE_MATERIALUI) = 1; then \
+			cp -r media/assets/glui/ $(DESTDIR)$(ASSETS_DIR)/assets; \
+		fi; \
+		if test $(HAVE_XMB) = 1; then \
+			cp -r media/assets/xmb/ $(DESTDIR)$(ASSETS_DIR)/assets; \
+		fi; \
+		if test $(HAVE_OZONE) = 1; then \
+			cp -r media/assets/ozone/ $(DESTDIR)$(ASSETS_DIR)/assets; \
+		fi; \
 		cp media/assets/COPYING $(DESTDIR)$(DOC_DIR)/COPYING.assets; \
 		echo "Asset copying done."; \
 	fi
@@ -0,0 +1,24 @@
+include Makefile.common
+
+# Qt MOC generation, required for QObject-derived classes
+ifneq ($(MOC_HEADERS),)
+	# prefix moc_ to base filename of paths and change extension from h to cpp, so a/b/foo.h becomes a/b/moc_foo.cpp
+	MOC_SRC := $(join $(addsuffix moc_,$(dir $(MOC_HEADERS))), $(notdir $(MOC_HEADERS:.h=.cpp)))
+endif
+
+MOC ?= $(error missing moc path)
+
+.PHONY: generate
+
+$(MOC_SRC):
+	@$(if $(Q), $(shell echo echo MOC $<),)
+	$(eval MOC_TMP := $(patsubst %.h,%_moc.cpp,$@))
+	$(MOC) -o $(MOC_TMP) $<
+
+$(foreach x,$(join $(addsuffix :,$(MOC_SRC)),$(MOC_HEADERS)),$(eval $x))
+
+generate: $(MOC_SRC)
+	@echo $(MOC_SRC)
+	
+print-%:
+	@echo '$*=$($*)'
@@ -0,0 +1,113 @@
+# This build was put together and is maintained by ModMyClassic.com for Libretro.
+# The purpose is to give Libretro a proper "official" build platform for classic consoles.
+# If you need any help in building for the classics or have any questions then please visit
+# https://modmyclassic.com/comp and we will help in any way possible! 
+
+# Building Prerequisites ##############
+# arm-linux-gnueabihf-gcc-8
+# arm-linux-gnueabihf-g++-8
+# arm-linux-gnueabihf-as
+# arm-linux-gnueabihf-strip
+# patchelf
+# bc
+
+include version.all
+
+# Classic Readme Variables ############
+CLASSIC_ALT_VER := $(shell echo $(RARCH_VERSION) | tr . _)
+CLASSIC_MODS_VER := Official_Retroarch_v$(CLASSIC_ALT_VER)c_COptimised
+CLASSIC_MODS_NAME := RetroArch v$(RARCH_VERSION)c \(Official Classic Optimised\)
+CLASSIC_VERSION := $(RARCH_VERSION)c \(Classic+\)
+MOD_CREATOR := Libretro + ModMyClassic
+MOD_CATEGORY := RetroArch
+GIT_COMMIT := $(shell echo "`git rev-parse --short HEAD``git diff-index --quiet HEAD -- || echo '-dirty'`")
+
+# Platform dependant Variables ########
+HAKCHI_DIR := RA_Platform-Hakchi
+HAKCHI_GIT := https://github.com/Classicmods/RA_Platform-Hakchi
+
+# General Shared Variables ############
+TARGET := retroarch
+CC_V = arm-linux-gnueabihf-gcc-8
+CXX_V = arm-linux-gnueabihf-g++-8
+AS_V = arm-linux-gnueabihf-as
+CC_AS_V = arm-linux-gnueabihf-gcc-8
+
+# Libretro Defines ####################
+#HAVE_CLASSIC = Classic Hook, disable some features
+#HAVE_C_A7A7 = Classic Armv7 Cortex A7 optimisation override
+#HAVE_HAKCHI = Hakchi Hook, change default configurations etc (TODO)
+
+all: $(TARGET)
+
+retroarch:
+	#Backup vanilla version files + ammend version
+	cp version.all version_BACKUP.all && cp version.dtd version_BACKUP.dtd
+	sed -i -e 's/RARCH_VERSION="[^"]*"/RARCH_VERSION="$(CLASSIC_VERSION)"/g' version.all
+	sed -i -e 's/PACKAGE_VERSION "[^"]*"/PACKAGE_VERSION "$(CLASSIC_VERSION)"/g' version.all
+	sed -i -e 's/ENTITY version "[^"]*"/ENTITY version "$(CLASSIC_VERSION)"/g' version.dtd
+	#Build the RetroArch Binary for cross platform classics (ARMv7 Cortex A7)
+	patchelf --version #Check if you have patchelf installed... (sudo apt-get install patchelf)
+	./configure --host=arm-linux-gnueabihf --enable-mali_fbdev --disable-freetype --enable-opengles --enable-udev --enable-alsa --enable-neon --enable-floathard --disable-discord
+	make CC=$(CC_V) CXX=$(CXX_V) AS=$(AS_V) CC_AS=$(CC_AS_V) LDFLAGS_SDL=-lSDL2 HAVE_CLASSIC=1 HAVE_C_A7A7=1 HAVE_HAKCHI=1 -j #Cook it
+	arm-linux-gnueabihf-strip -v retroarch
+	patchelf --replace-needed libSDL2-2.0.so.0 libSDL2.so retroarch #libSDL2-2.0.so.0 sym link doesn't exist on native build. Just patch the binary...
+
+	#HAKCHI BUILD (NESC, SNESC)
+	#FYI this build was originally known as RetroArch 'Neo' for Hakchi.
+	@echo "** BUILDING CLASSIC_MODS HAKCHI - $(CLASSIC_MODS_VER) HMOD PACKAGE **"
+	rm -fr /tmp/$(HAKCHI_DIR)
+	cd /tmp/; git clone $(HAKCHI_GIT)
+	cp retroarch /tmp/$(HAKCHI_DIR)/bin/retroarch
+	echo $$(echo "Built by: " $$USER @ $$(date) \\\\\\ Git Commit: $(GIT_COMMIT)) > /tmp/$(HAKCHI_DIR)/etc/libretro/retroarch_version
+	cp /tmp/$(HAKCHI_DIR)/readme.md /tmp/$(HAKCHI_DIR)/readme_COPY.md
+	printf "%s\n" \
+	"---" \
+	"Name: $(CLASSIC_MODS_NAME)" \
+	"Creator: $(MOD_CREATOR)" \
+	"Category: $(MOD_CATEGORY)" \
+	"Version: $(CLASSIC_MODS_VER)" \
+	"Built on: $(shell date)" \
+	"Git commit: $(GIT_COMMIT)" \
+	"---" > /tmp/$(HAKCHI_DIR)/readme.md
+	cat /tmp/$(HAKCHI_DIR)/readme_COPY.md >> /tmp/$(HAKCHI_DIR)/readme.md
+	rm /tmp/$(HAKCHI_DIR)/readme_COPY.md
+	@echo "** COMPRESSING $(CLASSIC_MODS_VER) HMOD PACKAGE **"
+	cd /tmp/$(HAKCHI_DIR)/; tar -czvf "$(CLASSIC_MODS_VER).hmod" *
+	mv /tmp/$(HAKCHI_DIR)/$(CLASSIC_MODS_VER).hmod .
+	@echo "** BUILT CLASSIC_MODS HAKCHI - $(CLASSIC_MODS_VER) HMOD PACKAGE **"
+	rm -fr /tmp/$(HAKCHI_DIR) #clean up tmp
+
+	#COMMODORE 64 MINI BUILD (WIP)
+	
+	#Clean down dirty files
+	rm -f version.all version.dtd
+	mv version_BACKUP.all version.all && mv version_BACKUP.dtd version.dtd
+	@echo "*********************************************************************"
+	@echo "*** Classic ARM7 Cortex A7 build and packages built successfully! ***"
+	@echo "****************** Winner, Winner, Chicken Dinner! ******************"
+	@echo "*********************************************************************"
+clean:
+	rm -rf obj-unix
+	rm -f *.d
+	rm -f *.o
+	rm -f audio/*.o
+	rm -f conf/*.o
+	rm -f gfx/*.o
+	rm -f gfx/drivers_font/*.o
+	rm -f gfx/drivers_font_renderer/*.o
+	rm -f gfx/drivers_context/*.o
+	rm -f gfx/py_state/*.o
+	rm -f compat/*.o
+	rm -f record/*.o
+	rm -f input/*.o
+	rm -f tools/*.o
+	rm -f $(BINDIR)/retroarch
+	rm -f $(BINDIR)/retroarch-joyconfig
+	rm -f $(PNDDIR)/readme.html
+	rm -f retroarch
+	rm -f $(CLASSIC_MODS_VER).hmod
+	rm -f version.all version.dtd
+	mv -f version_BACKUP.all version.all || echo "Backup Doesn't Exist - Ignoring..."
+	mv -f version_BACKUP.dtd version.dtd || echo "Backup Doesn't Exist - Ignoring..."
+	rm -f *_BACKUP*
@@ -52,8 +52,8 @@ ifeq ($(GRIFFIN_BUILD), 1)
 	OBJ += griffin/griffin.o
 	DEFINES += -DHAVE_GRIFFIN=1 -DHAVE_MENU -DHAVE_RGUI -DHAVE_XMB -DHAVE_MATERIALUI -DHAVE_LIBRETRODB -DHAVE_CC_RESAMPLER
 	DEFINES += -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DWANT_ZLIB
-	DEFINES += -DHAVE_NETWORKING -DHAVE_CHEEVOS -DHAVE_SOCKET_LEGACY -DHAVE_THREADS
-	#-DHAVE_SSL -DMBEDTLS_SSL_DEBUG_ALL
+	#DEFINES += -DHAVE_NETWORKING -DHAVE_CHEEVOS -DRC_DISABLE_LUA -DHAVE_SOCKET_LEGACY -DHAVE_THREADS
+	#-DHAVE_SSL -DHAVE_BUILTINMBEDTLS -DMBEDTLS_SSL_DEBUG_ALL
 	#ssl is currently incompatible with griffin due to use of the "static" flag on repeating functions that will conflict when included in one file
 else
 	HAVE_CC_RESAMPLER = 1
@@ -62,23 +62,25 @@ else
 	HAVE_RPNG = 1
 	HAVE_RJPEG = 1
 	HAVE_RBMP = 1
+	HAVE_MENU = 1
 	HAVE_RGUI = 1
 	HAVE_ZLIB = 1
 	HAVE_7ZIP = 1
 	HAVE_BUILTINZLIB = 1
 	HAVE_LIBRETRODB = 1
-	HAVE_ZARCH = 0
 	HAVE_MATERIALUI = 1
 	HAVE_XMB = 1
 	HAVE_STATIC_VIDEO_FILTERS = 1
 	HAVE_STATIC_AUDIO_FILTERS = 1
-	HAVE_NETWORKING = 1
-	HAVE_CHEEVOS = 1
-	HAVE_SOCKET_LEGACY = 1
-	HAVE_THREADS = 1
-	HAVE_SSL = 1
+	#HAVE_NETWORKING = 1
+	#HAVE_CHEEVOS = 1
+	#HAVE_SOCKET_LEGACY = 1
+	#HAVE_THREADS = 1
+	#HAVE_SSL = 1
+	#HAVE_BUILTINMBEDTLS = 1

 	include Makefile.common
+	CFLAGS += $(DEF_FLAGS)
 	BLACKLIST :=
 	BLACKLIST += input/input_overlay.o
 	BLACKLIST += tasks/task_overlay.o
@@ -104,7 +106,6 @@ MAKEROM_ARGS_COMMON = -rsf $(APP_RSF) -exefslogo -elf $(TARGET).elf -icon $(TARG
 INCDIRS := -I$(CTRULIB)/include
 LIBDIRS := -L. -L$(CTRULIB)/lib

-
 ARCH     := -march=armv6k -mtune=mpcore -mfloat-abi=hard -marm -mfpu=vfp -mtp=soft

 CFLAGS	+=	-mword-relocations \
@@ -130,7 +131,12 @@ ifeq ($(WHOLE_ARCHIVE_LINK), 1)
   WHOLE_END := -Wl,--no-whole-archive
 endif

-CFLAGS += -I. -Ideps -Ideps/libz -Ideps/7zip -Ideps/stb -Ilibretro-common/include
+CFLAGS += -I. \
+			 -Ideps \
+			 -Ideps/libz \
+			 -Ideps/7zip \
+			 -Ideps/stb \
+			 -Ilibretro-common/include

 CFLAGS += -DRARCH_INTERNAL -DRARCH_CONSOLE
 CFLAGS += -DHAVE_FILTERS_BUILTIN $(DEFINES)
@@ -142,7 +148,6 @@ LDFLAGS  +=	-specs=ctr/3dsx_custom.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)

 CFLAGS   += -std=gnu99 -ffast-math

-
 LIBS	:= $(WHOLE_START) -lretro_ctr $(WHOLE_END) -lm

 ifeq ($(DEBUG), 1)
@@ -151,7 +156,6 @@ else
 	LIBS	+= -lctru
 endif

-
 ifeq ($(BUILD_3DSX), 1)
 	TARGET_3DSX := $(TARGET).3dsx $(TARGET).smdh
 endif
@@ -261,7 +265,6 @@ $(TARGET).3ds: $(TARGET).elf $(TARGET).bnr $(TARGET).icn $(APP_RSF)
 $(TARGET).cia: $(TARGET).elf $(TARGET).bnr $(TARGET).icn $(APP_RSF)
 	$(MAKEROM) -f cia -o $@ $(MAKEROM_ARGS_COMMON) -DAPP_ENCRYPTED=false

-
 clean:
 	rm -f $(OBJ)
 	rm -f $(TARGET).3dsx
@@ -275,5 +278,3 @@ clean:
 	rm -f ctr/3dsx_custom_crt0.o

 .PHONY: clean
-
-
@@ -27,6 +27,7 @@ OBJ := ctr/ctr_system.o \
 		 frontend/drivers/platform_null.o \
 		 libretro-common/encodings/encoding_utf.o \
 		 libretro-common/compat/compat_strcasestr.o \
+		 libretro-common/compat/fopen_utf8.o \
 		 libretro-common/file/file_path.o \
 		 libretro-common/string/stdstring.o \
 		 libretro-common/lists/string_list.o \
@@ -94,10 +95,8 @@ LDFLAGS  +=	-specs=ctr/3dsx_custom.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)

 CFLAGS   += -std=gnu99 -ffast-math

-
 LIBS	:= -lctru -lm

-
 ifeq ($(BUILD_3DSX), 1)
 TARGET_3DSX := $(TARGET).3dsx $(TARGET).smdh
 endif
@@ -220,5 +219,3 @@ clean:
 	rm -f ctr/3dsx_custom_crt0.o

 .PHONY: clean
-
-
@@ -7,7 +7,7 @@ PTHREAD = 0
 OS = Emscripten
 OBJ :=
 DEFINES := -DRARCH_INTERNAL -DHAVE_MAIN -s USE_PTHREADS=$(PTHREAD)
-DEFINES += -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DHAVE_GLSL -DHAVE_FILTERS_BUILTIN
+DEFINES += -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DHAVE_GLSL -DHAVE_FILTERS_BUILTIN -DHAVE_STB_FONT

 HAVE_OVERLAY = 1
 HAVE_CC_RESAMPLER = 1
@@ -16,6 +16,7 @@ HAVE_OPENGLES = 1
 HAVE_RJPEG  = 0
 HAVE_RPNG   = 1
 HAVE_EMSCRIPTEN = 1
+HAVE_MENU = 1
 HAVE_RGUI = 1
 HAVE_SDL = 0
 HAVE_SDL2 = 0
@@ -25,6 +26,7 @@ HAVE_SHADERPIPELINE = 1
 HAVE_STATIC_VIDEO_FILTERS = 1
 HAVE_STATIC_AUDIO_FILTERS = 1
 MEMORY = 536870912
+HAVE_STB_FONT = 1

 PRECISE_F32 = 1

@@ -56,7 +58,7 @@ endif

 include Makefile.common

-CFLAGS += -Ideps/libz -Ideps -Ideps/stb
+CFLAGS += $(DEF_FLAGS) -Ideps/libz -Ideps -Ideps/stb
 libretro = libretro_emscripten.bc

 ifneq ($(V), 1)
@@ -158,8 +158,6 @@ else ifeq ($(libogc_platform), 1)
      endif
   endif

-   LIBS += -logc
-
   ifeq ($(EXTERNAL_LIBOGC), 1)
      LIBS += -lfat
   endif
@@ -176,6 +174,8 @@ else ifeq ($(libogc_platform), 1)
      endif
   endif

+   LIBS += -logc
+
   CFLAGS += -DGEKKO -U__INT32_TYPE__ -U __UINT32_TYPE__ -D__INT32_TYPE__=int

   HAVE_RUNAHEAD            := 1
@@ -193,7 +193,7 @@ else ifeq ($(libogc_platform), 1)
   RARCH_CONSOLE             = 1

   ifeq ($(platform), wii)
-      HAVE_LANGEXTRA           := 1
+      #HAVE_LANGEXTRA           := 1
      HAVE_WIIUSB_HID          := 1
      HAVE_RARCH_EXEC          := 1
      HAVE_RSOUND              := 1
@@ -250,7 +250,7 @@ else ifeq ($(platform), psp1)
   HAVE_RBMP                := 1
   HAVE_RTGA                := 1
   HAVE_KERNEL_PRX          := 1
-   HAVE_LANGEXTRA           := 1
+   #HAVE_LANGEXTRA          := 1
   RARCH_CONSOLE             = 1

   ifeq ($(BUILD_PRX), 1)
@@ -320,6 +320,7 @@ else ifeq ($(platform), windows_msvc6_x86)
   HAVE_7ZIP                := 1
   HAVE_NETWORKING          := 0
   HAVE_NETWORK_CMD         := 1
+	HAVE_NETPLAYDISCOVERY    := 1
   HAVE_OVERLAY             := 1
   HAVE_MATERIALUI          := 1
   HAVE_XMB                 := 1
@@ -361,6 +362,7 @@ else ifeq ($(platform), windows_msvc2003_x86)
   HAVE_7ZIP                := 1
   HAVE_NETWORKING          := 1
   HAVE_NETWORK_CMD         := 1
+	HAVE_NETPLAYDISCOVERY    := 1
   HAVE_OVERLAY             := 1
   HAVE_MATERIALUI          := 1
   HAVE_XMB                 := 1
@@ -407,6 +409,7 @@ else ifeq ($(platform), windows_msvc2005_x86)
   HAVE_7ZIP                := 1
   HAVE_NETWORKING          := 1
   HAVE_NETWORK_CMD         := 1
+	HAVE_NETPLAYDISCOVERY    := 1
   HAVE_OVERLAY             := 1
   HAVE_MATERIALUI          := 1
   HAVE_XMB                 := 1
@@ -427,8 +430,8 @@ else ifeq ($(platform), windows_msvc2005_x86)
   CXX = cl.exe
   LD = link.exe

-   PLATCFLAGS += -D_WIN32 -D_WIN32_WINNT=0x0410 -D__STDC_CONSTANT_MACROS -D_MBCS
-   LDFLAGS += shell32.lib user32.lib gdi32.lib comdlg32.lib winmm.lib ole32.lib
+   PLATCFLAGS += -D_WIN32 -D_WIN32_WINNT=0x0410 -D__STDC_CONSTANT_MACROS -D_MBCS -DHAVE_EASTEREGG
+   LDFLAGS += shell32.lib user32.lib gdi32.lib comdlg32.lib winmm.lib ole32.lib msimg32.lib
   
   PATH := $(shell IFS=$$'\n'; cygpath "$(VS80COMNTOOLS)../../VC/bin"):$(PATH)
   PATH := $(PATH):$(shell IFS=$$'\n'; cygpath "$(VS80COMNTOOLS)../IDE")
@@ -454,6 +457,7 @@ else ifneq (,$(findstring windows_msvc2010,$(platform)))
   HAVE_7ZIP                := 1
   HAVE_NETWORKING          := 1
   HAVE_NETWORK_CMD         := 1
+	HAVE_NETPLAYDISCOVERY    := 1
   HAVE_OVERLAY             := 1
   HAVE_MATERIALUI          := 1
   HAVE_XMB                 := 1
@@ -475,7 +479,7 @@ else ifneq (,$(findstring windows_msvc2010,$(platform)))
   LD = link.exe

   PLATCFLAGS += -D_WIN32 -D__STDC_CONSTANT_MACROS -D_MBCS
-   PLATCFLAGS += -D__i686__ -D__SSE__ -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_WINDOWS -DHAVE_CC_RESAMPLER -DHAVE_GL_SYNC -DHAVE_GLSL -DHAVE_IMAGEVIEWER -DHAVE_LANGEXTRA -DHAVE_OPENGL -DHAVE_SHADERPIPELINE -DHAVE_UPDATE_ASSETS -DWIN32
+   PLATCFLAGS += -D__i686__ -D__SSE__ -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_WINDOWS -DHAVE_CC_RESAMPLER -DHAVE_GL_SYNC -DHAVE_GLSL -DHAVE_IMAGEVIEWER -DHAVE_LANGEXTRA -DHAVE_OPENGL -DHAVE_SHADERPIPELINE -DHAVE_UPDATE_ASSETS -DWIN32 -DHAVE_EASTEREGG
   LDFLAGS += shell32.lib user32.lib gdi32.lib comdlg32.lib winmm.lib ole32.lib iphlpapi.lib

   PlatformSuffix = $(subst windows_msvc2010_,,$(platform))
@@ -524,6 +528,7 @@ else ifneq (,$(findstring windows_msvc2012,$(platform)))
   HAVE_7ZIP                := 1
   HAVE_NETWORKING          := 1
   HAVE_NETWORK_CMD         := 1
+	HAVE_NETPLAYDISCOVERY    := 1
   HAVE_OVERLAY             := 1
   HAVE_MATERIALUI          := 1
   HAVE_XMB                 := 1
@@ -545,7 +550,7 @@ else ifneq (,$(findstring windows_msvc2012,$(platform)))
   LD = link.exe

   PLATCFLAGS += -D_WIN32 -D__STDC_CONSTANT_MACROS -D_MBCS
-   PLATCFLAGS += -D__i686__ -D__SSE__ -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_WINDOWS -DHAVE_CC_RESAMPLER -DHAVE_GL_SYNC -DHAVE_GLSL -DHAVE_IMAGEVIEWER -DHAVE_LANGEXTRA -DHAVE_OPENGL -DHAVE_SHADERPIPELINE -DHAVE_UPDATE_ASSETS -DWIN32
+   PLATCFLAGS += -D__i686__ -D__SSE__ -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_WINDOWS -DHAVE_CC_RESAMPLER -DHAVE_GL_SYNC -DHAVE_GLSL -DHAVE_IMAGEVIEWER -DHAVE_LANGEXTRA -DHAVE_OPENGL -DHAVE_SHADERPIPELINE -DHAVE_UPDATE_ASSETS -DWIN32 -DHAVE_EASTEREGG
   LDFLAGS += shell32.lib user32.lib gdi32.lib comdlg32.lib winmm.lib ole32.lib iphlpapi.lib

   PlatformSuffix = $(subst windows_msvc2012_,,$(platform))
@@ -598,6 +603,7 @@ else ifneq (,$(findstring windows_msvc2013,$(platform)))
   HAVE_7ZIP                := 1
   HAVE_NETWORKING          := 1
   HAVE_NETWORK_CMD         := 1
+	HAVE_NETPLAYDISCOVERY    := 1
   HAVE_OVERLAY             := 1
   HAVE_MATERIALUI          := 1
   HAVE_XMB                 := 1
@@ -619,7 +625,7 @@ else ifneq (,$(findstring windows_msvc2013,$(platform)))
   LD = link.exe

   PLATCFLAGS += -D_WIN32 -D__STDC_CONSTANT_MACROS -D_MBCS
-   PLATCFLAGS += -D__i686__ -D__SSE__ -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_WINDOWS -DHAVE_CC_RESAMPLER -DHAVE_GL_SYNC -DHAVE_GLSL -DHAVE_IMAGEVIEWER -DHAVE_LANGEXTRA -DHAVE_OPENGL -DHAVE_SHADERPIPELINE -DHAVE_UPDATE_ASSETS -DWIN32
+   PLATCFLAGS += -D__i686__ -D__SSE__ -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_WINDOWS -DHAVE_CC_RESAMPLER -DHAVE_GL_SYNC -DHAVE_GLSL -DHAVE_IMAGEVIEWER -DHAVE_LANGEXTRA -DHAVE_OPENGL -DHAVE_SHADERPIPELINE -DHAVE_UPDATE_ASSETS -DWIN32 -DHAVE_EASTEREGG
   LDFLAGS += shell32.lib user32.lib gdi32.lib comdlg32.lib winmm.lib ole32.lib iphlpapi.lib

   PlatformSuffix = $(subst windows_msvc2013_,,$(platform))
@@ -672,6 +678,7 @@ else ifneq (,$(findstring windows_msvc2015,$(platform)))
   HAVE_7ZIP                := 1
   HAVE_NETWORKING          := 1
   HAVE_NETWORK_CMD         := 1
+	HAVE_NETPLAYDISCOVERY    := 1
   HAVE_OVERLAY             := 1
   HAVE_MATERIALUI          := 1
   HAVE_XMB                 := 1
@@ -693,7 +700,7 @@ else ifneq (,$(findstring windows_msvc2015,$(platform)))
   LD = link.exe

   PLATCFLAGS += -D_WIN32 -D__STDC_CONSTANT_MACROS -D_MBCS
-   PLATCFLAGS += -D__i686__ -D__SSE__ -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_WINDOWS -DHAVE_CC_RESAMPLER -DHAVE_GL_SYNC -DHAVE_GLSL -DHAVE_IMAGEVIEWER -DHAVE_LANGEXTRA -DHAVE_OPENGL -DHAVE_SHADERPIPELINE -DHAVE_UPDATE_ASSETS -DWIN32
+   PLATCFLAGS += -D__i686__ -D__SSE__ -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_WINDOWS -DHAVE_CC_RESAMPLER -DHAVE_GL_SYNC -DHAVE_GLSL -DHAVE_IMAGEVIEWER -DHAVE_LANGEXTRA -DHAVE_OPENGL -DHAVE_SHADERPIPELINE -DHAVE_UPDATE_ASSETS -DWIN32 -DHAVE_EASTEREGG
   LDFLAGS += shell32.lib user32.lib gdi32.lib comdlg32.lib winmm.lib ole32.lib iphlpapi.lib

   PlatformSuffix = $(subst windows_msvc2015_,,$(platform))
@@ -857,6 +864,10 @@ ifeq ($(HAVE_NETWORKING), 1)
   CFLAGS      += -DHAVE_NETWORKING
 endif

+ifeq ($(HAVE_NETPLAYDISCOVERY), 1)
+   CFLAGS      += -DHAVE_NETPLAYDISCOVERY
+endif
+
 ifeq ($(RARCH_CONSOLE), 1)
   CFLAGS += -DRARCH_CONSOLE
 endif
@@ -1063,7 +1074,6 @@ overlays-checkout:
      $(GIT) clone git://github.com/libretro/common-overlays.git $(OVERLAY_DIR); \
   fi

-
 clean:
 	rm -f $(EXT_TARGET)
 	rm -f $(EXT_INTER_TARGET)
@@ -0,0 +1,259 @@
+include version.all
+
+#---------------------------------------------------------------------------------
+.SUFFIXES:
+#---------------------------------------------------------------------------------
+
+ifeq ($(strip $(DEVKITPRO)),)
+$(error "Please set DEVKITPRO in your environment. export DEVKITPRO=<path to>/devkitpro")
+endif
+
+TOPDIR ?= $(CURDIR)
+include $(DEVKITPRO)/libnx/switch_rules
+
+TARGET := retroarch_switch
+
+DEBUG                  ?= 0
+WHOLE_ARCHIVE_LINK      = 0
+GRIFFIN_BUILD           = 0
+
+OBJ := 
+
+# For threading we need to overwrite some vars with global defines because devkitPro's includes 
+# make it hard for us. This works for the pthread wrapper
+DEFINES_THREAD := -Dpthread_t=Thread -Dpthread_mutex_t=Mutex -Dpthread_mutexattr_t='void*' -Dpthread_attr_t=int -Dpthread_cond_t=CondVar -Dpthread_condattr_t='int' -D_SYS__PTHREADTYPES_H_
+DEFINES := -D__SWITCH__=1 -U__linux__ -U__linux -DGLM_FORCE_PURE=1 -DRARCH_CONSOLE -DRARCH_INTERNAL -DGLOBAL_CONFIG_DIR='"/switch"' $(DEFINES_THREAD) -DHAVE_STB_VORBIS
+
+HAVE_CC_RESAMPLER = 1
+HAVE_MENU_COMMON = 1
+HAVE_RTGA = 1
+HAVE_RPNG = 1
+HAVE_RJPEG = 1
+HAVE_RBMP = 1
+HAVE_ZLIB = 1
+HAVE_BUILTINZLIB = 1
+HAVE_LIBRETRODB = 1
+HAVE_STATIC_VIDEO_FILTERS = 1
+HAVE_STATIC_AUDIO_FILTERS = 1
+HAVE_MENU = 1
+HAVE_RUNAHEAD = 1
+HAVE_NETWORKING = 1
+HAVE_NETPLAYDISCOVERY = 1
+HAVE_STB_FONT = 1
+HAVE_CHEEVOS = 1
+HAVE_CHD = 0 # disabled due to static libretro-common and libchdr conflicts between different cores
+HAVE_STB_VORBIS = 1
+
+# RetroArch libnx useful flags
+HAVE_THREADS = 1
+HAVE_PTHREADS = 1
+HAVE_FREETYPE = 0
+HAVE_SWITCH = 1
+HAVE_LIBNX = 1
+HAVE_OPENGL = 1
+HAVE_LANGEXTRA = 1
+
+ifeq ($(HAVE_OPENGL), 1)
+  HAVE_EGL = 1
+  HAVE_SHADERPIPELINE = 1
+  HAVE_RGUI = 1
+  HAVE_MATERIALUI = 1
+  HAVE_XMB = 1
+  HAVE_OZONE = 1
+  HAVE_OVERLAY = 1
+else
+  HAVE_RGUI = 1
+  HAVE_MATERIALUI = 0
+  HAVE_XMB = 0
+  HAVE_OZONE = 0
+  HAVE_STRIPES = 0
+endif
+
+include Makefile.common
+BLACKLIST :=
+
+OBJ := $(filter-out $(BLACKLIST),$(OBJ))
+
+#---------------------------------------------------------------------------------
+# TARGET is the name of the output
+# BUILD is the directory where object files & intermediate files will be placed
+# SOURCES is a list of directories containing source code
+# DATA is a list of directories containing data files
+# INCLUDES is a list of directories containing header files
+# EXEFS_SRC is the optional input directory containing data copied into exefs, if anything this normally should only contain "main.npdm".
+# ROMFS is the directory containing data to be added to RomFS, relative to the Makefile (Optional)
+#
+# NO_ICON: if set to anything, do not use icon.
+# NO_NACP: if set to anything, no .nacp file is generated.
+# APP_TITLE is the name of the app stored in the .nacp file (Optional)
+# APP_AUTHOR is the author of the app stored in the .nacp file (Optional)
+# APP_VERSION is the version of the app stored in the .nacp file (Optional)
+# APP_TITLEID is the titleID of the app stored in the .nacp file (Optional)
+# ICON is the filename of the icon (.jpg), relative to the project folder.
+#   If not set, it attempts to use one of the following (in this order):
+#     - <Project name>.jpg
+#     - icon.jpg
+#     - <libnx folder>/default_icon.jpg
+#---------------------------------------------------------------------------------
+BUILD := build
+SOURCES := $(CURDIR)/source
+DATA := data
+INCLUDES :=	include
+EXEFS_SRC := exefs_src
+#ROMFS := switch/romfs
+
+APP_TITLE := RetroArch
+APP_VERSION := $(RARCH_VERSION)
+APP_AUTHOR := libretro Team
+APP_ICON := pkg/libnx/retroarch.jpg
+
+#---------------------------------------------------------------------------------
+# options for code generation
+#---------------------------------------------------------------------------------
+ARCH	:=	-march=armv8-a -mtune=cortex-a57 -mtp=soft -fPIE -mcpu=cortex-a57+crc+fp+simd
+
+CFLAGS := -g -Wall -O3 -ffast-math -ffunction-sections \
+          $(ARCH) $(DEFINES) -Ideps -Ideps/libz -Ilibretro-common/include -Ideps/stb -I$(LIBNX)/include -I$(PORTLIBS)/include/ -include $(LIBNX)/include/switch.h #$(shell $(PORTLIBS)/bin/freetype-config --cflags)
+
+CFLAGS += $(INCLUDE) -DSWITCH=1 -DHAVE_LIBNX=1 -DNXLINK=1 -DHAVE_SHADERPIPELINE -DHAVE_UPDATE_ASSETS -DHAVE_STB_FONT #-DHAVE_FREETYPE
+
+ifeq ($(strip $(HAVE_STATIC_DUMMY)),1)
+  CFLAGS	+=	-DHAVE_STATIC_DUMMY=1
+endif
+
+# The following line works around an issue in newlib that produces a compilation
+# error in glm. It will be removed as soon as this issue is resolved.
+CFLAGS	+= -D_GLIBCXX_USE_C99_MATH_TR1 -D_LDBL_EQ_DBL
+
+CXXFLAGS	:= $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11
+
+ASFLAGS	:=	-g $(ARCH)
+LDFLAGS	=	-specs=$(DEVKITPRO)/libnx/switch.specs $(ARCH) -Wl,--allow-multiple-definition -Wl,-Map,$(notdir $*.map)
+
+LIBS	:= -lstdc++ -lbz2 -lpng -lz -lnx -lm
+
+ifeq ($(HAVE_OPENGL), 1)
+  LIBS := -lEGL -lglapi -ldrm_nouveau $(LIBS)
+endif
+
+#---------------------------------------------------------------------------------
+# list of directories containing libraries, this must be the top level containing
+# include and lib
+#---------------------------------------------------------------------------------
+LIBDIRS := $(PORTLIBS) $(LIBNX)
+
+#---------------------------------------------------------------------------------
+# no real need to edit anything past this point unless you need to add additional
+# rules for different file extensions
+#---------------------------------------------------------------------------------
+ifneq ($(BUILD),$(notdir $(CURDIR)))
+#---------------------------------------------------------------------------------
+
+export OUTPUT	:=	$(TARGET)
+export TOPDIR	:=	$(CURDIR)
+
+export VPATH	:=	$(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) \
+			$(foreach dir,$(DATA),$(CURDIR)/$(dir))
+
+export DEPSDIR	:=	$(CURDIR)/
+
+CFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c)))
+CPPFILES	:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp)))
+SFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s)))
+BINFILES	:=	$(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.*)))
+
+#---------------------------------------------------------------------------------
+# use CXX for linking C++ projects, CC for standard C
+#---------------------------------------------------------------------------------
+ifeq ($(strip $(CPPFILES)),)
+#---------------------------------------------------------------------------------
+	export LD	:=	$(CC)
+#---------------------------------------------------------------------------------
+else
+#---------------------------------------------------------------------------------
+	export LD	:=	$(CXX)
+#---------------------------------------------------------------------------------
+endif
+#---------------------------------------------------------------------------------
+
+export OFILES 	:=	$(OBJ)
+
+ifeq ($(strip $(HAVE_STATIC_DUMMY)),)
+  OFILES += libretro_libnx.a
+endif
+
+export HFILES_BIN	:=	$(addsuffix .h,$(subst .,_,$(BINFILES)))
+
+export INCLUDE	:=	$(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \
+			$(foreach dir,$(LIBDIRS),-I$(dir)/include) \
+			-I$(CURDIR)/$(BUILD)
+
+export LIBPATHS	:=	$(foreach dir,$(LIBDIRS),-L$(dir)/lib)
+
+export BUILD_EXEFS_SRC := $(TOPDIR)/$(EXEFS_SRC)
+
+ifeq ($(strip $(ICON)),)
+	icons := $(wildcard *.jpg)
+	ifneq (,$(findstring $(TARGET).jpg,$(icons)))
+		export APP_ICON := $(TOPDIR)/$(TARGET).jpg
+	else
+		ifneq (,$(findstring icon.jpg,$(icons)))
+			export APP_ICON := $(TOPDIR)/icon.jpg
+		endif
+	endif
+else
+	export APP_ICON := $(TOPDIR)/$(ICON)
+endif
+
+ifeq ($(strip $(NO_ICON)),)
+	export NROFLAGS += --icon=$(APP_ICON)
+endif
+
+ifeq ($(strip $(NO_NACP)),)
+	export NROFLAGS += --nacp=$(CURDIR)/$(TARGET).nacp
+endif
+
+ifneq ($(APP_TITLEID),)
+	export NACPFLAGS += --titleid=$(APP_TITLEID)
+endif
+
+ifneq ($(ROMFS),)
+	export NROFLAGS += --romfsdir=$(CURDIR)/$(ROMFS)
+endif
+
+DEPENDS_TMP  := $(OFILES:.o=.d)
+DEPENDS      := $(filter-out libretro_libnx.a,$(DEPENDS_TMP))
+
+.PHONY: clean all
+
+#---------------------------------------------------------------------------------
+# main targets
+#---------------------------------------------------------------------------------
+all	:	$(OUTPUT).pfs0 $(OUTPUT).nro
+
+$(OUTPUT).pfs0	:	$(OUTPUT).nso
+
+$(OUTPUT).nso	:	$(OUTPUT).elf
+
+ifeq ($(strip $(NO_NACP)),)
+$(OUTPUT).nro	:	$(OUTPUT).elf $(OUTPUT).nacp
+else
+$(OUTPUT).nro	:	$(OUTPUT).elf
+endif
+
+$(OUTPUT).elf	:	$(OBJ)
+
+clean:
+	rm -f $(DEPENDS) $(OBJ) $(OUTPUT).pfs0 $(OUTPUT).nro $(OUTPUT).elf
+
+#---------------------------------------------------------------------------------
+# you need a rule like this for each extension you use as binary data
+#---------------------------------------------------------------------------------
+%.bin.o	%_bin.h :	%.bin
+#---------------------------------------------------------------------------------
+	@echo $(notdir $<)
+	@$(bin2o)
+
+#---------------------------------------------------------------------------------------
+endif
+#---------------------------------------------------------------------------------------
@@ -45,7 +45,6 @@ export CXX	:=	$(PREFIX)g++
 export AR	:=	$(PREFIX)ar
 export OBJCOPY	:=	$(PREFIX)objcopy

-
 ISVC=$(or $(VCBUILDHELPER_COMMAND),$(MSBUILDEXTENSIONSPATH32),$(MSBUILDEXTENSIONSPATH))

 #---------------------------------------------------------------------------------
@@ -131,7 +130,6 @@ INCLUDES	:=	$(DEFINCS) \

 MACHDEP		:= -DBIGENDIAN -DGEKKO -mcpu=750 -meabi -msdata=eabi -mhard-float -ffunction-sections -fdata-sections

-
 ifeq ($(PLATFORM),wii)
 MACHDEP		+=	-DHW_RVL
 endif
@@ -159,7 +157,6 @@ VPATH :=	$(LWIPDIR)				\
 			$(LIBWIIKEYB)		\
 			$(STUBSDIR)

-
 #---------------------------------------------------------------------------------
 SOURCES_LWIP := $(LWIPDIR)/network.c \
 					 $(LWIPDIR)/netio.c \
@@ -264,7 +261,6 @@ SOURCES_OGC_ASM := $(OGCDIR)/cache_asm.S \
 						 $(OGCDIR)/system_asm.S \
 						 $(OGCDIR)/video_asm.S

-
 ifneq ($(BUILD_LITE), 1)
 SOURCES_OGC += $(OGCDIR)/dvd.c
 endif
@@ -7,7 +7,6 @@ ARCH            = amd64
 BUILD_DIR       = objs/msvc
 CXX_BUILD       = 0

-
 WindowsSdkDir = C:\Program Files (x86)\Windows Kits\10\$(NOTHING)
 WindowsSDKVersion := 10.0.14393.0\$(NOTHING)
 VCINSTALLDIR := C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\$(NOTHING)
@@ -30,6 +29,7 @@ HAVE_WINMM               := 1
 HAVE_RPNG                := 1
 HAVE_ZLIB                := 1
 WANT_ZLIB                := 1
+HAVE_MENU                := 1
 HAVE_RGUI                := 1
 HAVE_XMB                 := 1
 HAVE_MATERIALUI          := 1
@@ -59,7 +59,7 @@ HAVE_IMAGEVIEWER         := 1

 include Makefile.common
 INCLUDE_DIRS := $(patsubst  -isystem%,-I%,$(INCLUDE_DIRS))
-CFLAGS       := $(filter-out  -Wno-unknown-pragmas,$(CFLAGS))
+CFLAGS       := $(filter-out  -Wno-unknown-pragmas,$(DEF_FLAGS))
 CXXFLAGS     := $(filter-out  -fpermissive -Wno-switch -Wno-sign-compare -fno-strict-aliasing -Wno-maybe-uninitialized -Wno-reorder -Wno-parentheses,$(CXXFLAGS))
 LIBS         := $(filter-out  -lstdc++,$(LIBS))

@@ -90,14 +90,12 @@ ifeq ($(ARCH),x86)
 CROSS =
 endif

-
 INCLUDE := $(VCINSTALLDIR)include;$(VCINSTALLDIR)atlmfc\include;$(WindowsSdkDir)include\$(WindowsSDKVersion)ucrt;$(WindowsSdkDir)include\$(WindowsSDKVersion)shared;$(WindowsSdkDir)include\$(WindowsSDKVersion)um;
 LIB     := $(VCINSTALLDIR)LIB\$(CROSS);$(VCINSTALLDIR)atlmfc\lib\$(CROSS);$(WindowsSdkDir)lib\$(WindowsSDKVersion)ucrt\$(TARGET_ARCH2);$(WindowsSdkDir)lib\$(WindowsSDKVersion)um\$(TARGET_ARCH2);C:\Program Files (x86)\NVIDIA Corporation\Cg\lib.$(TARGET_ARCH2);C:\Program Files (x86)\Microsoft DirectX SDK (February 2010)\Lib\$(TARGET_ARCH2);
 LIBPATH := $(VCINSTALLDIR)LIB\$(CROSS);$(VCINSTALLDIR)atlmfc\lib\$(CROSS);

 PATH := $(shell IFS=$$'\n'; cygpath "$(VCINSTALLDIR)bin\\$(CROSS)"):$(shell IFS=$$'\n'; cygpath "$(WindowsSdkDir)\bin\\$(ARCH2)"):$(PATH)

-
 export INCLUDE := $(INCLUDE)
 export LIB     := $(LIB)
 export LIBPATH := $(LIBPATH)
@@ -144,7 +142,6 @@ RC = rc.exe
 LIBS += shell32.lib user32.lib gdi32.lib comdlg32.lib winmm.lib ole32.lib
 LDFLAGS  += -nologo -wx -nxcompat -machine:$(TARGET_ARCH2)

-
 ifeq ($(DEBUG),1)
   FLAGS += -GS -Gy -Od -RTC1 -D_SECURE_SCL=1 -Zi
   FLAGS += -MDd
@@ -155,7 +152,6 @@ else
   FLAGS += -MD
 endif

-
 ifeq ($(DEBUG),1)
   BUILD_DIR := $(BUILD_DIR)-debug
 endif
@@ -170,7 +166,6 @@ ifneq ($(V), 1)
   Q := @
 endif

-
 ifeq ($(GRIFFIN_BUILD), 1)
   OBJ       := griffin/griffin.o griffin/griffin_cpp.o
   DEFINES   += -DHAVE_GRIFFIN -DUSE_MATH_DEFINES
@@ -188,9 +183,6 @@ OBJ := $(patsubst %rarch.o,%rarch.res,$(OBJ))
 OBJ := $(addprefix $(BUILD_DIR)/,$(OBJ))
 OBJ := $(OBJ:.o=.obj)

-
-
-
 LDFLAGS += -WX -SUBSYSTEM:WINDOWS -ENTRY:mainCRTStartup

 DEFINES := $(patsubst -f%,,$(DEFINES))
@@ -198,7 +190,6 @@ LDFLAGS := $(patsubst -l%,%.lib,$(LDFLAGS))
 LIBS := $(filter-out -lm,$(LIBS))
 LIBS := $(patsubst -l%,%.lib,$(LIBS))

-
 #$(info INCLUDE_DIRS : $(INCLUDE_DIRS))
 #$(info DEFINES : $(DEFINES))
 #$(info CFLAGS : $(CFLAGS))
@@ -1,62 +0,0 @@
-# Hakchi version added to ease confusion amongst Hakchi community due to messy past...
-#
-# Make sure you have readelf installed (sudo apt-get install readelf) to patch the binary
-# Might not be needed for your build but it's a useful tool and for safety it should be
-# run anyway to ensure the SDL2 link isn't broken...
-
-HAKCHI_VER := Hakchi_Retroarch_Neo_v1_7_3b
-HAKCHI_NAME := "Hakchi RetroArch 'Neo' v1.7.3b
-MOD_CREATOR := TheOtherGuys
-MOD_CATEGORY := RetroArch
-
-HAKCHI_DIR := hakchi
-TARGET := retroarch
-GIT_COMMIT := $(shell echo "`git rev-parse --short HEAD``git diff-index --quiet HEAD -- || echo '-dirty'`")
-
-all: $(TARGET)
-
-retroarch:
-	readelf -v #Check if you have readelf installed... (sudo apt-get install readelf)
-	./configure --host=arm-linux-gnueabihf --disable-freetype --enable-opengles --enable-udev --enable-alsa --enable-neon --enable-floathard
-	make -f Makefile -j HAVE_HAKCHI=1
-	patchelf --replace-needed libSDL2-2.0.so.0 libSDL2.so retroarch #libSDL2-2.0.so.0 sym link doesn't exist on native build. Just patch the binary...
-	#/usr/bin/arm-linux-gnueabihf-strip retroarch
-	rm -f $(HAKCHI_DIR)/bin/retroarch
-	cp retroarch $(HAKCHI_DIR)/bin/retroarch
-	echo $$(echo "Built by: " $$USER @ $$(date) \\\\\\ Git Commit: $(GIT_COMMIT)) > $(HAKCHI_DIR)/etc/libretro/retroarch_version
-	cp $(HAKCHI_DIR)/readme.md $(HAKCHI_DIR)/readme_COPY.md
-	printf "%s\n" \
-	"---" \
-	"Name: $(HAKCHI_VER)" \
-	"Creator: $(MOD_CREATOR)" \
-	"Category: $(MOD_CATEGORY)" \
-	"Version: $(HAKCHI_VER)" \
-	"Built on: $(shell date)" \
-	"Git commit: $(GIT_COMMIT)" \
-	"---" > $(HAKCHI_DIR)/readme.md
-	cat $(HAKCHI_DIR)/readme_COPY.md >> $(HAKCHI_DIR)/readme.md
-	rm $(HAKCHI_DIR)/readme_COPY.md
-	@echo "** BUILDING HAKCHI $(HAKCHI_VER) HMOD PACKAGE **"
-	cd $(HAKCHI_DIR)/; tar -czvf "$(HAKCHI_VER).hmod" *
-	mv $(HAKCHI_DIR)/$(HAKCHI_VER).hmod .
-	@echo "** BUILT HAKCHI $(HAKCHI_VER) HMOD PACKAGE **"
-clean:
-	rm -f *.o
-	rm -f audio/*.o
-	rm -f conf/*.o
-	rm -f gfx/*.o
-	rm -f gfx/drivers_font/*.o
-	rm -f gfx/drivers_font_renderer/*.o
-	rm -f gfx/drivers_context/*.o
-	rm -f gfx/py_state/*.o
-	rm -f compat/*.o
-	rm -f record/*.o
-	rm -f input/*.o
-	rm -f tools/*.o
-	rm -f $(BINDIR)/retroarch
-	rm -f $(BINDIR)/retroarch-joyconfig
-	rm -f $(PNDDIR)/readme.html
-	rm -f retroarch
-	rm -f $(HAKCHI_DIR)/bin/retroarch
-	rm -f $(HAKCHI_VER).hmod
-	rm -f $(HAKCHI_DIR)/etc/libretro/retroarch_version
@@ -0,0 +1,166 @@
+TARGET		    := retroarch_orbis
+DEBUG               ?= 0
+GRIFFIN_BUILD        = 0
+WHOLE_ARCHIVE_LINK   = 0
+
+PS4_TITLE_ID	:= RETROARCH
+PS4_TITLE_NAME	:= RetroArch
+
+PC_DEVELOPMENT_IP_ADDRESS  =
+PC_DEVELOPMENT_UDP_PORT	   =
+
+OBJ :=
+
+DEFINES :=
+
+ifeq ($(GRIFFIN_BUILD), 1)
+	OBJ += griffin/griffin.o
+	DEFINES += -DHAVE_GRIFFIN=1
+	DEFINES += -DHAVE_MENU -DHAVE_LIBRETRODB
+	DEFINES += -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DWANT_ZLIB -DHAVE_CC_RESAMPLER
+	ifeq ($(DEBUG), 1)
+		DEFINES += -DHAVE_NETLOGGER
+	endif
+else
+
+	HAVE_FILTERS_BUILTIN	:= 1
+	HAVE_LANGEXTRA		:= 0
+	HAVE_RPNG		:= 1
+	HAVE_RJPEG		:= 1
+	HAVE_RBMP		:= 1
+	HAVE_RTGA		:= 1
+	HAVE_ZLIB		:= 1
+	HAVE_OVERLAY		:= 1
+	HAVE_7ZIP		:= 1
+	HAVE_EGL 		:= 1
+	HAVE_OPENGLES  		:= 1
+	HAVE_NETWORKING		:= 0
+	HAVE_SOCKET_LEGACY	:= 0
+	HAVE_MENU		:= 1
+	HAVE_MENU_COMMON	:= 1
+	HAVE_RGUI		:= 0
+	HAVE_MATERIALUI 	:= 0
+	HAVE_XMB		:= 1
+	HAVE_THREADS		:= 1
+	HAVE_LIBRETRODB		:= 1
+	HAVE_CC_RESAMPLER	:= 1
+	HAVE_CHEEVOS		:= 1
+	RARCH_CONSOLE		:= 1
+	HAVE_STATIC_VIDEO_FILTERS = 1
+	HAVE_STATIC_AUDIO_FILTERS = 1
+
+	ifeq ($(DEBUG), 1)
+		HAVE_NETLOGGER = 1
+	endif
+
+	include Makefile.common
+	CFLAGS += $(DEF_FLAGS)
+	BLACKLIST :=
+	OBJ := $(filter-out $(BLACKLIST),$(OBJ))
+
+	OBJ += input/drivers/ps4_input.o
+	OBJ += input/drivers_joypad/ps4_joypad.o
+	OBJ += audio/drivers/psp_audio.o
+	#OBJ += frontend/drivers/platform_orbis.o
+endif
+
+ifeq ($(strip $(PS4SDK)),)
+$(error "Please set PS4SDK in your environment. export PS4SDK=<path to>ps4sdk")
+endif
+
+export PATH := $(PATH):$(PS4SDK)/bin
+
+PREFIX :=
+
+CC      := $(PREFIX)clang
+CXX     := $(PREFIX)clang
+AS      := $(PREFIX)clang
+AR      := $(PREFIX)ar
+OBJCOPY := $(PREFIX)objcopy
+STRIP   := $(PREFIX)strip
+NM      := $(PREFIX)nm
+LD      := $(CXX)
+
+INCDIRS := -I. -Ideps/libz -Ideps/7zip -Ilibretro-common/include -Ideps/stb
+LIBDIRS := -L.
+
+ARCHFLAGS := -m64 -DORBIS
+CFLAGS    += $(ARCHFLAGS) -std=c11 -mcmodel=large -ffreestanding -nostdlib -nostdinc -fno-builtin -fno-stack-protector
+
+ifeq ($(DEBUG), 1)
+   CFLAGS += -O2 -g
+else
+   CFLAGS += -O3
+endif
+
+ASFLAGS := $(ARCHFLAGS) -I$(PS4SDK)/include -target x86_64-scei-ps4-elf -fPIE
+LDFLAGS := -O3 -Wall -m64 -nostartfiles -nostdlib -L$(PS4SDK)/lib -pie
+ARFLAGS := rcs
+
+CRTFILE ?= $(PS4SDK)/crt0.s
+
+CFLAGS += -Wall -pedantic -Wno-zero-length-array -Wno-format-pedantic
+CFLAGS += -D__PS4__ -I$(PS4SDK)/include -I $(PS4SDK)/include/sce
+CFLAGS += -target x86_64-scei-ps4-elf -fPIE
+CFLAGS += -DRARCH_INTERNAL -DRARCH_CONSOLE
+CFLAGS += -DHAVE_FILTERS_BUILTIN $(DEFINES)
+
+ifneq ($(PC_DEVELOPMENT_IP_ADDRESS),)
+   CFLAGS += -DPC_DEVELOPMENT_IP_ADDRESS='"$(PC_DEVELOPMENT_IP_ADDRESS)"'
+endif
+
+ifneq ($(PC_DEVELOPMENT_UDP_PORT),)
+   CFLAGS += -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT)
+endif
+
+ifeq ($(WHOLE_ARCHIVE_LINK), 1)
+   WHOLE_START := -Wl,--whole-archive
+   WHOLE_END := -Wl,--no-whole-archive
+endif
+CXXFLAGS := $(CFLAGS) 
+
+PS4_LIBS := -lps4link -ldebugnet -lorbisFile -lelfloader -lorbisKeyboard -lorbis2d -lpng -lz -lorbisGl -lorbisPad -lorbisAudio -lmod -lorbisFileBrowser -lorbisXbmFont -lSceNet_stub -lScePigletv2VSH_stub -lSceSystemService_stub -lSceUserService_stub -lScePad_stub -lSceAudioOut_stub -lSceIme_stub -lSceSysmodule_stub \
+	-lPs4_extension_kernel_call_standard -lPs4_extension_kernel_execute_dynlib_prepare_dlclose -lPs4_common_kernel -lPs4_common_user -lPs4_common_generic -lPs4LibCInternalAdaptive_stub -lPs4LibKernelAdaptive_stub -lSceLibcInternal_stub -lkernel_stub -lps4Kernel_stub -lPs4_base_stub_resolve_minimal -lPs4_base_kernel_dlsym_standard -lPs4_base_kernel_seek_elf_address_standard -lPs4_base_assembler_register_parameter_standard -lPs4_base_assembler_system_call_standard
+
+LIBS	:= $(WHOLE_START) -lretro_orbis $(WHOLE_END) $(PS4_LIBS) 
+
+TARGETS := $(TARGET).elf
+
+DEPFLAGS    = -MT $@ -MMD -MP -MF $*.Tdepend
+POSTCOMPILE = mv -f $*.Tdepend $*.depend
+
+all: $(TARGETS)
+
+%.o: %.cpp
+%.o: %.cpp %.depend
+	$(CXX) -c -o $@ $< $(CXXFLAGS) $(INCDIRS) $(DEPFLAGS)
+	$(POSTCOMPILE)
+
+%.o: %.c
+%.o: %.c %.depend
+	$(CC) -c -o $@ $< $(CFLAGS) $(INCDIRS) $(DEPFLAGS)
+	$(POSTCOMPILE)
+
+%.o: %.S
+%.o: %.S %.depend
+	$(CC) -c -o $@ $< $(ASFLAGS) $(INCDIRS) $(DEPFLAGS)
+	$(POSTCOMPILE)
+
+%.o: %.s
+%.o: %.s %.depend
+	$(CC) -c -o $@ $< $(ASFLAGS) $(INCDIRS) $(DEPFLAGS)
+	$(POSTCOMPILE)
+
+%.depend: ;
+
+$(TARGET).elf: $(OBJ) libretro_orbis.a
+	$(LD) $(CRTFILE) $(OBJ) $(LDFLAGS) $(LIBDIRS) $(LIBS) -o $@
+
+clean:
+	rm -f $(OBJ) $(TARGET).elf 
+	rm -f $(OBJ:.o=.depend)
+
+.PHONY: clean all 
+.PRECIOUS: %.depend
+
+-include $(OBJ:.o=.depend)
@@ -52,4 +52,3 @@ clean:
 	rm -f $(BINDIR)/retroarch-joyconfig
 	rm -f $(PNDDIR)/readme.html
 	rm -f retroarch
-
@@ -0,0 +1,114 @@
+BUILD_PRX          = 0
+DEBUG              = 0
+HAVE_KERNEL_PRX    = 0
+HAVE_LOGGER        = 0
+HAVE_FILE_LOGGER   = 0
+HAVE_THREADS       = 0
+BIG_STACK          = 0
+MUTE_WARNINGS      = 0
+PS2_IP = 192.168.1.150
+
+#Configuration for IRX
+EE_BIN2O = bin2o
+IRX_DIR = $(PS2SDK)/iop/irx
+
+TARGET = retroarchps2.elf
+TARGET_RELEASE = retroarchps2-release.elf
+
+ifeq ($(DEBUG), 1)
+   OPTIMIZE_LV	:= -O0 -g
+	RARCH_DEFINES += -DDEBUG
+else
+   OPTIMIZE_LV	:= -O2
+	LDFLAGS :=  -s
+endif
+
+ifeq ($(MUTE_WARNINGS), 1)
+   DISABLE_WARNINGS := -Wno-sign-compare -Wno-unused -Wno-parentheses
+endif
+
+INCDIR = -I$(PS2DEV)/gsKit/include -I$(PS2SDK)/ports/include
+INCDIR += -Ips2 -Ips2/include -Ilibretro-common/include
+INCDIR += -Ideps -Ideps/stb -Ideps/libz -Ideps/7zip -Ideps/pthreads -Ideps/pthreads/platform/ps2 -Ideps/pthreads/platform/helper
+GPVAL = -G0
+CFLAGS = $(OPTIMIZE_LV) $(DISABLE_WARNINGS) -ffast-math -fsingle-precision-constant
+ASFLAGS = $(CFLAGS)
+
+RARCH_DEFINES += -DPS2 -DUSE_IOP_CTYPE_MACRO -D_MIPS_ARCH_R5900 -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DWANT_ZLIB
+RARCH_DEFINES += -DHAVE_GRIFFIN=1 -DRARCH_INTERNAL -DRARCH_CONSOLE -DHAVE_MENU -DHAVE_RGUI -DHAVE_FILTERS_BUILTIN -DHAVE_7ZIP -DHAVE_CC_RESAMPLER
+
+LIBDIR =
+LDFLAGS += -L$(PS2SDK)/ports/lib -L$(PS2DEV)/gsKit/lib -L$(PS2SDK)/ee/lib -L.
+LIBS += -lretro_ps2 -lgskit -ldmakit -lgskit_toolkit -laudsrv -lpad -lmc -lhdd -lsdl -lfileXio -lpatches -lpoweroff
+
+#IRX modules
+# IRX modules - modules have to be in IRX_DIR
+IRX = iomanX.irx fileXio.irx mcman.irx mcserv.irx usbd.irx usbhdfsd.irx freesd.irx audsrv.irx poweroff.irx ps2dev9.irx ps2atad.irx ps2hdd.irx ps2fs.irx
+IRX_OBJ = $(IRX:.irx=.o)
+EE_OBJS += $(IRX_OBJ)
+
+ifeq ($(HAVE_THREADS), 1)
+RARCH_DEFINES += -DHAVE_THREADS
+endif
+
+ifeq ($(HAVE_FILE_LOGGER), 1)
+CFLAGS += -DHAVE_FILE_LOGGER
+endif
+
+ifeq ($(HAVE_KERNEL_PRX), 1)
+CFLAGS += -DHAVE_KERNEL_PRX
+endif
+
+ifeq ($(BIG_STACK), 1)
+CFLAGS += -DBIG_STACK
+endif
+
+CFLAGS += $(RARCH_DEFINES)
+
+# Missing objecst on the PS2SDK
+EE_OBJS += ps2/compat_files/compat_ctype.o ps2/compat_files/time.o
+
+#EE_OBJS = griffin/griffin.o bootstrap/ps2/kernel_functions.o
+EE_OBJS += griffin/griffin.o
+
+EE_CFLAGS = $(CFLAGS)
+EE_CXXFLAGS = $(CFLAGS)
+EE_LDFLAGS = $(LDFLAGS)
+EE_LIBS = $(LIBS)
+EE_ASFLAGS = $(ASFLAGS)
+EE_INCS = $(INCDIR)
+EE_IRX_OBJ = $(IRX_OBJ) 
+EE_BIN = $(TARGET)
+EE_GPVAL = $(GPVAL)
+
+all: $(EE_IRX_OBJ) $(EE_BIN)
+
+clean:
+	rm -f $(EE_BIN) $(EE_OBJS)
+
+prepare:
+	ps2client -h $(PS2_IP) reset
+	ps2client -h $(PS2_IP) netdump
+
+run:
+	ps2client -h $(PS2_IP) execee host:$(EE_BIN)
+
+debug: clean prepare all run
+
+package:
+	ps2-packer $(EE_BIN) $(TARGET_RELEASE)
+
+release: clean all package
+
+#Specific file name and output per IRX Module
+$(EE_IRX_OBJ):
+	$(EE_BIN2O) $(EE_GPVAL) $(IRX_DIR)/$(@:.o=.irx) $@ $(@:.o=_irx)
+
+#Include preferences
+include $(PS2SDK)/samples/Makefile.pref 
+include $(PS2SDK)/samples/Makefile.eeglobal
+
+#Linking with C++
+$(EE_BIN): $(EE_OBJS) $(PS2SDK)/ee/startup/crt0.o
+	$(EE_CXX) $(EE_NO_CRT) -T$(PS2SDK)/ee/startup/linkfile $(EE_CXXFLAGS) \
+		-o $(EE_BIN) $(PS2SDK)/ee/startup/crt0.o $(CRTI_OBJ) $(CRTBEGIN_OBJ) $(EE_OBJS) $(CRTEND_OBJ) $(CRTN_OBJ) $(EE_LDFLAGS) $(EE_LIBS)
@@ -112,7 +112,7 @@ PPU_LDLIBS =  $(FONT_LIBS) $(GL_LIBS) $(WHOLE_START) -lretro_ps3 $(WHOLE_END) -l

 PPU_RANLIB = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ranlib.exe

-DEFINES += -DHAVE_THREADS -DRARCH_CONSOLE -DHAVE_OPENGL -DHAVE_HEADSET -DHAVE_LANGEXTRA -DHAVE_OPENGLES -DHAVE_OPENGLES1 -DHAVE_PSGL -DHAVE_CG -DHAVE_CG_RUNTIME_COMPILER -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_RSOUND -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DHAVE_7Z -DWANT_ZLIB -D__CELLOS_LV2__ -DHAVE_NETWORKING=1 -DHAVE_SOCKET_LEGACY=1 -DHAVE_MOUSE -DHAVE_GRIFFIN=1 -DHAVE_MULTIMAN=1 -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) -DHAVE_FILTERS_BUILTIN -DHAVE_CHEEVOS
+DEFINES += -DHAVE_THREADS -DRARCH_CONSOLE -DHAVE_OPENGL -DHAVE_HEADSET -DHAVE_LANGEXTRA -DHAVE_OPENGLES -DHAVE_OPENGLES1 -DHAVE_PSGL -DHAVE_CG -DHAVE_CG_RUNTIME_COMPILER -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_RSOUND -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DHAVE_7Z -DWANT_ZLIB -D__CELLOS_LV2__ -DHAVE_NETWORKING=1 -DHAVE_SOCKET_LEGACY=1 -DHAVE_MOUSE -DHAVE_GRIFFIN=1 -DHAVE_MULTIMAN=1 -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) -DHAVE_FILTERS_BUILTIN -DHAVE_CHEEVOS -DRC_DISABLE_LUA

 #DEFINES += -DHAVE_IMAGEVIEWER

@@ -55,6 +55,7 @@ PPU_SRCS		= frontend/frontend_salamander.c \
 				  libretro-common/encodings/encoding_utf.c \
 				  libretro-common/compat/compat_strl.c \
 				  libretro-common/compat/compat_strcasestr.c \
+				  libretro-common/compat/fopen_utf8.c \
 				  libretro-common/streams/file_stream.c \
 				  libretro-common/vfs/vfs_implementation.c \
 				  libretro-common/file/config_file.c \
@@ -128,4 +128,3 @@ clean:
 	rm -f $(OBJ)

 .PHONY: clean
-
@@ -49,7 +49,6 @@ endif

 CFLAGS += $(RARCH_DEFINES)

-
 EXTRA_TARGETS = EBOOT.PBP
 PSP_EBOOT_TITLE = RetroArch PSP1

@@ -42,6 +42,7 @@ OBJS = frontend/frontend_salamander.o \
 		 libretro-common/lists/dir_list.o \
 		 libretro-common/file/retro_dirent.o \
 		 libretro-common/encodings/encoding_utf.o \
+		 libretro-common/compat/fopen_utf8.o \
 		 libretro-common/compat/compat_strl.o \
 		 libretro-common/compat/compat_strcasestr.o \
 		 libretro-common/file/config_file.o \
@@ -24,7 +24,6 @@ else
 	HAVE_ZLIB = 1
 	HAVE_BUILTINZLIB = 1
 	HAVE_LIBRETRODB = 1
-	HAVE_ZARCH = 0
 	HAVE_MATERIALUI = 0 # enable later?
 	HAVE_XMB = 0
 	HAVE_STATIC_VIDEO_FILTERS = 1
@@ -34,15 +33,15 @@ else
 	HAVE_DYNAMIC = 1

 	include Makefile.common
-        BLACKLIST :=
+	CFLAGS += $(DEF_FLAGS)
+	BLACKLIST :=
 	BLACKLIST += input/input_overlay.o
-        BLACKLIST += tasks/task_overlay.o
+	BLACKLIST += tasks/task_overlay.o
 	OBJ := $(filter-out $(BLACKLIST),$(OBJ))
 endif

-
 ifeq ($(strip $(LIBTRANSISTOR_HOME)),)
-$(error "Please set LIBTRANSISTOR_HOME in your environment. export LIBTRANSISTOR_HOME=<path t>o libtransistor")
+$(error "Please set LIBTRANSISTOR_HOME in your environment. export LIBTRANSISTOR_HOME=<path/to/libtransistor/dist/>")
 endif

 include $(LIBTRANSISTOR_HOME)/libtransistor.mk
@@ -52,7 +51,7 @@ LIBDIRS := -L.

 TARGETS := $(TARGET).nro

-CFLAGS += $(INCDIRS) $(DEFINES) -Wunused-command-line-argument
+CFLAGS += $(INCDIRS) $(DEFINES) -Wno-unused-command-line-argument -Werror-implicit-function-declaration

 all: $(TARGETS)

@@ -55,6 +55,7 @@ else
 	endif

 	include Makefile.common
+	CFLAGS += $(DEF_FLAGS)
 	BLACKLIST :=
 	OBJ := $(filter-out $(BLACKLIST),$(OBJ))

@@ -64,7 +65,6 @@ else
 	OBJ += frontend/drivers/platform_psp.o
 endif

-
 ifeq ($(strip $(VITASDK)),)
 $(error "Please set VITASDK in your environment. export VITASDK=<path to>vitasdk")
 endif
@@ -127,7 +127,6 @@ TARGETS := $(TARGET).vpk
 DEPFLAGS    = -MT $@ -MMD -MP -MF $*.Tdepend
 POSTCOMPILE = mv -f $*.Tdepend $*.depend

-
 all: $(TARGETS)

 %.o: %.cpp
@@ -140,7 +139,6 @@ all: $(TARGETS)
 	$(CC) -c -o $@ $< $(CFLAGS) $(INCDIRS) $(DEPFLAGS)
 	$(POSTCOMPILE)

-
 %.o: %.S
 %.o: %.S %.depend
 	$(CC) -c -o $@ $< $(ASFLAGS) $(INCDIRS) $(DEPFLAGS)
@@ -44,6 +44,7 @@ OBJS = frontend/frontend_salamander.o \
 		 libretro-common/encodings/encoding_utf.o \
 		 libretro-common/compat/compat_strl.o \
 		 libretro-common/compat/compat_strcasestr.o \
+		 libretro-common/compat/fopen_utf8.o \
 		 libretro-common/file/config_file.o \
 		 libretro-common/streams/file_stream.o \
 		 libretro-common/vfs/vfs_implementation.o \
@@ -42,12 +42,13 @@ endif
 MACHDEP := -DGEKKO -DHW_RVL -mrvl -mcpu=750 -meabi -mhard-float
 CFLAGS += -Wall -std=gnu99 $(MACHDEP) $(INCLUDE)
 LDFLAGS := $(MACHDEP) -Wl,-Map,$(notdir $(ELF_TARGET)).map
-LIBS := -lwiiuse -logc -lbte

 ifeq ($(EXTERNAL_LIBOGC), 1)
-LIBS += -lfat
+LIBS := -lfat
 endif

+LIBS += -lwiiuse -logc -lbte
+
 APP_BOOTER_DIR = wii/app_booter

 OBJ = frontend/frontend_salamander.o \
@@ -66,6 +67,7 @@ OBJ = frontend/frontend_salamander.o \
 		libretro-common/encodings/encoding_utf.o \
 		libretro-common/compat/compat_strl.o \
 		libretro-common/compat/compat_strcasestr.o \
+		libretro-common/compat/fopen_utf8.o \
 		libretro-common/file/config_file.o \
 		file_path_str.o \
 		verbosity.o \
@@ -64,6 +64,7 @@ ifeq ($(SALAMANDER_BUILD),1)
   OBJ += frontend/drivers/platform_null.o
   OBJ += libretro-common/encodings/encoding_utf.o
   OBJ += libretro-common/compat/compat_strcasestr.o
+   OBJ += libretro-common/compat/fopen_utf8.o
   OBJ += libretro-common/file/file_path.o
   OBJ += libretro-common/string/stdstring.o
   OBJ += libretro-common/lists/string_list.o
@@ -105,7 +106,7 @@ endif
   	OBJ += griffin/griffin.o
   	DEFINES += -DHAVE_GRIFFIN=1 -DHAVE_MENU -DHAVE_RGUI -DHAVE_LIBRETRODB
   	DEFINES += -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DWANT_ZLIB -DHAVE_CC_RESAMPLER
-   	DEFINES += -DHAVE_STB_FONT -DHAVE_STB_VORBIS -DHAVE_LANGEXTRA -DHAVE_LIBRETRODB -DHAVE_NETWORKING
+   	DEFINES += -DHAVE_STB_FONT -DHAVE_STB_VORBIS -DHAVE_LANGEXTRA -DHAVE_LIBRETRODB -DHAVE_NETWORKING -DHAVE_NETPLAYDISCOVERY
   #	DEFINES += -DWANT_IFADDRS
   #	DEFINES += -DHAVE_FREETYPE
   	DEFINES += -DHAVE_XMB -DHAVE_MATERIALUI
@@ -115,12 +116,12 @@ endif
   	HAVE_RPNG = 1
   	HAVE_RJPEG = 1
   	HAVE_RBMP = 1
+	HAVE_MENU = 1
   	HAVE_RGUI = 1
   	HAVE_ZLIB = 1
   	HAVE_7ZIP = 1
 	HAVE_BUILTINZLIB = 0
   	HAVE_LIBRETRODB = 1
-   	HAVE_ZARCH = 0
   	HAVE_MATERIALUI = 1
   	HAVE_XMB = 1
   	HAVE_STB_FONT = 1
@@ -128,6 +129,7 @@ endif
   	HAVE_LANGEXTRA = 1
   	HAVE_LIBRETRODB = 1
   	HAVE_NETWORKING = 1
+		HAVE_NETPLAYDISCOVERY = 1
   	HAVE_CHEEVOS = 1
   #	WANT_IFADDRS = 1
   	HAVE_OVERLAY = 1
@@ -137,8 +139,6 @@ endif
   	WANT_IOSUHAX = 1

   	include Makefile.common
-   	BLACKLIST := $(LIBRETRO_COMM_DIR)/net/net_ifinfo.o
-   	OBJ := $(filter-out $(BLACKLIST),$(OBJ))

   	OBJ += gfx/drivers/gx2_gfx.o
   	OBJ += gfx/drivers_font/wiiu_font.o
@@ -242,7 +242,6 @@ ifneq ($(WANT_IOSUHAX), 1)
 LIBS += -liosuhax
 endif

-
 RPX_OBJ           = $(BUILD_DIR)/wiiu/system/stubs_rpl.o
 HBL_ELF_OBJ       = $(BUILD_DIR)/wiiu/system/dynamic.o $(BUILD_DIR)/wiiu/system/stubs_elf.o

@@ -264,13 +263,11 @@ endif

 DEPFLAGS    = -MT $@ -MMD -MP -MF $(BUILD_DIR)/$*.depend

-
 all: $(TARGETS)

 %: $(BUILD_DIR)/%
 	cp $< $@

-
 $(BUILD_DIR)/%.o: %.cpp %.depend
 	@$(if $(Q), echo CXX $<,)
 	@mkdir -p $(dir $@)
@@ -8,9 +8,11 @@ HAVE_OPENGL = 1
 HAVE_DYLIB = 1
 HAVE_D3D9 = 1
 HAVE_NETWORKING = 1
+HAVE_NETPLAYDISCOVERY = 1
 HAVE_STDIN_CMD = 1
 HAVE_COMMAND = 1
 HAVE_THREADS = 1
+HAVE_MENU = 1
 HAVE_RGUI = 1
 HAVE_MATERIALUI = 1
 HAVE_7ZIP = 1
@@ -101,7 +103,6 @@ else
   WINDRES = windres
 endif

-
 libretro ?= -lretro

 ifeq ($(DYNAMIC), 1)
@@ -122,7 +123,7 @@ else
   CXXFLAGS += -O3 -ffast-math
 endif

-CFLAGS += -Wall -Wno-unused-result -Wno-unused-variable -I. -Ideps 
+CFLAGS += $(DEF_FLAGS) -Wall -Wno-unused-result -Wno-unused-variable -I. -Ideps
 CXXFLAGS += -Wall -Wno-unused-result -Wno-unused-variable -I. -Ideps -std=c++98 -D__STDC_CONSTANT_MACROS
 ifeq ($(CXX_BUILD), 1)
   CFLAGS += -std=c++98 -xc++ -D__STDC_CONSTANT_MACROS
@@ -171,4 +172,3 @@ clean:
 	rm -f *.d

 .PHONY: all install uninstall clean
-
@@ -189,46 +189,46 @@ The default super resolution is 2560. It is displayed just under the CRT switch

 If native resolutions are activated you will need a whole new set of modelines:

- 512 x 240 @ 50.006977 SNESpal
+- 256 x 240 @ 50.006977 SNESpal
+- 256 x 448 @ 50.006977 SNESpal
 - 512 x 224 @ 50.006977 SNESpal
+- 512 x 240 @ 50.006977 SNESpal
 - 512 x 448 @ 50.006977 SNESpal
+- 256 x 240 @ 60.098812 SNESntsc
+- 256 x 448 @ 60.098812 SNESntsc
 - 512 x 240 @ 60.098812 SNESntsc
 - 512 x 224 @ 60.098812 SNESntsc
 - 512 x 448 @ 60.098812 SNESntsc
- 256 x 240 @ 50.006977 SNESpal
- 256 x 448 @ 50.006977 SNESpal
- 256 x 240 @ 60.098812 SNESntsc
- 256 x 448 @ 60.098812 SNESntsc
- 320 x 240 @ 59.922745 MDntsc
- 320 x 448 @ 59.922745 MDntp
- 320 x 480 @ 59.922745 MDntsc
 - 256 x 192 @ 59.922745 MDntsc
- 320 x 224 @ 59.922745 MDntsc
 - 256 x 224 @ 59.922745 MDntsc
- 320 x 288 @ 49.701458 MDpal
- 320 x 576 @ 49.701458 MDpal
+- 320 x 224 @ 59.922745 MDntsc
+- 320 x 240 @ 59.922745 MDntsc
+- 320 x 448 @ 59.922745 MDntsc
+- 320 x 480 @ 59.922745 MDntsc
 - 256 x 192 @ 49.701458 MDpal
+- 256 x 224 @ 49.701458 MDpal
 - 320 x 224 @ 49.701458 MDpal
 - 320 x 240 @ 49.701458 MDpal
+- 320 x 288 @ 49.701458 MDpal
 - 320 x 448 @ 49.701458 MDpal
 - 320 x 480 @ 49.701458 MDpal
- 256 x 224 @ 49.701458 MDpal
+- 320 x 576 @ 49.701458 MDpal
 - 256 x 288 @ 49.701458 MSYSpal
 - 256 x 240 @ 60.098812 NESntsc
 - 256 x 240 @ 50.006977 NESpal

- 640 x 480 @ 60.130001 N64ntsc
 - 640 x 237 @ 60.130001 N64ntsc
 - 640 x 240 @ 60.130001 N64ntsc
+- 640 x 480 @ 60.130001 N64ntsc
+- 640 x 288 @ 50.000000 N64pal
 - 640 x 480 @ 50.000000 N64pal
- 640 x 576 @ 50.000000 n64pal
- 640 x 288 @ 50.000000 n64pal
+- 640 x 576 @ 50.000000 N64pal

 - 256 x 252 @ 49.759998 PSXpal
- 384 x 252 @ 49.759998 PSXpal
- 640 x 540 @ 49.759998 PSXpal
 - 320 x 252 @ 49.759998 PSXpal
+- 384 x 252 @ 49.759998 PSXpal
 - 640 x 252 @ 49.759998 PSXpal
+- 640 x 540 @ 49.759998 PSXpal

 - 384 x 240 @ 59.941002 PSXntsc
 - 256 x 480 @ 59.941002 PSXntsc
@@ -0,0 +1,88 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
+ *  Copyright (C) 2011-2017 - Daniel De Matteis
+ *
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __AUDIO_DEFINES__H
+#define __AUDIO_DEFINES__H
+
+#include <retro_common_api.h>
+
+RETRO_BEGIN_DECLS
+
+#define AUDIO_CHUNK_SIZE_BLOCKING      512
+
+/* So we don't get complete line-noise when fast-forwarding audio. */
+#define AUDIO_CHUNK_SIZE_NONBLOCKING   2048
+
+#define AUDIO_MAX_RATIO                16
+
+#define AUDIO_MIXER_MAX_STREAMS        16
+
+#define AUDIO_MIXER_MAX_SYSTEM_STREAMS (AUDIO_MIXER_MAX_STREAMS + 4)
+
+/* do not define more than (MAX_SYSTEM_STREAMS - MAX_STREAMS) */
+enum audio_mixer_system_slot
+{
+   AUDIO_MIXER_SYSTEM_SLOT_OK = AUDIO_MIXER_MAX_STREAMS,
+   AUDIO_MIXER_SYSTEM_SLOT_CANCEL,
+   AUDIO_MIXER_SYSTEM_SLOT_NOTICE,
+   AUDIO_MIXER_SYSTEM_SLOT_BGM
+};
+
+enum audio_action
+{
+   AUDIO_ACTION_NONE = 0,
+   AUDIO_ACTION_RATE_CONTROL_DELTA,
+   AUDIO_ACTION_MIXER_MUTE_ENABLE,
+   AUDIO_ACTION_MUTE_ENABLE,
+   AUDIO_ACTION_VOLUME_GAIN,
+   AUDIO_ACTION_MIXER_VOLUME_GAIN,
+   AUDIO_ACTION_MIXER
+};
+
+enum audio_mixer_slot_selection_type
+{
+   AUDIO_MIXER_SLOT_SELECTION_AUTOMATIC = 0,
+   AUDIO_MIXER_SLOT_SELECTION_MANUAL
+};
+
+enum audio_mixer_stream_type
+{
+   AUDIO_STREAM_TYPE_NONE = 0,
+   AUDIO_STREAM_TYPE_USER,
+   AUDIO_STREAM_TYPE_SYSTEM
+};
+
+enum audio_mixer_state
+{
+   AUDIO_STREAM_STATE_NONE = 0,
+   AUDIO_STREAM_STATE_STOPPED,
+   AUDIO_STREAM_STATE_PLAYING,
+   AUDIO_STREAM_STATE_PLAYING_LOOPED,
+   AUDIO_STREAM_STATE_PLAYING_SEQUENTIAL
+};
+
+typedef struct audio_statistics
+{
+   float average_buffer_saturation;
+   float std_deviation_percentage;
+   float close_to_underrun;
+   float close_to_blocking;
+   unsigned samples;
+} audio_statistics_t;
+
+RETRO_END_DECLS
+
+#endif
@@ -21,10 +21,12 @@
 #include <lists/string_list.h>
 #include <audio/conversion/float_to_s16.h>
 #include <audio/conversion/s16_to_float.h>
+#include <audio/audio_resampler.h>
 #include <audio/dsp_filter.h>
 #include <file/file_path.h>
 #include <lists/dir_list.h>
 #include <string/stdstring.h>
+#include <streams/file_stream.h>

 #ifdef HAVE_CONFIG_H
 #include "../config.h"
@@ -35,6 +37,8 @@
 #include "../gfx/video_driver.h"
 #include "../record/record_driver.h"
 #include "../frontend/frontend_driver.h"
+#include "../tasks/task_audio_mixer.h"
+#include "../tasks/tasks_internal.h"

 #include "../command.h"
 #include "../driver.h"
@@ -42,9 +46,17 @@
 #include "../retroarch.h"
 #include "../verbosity.h"
 #include "../list_special.h"
+#include "../file_path_special.h"
+#include "../content.h"
+
+#ifdef HAVE_THREADS
+#include <rthreads/rthreads.h>
+#endif

 #define AUDIO_BUFFER_FREE_SAMPLES_COUNT (8 * 1024)

+#define MENU_SOUND_FORMATS "ogg|mod|xm|s3m|mp3|flac"
+
 /**
 * db_to_gain:
 * @db          : Decibels.
@@ -65,6 +77,9 @@ static const audio_driver_t *audio_drivers[] = {
 #ifdef HAVE_TINYALSA
 	&audio_tinyalsa,
 #endif
+#if defined(HAVE_AUDIOIO)
+   &audio_audioio,
+#endif
 #if defined(HAVE_OSS) || defined(HAVE_OSS_BSD)
   &audio_oss,
 #endif
@@ -74,6 +89,9 @@ static const audio_driver_t *audio_drivers[] = {
 #ifdef HAVE_COREAUDIO
   &audio_coreaudio,
 #endif
+#ifdef HAVE_COREAUDIO3
+   &audio_coreaudio3,
+#endif
 #ifdef HAVE_AL
   &audio_openal,
 #endif
@@ -116,21 +134,25 @@ static const audio_driver_t *audio_drivers[] = {
 #ifdef EMSCRIPTEN
   &audio_rwebaudio,
 #endif
-#if defined(PSP) || defined(VITA)
+#if defined(PSP) || defined(VITA) || defined(ORBIS)
  &audio_psp,
 #endif
+#if defined(PS2)
+  &audio_ps2,
+#endif
 #ifdef _3DS
   &audio_ctr_csnd,
   &audio_ctr_dsp,
 #endif
 #ifdef SWITCH
+   &audio_switch_thread,
   &audio_switch,
 #endif
   &audio_null,
   NULL,
 };

-static struct audio_mixer_stream audio_mixer_streams[AUDIO_MIXER_MAX_STREAMS] = {{0}};
+static struct audio_mixer_stream audio_mixer_streams[AUDIO_MIXER_MAX_SYSTEM_STREAMS] = {{0}};

 static size_t audio_driver_chunk_size                    = 0;
 static size_t audio_driver_chunk_nonblock_size           = 0;
@@ -178,13 +200,36 @@ static const audio_driver_t *current_audio               = NULL;
 static void *audio_driver_context_audio_data             = NULL;

 static bool audio_suspended                              = false;
+static bool audio_is_threaded                            = false;
+
+#ifdef HAVE_THREADS
+static slock_t* s_audio_driver_lock = NULL;
+#endif

 static void audio_mixer_play_stop_sequential_cb(
      audio_mixer_sound_t *sound, unsigned reason);
 static void audio_mixer_play_stop_cb(
      audio_mixer_sound_t *sound, unsigned reason);
+static void audio_mixer_menu_stop_cb(
+      audio_mixer_sound_t *sound, unsigned reason);

-enum resampler_quality audio_driver_get_resampler_quality(void)
+#ifdef HAVE_THREADS
+#define audio_driver_lock() \
+   if (s_audio_driver_lock) \
+      slock_lock(s_audio_driver_lock)
+#else
+#define audio_driver_lock()
+#endif
+
+#ifdef HAVE_THREADS
+#define audio_driver_unlock() \
+   if (s_audio_driver_lock) \
+      slock_unlock(s_audio_driver_lock)
+#else
+#define audio_driver_unlock()
+#endif
+
+static enum resampler_quality audio_driver_get_resampler_quality(void)
 {
   settings_t *settings = config_get_ptr();

@@ -196,14 +241,14 @@ enum resampler_quality audio_driver_get_resampler_quality(void)

 audio_mixer_stream_t *audio_driver_mixer_get_stream(unsigned i)
 {
-   if (i > (AUDIO_MIXER_MAX_STREAMS-1))
+   if (i > (AUDIO_MIXER_MAX_SYSTEM_STREAMS-1))
      return NULL;
   return &audio_mixer_streams[i];
 }

 const char *audio_driver_mixer_get_stream_name(unsigned i)
 {
-   if (i > (AUDIO_MIXER_MAX_STREAMS-1))
+   if (i > (AUDIO_MIXER_MAX_SYSTEM_STREAMS-1))
      return "N/A";
   if (!string_is_empty(audio_mixer_streams[i].name))
      return audio_mixer_streams[i].name;
@@ -385,12 +430,11 @@ static bool audio_driver_deinit_internal(void)
   return true;
 }

-static void audio_driver_mixer_init(unsigned out_rate)
+static void audio_driver_mixer_init(unsigned audio_out_rate)
 {
-   audio_mixer_init(out_rate);
+   audio_mixer_init(audio_out_rate);
 }

-
 static bool audio_driver_init_internal(bool audio_cb_inited)
 {
   unsigned new_rate     = 0;
@@ -441,6 +485,7 @@ static bool audio_driver_init_internal(bool audio_cb_inited)
 #ifdef HAVE_THREADS
   if (audio_cb_inited)
   {
+      audio_is_threaded = true;
      RARCH_LOG("[Audio]: Starting threaded audio driver ...\n");
      if (!audio_init_thread(
               &current_audio,
@@ -459,6 +504,7 @@ static bool audio_driver_init_internal(bool audio_cb_inited)
   else
 #endif
   {
+      audio_is_threaded = false;
      audio_driver_context_audio_data =
         current_audio->init(*settings->arrays.audio_device ?
               settings->arrays.audio_device : NULL,
@@ -501,6 +547,15 @@ static bool audio_driver_init_internal(bool audio_cb_inited)
   audio_source_ratio_original   = audio_source_ratio_current =
      (double)settings->uints.audio_out_rate / audio_driver_input;

+#ifdef HAVE_THREADS
+   if (s_audio_driver_lock)
+      slock_free(s_audio_driver_lock);
+   s_audio_driver_lock = slock_new();
+#endif
+
+   audio_resampler_lock_init();
+   audio_resampler_lock();
+
   if (!retro_resampler_realloc(
            &audio_driver_resampler_data,
            &audio_driver_resampler,
@@ -513,6 +568,8 @@ static bool audio_driver_init_internal(bool audio_cb_inited)
      audio_driver_active = false;
   }

+   audio_resampler_unlock();
+
   aud_inp_data = (float*)malloc(max_bufsamples * sizeof(float));
   retro_assert(aud_inp_data != NULL);

@@ -583,9 +640,13 @@ void audio_driver_set_nonblocking_state(bool enable)
            audio_driver_context_audio_data,
            settings->bools.audio_sync ? enable : true);

+   audio_driver_lock();
+
   audio_driver_chunk_size = enable ?
      audio_driver_chunk_nonblock_size :
      audio_driver_chunk_block_size;
+
+   audio_driver_unlock();
 }

 /**
@@ -603,6 +664,7 @@ static void audio_driver_flush(const int16_t *data, size_t samples)
   bool is_paused                    = false;
   bool is_idle                      = false;
   bool is_slowmotion                = false;
+   bool is_active                    = false;
   const void *output_data           = NULL;
   unsigned output_frames            = 0;
   float audio_volume_gain           = !audio_driver_mute_enable ?
@@ -611,9 +673,13 @@ static void audio_driver_flush(const int16_t *data, size_t samples)
   src_data.data_out                 = NULL;
   src_data.output_frames            = 0;

+   recording_driver_lock();
+
   if (recording_data)
      recording_push_audio(data, samples);

+   recording_driver_unlock();
+
   runloop_get_status(&is_paused, &is_idle, &is_slowmotion,
         &is_perfcnt_enable);

@@ -623,13 +689,16 @@ static void audio_driver_flush(const int16_t *data, size_t samples)
 		   !audio_driver_output_samples_buf)
      return;

+   audio_driver_lock();
+
   convert_s16_to_float(audio_driver_input_data, data, samples,
         audio_volume_gain);

+   audio_driver_unlock();
+
   src_data.data_in                  = audio_driver_input_data;
   src_data.input_frames             = samples >> 1;

-
   if (audio_driver_dsp)
   {
      struct retro_dsp_data dsp_data;
@@ -690,9 +759,15 @@ static void audio_driver_flush(const int16_t *data, size_t samples)
      src_data.ratio       *= settings->floats.slowmotion_ratio;
   }

-   audio_driver_resampler->process(audio_driver_resampler_data, &src_data);
+   audio_driver_lock();

-   if (audio_mixer_active)
+   audio_resampler_lock();
+   audio_driver_resampler->process(audio_driver_resampler_data, &src_data);
+   audio_resampler_unlock();
+
+   is_active = audio_mixer_active;
+
+   if (is_active)
   {
      bool override     = audio_driver_mixer_mute_enable ? true :
         (audio_driver_mixer_volume_gain != 1.0f) ? true : false;
@@ -702,6 +777,8 @@ static void audio_driver_flush(const int16_t *data, size_t samples)
            src_data.output_frames, mixer_gain, override);
   }

+   audio_driver_unlock();
+
   output_data        = audio_driver_output_samples_buf;
   output_frames      = (unsigned)src_data.output_frames;

@@ -716,9 +793,13 @@ static void audio_driver_flush(const int16_t *data, size_t samples)
      output_frames  *= sizeof(int16_t);
   }

+   audio_driver_lock();
+
   if (current_audio->write(audio_driver_context_audio_data,
            output_data, output_frames * 2) < 0)
      audio_driver_active = false;
+
+   audio_driver_unlock();
 }

 /**
@@ -730,14 +811,24 @@ static void audio_driver_flush(const int16_t *data, size_t samples)
 **/
 void audio_driver_sample(int16_t left, int16_t right)
 {
+   audio_driver_lock();
+
   if (audio_suspended)
+   {
+      audio_driver_unlock();
      return;
+   }

   audio_driver_output_samples_conv_buf[audio_driver_data_ptr++] = left;
   audio_driver_output_samples_conv_buf[audio_driver_data_ptr++] = right;

   if (audio_driver_data_ptr < audio_driver_chunk_size)
+   {
+      audio_driver_unlock();
      return;
+   }
+
+   audio_driver_unlock();

   audio_driver_flush(audio_driver_output_samples_conv_buf,
         audio_driver_data_ptr);
@@ -748,9 +839,8 @@ void audio_driver_sample(int16_t left, int16_t right)
 void audio_driver_menu_sample(void)
 {
   static int16_t samples_buf[1024]       = {0};
-   struct retro_system_av_info   
-      *av_info                            = video_viewport_get_system_av_info();
-   const struct retro_system_timing *info = 
+   struct retro_system_av_info *av_info   = video_viewport_get_system_av_info();
+   const struct retro_system_timing *info =
      (const struct retro_system_timing*)&av_info->timing;
   unsigned sample_count                  = (info->sample_rate / info->fps) * 2;
   while (sample_count > 1024)
@@ -795,6 +885,9 @@ size_t audio_driver_sample_batch(const int16_t *data, size_t frames)
 **/
 void audio_driver_sample_rewind(int16_t left, int16_t right)
 {
+   if (audio_driver_rewind_ptr == 0)
+      return;
+
   audio_driver_rewind_buf[--audio_driver_rewind_ptr] = right;
   audio_driver_rewind_buf[--audio_driver_rewind_ptr] = left;
 }
@@ -818,7 +911,10 @@ size_t audio_driver_sample_batch_rewind(const int16_t *data, size_t frames)
   size_t samples   = frames << 1;

   for (i = 0; i < samples; i++)
-      audio_driver_rewind_buf[--audio_driver_rewind_ptr] = data[i];
+   {
+      if (audio_driver_rewind_ptr > 0)
+         audio_driver_rewind_buf[--audio_driver_rewind_ptr] = data[i];
+   }

   return frames;
 }
@@ -904,11 +1000,13 @@ void audio_driver_setup_rewind(void)

   for (i = 0; i < audio_driver_data_ptr; i += 2)
   {
-      audio_driver_rewind_buf[--audio_driver_rewind_ptr] =
-         audio_driver_output_samples_conv_buf[i + 1];
+      if (audio_driver_rewind_ptr > 0)
+         audio_driver_rewind_buf[--audio_driver_rewind_ptr] =
+            audio_driver_output_samples_conv_buf[i + 1];

-      audio_driver_rewind_buf[--audio_driver_rewind_ptr] =
-         audio_driver_output_samples_conv_buf[i + 0];
+      if (audio_driver_rewind_ptr > 0)
+         audio_driver_rewind_buf[--audio_driver_rewind_ptr] =
+            audio_driver_output_samples_conv_buf[i + 0];
   }

   audio_driver_data_ptr = 0;
@@ -953,10 +1051,13 @@ bool audio_driver_find_driver(void)

 void audio_driver_deinit_resampler(void)
 {
+   audio_resampler_lock();
   if (audio_driver_resampler && audio_driver_resampler_data)
      audio_driver_resampler->free(audio_driver_resampler_data);
   audio_driver_resampler      = NULL;
   audio_driver_resampler_data = NULL;
+   audio_resampler_unlock();
+   audio_resampler_lock_free();
 }

 bool audio_driver_free_devices_list(void)
@@ -1040,7 +1141,7 @@ static int audio_mixer_find_index(audio_mixer_sound_t *sound)
 {
   unsigned i;

-   for (i = 0; i < AUDIO_MIXER_MAX_STREAMS; i++)
+   for (i = 0; i < AUDIO_MIXER_MAX_SYSTEM_STREAMS; i++)
   {
      audio_mixer_sound_t *handle = audio_mixer_streams[i].handle;
      if (handle == sound)
@@ -1082,6 +1183,28 @@ static void audio_mixer_play_stop_cb(
   }
 }

+static void audio_mixer_menu_stop_cb(
+      audio_mixer_sound_t *sound, unsigned reason)
+{
+   int idx = audio_mixer_find_index(sound);
+
+   switch (reason)
+   {
+      case AUDIO_MIXER_SOUND_FINISHED:
+         if (idx >= 0)
+         {
+            unsigned i = (unsigned)idx;
+            audio_mixer_streams[i].state   = AUDIO_STREAM_STATE_STOPPED;
+            audio_mixer_streams[i].volume  = 0.0f;
+         }
+         break;
+      case AUDIO_MIXER_SOUND_STOPPED:
+         break;
+      case AUDIO_MIXER_SOUND_REPEATED:
+         break;
+   }
+}
+
 static void audio_mixer_play_stop_sequential_cb(
      audio_mixer_sound_t *sound, unsigned reason)
 {
@@ -1099,6 +1222,11 @@ static void audio_mixer_play_stop_sequential_cb(
            if (!string_is_empty(audio_mixer_streams[i].name))
               free(audio_mixer_streams[i].name);

+            if (i < AUDIO_MIXER_MAX_STREAMS)
+               audio_mixer_streams[i].stream_type = AUDIO_STREAM_TYPE_USER;
+            else
+               audio_mixer_streams[i].stream_type = AUDIO_STREAM_TYPE_SYSTEM;
+
            audio_mixer_streams[i].name    = NULL;
            audio_mixer_streams[i].state   = AUDIO_STREAM_STATE_NONE;
            audio_mixer_streams[i].volume  = 0.0f;
@@ -1109,7 +1237,7 @@ static void audio_mixer_play_stop_sequential_cb(

            i++;

-            for (; i < AUDIO_MIXER_MAX_STREAMS; i++)
+            for (; i < AUDIO_MIXER_MAX_SYSTEM_STREAMS; i++)
            {
               if (audio_mixer_streams[i].state == AUDIO_STREAM_STATE_STOPPED)
               {
@@ -1126,10 +1254,11 @@ static void audio_mixer_play_stop_sequential_cb(
   }
 }

-bool audio_driver_mixer_get_free_stream_slot(unsigned *id)
+static bool audio_driver_mixer_get_free_stream_slot(unsigned *id, enum audio_mixer_stream_type type)
 {
-   unsigned i;
-   for (i = 0; i < AUDIO_MIXER_MAX_STREAMS; i++)
+   unsigned i     = (type == AUDIO_STREAM_TYPE_USER) ? 0                       : AUDIO_MIXER_MAX_STREAMS;
+   unsigned count = (type == AUDIO_STREAM_TYPE_USER) ? AUDIO_MIXER_MAX_STREAMS : AUDIO_MIXER_MAX_SYSTEM_STREAMS;
+   for (; i < count; i++)
   {
      if (audio_mixer_streams[i].state == AUDIO_STREAM_STATE_NONE)
      {
@@ -1149,9 +1278,22 @@ bool audio_driver_mixer_add_stream(audio_mixer_stream_params_t *params)
   audio_mixer_stop_cb_t stop_cb = audio_mixer_play_stop_cb;
   bool looped                   = false;
   void *buf                     = NULL;
-   
-   if (!audio_driver_mixer_get_free_stream_slot(&free_slot))
+
+   if (params->stream_type == AUDIO_STREAM_TYPE_NONE)
      return false;
+   
+   switch (params->slot_selection_type)
+   {
+      case AUDIO_MIXER_SLOT_SELECTION_MANUAL:
+         free_slot = params->slot_selection_idx;
+         break;
+      case AUDIO_MIXER_SLOT_SELECTION_AUTOMATIC:
+      default:
+         if (!audio_driver_mixer_get_free_stream_slot(
+                  &free_slot, params->stream_type))
+            return false;
+         break;
+   }

   if (params->state == AUDIO_STREAM_STATE_NONE)
      return false;
@@ -1211,22 +1353,28 @@ bool audio_driver_mixer_add_stream(audio_mixer_stream_params_t *params)
         break;
   }

+   audio_driver_lock();
+
   audio_mixer_active                     = true;

-   audio_mixer_streams[free_slot].name    = !string_is_empty(params->basename) ? strdup(params->basename) : NULL; 
+   audio_mixer_streams[free_slot].name    = !string_is_empty(params->basename) ? strdup(params->basename) : NULL;
   audio_mixer_streams[free_slot].buf     = buf;
   audio_mixer_streams[free_slot].handle  = handle;
   audio_mixer_streams[free_slot].voice   = voice;
+   audio_mixer_streams[free_slot].stream_type = params->stream_type;
+   audio_mixer_streams[free_slot].type    = params->type;
   audio_mixer_streams[free_slot].state   = params->state;
   audio_mixer_streams[free_slot].volume  = params->volume;
   audio_mixer_streams[free_slot].stop_cb = stop_cb;

+   audio_driver_unlock();
+
   return true;
 }

 enum audio_mixer_state audio_driver_mixer_get_stream_state(unsigned i)
 {
-   if (i >= AUDIO_MIXER_MAX_STREAMS)
+   if (i >= AUDIO_MIXER_MAX_SYSTEM_STREAMS)
      return AUDIO_STREAM_STATE_NONE;

   return audio_mixer_streams[i].state;
@@ -1236,7 +1384,7 @@ static void audio_driver_mixer_play_stream_internal(unsigned i, unsigned type)
 {
   bool set_state              = false;

-   if (i >= AUDIO_MIXER_MAX_STREAMS)
+   if (i >= AUDIO_MIXER_MAX_SYSTEM_STREAMS)
      return;

   switch (audio_mixer_streams[i].state)
@@ -1258,12 +1406,128 @@ static void audio_driver_mixer_play_stream_internal(unsigned i, unsigned type)
      audio_mixer_streams[i].state   = (enum audio_mixer_state)type;
 }

+static void audio_driver_load_menu_bgm_callback(void *task_data, void *user_data, const char *error)
+{
+   bool contentless = false;
+   bool is_inited = false;
+
+   content_get_status(&contentless, &is_inited);
+
+   if (!is_inited)
+      audio_driver_mixer_play_menu_sound_looped(AUDIO_MIXER_SYSTEM_SLOT_BGM);
+}
+
+void audio_driver_load_menu_sounds(void)
+{
+   settings_t *settings = config_get_ptr();
+   char *sounds_path = NULL;
+   char *sounds_fallback_path = NULL;
+   const char *path_ok = NULL;
+   const char *path_cancel = NULL;
+   const char *path_notice = NULL;
+   const char *path_bgm = NULL;
+   struct string_list *list = NULL;
+   struct string_list *list_fallback = NULL;
+   int i = 0;
+
+   sounds_path = (char*)malloc(PATH_MAX_LENGTH * sizeof(char));
+   sounds_fallback_path = (char*)malloc(PATH_MAX_LENGTH * sizeof(char));
+   sounds_path[0] = sounds_fallback_path[0] = '\0';
+
+   fill_pathname_join(
+         sounds_fallback_path,
+         settings->paths.directory_assets,
+         "sounds",
+         PATH_MAX_LENGTH * sizeof(char)
+   );
+
+   fill_pathname_application_special(sounds_path, PATH_MAX_LENGTH * sizeof(char), APPLICATION_SPECIAL_DIRECTORY_ASSETS_SOUNDS);
+
+   list = dir_list_new(sounds_path, MENU_SOUND_FORMATS, false, false, false, false);
+   list_fallback = dir_list_new(sounds_fallback_path, MENU_SOUND_FORMATS, false, false, false, false);
+
+   if (!list)
+   {
+      list = list_fallback;
+      list_fallback = NULL;
+   }
+
+   if (!list || list->size == 0)
+      goto end;
+
+   if (list_fallback && list_fallback->size > 0)
+   {
+      for (i = 0; i < list_fallback->size; i++)
+      {
+         if (list->size == 0 || !string_list_find_elem(list, list_fallback->elems[i].data))
+         {
+            union string_list_elem_attr attr = {0};
+            string_list_append(list, list_fallback->elems[i].data, attr);
+         }
+      }
+   }
+
+   for (i = 0; i < list->size; i++)
+   {
+      const char *path = list->elems[i].data;
+      const char *ext = path_get_extension(path);
+      char basename_noext[PATH_MAX_LENGTH];
+
+      basename_noext[0] = '\0';
+
+      fill_pathname_base_noext(basename_noext, path, sizeof(basename_noext));
+
+      if (audio_driver_mixer_extension_supported(ext))
+      {
+         if (string_is_equal_noncase(basename_noext, "ok"))
+            path_ok = path;
+         if (string_is_equal_noncase(basename_noext, "cancel"))
+            path_cancel = path;
+         if (string_is_equal_noncase(basename_noext, "notice"))
+            path_notice = path;
+         if (string_is_equal_noncase(basename_noext, "bgm"))
+            path_bgm = path;
+      }
+   }
+
+   if (path_ok && settings->bools.audio_enable_menu_ok)
+      task_push_audio_mixer_load(path_ok, NULL, NULL, true, AUDIO_MIXER_SLOT_SELECTION_MANUAL, AUDIO_MIXER_SYSTEM_SLOT_OK);
+   if (path_cancel && settings->bools.audio_enable_menu_cancel)
+      task_push_audio_mixer_load(path_cancel, NULL, NULL, true, AUDIO_MIXER_SLOT_SELECTION_MANUAL, AUDIO_MIXER_SYSTEM_SLOT_CANCEL);
+   if (path_notice && settings->bools.audio_enable_menu_notice)
+      task_push_audio_mixer_load(path_notice, NULL, NULL, true, AUDIO_MIXER_SLOT_SELECTION_MANUAL, AUDIO_MIXER_SYSTEM_SLOT_NOTICE);
+   if (path_bgm && settings->bools.audio_enable_menu_bgm)
+      task_push_audio_mixer_load(path_bgm, audio_driver_load_menu_bgm_callback, NULL, true, AUDIO_MIXER_SLOT_SELECTION_MANUAL, AUDIO_MIXER_SYSTEM_SLOT_BGM);
+
+end:
+   if (list)
+      string_list_free(list);
+   if (list_fallback)
+      string_list_free(list_fallback);
+   if (sounds_path)
+      free(sounds_path);
+   if (sounds_fallback_path)
+      free(sounds_fallback_path);
+}
+
 void audio_driver_mixer_play_stream(unsigned i)
 {
   audio_mixer_streams[i].stop_cb = audio_mixer_play_stop_cb;
   audio_driver_mixer_play_stream_internal(i, AUDIO_STREAM_STATE_PLAYING);
 }

+void audio_driver_mixer_play_menu_sound_looped(unsigned i)
+{
+   audio_mixer_streams[i].stop_cb = audio_mixer_menu_stop_cb;
+   audio_driver_mixer_play_stream_internal(i, AUDIO_STREAM_STATE_PLAYING_LOOPED);
+}
+
+void audio_driver_mixer_play_menu_sound(unsigned i)
+{
+   audio_mixer_streams[i].stop_cb = audio_mixer_menu_stop_cb;
+   audio_driver_mixer_play_stream_internal(i, AUDIO_STREAM_STATE_PLAYING);
+}
+
 void audio_driver_mixer_play_stream_looped(unsigned i)
 {
   audio_mixer_streams[i].stop_cb = audio_mixer_play_stop_cb;
@@ -1278,7 +1542,7 @@ void audio_driver_mixer_play_stream_sequential(unsigned i)

 float audio_driver_mixer_get_stream_volume(unsigned i)
 {
-   if (i >= AUDIO_MIXER_MAX_STREAMS)
+   if (i >= AUDIO_MIXER_MAX_SYSTEM_STREAMS)
      return 0.0f;

   return audio_mixer_streams[i].volume;
@@ -1288,7 +1552,7 @@ void audio_driver_mixer_set_stream_volume(unsigned i, float vol)
 {
   audio_mixer_voice_t *voice     = NULL;

-   if (i >= AUDIO_MIXER_MAX_STREAMS)
+   if (i >= AUDIO_MIXER_MAX_SYSTEM_STREAMS)
      return;

   audio_mixer_streams[i].volume  = vol;
@@ -1303,7 +1567,7 @@ void audio_driver_mixer_stop_stream(unsigned i)
 {
   bool set_state              = false;

-   if (i >= AUDIO_MIXER_MAX_STREAMS)
+   if (i >= AUDIO_MIXER_MAX_SYSTEM_STREAMS)
      return;

   switch (audio_mixer_streams[i].state)
@@ -1333,7 +1597,7 @@ void audio_driver_mixer_remove_stream(unsigned i)
 {
   bool destroy                = false;

-   if (i >= AUDIO_MIXER_MAX_STREAMS)
+   if (i >= AUDIO_MIXER_MAX_SYSTEM_STREAMS)
      return;

   switch (audio_mixer_streams[i].state)
@@ -1375,7 +1639,7 @@ static void audio_driver_mixer_deinit(void)

   audio_mixer_active = false;

-   for (i = 0; i < AUDIO_MIXER_MAX_STREAMS; i++)
+   for (i = 0; i < AUDIO_MIXER_MAX_SYSTEM_STREAMS; i++)
   {
      audio_driver_mixer_stop_stream(i);
      audio_driver_mixer_remove_stream(i);
@@ -1388,6 +1652,11 @@ bool audio_driver_deinit(void)
 {
   audio_driver_mixer_deinit();
   audio_driver_free_devices_list();
+#ifdef HAVE_THREADS
+   slock_free(s_audio_driver_lock);
+   s_audio_driver_lock = NULL;
+#endif
+
   if (!audio_driver_deinit_internal())
      return false;
   return true;
@@ -1489,7 +1758,6 @@ error:
   return false;
 }

-
 bool audio_driver_stop(void)
 {
   if (!current_audio || !current_audio->stop
@@ -1579,7 +1847,6 @@ void audio_set_bool(enum audio_action action, bool val)
   }
 }

-
 void audio_set_float(enum audio_action action, float val)
 {
   switch (action)
@@ -22,46 +22,21 @@
 #include <sys/types.h>

 #include <boolean.h>
-#include <audio/audio_mixer.h>
-#include <audio/audio_resampler.h>
 #include <retro_common_api.h>

+#include <audio/audio_mixer.h>
+
+#include "audio_defines.h"
+
 RETRO_BEGIN_DECLS

-#define AUDIO_CHUNK_SIZE_BLOCKING      512
-
-/* So we don't get complete line-noise when fast-forwarding audio. */
-#define AUDIO_CHUNK_SIZE_NONBLOCKING   2048
-
-#define AUDIO_MAX_RATIO                16
-
-#define AUDIO_MIXER_MAX_STREAMS        16
-
-enum audio_action
-{
-   AUDIO_ACTION_NONE = 0,
-   AUDIO_ACTION_RATE_CONTROL_DELTA,
-   AUDIO_ACTION_MIXER_MUTE_ENABLE,
-   AUDIO_ACTION_MUTE_ENABLE,
-   AUDIO_ACTION_VOLUME_GAIN,
-   AUDIO_ACTION_MIXER_VOLUME_GAIN,
-   AUDIO_ACTION_MIXER
-};
-
-enum audio_mixer_state
-{
-   AUDIO_STREAM_STATE_NONE = 0,
-   AUDIO_STREAM_STATE_STOPPED,
-   AUDIO_STREAM_STATE_PLAYING,
-   AUDIO_STREAM_STATE_PLAYING_LOOPED,
-   AUDIO_STREAM_STATE_PLAYING_SEQUENTIAL
-};
-
 typedef struct audio_mixer_stream
 {
   audio_mixer_sound_t *handle;
   audio_mixer_voice_t *voice;
   audio_mixer_stop_cb_t stop_cb;
+   enum audio_mixer_stream_type  stream_type;
+   enum audio_mixer_type type;
   enum audio_mixer_state state;
   float volume;
   void *buf;
@@ -69,14 +44,19 @@ typedef struct audio_mixer_stream
   size_t bufsize;
 } audio_mixer_stream_t;

-typedef struct audio_statistics
+typedef struct audio_mixer_stream_params
 {
-   float average_buffer_saturation;
-   float std_deviation_percentage;
-   float close_to_underrun;
-   float close_to_blocking;
-   unsigned samples;
-} audio_statistics_t;
+   float volume;
+   enum audio_mixer_slot_selection_type slot_selection_type;
+   unsigned slot_selection_idx;
+   enum audio_mixer_stream_type  stream_type;
+   enum audio_mixer_type  type;
+   enum audio_mixer_state state;
+   void *buf;
+   char *basename;
+   size_t bufsize;
+   audio_mixer_stop_cb_t cb;
+} audio_mixer_stream_params_t;

 typedef struct audio_driver
 {
@@ -160,17 +140,6 @@ typedef struct audio_driver
   size_t (*buffer_size)(void *data);
 } audio_driver_t;

-typedef struct audio_mixer_stream_params
-{
-   float volume;
-   enum audio_mixer_type  type;
-   enum audio_mixer_state state;
-   void *buf;
-   char *basename;
-   size_t bufsize;
-   audio_mixer_stop_cb_t cb;
-} audio_mixer_stream_params_t;
-
 void audio_driver_destroy_data(void);

 void audio_driver_set_own_driver(void);
@@ -295,6 +264,10 @@ bool audio_driver_mixer_add_stream(audio_mixer_stream_params_t *params);

 void audio_driver_mixer_play_stream(unsigned i);

+void audio_driver_mixer_play_menu_sound(unsigned i);
+
+void audio_driver_mixer_play_menu_sound_looped(unsigned i);
+
 void audio_driver_mixer_play_stream_sequential(unsigned i);

 void audio_driver_mixer_play_stream_looped(unsigned i);
@@ -307,15 +280,16 @@ void audio_driver_mixer_set_stream_volume(unsigned i, float vol);

 void audio_driver_mixer_remove_stream(unsigned i);

-enum resampler_quality audio_driver_get_resampler_quality(void);
-
 enum audio_mixer_state audio_driver_mixer_get_stream_state(unsigned i);

 const char *audio_driver_mixer_get_stream_name(unsigned i);

 bool compute_audio_buffer_statistics(audio_statistics_t *stats);

+void audio_driver_load_menu_sounds(void);
+
 extern audio_driver_t audio_rsound;
+extern audio_driver_t audio_audioio;
 extern audio_driver_t audio_oss;
 extern audio_driver_t audio_alsa;
 extern audio_driver_t audio_alsathread;
@@ -330,14 +304,17 @@ extern audio_driver_t audio_pulse;
 extern audio_driver_t audio_dsound;
 extern audio_driver_t audio_wasapi;
 extern audio_driver_t audio_coreaudio;
+extern audio_driver_t audio_coreaudio3;
 extern audio_driver_t audio_xenon360;
 extern audio_driver_t audio_ps3;
 extern audio_driver_t audio_gx;
 extern audio_driver_t audio_ax;
 extern audio_driver_t audio_psp;
+extern audio_driver_t audio_ps2;
 extern audio_driver_t audio_ctr_csnd;
 extern audio_driver_t audio_ctr_dsp;
 extern audio_driver_t audio_switch;
+extern audio_driver_t audio_switch_thread;
 extern audio_driver_t audio_rwebaudio;
 extern audio_driver_t audio_null;

@@ -43,4 +43,3 @@ bool audio_init_thread(const audio_driver_t **out_driver, void **out_data,
      const audio_driver_t *driver);

 #endif
-
@@ -219,7 +219,6 @@ static int check_pcm_status(void *data, int channel_type)
   return ret;
 }

-
 static ssize_t alsa_qsa_write(void *data, const void *buf, size_t size)
 {
   alsa_t              *alsa = (alsa_t*)data;
@@ -328,7 +327,6 @@ static void alsa_qsa_set_nonblock_state(void *data, bool state)
   alsa->nonblock = state;
 }

-
 static bool alsa_qsa_use_float(void *data)
 {
   alsa_t *alsa = (alsa_t*)data;
@@ -0,0 +1,204 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
+ *  Copyright (C) 2011-2017 - Daniel De Matteis
+ *
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <fcntl.h>
+#include <sys/ioctl.h>
+#include <unistd.h>
+#include <errno.h>
+
+#include <sys/audioio.h>
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "../audio_driver.h"
+#include "../../verbosity.h"
+
+#define DEFAULT_DEV "/dev/audio"
+
+static void *audioio_init(const char *device, unsigned rate, unsigned latency,
+      unsigned block_frames,
+      unsigned *new_out_rate)
+{
+   int *fd = (int*)calloc(1, sizeof(int));
+   const char *audiodev = device ? device : DEFAULT_DEV;
+   struct audio_info info;
+
+   if (!fd)
+      return NULL;
+
+   AUDIO_INITINFO(&info);
+
+#ifdef AUMODE_PLAY_ALL
+   info.mode = AUMODE_PLAY_ALL;
+#endif
+   info.play.sample_rate = rate;
+   info.play.channels = 2;
+   info.play.precision = 16;
+#ifdef AUDIO_ENCODING_SLINEAR
+   info.play.encoding = AUDIO_ENCODING_SLINEAR;
+#else
+   info.play.encoding = AUDIO_ENCODING_LINEAR;
+#endif
+
+   if ((*fd = open(audiodev, O_WRONLY)) < 0)
+   {
+      free(fd);
+      perror("open");
+      return NULL;
+   }
+
+   if (ioctl(*fd, AUDIO_SETINFO, &info) < 0)
+      goto error;
+
+   if (ioctl(*fd, AUDIO_GETINFO, &info) < 0)
+      goto error;
+
+   *new_out_rate = info.play.sample_rate;
+
+   return fd;
+error:
+   close(*fd);
+   free(fd);
+   perror("ioctl");
+   return NULL;
+}
+
+static ssize_t audioio_write(void *data, const void *buf, size_t size)
+{
+   ssize_t ret;
+   int *fd = (int*)data;
+
+   if (size == 0)
+      return 0;
+
+   if ((ret = write(*fd, buf, size)) < 0)
+   {
+      if (errno == EAGAIN && (fcntl(*fd, F_GETFL) & O_NONBLOCK))
+         return 0;
+
+      return -1;
+   }
+
+   return ret;
+}
+
+static bool audioio_stop(void *data)
+{
+   struct audio_info info;
+   int *fd = (int*)data;
+
+   if (ioctl(*fd, AUDIO_FLUSH, NULL) < 0)
+      return false;
+
+   if (ioctl(*fd, AUDIO_GETINFO, &info) < 0)
+      return false;
+
+   info.play.pause = true;
+
+   return ioctl(*fd, AUDIO_SETINFO, &info) == 0;
+}
+
+static bool audioio_start(void *data, bool is_shutdown)
+{
+   struct audio_info info;
+   int *fd = (int*)data;
+
+   if (ioctl(*fd, AUDIO_FLUSH, NULL) < 0)
+      return false;
+
+   if (ioctl(*fd, AUDIO_GETINFO, &info) < 0)
+      return false;
+
+   info.play.pause = false;
+
+   return ioctl(*fd, AUDIO_SETINFO, &info) == 0;
+}
+
+static bool audioio_alive(void *data)
+{
+   struct audio_info info;
+   int *fd = (int*)data;
+
+   if (ioctl(*fd, AUDIO_GETINFO, &info) < 0)
+      return false;
+
+   return !info.play.pause;
+}
+
+static void audioio_set_nonblock_state(void *data, bool state)
+{
+   int rc;
+   int *fd = (int*)data;
+
+   if (state)
+      rc = fcntl(*fd, F_SETFL, fcntl(*fd, F_GETFL) | O_NONBLOCK);
+   else
+      rc = fcntl(*fd, F_SETFL, fcntl(*fd, F_GETFL) & (~O_NONBLOCK));
+   if (rc != 0)
+      RARCH_WARN("Could not set nonblocking on audio file descriptor. Will not be able to fast-forward.\n");
+}
+
+static void audioio_free(void *data)
+{
+   int *fd = (int*)data;
+
+   (void)ioctl(*fd, AUDIO_FLUSH, NULL);
+
+   close(*fd);
+   free(fd);
+}
+
+static size_t audioio_buffer_size(void *data)
+{
+   struct audio_info info;
+   int *fd = (int*)data;
+
+   if (ioctl(*fd, AUDIO_GETINFO, &info) < 0)
+      return false;
+
+   return info.play.buffer_size;
+}
+
+static size_t audioio_write_avail(void *data)
+{
+   return audioio_buffer_size(data);
+}
+
+static bool audioio_use_float(void *data)
+{
+   (void)data;
+   return false;
+}
+
+audio_driver_t audio_audioio = {
+   audioio_init,
+   audioio_write,
+   audioio_stop,
+   audioio_start,
+   audioio_alive,
+   audioio_set_nonblock_state,
+   audioio_free,
+   audioio_use_float,
+   "audioio",
+   NULL,
+   NULL,
+   audioio_write_avail,
+   audioio_buffer_size,
+};
@@ -15,7 +15,6 @@
 */
 #include <stdlib.h>

-
 #if TARGET_OS_IPHONE
 #include <AudioToolbox/AudioToolbox.h>
 #else
@@ -126,7 +125,9 @@ static OSStatus audio_write_cb(void *userdata,
 static void coreaudio_interrupt_listener(void *data, UInt32 interrupt_state)
 {
    (void)data;
+#if TARGET_OS_IOS
    g_interrupted = (interrupt_state == kAudioSessionBeginInterruption);
+#endif
 }
 #else
 static void choose_output_device(coreaudio_t *dev, const char* device)
@@ -219,7 +220,7 @@ static void *coreaudio_init(const char *device,
   dev->lock = slock_new();
   dev->cond = scond_new();

-#if TARGET_OS_IPHONE
+#if TARGET_OS_IOS
   if (!session_initialized)
   {
      session_initialized = true;
@@ -0,0 +1,382 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2019      - Stuart Carnie
+ *
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#import <Foundation/Foundation.h>
+#import <AudioToolbox/AudioToolbox.h>
+#import <AVFoundation/AVFoundation.h>
+
+#include <stdio.h>
+#include <stdatomic.h>
+#include <stdlib.h>
+#include <memory.h>
+
+#include "../audio_driver.h"
+
+#pragma mark - ringbuffer
+
+typedef struct ringbuffer
+{
+   float *buffer;
+   size_t cap;
+   atomic_int len;
+   size_t writePtr;
+   size_t readPtr;
+} ringbuffer_t;
+
+typedef ringbuffer_t * ringbuffer_h;
+
+static inline size_t rb_len(ringbuffer_h r)
+{
+   return atomic_load_explicit(&r->len, memory_order_relaxed);
+}
+
+static inline size_t rb_cap(ringbuffer_h r)
+{
+   return (r->readPtr + r->cap - r->writePtr) % r->cap;
+}
+
+static inline size_t rb_avail(ringbuffer_h r)
+{
+   return r->cap - rb_len(r);
+}
+
+static inline void rb_advance_write(ringbuffer_h r)
+{
+   r->writePtr = (r->writePtr + 1) % r->cap;
+}
+
+static inline void rb_advance_write_n(ringbuffer_h r, size_t n)
+{
+   r->writePtr = (r->writePtr + n) % r->cap;
+}
+
+static inline void rb_advance_read(ringbuffer_h r)
+{
+   r->readPtr = (r->readPtr + 1) % r->cap;
+}
+
+static inline void rb_len_add(ringbuffer_h r, int n)
+{
+   atomic_fetch_add(&r->len, n);
+}
+
+static inline void rb_len_sub(ringbuffer_h r, int n)
+{
+   atomic_fetch_sub(&r->len, n);
+}
+
+static void rb_init(ringbuffer_h r, size_t cap)
+{
+   r->buffer   = malloc(cap * sizeof(float));
+   r->cap      = cap;
+   atomic_init(&r->len, 0);
+   r->writePtr = 0;
+   r->readPtr  = 0;
+}
+
+static void rb_free(ringbuffer_h r)
+{
+   free(r->buffer);
+   bzero(r, sizeof(*r));
+}
+
+#define UNLIKELY(x) __builtin_expect((x), 0)
+#define LIKELY(x)   __builtin_expect((x), 1)
+
+static void rb_write_data(ringbuffer_h r, const float *data, size_t len)
+{
+   size_t avail       = rb_avail(r);
+   size_t n           = MIN(len, avail);
+   size_t first_write = n;
+   size_t rest_write  = 0;
+
+   if (r->writePtr + n > r->cap)
+   {
+      first_write = r->cap - r->writePtr;
+      rest_write  = n - first_write;
+   }
+
+   memcpy(r->buffer + r->writePtr, data, first_write*sizeof(float));
+   memcpy(r->buffer, data + first_write, rest_write*sizeof(float));
+
+   rb_advance_write_n(r, n);
+   rb_len_add(r, (int)n);
+}
+
+static void rb_read_data(ringbuffer_h r, float *d0, float *d1, size_t len)
+{
+   size_t need = len*2;
+
+   do {
+      size_t have = rb_len(r);
+      size_t n    = MIN(have, need);
+      int i       = 0;
+      for (; i < n/2; i++)
+      {
+         d0[i] = r->buffer[r->readPtr];
+         rb_advance_read(r);
+         d1[i] = r->buffer[r->readPtr];
+         rb_advance_read(r);
+      }
+
+      need -= n;
+      rb_len_sub(r, (int)n);
+
+      if (UNLIKELY(need > 0))
+      {
+         /* we got more data */
+         if (rb_len(r) > 0)
+            continue;
+
+         // underflow
+         const float quiet = 0.0f;
+         size_t       fill = (need/2)*sizeof(float);
+         memset_pattern4(&d0[i], &quiet, fill);
+         memset_pattern4(&d1[i], &quiet, fill);
+      }
+   } while (0);
+}
+
+#pragma mark - CoreAudio3
+
+static bool g_interrupted;
+
+@interface CoreAudio3 : NSObject {
+   ringbuffer_t _rb;
+   dispatch_semaphore_t _sema;
+   AUAudioUnit *_au;
+   size_t _bufferSize;
+   BOOL _nonBlock;
+}
+
+@property (nonatomic, readwrite) BOOL nonBlock;
+@property (nonatomic, readonly) BOOL paused;
+@property (nonatomic, readonly) size_t writeAvailableInBytes;
+@property (nonatomic, readonly) size_t bufferSizeInBytes;
+
+- (instancetype)initWithRate:(NSUInteger)rate
+                     latency:(NSUInteger)latency;
+- (ssize_t)writeFloat:(const float *)data samples:(size_t)samples;
+- (void)start;
+- (void)stop;
+
+@end
+
+@implementation CoreAudio3
+
+- (instancetype)initWithRate:(NSUInteger)rate
+                     latency:(NSUInteger)latency {
+   if (self = [super init])
+   {
+      _sema = dispatch_semaphore_create(0);
+
+      _bufferSize = (latency * rate) / 1000;
+      _bufferSize *= 2; // stereo
+      rb_init(&_rb, _bufferSize);
+
+      AudioComponentDescription desc = {
+         .componentType          = kAudioUnitType_Output,
+         .componentSubType       = kAudioUnitSubType_DefaultOutput,
+         .componentManufacturer  = kAudioUnitManufacturer_Apple,
+      };
+
+      NSError *err;
+      AUAudioUnit *au = [[AUAudioUnit alloc] initWithComponentDescription:desc error:&err];
+      if (err != nil)
+         return nil;
+
+      AVAudioFormat *format = au.outputBusses[0].format;
+      if (format.channelCount != 2)
+         return nil;
+
+      AVAudioFormat *renderFormat = [[AVAudioFormat alloc] initStandardFormatWithSampleRate:rate channels:2];
+      [au.inputBusses[0] setFormat:renderFormat error:&err];
+      if (err != nil)
+         return nil;
+
+      ringbuffer_h rb = &_rb;
+      __block dispatch_semaphore_t sema = _sema;
+      au.outputProvider = ^AUAudioUnitStatus(AudioUnitRenderActionFlags * actionFlags, const AudioTimeStamp * timestamp, AUAudioFrameCount frameCount, NSInteger inputBusNumber, AudioBufferList * inputData) {
+         rb_read_data(rb, inputData->mBuffers[0].mData, inputData->mBuffers[1].mData, frameCount);
+         dispatch_semaphore_signal(sema);
+         return 0;
+      };
+
+      [au allocateRenderResourcesAndReturnError:&err];
+      if (err != nil)
+         return nil;
+
+      _au = au;
+
+      RARCH_LOG("[CoreAudio3]: Using buffer size of %u bytes: (latency = %u ms)\n", (unsigned)self.bufferSizeInBytes, latency);
+
+      [self start];
+   }
+   return self;
+}
+
+- (void)dealloc {
+   rb_free(&_rb);
+}
+
+- (BOOL)paused {
+   return !_au.running;
+}
+
+- (size_t)bufferSizeInBytes {
+   return _bufferSize * sizeof(float);
+}
+
+- (size_t)writeAvailableInBytes {
+   return rb_avail(&_rb) * sizeof(float);
+}
+
+- (void)start {
+   NSError *err;
+   [_au startHardwareAndReturnError:&err];
+}
+
+- (void)stop {
+   [_au stopHardware];
+}
+
+- (ssize_t)writeFloat:(const float *)data samples:(size_t)samples {
+   size_t written = 0;
+   while (!g_interrupted && samples > 0)
+   {
+      size_t write_avail = rb_avail(&_rb);
+      if (write_avail > samples)
+         write_avail = samples;
+
+      rb_write_data(&_rb, data, write_avail);
+      data    += write_avail;
+      written += write_avail;
+      samples -= write_avail;
+
+      if (_nonBlock)
+         break;
+
+      if (write_avail == 0)
+         dispatch_semaphore_wait(_sema, DISPATCH_TIME_FOREVER);
+   }
+
+   return written;
+}
+
+@end
+
+static void coreaudio3_free(void *data)
+{
+   CoreAudio3 *dev = (__bridge_transfer CoreAudio3 *)data;
+   if (dev == nil)
+      return;
+
+   [dev stop];
+   dev = nil;
+}
+
+static void *coreaudio3_init(const char *device,
+                            unsigned rate, unsigned latency,
+                            unsigned block_frames,
+                            unsigned *new_rate)
+{
+   CoreAudio3 *dev = [[CoreAudio3 alloc] initWithRate:rate
+                                              latency:latency];
+
+   *new_rate = rate;
+
+   return (__bridge_retained void *)dev;
+}
+
+static ssize_t coreaudio3_write(void *data, const void *buf_, size_t size)
+{
+   CoreAudio3 *dev = (__bridge CoreAudio3 *)data;
+   return [dev writeFloat:(const float *)buf_ samples:size/sizeof(float)] * sizeof(float);
+}
+
+static void coreaudio3_set_nonblock_state(void *data, bool state)
+{
+   CoreAudio3 *dev = (__bridge CoreAudio3 *)data;
+   if (dev == nil)
+      return;
+
+   dev.nonBlock = state;
+}
+
+static bool coreaudio3_alive(void *data)
+{
+   CoreAudio3 *dev = (__bridge CoreAudio3 *)data;
+   if (dev == nil)
+      return NO;
+
+   return !dev.paused;
+}
+
+static bool coreaudio3_stop(void *data)
+{
+   CoreAudio3 *dev = (__bridge CoreAudio3 *)data;
+   if (dev == nil)
+      return NO;
+
+   [dev stop];
+   return dev.paused;
+}
+
+static bool coreaudio3_start(void *data, bool is_shutdown)
+{
+   CoreAudio3 *dev = (__bridge CoreAudio3 *)data;
+   if (dev == nil)
+      return NO;
+
+   [dev start];
+   return !dev.paused;
+}
+
+static bool coreaudio3_use_float(void *data)
+{
+   return YES;
+}
+
+static size_t coreaudio3_write_avail(void *data)
+{
+   CoreAudio3 *dev = (__bridge CoreAudio3 *)data;
+   if (dev == nil)
+      return 0;
+
+   return dev.writeAvailableInBytes;
+}
+
+static size_t coreaudio3_buffer_size(void *data)
+{
+   CoreAudio3 *dev = (__bridge CoreAudio3 *)data;
+   if (dev == nil)
+      return 0;
+
+   return dev.bufferSizeInBytes;
+}
+
+audio_driver_t audio_coreaudio3 = {
+   coreaudio3_init,
+   coreaudio3_write,
+   coreaudio3_stop,
+   coreaudio3_start,
+   coreaudio3_alive,
+   coreaudio3_set_nonblock_state,
+   coreaudio3_free,
+   coreaudio3_use_float,
+   "coreaudio3",
+   coreaudio3_write_avail,
+   coreaudio3_buffer_size,
+};
@@ -56,7 +56,6 @@ static void ctr_csnd_audio_update_playpos(ctr_csnd_audio_t* ctr)
   ctr->cpu_ticks_last += samples_played * CTR_CSND_CPU_TICKS_PER_SAMPLE;
 }

-
 Result csndPlaySound_custom(int chn, u32 flags, float vol, float pan,
      void* data0, void* data1, u32 size)
 {
@@ -289,7 +288,6 @@ static size_t ctr_csnd_audio_buffer_size(void *data)
   return CTR_CSND_AUDIO_COUNT;
 }

-
 audio_driver_t audio_ctr_csnd = {
   ctr_csnd_audio_init,
   ctr_csnd_audio_write,
@@ -195,7 +195,6 @@ static size_t ctr_dsp_audio_buffer_size(void *data)
   return CTR_DSP_AUDIO_COUNT;
 }

-
 audio_driver_t audio_ctr_dsp = {
   ctr_dsp_audio_init,
   ctr_dsp_audio_write,
@@ -211,4 +210,3 @@ audio_driver_t audio_ctr_dsp = {
   ctr_dsp_audio_write_avail,
   ctr_dsp_audio_buffer_size
 };
-
@@ -51,7 +51,6 @@
 #pragma comment(lib, "dxguid")
 #endif

-
 typedef struct dsound
 {
   LPDIRECTSOUND ds;
@@ -174,7 +173,6 @@ static DWORD CALLBACK dsound_thread(PVOID data)
         /* No space to write, or we don't have data in our fifo,
          * but we can wait some time before it underruns ... */

-
         /* We could opt for using the notification interface,
          * but it is not guaranteed to work, so use high
          * priority sleeping patterns.
@@ -39,7 +39,6 @@ typedef struct
   volatile unsigned dma_write;
   size_t write_ptr;

-   OSCond cond;
   bool nonblock;
   bool is_paused;
 } gx_audio_t;
@@ -63,8 +62,6 @@ static void dma_callback(void)
   DCFlushRange(wa->data[wa->dma_next], CHUNK_SIZE);

   AIInitDMA((uint32_t)wa->data[wa->dma_next], CHUNK_SIZE);
-
-   OSSignalCond(wa->cond);
 }

 static void *gx_audio_init(const char *device,
@@ -95,8 +92,6 @@ static void *gx_audio_init(const char *device,
      *new_rate = 48000;
   }

-   OSInitThreadQueue(&wa->cond);
-
   wa->dma_write = BLOCKS - 1;
   DCFlushRange(wa->data, sizeof(wa->data));
   stop_audio = false;
@@ -133,8 +128,7 @@ static ssize_t gx_audio_write(void *data, const void *buf_, size_t size)
      /* FIXME: Nonblocking audio should break out of loop
       * when it has nothing to write. */
      while ((wa->dma_write == wa->dma_next ||
-               wa->dma_write == wa->dma_busy) && !wa->nonblock)
-         OSSleepThread(wa->cond);
+               wa->dma_write == wa->dma_busy) && !wa->nonblock);

      copy_swapped(wa->data[wa->dma_write] + wa->write_ptr, buf, to_write);

@@ -205,10 +199,6 @@ static void gx_audio_free(void *data)
   AIStopDMA();
   AIRegisterDMACallback(NULL);

-   if (wa->cond)
-      OSCloseThreadQueue(wa->cond);
-   wa->cond = 0;
-
   free(data);
 }

@@ -21,7 +21,7 @@ static void *null_audio_init(const char *device, unsigned rate, unsigned latency
      unsigned block_frames,
      unsigned *new_rate)
 {
-   RARCH_ERR("Using the null audio driver. RetroArch will be silent.");
+   RARCH_ERR("Using the null audio driver. RetroArch will be silent.\n");

   (void)device;
   (void)rate;
@@ -232,7 +232,6 @@ static bool sl_start(void *data, bool is_shutdown)
   return sl->is_paused ? false : true;
 }

-
 static ssize_t sl_write(void *data, const void *buf_, size_t size)
 {
   sl_t           *sl = (sl_t*)data;
@@ -0,0 +1,292 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2014-2017 - Francisco Javier Trujillo Mata
+ *
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <stdint.h>
+#include <malloc.h>
+#include <stdio.h>
+#include <string.h>
+
+#include <kernel.h>
+#include <audsrv.h>
+
+#include "../audio_driver.h"
+
+typedef struct ps2_audio
+{
+   fifo_buffer_t* buffer;
+   bool nonblocking;
+   volatile bool running;
+   int worker_thread;
+   int lock;
+   int cond_lock;
+
+} ps2_audio_t;
+
+static ps2_audio_t *backup_ps2;
+static u8 audioThreadStack[4 * 1024] __attribute__ ((aligned(16)));
+
+#define AUDIO_OUT_BUFFER 2 * 1024
+#define AUDIO_BUFFER 64 * 1024
+#define AUDIO_CHANNELS 2
+#define AUDIO_BITS 16
+#define AUDIO_PRIORITY 0x7F /* LOWER VALUE GRATHER PRIORITY*/
+
+static void audioMainLoop(void *data)
+{
+   char out_tmp[AUDIO_OUT_BUFFER];
+   ps2_audio_t* ps2 = backup_ps2;
+
+   while (ps2->running)
+   {
+      size_t size;
+
+      WaitSema(ps2->lock);
+      size = MIN(fifo_read_avail(ps2->buffer), sizeof(out_tmp)); 
+      fifo_read(ps2->buffer, out_tmp, size);
+      iSignalSema(ps2->lock);
+      iSignalSema(ps2->cond_lock);
+
+      audsrv_wait_audio(size);
+      audsrv_play_audio(out_tmp, size);
+   }
+
+   audsrv_stop_audio();
+   ExitDeleteThread();
+}
+
+static void audioCreateThread(ps2_audio_t *ps2)
+{
+   int ret;
+   ee_thread_t thread;
+
+   thread.func=&audioMainLoop;
+   thread.stack=audioThreadStack;
+   thread.stack_size=sizeof(audioThreadStack);
+   thread.gp_reg=&_gp;
+   thread.initial_priority=AUDIO_PRIORITY;
+   thread.attr=thread.option=0;
+
+   /*Backup the PS2 content to be used in the thread */
+   backup_ps2 = ps2;
+
+   ps2->running = true;
+   ps2->worker_thread = CreateThread(&thread);
+
+   if (ps2->worker_thread >= 0)
+   {
+      ret = StartThread(ps2->worker_thread, NULL);
+      if (ret < 0)
+         printf("sound_init: StartThread returned %d\n", ret);
+   }
+   else
+      printf("CreateThread failed: %d\n", ps2->worker_thread);
+}
+
+static void audioStopNDeleteThread(ps2_audio_t *ps2)
+{
+   ps2->running = false;
+   if (ps2->worker_thread)
+      ps2->worker_thread = 0;
+}
+
+static void audioConfigure(ps2_audio_t *ps2, unsigned rate)
+{
+   int err;
+   struct audsrv_fmt_t format;
+
+   format.bits = AUDIO_BITS;
+   format.freq = rate;
+   format.channels = AUDIO_CHANNELS;
+
+   err = audsrv_set_format(&format);
+
+   if (err){
+      printf("set format returned %d\n", err);
+      printf("audsrv returned error string: %s\n", audsrv_get_error_string());
+   }
+
+   audsrv_set_volume(MAX_VOLUME);
+}
+
+static void audioCreateSemas(ps2_audio_t *ps2)
+{
+   ee_sema_t lock_info;
+   ee_sema_t cond_lock_info;
+
+   lock_info.max_count = 1;
+   lock_info.init_count = 1;
+   lock_info.option = 0;
+   ps2->lock = CreateSema(&lock_info);
+
+   cond_lock_info.init_count = 1;
+   cond_lock_info.max_count  = 1;
+   cond_lock_info.option = 0;
+
+   ps2->cond_lock = CreateSema(&cond_lock_info);
+}
+
+static void *ps2_audio_init(const char *device,
+      unsigned rate, unsigned latency,
+      unsigned block_frames,
+      unsigned *new_rate)
+{
+   ps2_audio_t *ps2 = (ps2_audio_t*)calloc(1, sizeof(ps2_audio_t));
+
+   if (!ps2)
+      return NULL;
+
+   ps2->buffer = fifo_new(AUDIO_BUFFER);
+   audioConfigure(ps2, rate);
+   audioCreateSemas(ps2);
+   audioCreateThread(ps2);
+
+   return ps2;
+}
+
+static void ps2_audio_free(void *data)
+{
+   ps2_audio_t* ps2 = (ps2_audio_t*)data;
+   if(!ps2)
+      return;
+
+   if(ps2->running){
+      audioStopNDeleteThread(ps2);
+
+      if (ps2->lock){
+         iDeleteSema(ps2->lock);
+         ps2->lock = 0;
+      }
+
+      if (ps2->cond_lock){
+         iDeleteSema(ps2->cond_lock);
+         ps2->cond_lock = 0;
+      }
+
+   }
+   fifo_free(ps2->buffer);
+   free(ps2);
+}
+
+static ssize_t ps2_audio_write(void *data, const void *buf, size_t size)
+{
+   ps2_audio_t* ps2 = (ps2_audio_t*)data;
+
+   if (!ps2->running)
+      return -1;
+
+   if (ps2->nonblocking)
+   {
+      if (fifo_write_avail(ps2->buffer) < size)
+         return 0;
+   }
+
+   while (fifo_write_avail(ps2->buffer) < size)
+      WaitSema(ps2->cond_lock);
+
+   WaitSema(ps2->lock);
+   fifo_write(ps2->buffer, buf, size);
+   iSignalSema(ps2->lock);
+
+   return size;
+}
+
+static bool ps2_audio_alive(void *data)
+{
+   bool       alive = false;
+   ps2_audio_t* ps2 = (ps2_audio_t*)data;
+
+   if (ps2)
+      alive = ps2->running;
+
+   return alive;
+}
+
+static bool ps2_audio_stop(void *data)
+{
+   bool        stop = true;
+   ps2_audio_t* ps2 = (ps2_audio_t*)data;
+
+   if (ps2)
+   {
+      audioStopNDeleteThread(ps2);
+      audsrv_stop_audio();
+   }
+
+   return stop;
+}
+
+static bool ps2_audio_start(void *data, bool is_shutdown)
+{
+   ps2_audio_t* ps2 = (ps2_audio_t*)data;
+   bool       start = true;
+
+   if (ps2)
+   {
+      if (!ps2->running && !ps2->worker_thread)
+         audioCreateThread(ps2);
+   }
+
+   return start;
+}
+
+static void ps2_audio_set_nonblock_state(void *data, bool toggle)
+{
+   ps2_audio_t* ps2 = (ps2_audio_t*)data;
+
+   if (ps2)
+      ps2->nonblocking = toggle;
+}
+
+static bool ps2_audio_use_float(void *data)
+{
+   return false;
+}
+
+static size_t ps2_audio_write_avail(void *data)
+{
+   ps2_audio_t* ps2 = (ps2_audio_t*)data;
+
+   if (ps2 && ps2->running)
+   {
+      size_t size;
+      WaitSema(ps2->lock);
+      size = AUDIO_BUFFER - fifo_read_avail(ps2->buffer); 
+      iSignalSema(ps2->lock);
+      return size;
+   }
+
+   return 0;
+}
+
+static size_t ps2_audio_buffer_size(void *data)
+{
+   return AUDIO_BUFFER;
+}
+
+audio_driver_t audio_ps2 = {
+   ps2_audio_init,
+   ps2_audio_write,
+   ps2_audio_stop,
+   ps2_audio_start,
+   ps2_audio_alive,
+   ps2_audio_set_nonblock_state,
+   ps2_audio_free,
+   ps2_audio_use_float,
+   "ps2",
+   NULL,
+   NULL,
+   ps2_audio_write_avail,
+   ps2_audio_buffer_size
+};
@@ -16,21 +16,28 @@
 */

 #include <stdint.h>
+#if defined(VITA) || defined(PSP)
 #include <malloc.h>
+#endif
 #include <stdio.h>
 #include <string.h>

 #include <rthreads/rthreads.h>
 #include <queues/fifo_queue.h>

-#ifdef VITA
+#if defined(VITA)
 #include <psp2/kernel/processmgr.h>
 #include <psp2/kernel/threadmgr.h>
 #include <psp2/kernel/sysmem.h>
 #include <psp2/audioout.h>
-#else
+#elif defined(PSP)
 #include <pspkernel.h>
 #include <pspaudio.h>
+#elif defined(ORBIS)
+#include <audioout.h>
+#define SCE_AUDIO_OUT_PORT_TYPE_MAIN   0
+#define SCE_AUDIO_OUT_MODE_STEREO      1
+#define SceUID uint32_t
 #endif

 #include "../audio_driver.h"
@@ -64,10 +71,14 @@ static void audioMainLoop(void *data)
 {
   psp_audio_t* psp = (psp_audio_t*)data;

-#ifdef VITA
+#if defined(VITA)
   int port         = sceAudioOutOpenPort(
         SCE_AUDIO_OUT_PORT_TYPE_MAIN, AUDIO_OUT_COUNT,
         psp->rate, SCE_AUDIO_OUT_MODE_STEREO);
+#elif defined(ORBIS)
+   int port         = sceAudioOutOpen(0xff,
+         SCE_AUDIO_OUT_PORT_TYPE_MAIN, 0, AUDIO_OUT_COUNT,
+         psp->rate, SCE_AUDIO_OUT_MODE_STEREO);
 #else
   sceAudioSRCChReserve(AUDIO_OUT_COUNT, psp->rate, 2);
 #endif
@@ -95,7 +106,7 @@ static void audioMainLoop(void *data)
      scond_signal(psp->cond);
      slock_unlock(psp->cond_lock);

-#ifdef VITA
+#if defined(VITA) || defined(ORBIS)
      sceAudioOutOutput(port,
        cond ? (psp->zeroBuffer)
              : (psp->buffer + read_pos_2));
@@ -105,8 +116,10 @@ static void audioMainLoop(void *data)
 #endif
   }

-#ifdef VITA
+#if defined(VITA)
   sceAudioOutReleasePort(port);
+#elif defined(ORBIS)
+   sceAudioOutClose(port);
 #else
   sceAudioSRCChRelease();
 #endif
@@ -127,12 +140,23 @@ static void *psp_audio_init(const char *device,
   (void)device;
   (void)latency;

+#ifdef ORBIS
+   psp->buffer      = (uint32_t*)
+      malloc(AUDIO_BUFFER_SIZE * sizeof(uint32_t));
+#else
   /* Cache aligned, not necessary but helpful. */
   psp->buffer      = (uint32_t*)
      memalign(64, AUDIO_BUFFER_SIZE * sizeof(uint32_t));
+#endif
   memset(psp->buffer, 0, AUDIO_BUFFER_SIZE * sizeof(uint32_t));
+
+#ifdef ORBIS
+   psp->zeroBuffer      = (uint32_t*)
+      malloc(AUDIO_OUT_COUNT * sizeof(uint32_t));
+#else
   psp->zeroBuffer  = (uint32_t*)
      memalign(64, AUDIO_OUT_COUNT   * sizeof(uint32_t));
+#endif
   memset(psp->zeroBuffer, 0, AUDIO_OUT_COUNT * sizeof(uint32_t));

   psp->read_pos    = 0;
@@ -228,7 +252,6 @@ static bool psp_audio_alive(void *data)
   return psp->running;
 }

-
 static bool psp_audio_stop(void *data)
 {
   psp_audio_t* psp = (psp_audio_t*)data;
@@ -294,7 +317,6 @@ static size_t psp_buffer_size(void *data)
   return AUDIO_BUFFER_SIZE /** sizeof(uint32_t)*/;
 }

-
 audio_driver_t audio_psp = {
   psp_audio_init,
   psp_audio_write,
@@ -304,8 +326,10 @@ audio_driver_t audio_psp = {
   psp_audio_set_nonblock_state,
   psp_audio_free,
   psp_audio_use_float,
-#ifdef VITA
+#if defined(VITA)
   "vita",
+#elif defined(ORBIS)
+   "orbis",
 #else
   "psp",
 #endif
@@ -1,4 +1,6 @@
 /*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2018      - misson20000
+ *  Copyright (C) 2018      - m4xw
 *
 *  RetroArch is free software: you can redistribute it and/or modify it under the terms
 *  of the GNU General Public License as published by the Free Software Found-
@@ -17,12 +19,16 @@
 #include <malloc.h>
 #include <stdint.h>

-#include<libtransistor/nx.h>
-#include<libtransistor/alloc_pages.h>
-
+#include "switch_audio_compat.h"
 #include "../audio_driver.h"
 #include "../../verbosity.h"

+#ifdef HAVE_LIBNX
+#define BUFFER_COUNT 5
+#else
+#define BUFFER_COUNT 3
+#endif
+
 static const int sample_rate           = 48000;
 static const int max_num_samples       = sample_rate;
 static const int num_channels          = 2;
@@ -30,38 +36,57 @@ static const size_t sample_buffer_size = ((max_num_samples * num_channels * size

 typedef struct
 {
-   audio_output_t output;
-   handle_t event;
-   audio_output_buffer_t buffers[3];
-   audio_output_buffer_t *current_buffer;
   bool blocking;
   bool is_paused;
   uint64_t last_append;
   unsigned latency;
+   compat_audio_out_buffer buffers[BUFFER_COUNT];
+   compat_audio_out_buffer *current_buffer;
+
+#ifndef HAVE_LIBNX
+   audio_output_t output;
+   handle_t event;
+#endif
 } switch_audio_t;

+static uint32_t switch_audio_data_size(void)
+{
+#ifdef HAVE_LIBNX
+   static const int framerate = 1000 / 30;
+   static const int samplecount = (sample_rate / framerate);
+   return (samplecount * num_channels * sizeof(uint16_t));
+#else
+   return sample_buffer_size;
+#endif
+}
+
+static size_t switch_audio_buffer_size(void *data)
+{
+   (void) data;
+#ifdef HAVE_LIBNX
+   return (switch_audio_data_size() + 0xfff) & ~0xfff;
+#else
+   return sample_buffer_size;
+#endif
+}
+
 static ssize_t switch_audio_write(void *data, const void *buf, size_t size)
 {
   size_t to_write     = size;
 	switch_audio_t *swa = (switch_audio_t*) data;

-#if 0
-	RARCH_LOG("write %ld samples\n", size/sizeof(uint16_t));
-#endif
+   if (!swa)
+      return -1;

 	if (!swa->current_buffer)
   {
      uint32_t num;
-      if (audio_ipc_output_get_released_buffer(&swa->output, &num, &swa->current_buffer) != RESULT_OK)
+      if (switch_audio_ipc_output_get_released_buffer(swa, num) != 0)
      {
         RARCH_LOG("Failed to get released buffer?\n");
         return -1;
      }

-#if 0
-      RARCH_LOG("got buffer, num %d, ptr %p\n", num, swa->current_buffer);
-#endif
-
      if (num < 1)
         swa->current_buffer = NULL;

@@ -69,51 +94,48 @@ static ssize_t switch_audio_write(void *data, const void *buf, size_t size)
      {
         if (swa->blocking)
         {
-            RARCH_LOG("No buffer, blocking...\n");
-
            while(swa->current_buffer == NULL)
            {
-               uint32_t num;
-               uint32_t handle_idx;
+               uint32_t handle_idx = 0;
+               num                 = 0;

+#ifdef HAVE_LIBNX
+               if (audoutWaitPlayFinish(&swa->current_buffer, &num, U64_MAX) != 0) { }
+#else
               svcWaitSynchronization(&handle_idx, &swa->event, 1, 33333333);
               svcResetSignal(swa->event);

-               if (audio_ipc_output_get_released_buffer(&swa->output, &num, &swa->current_buffer) != RESULT_OK)
+               if (switch_audio_ipc_output_get_released_buffer(swa, num) != 0)
                  return -1;
+#endif
            }
-         } else {
+         }
+         else
            /* no buffer, nonblocking... */
            return 0;
-         }
      }

      swa->current_buffer->data_size = 0;
   }

-	if (to_write > sample_buffer_size - swa->current_buffer->data_size)
-		to_write = sample_buffer_size - swa->current_buffer->data_size;
+	if (to_write > switch_audio_buffer_size(NULL) - swa->current_buffer->data_size)
+		to_write = switch_audio_buffer_size(NULL) - swa->current_buffer->data_size;
 	
+   #ifndef HAVE_LIBNX
 	memcpy(((uint8_t*) swa->current_buffer->sample_data) + swa->current_buffer->data_size, buf, to_write);
+   #else
+	memcpy(((uint8_t*) swa->current_buffer->buffer) + swa->current_buffer->data_size, buf, to_write);
+   #endif
 	swa->current_buffer->data_size   += to_write;
-	swa->current_buffer->buffer_size  = sample_buffer_size;
+	swa->current_buffer->buffer_size  = switch_audio_buffer_size(NULL);

-	if (swa->current_buffer->data_size > (48000*swa->latency)/1000)
+	if (swa->current_buffer->data_size > (48000 * swa->latency) / 1000)
   {
-		result_t r = audio_ipc_output_append_buffer(&swa->output, swa->current_buffer);
-		if (r != RESULT_OK)
-      {
-			RARCH_ERR("failed to append buffer: 0x%x\n", r);
-			return -1;
-		}
+         if (switch_audio_ipc_output_append_buffer(swa, swa->current_buffer) != 0)
+            return -1;
 		swa->current_buffer = NULL;
 	}

-#if 0
-	RARCH_LOG("submitted %ld samples, %ld samples since last submit\n",
-         to_write/num_channels/sizeof(uint16_t),
-         (svcGetSystemTick() - swa->last_append) * sample_rate / 19200000);
-#endif
 	swa->last_append = svcGetSystemTick();
 	
 	return to_write;
@@ -125,25 +147,32 @@ static bool switch_audio_stop(void *data)
   if (!swa)
      return false;

-   if(!swa->is_paused) {
-	   if(audio_ipc_output_stop(&swa->output) != RESULT_OK)
+   /* TODO/FIXME - fix libnx codepath */
+#ifndef HAVE_LIBNX
+
+   if (!swa->is_paused)
+	   if (switch_audio_ipc_output_stop(swa) != 0)
 		   return false;
-   }

   swa->is_paused = true;
+#endif
   return true;
 }

 static bool switch_audio_start(void *data, bool is_shutdown)
 {
   switch_audio_t *swa = (switch_audio_t*) data;
+   if (!swa)
+      return false;

-   if(swa->is_paused) {
-	   if (audio_ipc_output_start(&swa->output) != RESULT_OK)
+   /* TODO/FIXME - fix libnx codepath */
+#ifndef HAVE_LIBNX
+   if (swa->is_paused)
+	   if (switch_audio_ipc_output_start(swa) != 0)
 		   return false;
-   }

   swa->is_paused = false;
+#endif
   return true;
 }

@@ -159,8 +188,22 @@ static void switch_audio_free(void *data)
 {
   switch_audio_t *swa = (switch_audio_t*) data;

+   if (!swa)
+      return;
+
+#ifdef HAVE_LIBNX
+   if (!swa->is_paused)
+      audoutStopAudioOut();
+
+   audoutExit();
+
+   int i;
+   for (i = 0; i < BUFFER_COUNT; i++)
+      free(swa->buffers[i].buffer);
+#else
   audio_ipc_output_close(&swa->output);
   audio_ipc_finalize();
+#endif
   free(swa);
 }

@@ -189,11 +232,10 @@ static void switch_audio_set_nonblock_state(void *data, bool state)
 }

 static void *switch_audio_init(const char *device,
-                               unsigned rate, unsigned latency,
-                               unsigned block_frames,
-                               unsigned *new_rate)
+      unsigned rate, unsigned latency,
+      unsigned block_frames,
+      unsigned *new_rate)
 {
-   result_t r;
   unsigned i;
   char names[8][0x20];
   uint32_t num_names  = 0;
@@ -202,12 +244,14 @@ static void *switch_audio_init(const char *device,
   if (!swa)
      return NULL;

-   r = audio_ipc_init();
-
-   if (r != RESULT_OK)
+   if (switch_audio_ipc_init() != 0)
      goto fail;

-   if (audio_ipc_list_outputs(&names[0], 8, &num_names) != RESULT_OK)
+#ifdef HAVE_LIBNX
+   if (audoutStartAudioOut() != 0)
+      goto fail;
+#else
+   if (audio_ipc_list_outputs(&names[0], 8, &num_names) != 0)
      goto fail_audio_ipc;

   if (num_names != 1)
@@ -216,7 +260,7 @@ static void *switch_audio_init(const char *device,
      goto fail_audio_ipc;
   }

-   if (audio_ipc_open_output(names[0], &swa->output) != RESULT_OK)
+   if (audio_ipc_open_output(names[0], &swa->output) != 0)
      goto fail_audio_ipc;

   if (swa->output.sample_rate != sample_rate)
@@ -239,51 +283,70 @@ static void *switch_audio_init(const char *device,
      goto fail_audio_output;
   }

-   if (audio_ipc_output_register_buffer_event(&swa->output, &swa->event) != RESULT_OK)
+   if (audio_ipc_output_register_buffer_event(&swa->output, &swa->event) != 0)
      goto fail_audio_output;
+#endif

-   swa->blocking = block_frames;
-
-   *new_rate = swa->output.sample_rate;
-
-   for(i = 0; i < 3; i++)
+   for (i = 0; i < BUFFER_COUNT; i++)
   {
-      swa->buffers[i].ptr         = &swa->buffers[i].sample_data;
-      swa->buffers[i].sample_data = alloc_pages(sample_buffer_size, sample_buffer_size, NULL);
-      swa->buffers[i].buffer_size = sample_buffer_size;
-      swa->buffers[i].data_size   = sample_buffer_size;
-      swa->buffers[i].unknown     = 0;
+      swa->buffers[i].buffer_size = switch_audio_buffer_size(NULL);
+      swa->buffers[i].data_size   = switch_audio_data_size();

-      if(swa->buffers[i].sample_data == NULL)
+#ifdef HAVE_LIBNX
+      swa->buffers[i].next        = NULL; /* Unused */
+      swa->buffers[i].data_offset = 0;
+      swa->buffers[i].buffer      = memalign(0x1000, switch_audio_buffer_size(NULL));
+
+      if (swa->buffers[i].buffer == NULL)
+         goto fail_audio_output;
+
+      memset(swa->buffers[i].buffer, 0, switch_audio_buffer_size(NULL));
+#else
+      swa->buffers[i].ptr         = &swa->buffers[i].sample_data;
+      swa->buffers[i].unknown     = 0;
+      swa->buffers[i].sample_data = alloc_pages(sample_buffer_size, switch_audio_buffer_size(NULL), NULL);
+
+      if (swa->buffers[i].sample_data == NULL)
 	      goto fail_audio_output;
-      
-      if (audio_ipc_output_append_buffer(&swa->output, &swa->buffers[i]) != RESULT_OK)
+#endif
+
+      if (switch_audio_ipc_output_append_buffer(swa, &swa->buffers[i]) != 0)
         goto fail_audio_output;
   }

+#ifdef HAVE_LIBNX
+   *new_rate           = audoutGetSampleRate();
+#else
+   *new_rate           = swa->output.sample_rate;
+#endif
+
   swa->current_buffer = NULL;
   swa->latency        = latency;
   swa->last_append    = svcGetSystemTick();

+   swa->blocking       = block_frames;
   swa->is_paused      = true;
+
+   RARCH_LOG("[Audio]: Audio initialized\n");
   
   return swa;

 fail_audio_output:
+/* TODO/FIXME - fix libnx codepath */
+#ifndef HAVE_LIBNX
   audio_ipc_output_close(&swa->output);
+#endif
 fail_audio_ipc:
+/* TODO/FIXME - fix libnx codepath */
+#ifndef HAVE_LIBNX
   audio_ipc_finalize();
+#endif
 fail:
-   free(swa);
+   if (swa)
+      free(swa);
   return NULL;
 }

-static size_t switch_audio_buffer_size(void *data)
-{
-   (void) data;
-   return sample_buffer_size;
-}
-
 audio_driver_t audio_switch = {
   switch_audio_init,
   switch_audio_write,
@@ -0,0 +1,93 @@
+#ifndef _SWITCH_AUDIO_COMPAT_H
+#define _SWITCH_AUDIO_COMPAT_H
+
+#ifdef HAVE_LIBNX
+#include <switch.h>
+#else
+#include <libtransistor/nx.h>
+#endif
+
+#ifdef HAVE_LIBNX
+
+/* libnx definitions */
+
+/* threading */
+typedef Mutex compat_mutex;
+typedef Thread compat_thread;
+typedef CondVar compat_condvar;
+
+#define compat_thread_create(thread, func, data, stack_size, prio, cpu) \
+   threadCreate(thread, func, data, stack_size, prio, cpu)
+#define compat_thread_start(thread) \
+   threadStart(thread)
+#define compat_thread_join(thread) \
+   threadWaitForExit(thread)
+#define compat_thread_close(thread) \
+   threadClose(thread)
+#define compat_mutex_create(mutex) \
+   mutexInit(mutex)
+#define compat_mutex_lock(mutex) \
+   mutexLock(mutex)
+#define compat_mutex_unlock(mutex) \
+   mutexUnlock(mutex)
+#define compat_condvar_create(condvar) \
+   condvarInit(condvar)
+#define compat_condvar_wait(condvar, mutex) \
+   condvarWait(condvar, mutex)
+#define compat_condvar_wake_all(condvar) \
+   condvarWakeAll(condvar)
+
+/* audio */
+typedef AudioOutBuffer compat_audio_out_buffer;
+#define switch_audio_ipc_init audoutInitialize
+#define switch_audio_ipc_finalize audoutExit
+#define switch_audio_ipc_output_get_released_buffer(a, b) audoutGetReleasedAudioOutBuffer(&a->current_buffer, &b)
+#define switch_audio_ipc_output_append_buffer(a, b) audoutAppendAudioOutBuffer(b)
+#define switch_audio_ipc_output_stop(a) audoutStopAudioOut()
+#define switch_audio_ipc_output_start(a) audoutStartAudioOut()
+
+#else
+
+/* libtransistor definitions */
+
+typedef result_t Result;
+#define R_FAILED(r) ((r) != RESULT_OK)
+
+/* threading */
+typedef trn_mutex_t compat_mutex;
+typedef trn_thread_t compat_thread;
+typedef trn_condvar_t compat_condvar;
+
+#define compat_thread_create(thread, func, data, stack_size, prio, cpu) \
+   trn_thread_create(thread, func, data, prio, cpu, stack_size, NULL)
+#define compat_thread_start(thread) \
+   trn_thread_start(thread)
+#define compat_thread_join(thread) \
+   trn_thread_join(thread, -1)
+#define compat_thread_close(thread) \
+   trn_thread_destroy(thread)
+#define compat_mutex_create(mutex) \
+   trn_mutex_create(mutex)
+#define compat_mutex_lock(mutex) \
+   trn_mutex_lock(mutex)
+#define compat_mutex_unlock(mutex) \
+   trn_mutex_unlock(mutex)
+#define compat_condvar_create(condvar) \
+   trn_condvar_create(condvar)
+#define compat_condvar_wait(condvar, mutex) \
+   trn_condvar_wait(condvar, mutex, -1)
+#define compat_condvar_wake_all(condvar) \
+   trn_condvar_signal(condvar, -1)
+
+/* audio */
+typedef audio_output_buffer_t compat_audio_out_buffer;
+#define switch_audio_ipc_init audio_ipc_init
+#define switch_audio_ipc_finalize audio_ipc_finalize
+#define switch_audio_ipc_output_get_released_buffer(a, b) audio_ipc_output_get_released_buffer(&a->output, &b, &a->current_buffer)
+#define switch_audio_ipc_output_append_buffer(a, b) audio_ipc_output_append_buffer(&a->output, b)
+#define switch_audio_ipc_output_stop(a) audio_ipc_output_stop(&a->output)
+#define switch_audio_ipc_output_start(a) audio_ipc_output_start(&a->output)
+
+#endif
+
+#endif
@@ -0,0 +1,447 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2018      - misson20000
+ *  Copyright (C) 2018      - m4xw
+ *  Copyright (C) 2018      - lifajucejo
+ *
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <malloc.h>
+#include <stdint.h>
+#include <sys/unistd.h>
+
+#ifdef HAVE_LIBNX
+#include <switch.h>
+#else
+#include <libtransistor/nx.h>
+#endif
+
+#include <queues/fifo_queue.h>
+#include "../audio_driver.h"
+#include "../../verbosity.h"
+
+#include "../../tasks/tasks_internal.h"
+
+#include "switch_audio_compat.h"
+
+static const size_t thread_stack_size = 1024 * 8;
+static const int thread_preferred_cpu = 2;
+static const int channel_count = 2;
+static const size_t sample_size = sizeof(uint16_t);
+static const size_t frame_size = channel_count * sample_size;
+
+#define AUDIO_BUFFER_COUNT 2
+
+typedef struct
+{
+   fifo_buffer_t* fifo;
+   compat_mutex fifoLock;
+   compat_condvar cond;
+   compat_mutex condLock;
+
+   size_t fifoSize;
+
+   volatile bool running;
+   bool nonblocking;
+   bool is_paused;
+
+   compat_audio_out_buffer buffers[AUDIO_BUFFER_COUNT];
+   compat_thread thread;
+
+   unsigned latency;
+   uint32_t sampleRate;
+
+#ifndef HAVE_LIBNX
+   audio_output_t output;
+   handle_t event;
+#endif
+} switch_thread_audio_t;
+
+static void mainLoop(void* data)
+{
+   Result rc;
+   uint32_t released_out_count                  = 0;
+   compat_audio_out_buffer *released_out_buffer = NULL;
+   switch_thread_audio_t                  *swa  = (switch_thread_audio_t*)data;
+
+   if (!swa)
+      return;
+
+   RARCH_LOG("[Audio]: start mainLoop cpu %u tid %u\n", svcGetCurrentProcessorNumber(), swa->thread.handle);
+
+   while (swa->running)
+   {
+      size_t buf_avail, avail, to_write;
+
+      if (!released_out_buffer)
+      {
+#ifdef HAVE_LIBNX
+         rc = audoutWaitPlayFinish(&released_out_buffer, &released_out_count, U64_MAX);
+#else
+         uint32_t handle_idx = 0;
+         svcWaitSynchronization(&handle_idx, &swa->event, 1, 33333333);
+         svcResetSignal(swa->event);
+
+         rc = audio_ipc_output_get_released_buffer(&swa->output, &released_out_count, &released_out_buffer);
+#endif
+         if (R_FAILED(rc))
+         {
+            swa->running = false;
+            RARCH_LOG("[Audio]: audoutGetReleasedAudioOutBuffer failed: %d\n", (int)rc);
+            break;
+         }
+         released_out_buffer->data_size = 0;
+      }
+
+      buf_avail = released_out_buffer->buffer_size - released_out_buffer->data_size;
+
+      compat_mutex_lock(&swa->fifoLock);
+
+      avail    = fifo_read_avail(swa->fifo);
+      to_write = MIN(avail, buf_avail);
+      if (to_write > 0)
+      {
+	      uint8_t *base;
+#ifdef HAVE_LIBNX
+	      base = (uint8_t*) released_out_buffer->buffer;
+#else
+	      base = (uint8_t*) released_out_buffer->sample_data;
+#endif
+         fifo_read(swa->fifo, base + released_out_buffer->data_size, to_write);
+      }
+
+      compat_mutex_unlock(&swa->fifoLock);
+      compat_condvar_wake_all(&swa->cond);
+
+      released_out_buffer->data_size += to_write;
+      if (released_out_buffer->data_size >= released_out_buffer->buffer_size / 2)
+      {
+         rc = switch_audio_ipc_output_append_buffer(swa, released_out_buffer);
+         if (R_FAILED(rc))
+         {
+            RARCH_LOG("[Audio]: audoutAppendAudioOutBuffer failed: %d\n", (int)rc);
+         }
+         released_out_buffer = NULL;
+      }
+      else
+         svcSleepThread(16000000); /* 16ms */
+   }
+}
+
+static void *switch_thread_audio_init(const char *device, unsigned rate, unsigned latency, unsigned block_frames, unsigned *new_rate)
+{
+   Result rc;
+   unsigned i;
+   uint32_t prio;
+   char names[8][0x20];
+   uint32_t num_names  = 0;
+   switch_thread_audio_t *swa = (switch_thread_audio_t *)calloc(1, sizeof(*swa));
+
+   if (!swa)
+      return NULL;
+
+   swa->running     = true;
+   swa->nonblocking = true;
+   swa->is_paused   = true;
+   swa->latency     = MAX(latency, 8);
+
+   rc               = switch_audio_ipc_init();
+   if (R_FAILED(rc))
+   {
+      RARCH_LOG("[Audio]: audio init failed %d\n", (int)rc);
+      free(swa);
+      return NULL;
+   }
+
+#ifdef HAVE_LIBNX
+   rc = audoutStartAudioOut();
+   if (R_FAILED(rc))
+   {
+      RARCH_LOG("[Audio]: audio start init failed: %d\n", (int)rc);
+      goto fail_audio_ipc;
+   }
+
+   swa->sampleRate = audoutGetSampleRate();
+#else
+   if (audio_ipc_list_outputs(&names[0], 8, &num_names) != RESULT_OK)
+	   goto fail_audio_ipc;
+
+   if (num_names != 1)
+   {
+	   RARCH_ERR("[Audio]: got back more than one AudioOut\n");
+	   goto fail_audio_ipc;
+   }
+
+   if (audio_ipc_open_output(names[0], &swa->output) != RESULT_OK)
+	   goto fail_audio_ipc;
+
+   swa->sampleRate = swa->output.sample_rate;
+
+   if (swa->output.num_channels != 2)
+   {
+      RARCH_ERR("expected %d channels, got %d\n", 2,
+            swa->output.num_channels);
+      goto fail_audio_output;
+   }
+
+   if (swa->output.sample_format != PCM_INT16)
+   {
+      RARCH_ERR("expected PCM_INT16, got %d\n", swa->output.sample_format);
+      goto fail_audio_output;
+   }
+
+   if (audio_ipc_output_register_buffer_event(&swa->output, &swa->event) != 0)
+      goto fail_audio_output;
+#endif
+
+   *new_rate     = swa->sampleRate;
+   swa->fifoSize = (swa->sampleRate * sample_size * swa->latency) / 1000;
+
+   for (i = 0; i < AUDIO_BUFFER_COUNT; i++)
+   {
+#ifdef HAVE_LIBNX
+      swa->buffers[i].next        = NULL; /* Unused */
+      swa->buffers[i].data_offset = 0;
+      swa->buffers[i].buffer_size = swa->fifoSize;
+      swa->buffers[i].data_size   = swa->buffers[i].buffer_size;
+      swa->buffers[i].buffer      = memalign(0x1000, swa->buffers[i].buffer_size);
+
+      if (swa->buffers[i].buffer == NULL)
+         goto fail;
+
+      memset(swa->buffers[i].buffer, 0, swa->buffers[i].buffer_size);
+#else
+      swa->buffers[i].ptr         = &swa->buffers[i].sample_data;
+      swa->buffers[i].unknown     = 0;
+      swa->buffers[i].buffer_size = swa->fifoSize;
+      swa->buffers[i].data_size   = swa->buffers[i].buffer_size;
+      swa->buffers[i].sample_data = alloc_pages(swa->buffers[i].buffer_size, swa->buffers[i].buffer_size, NULL);
+
+      if (swa->buffers[i].sample_data == NULL)
+	      goto fail_audio_output;
+
+      memset(swa->buffers[i].sample_data, 0, swa->buffers[i].buffer_size);
+#endif
+
+      if (switch_audio_ipc_output_append_buffer(swa, &swa->buffers[i]) != 0)
+         goto fail_audio_output;
+   }
+   
+   compat_mutex_create(&swa->fifoLock);
+   swa->fifo = fifo_new(swa->fifoSize);
+
+   compat_condvar_create(&swa->cond);
+
+   RARCH_LOG("[Audio]: switch_thread_audio_init device %s requested rate %hu rate %hu latency %hu block_frames %hu fifoSize %lu\n",
+         device, rate, swa->sampleRate, swa->latency, block_frames, swa->fifoSize);
+
+   svcGetThreadPriority(&prio, 0xffff8000);
+   rc = compat_thread_create(&swa->thread, &mainLoop, (void*)swa, thread_stack_size, prio - 1, thread_preferred_cpu);
+
+   if (R_FAILED(rc))
+   {
+      RARCH_LOG("[Audio]: thread creation failed create %u\n", swa->thread.handle);
+      swa->running = false;
+      return NULL;
+   }
+
+   if (R_FAILED(compat_thread_start(&swa->thread)))
+   {
+      RARCH_LOG("[Audio]: thread creation failed start %u\n", swa->thread.handle);
+      compat_thread_close(&swa->thread);
+      swa->running = false;
+      return NULL;
+   }
+
+   return swa;
+
+fail_audio_output:
+#ifndef HAVE_LIBNX
+   audio_ipc_output_close(&swa->output);
+#endif
+fail_audio_ipc:
+   switch_audio_ipc_finalize();
+fail:
+   free(swa); // freeing a null ptr is valid
+   return NULL;
+}
+
+static bool switch_thread_audio_start(void *data, bool is_shutdown)
+{
+   /* RARCH_LOG("[Audio]: switch_thread_audio_start\n"); */
+   switch_thread_audio_t *swa = (switch_thread_audio_t *)data;
+
+   if (!swa)
+      return false;
+
+   swa->is_paused = false;
+   return true;
+}
+
+static bool switch_thread_audio_stop(void *data)
+{
+   switch_thread_audio_t* swa = (switch_thread_audio_t*)data;
+
+   if (!swa)
+      return false;
+
+   swa->is_paused = true;
+   return true;
+}
+
+static void switch_thread_audio_free(void *data)
+{
+   unsigned i;
+   switch_thread_audio_t *swa = (switch_thread_audio_t *)data;
+
+   if (!swa)
+         return;
+
+   if (swa->running)
+   {
+         swa->running = false;
+         compat_thread_join(&swa->thread);
+         compat_thread_close(&swa->thread);
+   }
+
+   switch_audio_ipc_output_stop(swa);
+   switch_audio_ipc_finalize();
+
+   if (swa->fifo)
+   {
+         fifo_free(swa->fifo);
+         swa->fifo = NULL;
+   }
+
+   for (i = 0; i < ARRAY_SIZE(swa->buffers); i++)
+   {
+#ifdef HAVE_LIBNX
+         free(swa->buffers[i].buffer);
+#else
+         free_pages(swa->buffers[i].sample_data);
+#endif
+   }
+
+   free(swa);
+   swa = NULL;
+}
+
+static ssize_t switch_thread_audio_write(void *data, const void *buf, size_t size)
+{
+   size_t avail, written;
+   switch_thread_audio_t *swa = (switch_thread_audio_t *)data;
+
+   if (!swa || !swa->running)
+         return 0;
+
+   if (swa->nonblocking)
+   {
+      compat_mutex_lock(&swa->fifoLock);
+      avail = fifo_write_avail(swa->fifo);
+      written = MIN(avail, size);
+      if (written > 0)
+         fifo_write(swa->fifo, buf, written);
+      compat_mutex_unlock(&swa->fifoLock);
+   }
+   else
+   {
+      written = 0;
+      while (written < size && swa->running)
+      {
+         compat_mutex_lock(&swa->fifoLock);
+         avail = fifo_write_avail(swa->fifo);
+         if (avail == 0)
+         {
+            compat_mutex_unlock(&swa->fifoLock);
+            compat_mutex_lock(&swa->condLock);
+            if (swa->running)
+               compat_condvar_wait(&swa->cond, &swa->condLock);
+            compat_mutex_unlock(&swa->condLock);
+         }
+         else
+         {
+            size_t write_amt = MIN(size - written, avail);
+            fifo_write(swa->fifo, (const char*)buf + written, write_amt);
+            compat_mutex_unlock(&swa->fifoLock);
+            written += write_amt;
+         }
+      }
+   }
+
+   return written;
+}
+
+static bool switch_thread_audio_alive(void *data)
+{
+   switch_thread_audio_t *swa = (switch_thread_audio_t *)data;
+
+   if (!swa)
+         return false;
+
+   return !swa->is_paused;
+}
+
+static void switch_thread_audio_set_nonblock_state(void *data, bool state)
+{
+   switch_thread_audio_t *swa = (switch_thread_audio_t *)data;
+
+   if (swa)
+      swa->nonblocking = state;
+}
+
+static bool switch_thread_audio_use_float(void *data)
+{
+   (void)data;
+   return false;
+}
+
+static size_t switch_thread_audio_write_avail(void *data)
+{
+   size_t val;
+   switch_thread_audio_t* swa = (switch_thread_audio_t*)data;
+
+   compat_mutex_lock(&swa->fifoLock);
+   val = fifo_write_avail(swa->fifo);
+   compat_mutex_unlock(&swa->fifoLock);
+
+   return val;
+}
+
+size_t switch_thread_audio_buffer_size(void *data)
+{
+   switch_thread_audio_t *swa = (switch_thread_audio_t *)data;
+
+   if (!swa)
+         return 0;
+
+   return swa->fifoSize;
+}
+
+audio_driver_t audio_switch_thread = {
+      switch_thread_audio_init,
+      switch_thread_audio_write,
+      switch_thread_audio_stop,
+      switch_thread_audio_start,
+      switch_thread_audio_alive,
+      switch_thread_audio_set_nonblock_state,
+      switch_thread_audio_free,
+      switch_thread_audio_use_float,
+      "switch_thread",
+      NULL, /* device_list_new */
+      NULL, /* device_list_free */
+      switch_thread_audio_write_avail,
+      switch_thread_audio_buffer_size
+};
+
+/* vim: set ts=3 sw=3 */
@@ -296,7 +296,6 @@
 #define SNDRV_PCM_MMAP_OFFSET_STATUS   0x80000000
 #define SNDRV_PCM_MMAP_OFFSET_CONTROL  0x81000000

-
 /** Audio sample format of a PCM.
 * The first letter specifiers whether the sample is signed or unsigned.
 * The letter 'S' means signed. The letter 'U' means unsigned.
@@ -29,6 +29,15 @@
 #include <mmreg.h>
 #include <audioclient.h>

+#ifdef _MSC_VER
+DEFINE_GUID(IID_IAudioClient, 0x1CB9AD4C, 0xDBFA, 0x4C32, 0xB1, 0x78, 0xC2, 0xF5, 0x68, 0xA7, 0x03, 0xB2);
+DEFINE_GUID(IID_IAudioRenderClient, 0xF294ACFC, 0x3146, 0x4483, 0xA7, 0xBF, 0xAD, 0xDC, 0xA7, 0xC2, 0x60, 0xE2);
+DEFINE_GUID(IID_IMMDeviceEnumerator, 0xA95664D2, 0x9614, 0x4F35, 0xA7, 0x46, 0xDE, 0x8D, 0xB6, 0x36, 0x17, 0xE6);
+DEFINE_GUID(CLSID_MMDeviceEnumerator, 0xBCDE0395, 0xE52F, 0x467C, 0x8E, 0x3D, 0xC4, 0x57, 0x92, 0x91, 0x69, 0x2E);
+#undef KSDATAFORMAT_SUBTYPE_IEEE_FLOAT
+DEFINE_GUID(KSDATAFORMAT_SUBTYPE_IEEE_FLOAT, 0x00000003, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71);
+#endif
+
 #include <lists/string_list.h>
 #include <queues/fifo_queue.h>

@@ -580,7 +589,6 @@ static void *wasapi_init(const char *dev_id, unsigned rate, unsigned latency,
      unsigned u1, unsigned *u2)
 {
   HRESULT hr;
-   bool com_initialized      = false;
   UINT32 frame_count        = 0;
   REFERENCE_TIME dev_period = 0;
   BYTE *dest                = NULL;
@@ -592,11 +600,6 @@ static void *wasapi_init(const char *dev_id, unsigned rate, unsigned latency,

   WASAPI_CHECK(w, "Out of memory", return NULL);

-   hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);
-   WASAPI_HR_CHECK(hr, "CoInitializeEx", goto error);
-
-   com_initialized = true;
-
   w->device = wasapi_init_device(dev_id);
   if (!w->device && dev_id)
      w->device = wasapi_init_device(NULL);
@@ -676,8 +679,6 @@ error:
   if (w->buffer)
      fifo_free(w->buffer);
   free(w);
-   if (com_initialized)
-      CoUninitialize();

   return NULL;
 }
@@ -889,7 +890,6 @@ static void wasapi_free(void *wh)
      _IAudioClient_Stop(w->client);
   WASAPI_RELEASE(w->client);
   WASAPI_RELEASE(w->device);
-   CoUninitialize();
   if (w->buffer)
      fifo_free(w->buffer);
   free(w);
@@ -318,7 +318,6 @@ static size_t ax_audio_buffer_size(void* data)
   return AX_AUDIO_COUNT;
 }

-
 audio_driver_t audio_ax =
 {
   ax_audio_init,
@@ -202,10 +202,6 @@ static xaudio2_t *xaudio2_new(unsigned samplerate, unsigned channels,
   xaudio2_t *handle = NULL;
   WAVEFORMATEX wfx  = {0};

-#ifndef _XBOX
-   CoInitializeEx(0, COINIT_MULTITHREADED);
-#endif
-
 #if defined(__cplusplus) && !defined(CINTERFACE)
   handle = new xaudio2;
 #else
@@ -222,8 +218,13 @@ static xaudio2_t *xaudio2_new(unsigned samplerate, unsigned channels,
   if (FAILED(XAudio2Create(&handle->pXAudio2, 0, XAUDIO2_DEFAULT_PROCESSOR)))
      goto error;

+#if (_WIN32_WINNT >= 0x0602 /*_WIN32_WINNT_WIN8*/)
+   if (FAILED(IXAudio2_CreateMasteringVoice(handle->pXAudio2, &handle->pMasterVoice, channels, samplerate, 0, device, NULL, AudioCategory_GameEffects)))
+      goto error;
+#else
   if (FAILED(IXAudio2_CreateMasteringVoice(handle->pXAudio2, &handle->pMasterVoice, channels, samplerate, 0, device, NULL)))
      goto error;
+#endif

   xaudio2_set_wavefmt(&wfx, channels, samplerate);

@@ -1,7 +1,5 @@
 /*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- *  Copyright (C) 2011-2017 - Daniel De Matteis
- *  Copyright (C) 2010-2014 - OV2
+ *  Copyright (C) 2018 - Krzysztof Haładyn
 *
 *  RetroArch is free software: you can redistribute it and/or modify it under the terms
 *  of the GNU General Public License as published by the Free Software Found-
@@ -15,350 +13,14 @@
 *  If not, see <http://www.gnu.org/licenses/>.
 */

-/* Kinda stripped down. Only contains the bare essentials used in RetroArch. */
-
-#ifndef XAUDIO2_STRIPPED_H
-#define XAUDIO2_STRIPPED_H
-
-#include <retro_inline.h>
-#include <retro_environment.h>
-
-/* All structures defined in this file use tight field packing */
-#pragma pack(push, 1)
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-#define X2DEFAULT(x) = (x)
+#if (_WIN32_WINNT >= 0x0602 /*_WIN32_WINNT_WIN8*/)
+/* XAudio 2.7 it part of the old DirectX SDKs. XAudio 2.8+ is part of the
+ * Windows OS itself (starting from Windows 8). Since UWP lets you access
+ * only libraries that are built-in to the OS, the headers had to be
+ * upgraded to the newer version to get audio support working. */
+#include "xaudio29.h"
 #else
-#define X2DEFAULT(x)
+/* The old version still has to be there since XAudio 2.8 is not available
+ * on Windows 7 and earlier */
+#include "xaudio27.h"
 #endif
-
-#ifdef _XBOX
-#include <xtl.h>
-
-#ifndef __cplusplus
-#define OPAQUE interface
-#endif
-#define DEFINE_CLSID(className, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
-	DEFINE_GUID(CLSID_##className, 0x##l, 0x##w1, 0x##w2, 0x##b1, 0x##b2, 0x##b3, 0x##b4, 0x##b5, 0x##b6, 0x##b7, 0x##b8)
-#define DEFINE_IID(interfaceName, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
-	DEFINE_GUID(IID_##interfaceName, 0x##l, 0x##w1, 0x##w2, 0x##b1, 0x##b2, 0x##b3, 0x##b4, 0x##b5, 0x##b6, 0x##b7, 0x##b8)
-
-DEFINE_CLSID(XAudio2, 3eda9b49, 2085, 498b, 9b, b2, 39, a6, 77, 84, 93, de);
-DEFINE_CLSID(XAudio2_Debug, 47199894, 7cc2, 444d, 98, 73, ce, d2, 56, 2c, c6, 0e);
-DEFINE_IID(IXAudio2, 8bcf1f58, 9fe7, 4583, 8a, c6, e2, ad, c4, 65, c8, bb);
-
-#include <audiodefs.h>      /* Basic audio data types and constants */
-
-#else
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <basetyps.h>
-#include <objbase.h>
-#include <mmreg.h>
-
-#ifndef __cplusplus
-#undef OPAQUE
-#define OPAQUE struct
-#endif
-
-#define DEFINE_GUID_X(n, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
-   static const GUID n = { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } }
-#define DEFINE_CLSID_X(className, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
-   DEFINE_GUID_X(CLSID_##className, 0x##l, 0x##w1, 0x##w2, 0x##b1, 0x##b2, 0x##b3, 0x##b4, 0x##b5, 0x##b6, 0x##b7, 0x##b8)
-#define DEFINE_IID_X(interfaceName, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
-   DEFINE_GUID_X(IID_##interfaceName, 0x##l, 0x##w1, 0x##w2, 0x##b1, 0x##b2, 0x##b3, 0x##b4, 0x##b5, 0x##b6, 0x##b7, 0x##b8)
-
-#ifndef __cplusplus
-#ifndef INTERFACE
-#define INTERFACE void
-#endif
-#endif
-
-DEFINE_CLSID_X(XAudio2, 5a508685, a254, 4fba, 9b, 82, 9a, 24, b0, 03, 06, af); /* 2.7 */
-DEFINE_IID_X(IXAudio2, 8bcf1f58, 9fe7, 4583, 8a, c6, e2, ad, c4, 65, c8, bb);
-
-#endif
-
-#ifdef _XBOX
-#define XAUDIO2_DEFAULT_FREQ_RATIO      2.0f
-#else
-#define XAUDIO2_DEFAULT_FREQ_RATIO      4.0f
-#endif
-
-#define XAUDIO2_COMMIT_NOW              0
-#define XAUDIO2_DEFAULT_CHANNELS        0
-#define XAUDIO2_DEFAULT_SAMPLERATE      0
-
-#define XAUDIO2_DEBUG_ENGINE            0x0001
-#define XAUDIO2_VOICE_NOSRC             0x0004
-
-typedef enum XAUDIO2_DEVICE_ROLE
-{
-   NotDefaultDevice            = 0x0,
-   DefaultConsoleDevice        = 0x1,
-   DefaultMultimediaDevice     = 0x2,
-   DefaultCommunicationsDevice = 0x4,
-   DefaultGameDevice           = 0x8,
-   GlobalDefaultDevice         = 0xf,
-   InvalidDeviceRole           = ~GlobalDefaultDevice
-} XAUDIO2_DEVICE_ROLE;
-
-#ifdef _XBOX
-typedef enum XAUDIO2_XBOX_HWTHREAD_SPECIFIER
-{
-	XboxThread0 = 0x01,
-	XboxThread1 = 0x02,
-	XboxThread2 = 0x04,
-	XboxThread3 = 0x08,
-	XboxThread4 = 0x10,
-	XboxThread5 = 0x20,
-	XAUDIO2_ANY_PROCESSOR = XboxThread4,
-	XAUDIO2_DEFAULT_PROCESSOR = XAUDIO2_ANY_PROCESSOR
-} XAUDIO2_XBOX_HWTHREAD_SPECIFIER, XAUDIO2_PROCESSOR;
-#else
-typedef enum XAUDIO2_WINDOWS_PROCESSOR_SPECIFIER
-{
-#if defined(__STDC_C89__)
-   XAUDIO2_ANY_PROCESSOR       = 0xffff,
-#else
-   XAUDIO2_ANY_PROCESSOR       = 0xffffffff,
-#endif
-   XAUDIO2_DEFAULT_PROCESSOR   = XAUDIO2_ANY_PROCESSOR
-} XAUDIO2_WINDOWS_PROCESSOR_SPECIFIER, XAUDIO2_PROCESSOR;
-#endif
-
-typedef enum XAUDIO2_FILTER_TYPE {
-   LowPassFilter,
-   BandPassFilter,
-   HighPassFilter
-} XAUDIO2_FILTER_TYPE;
-
-typedef struct XAUDIO2_DEVICE_DETAILS
-{
-   WCHAR DeviceID[256];
-   WCHAR DisplayName[256];
-   XAUDIO2_DEVICE_ROLE Role;
-   WAVEFORMATEXTENSIBLE OutputFormat;
-} XAUDIO2_DEVICE_DETAILS;
-
-/* Forward declarations. */
-#ifdef __cplusplus
-struct XAUDIO2_VOICE_DETAILS;
-struct XAUDIO2_VOICE_SENDS;
-struct XAUDIO2_EFFECT_DESCRIPTOR;
-struct XAUDIO2_EFFECT_CHAIN;
-struct XAUDIO2_FILTER_PARAMETERS;
-struct XAUDIO2_BUFFER_WMA;
-struct XAUDIO2_VOICE_STATE;
-struct XAUDIO2_PERFORMANCE_DATA;
-struct XAUDIO2_DEBUG_CONFIGURATION;
-struct IXAudio2EngineCallback;
-struct IXAudio2SubmixVoice;
-#else
-typedef OPAQUE XAUDIO2_VOICE_DETAILS XAUDIO2_VOICE_DETAILS;
-typedef OPAQUE XAUDIO2_VOICE_SENDS XAUDIO2_VOICE_SENDS;
-typedef OPAQUE XAUDIO2_EFFECT_DESCRIPTOR XAUDIO2_EFFECT_DESCRIPTOR;
-typedef OPAQUE XAUDIO2_EFFECT_CHAIN XAUDIO2_EFFECT_CHAIN;
-typedef OPAQUE XAUDIO2_FILTER_PARAMETERS XAUDIO2_FILTER_PARAMETERS;
-typedef OPAQUE XAUDIO2_BUFFER_WMA XAUDIO2_BUFFER_WMA;
-typedef OPAQUE XAUDIO2_VOICE_STATE XAUDIO2_VOICE_STATE;
-typedef OPAQUE XAUDIO2_PERFORMANCE_DATA XAUDIO2_PERFORMANCE_DATA;
-typedef OPAQUE XAUDIO2_DEBUG_CONFIGURATION XAUDIO2_DEBUG_CONFIGURATION;
-typedef OPAQUE IXAudio2EngineCallback IXAudio2EngineCallback;
-typedef OPAQUE IXAudio2SubmixVoice IXAudio2SubmixVoice;
-#endif
-
-
-typedef struct XAUDIO2_BUFFER
-{
-   UINT32 Flags;
-   UINT32 AudioBytes;
-   const BYTE* pAudioData;
-   UINT32 PlayBegin;
-   UINT32 PlayLength;
-   UINT32 LoopBegin;
-   UINT32 LoopLength;
-   UINT32 LoopCount;
-   void *pContext;
-} XAUDIO2_BUFFER;
-
-#undef INTERFACE
-#define INTERFACE IXAudio2VoiceCallback
-
-DECLARE_INTERFACE(IXAudio2VoiceCallback)
-{
-   STDMETHOD_(void, OnVoiceProcessingPassStart) (THIS_ UINT32 BytesRequired) PURE;
-   STDMETHOD_(void, OnVoiceProcessingPassEnd) (THIS) PURE;
-   STDMETHOD_(void, OnStreamEnd) (THIS) PURE;
-   STDMETHOD_(void, OnBufferStart) (THIS_ void *pBufferContext) PURE;
-   STDMETHOD_(void, OnBufferEnd) (THIS_ void *pBufferContext) PURE;
-   STDMETHOD_(void, OnLoopEnd) (THIS_ void *pBufferContext) PURE;
-   STDMETHOD_(void, OnVoiceError) (THIS_ void *pBufferContext, HRESULT Error) PURE;
-};
-
-#undef INTERFACE
-#define INTERFACE IXAudio2Voice
-
-DECLARE_INTERFACE(IXAudio2Voice)
-{
-#define Declare_IXAudio2Voice_Methods() \
-   STDMETHOD_(void, GetVoiceDetails) (THIS_ XAUDIO2_VOICE_DETAILS* pVoiceDetails) PURE; \
-   STDMETHOD(SetOutputVoices) (THIS_ const XAUDIO2_VOICE_SENDS* pSendList) PURE; \
-   STDMETHOD(SetEffectChain) (THIS_ const XAUDIO2_EFFECT_CHAIN* pEffectChain) PURE; \
-   STDMETHOD(EnableEffect) (THIS_ UINT32 EffectIndex, \
-         UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE; \
-   STDMETHOD(DisableEffect) (THIS_ UINT32 EffectIndex, \
-         UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE; \
-   STDMETHOD_(void, GetEffectState) (THIS_ UINT32 EffectIndex, BOOL* pEnabled) PURE; \
-   STDMETHOD(SetEffectParameters) (THIS_ UINT32 EffectIndex, \
-         const void *pParameters, \
-         UINT32 ParametersByteSize, \
-         UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE; \
-   STDMETHOD(GetEffectParameters) (THIS_ UINT32 EffectIndex, void *pParameters, \
-         UINT32 ParametersByteSize) PURE; \
-   STDMETHOD(SetFilterParameters) (THIS_ const XAUDIO2_FILTER_PARAMETERS* pParameters, \
-         UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE; \
-   STDMETHOD_(void, GetFilterParameters) (THIS_ XAUDIO2_FILTER_PARAMETERS* pParameters) PURE; \
-   STDMETHOD_(void, SetOutputFilterParameters) (THIS_ IXAudio2Voice *voice, const XAUDIO2_FILTER_PARAMETERS* param, \
-         UINT32 op X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE; \
-   STDMETHOD_(void, GetOutputFilterParameters) (THIS_ IXAudio2Voice *voice, XAUDIO2_FILTER_PARAMETERS* param) PURE; \
-   STDMETHOD(SetVolume) (THIS_ float Volume, \
-         UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE; \
-   STDMETHOD_(void, GetVolume) (THIS_ float* pVolume) PURE; \
-   STDMETHOD(SetChannelVolumes) (THIS_ UINT32 Channels, const float* pVolumes, \
-         UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE; \
-   STDMETHOD_(void, GetChannelVolumes) (THIS_ UINT32 Channels, float* pVolumes) PURE; \
-   STDMETHOD(SetOutputMatrix) (THIS_ IXAudio2Voice* pDestinationVoice, \
-         UINT32 SourceChannels, UINT32 DestinationChannels, \
-         const float* pLevelMatrix, \
-         UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE; \
-   STDMETHOD_(void, GetOutputMatrix) (THIS_ IXAudio2Voice* pDestinationVoice, \
-         UINT32 SourceChannels, UINT32 DestinationChannels, \
-         float* pLevelMatrix) PURE; \
-   STDMETHOD_(void, DestroyVoice) (THIS) PURE
-
-   Declare_IXAudio2Voice_Methods();
-};
-
-#undef INTERFACE
-#define INTERFACE IXAudio2MasteringVoice
-
-DECLARE_INTERFACE_(IXAudio2MasteringVoice, IXAudio2Voice)
-{
-   Declare_IXAudio2Voice_Methods();
-};
-
-#undef INTERFACE
-#define INTERFACE IXAudio2SourceVoice
-
-DECLARE_INTERFACE_(IXAudio2SourceVoice, IXAudio2Voice)
-{
-   Declare_IXAudio2Voice_Methods();
-   STDMETHOD(Start) (THIS_ UINT32 Flags, UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE;
-   STDMETHOD(Stop) (THIS_ UINT32 Flags, UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE;
-   STDMETHOD(SubmitSourceBuffer) (THIS_ const XAUDIO2_BUFFER* pBuffer, const XAUDIO2_BUFFER_WMA* pBufferWMA X2DEFAULT(NULL)) PURE;
-   STDMETHOD(FlushSourceBuffers) (THIS) PURE;
-   STDMETHOD(Discontinuity) (THIS) PURE;
-   STDMETHOD(ExitLoop) (THIS_ UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE;
-   STDMETHOD_(void, GetState) (THIS_ XAUDIO2_VOICE_STATE* pVoiceState) PURE;
-   STDMETHOD(SetFrequencyRatio) (THIS_ float Ratio,
-         UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE;
-   STDMETHOD_(void, GetFrequencyRatio) (THIS_ float* pRatio) PURE;
-};
-
-#undef INTERFACE
-#define INTERFACE IXAudio2
-
-DECLARE_INTERFACE_(IXAudio2, IUnknown)
-{
-   STDMETHOD(QueryInterface) (THIS_ REFIID riid, void** ppvInterface) PURE;
-   STDMETHOD_(ULONG, AddRef) (THIS) PURE;
-   STDMETHOD_(ULONG, Release) (THIS) PURE;
-   STDMETHOD(GetDeviceCount) (THIS_ UINT32* pCount) PURE;
-   STDMETHOD(GetDeviceDetails) (THIS_ UINT32 Index, XAUDIO2_DEVICE_DETAILS* pDeviceDetails) PURE;
-   STDMETHOD(Initialize) (THIS_ UINT32 Flags X2DEFAULT(0),
-         XAUDIO2_PROCESSOR XAudio2Processor X2DEFAULT(XAUDIO2_DEFAULT_PROCESSOR)) PURE;
-   STDMETHOD(RegisterForCallbacks) (IXAudio2EngineCallback* pCallback) PURE;
-   STDMETHOD_(void, UnregisterForCallbacks) (IXAudio2EngineCallback* pCallback) PURE;
-   STDMETHOD(CreateSourceVoice) (THIS_ IXAudio2SourceVoice** ppSourceVoice,
-         const WAVEFORMATEX* pSourceFormat,
-         UINT32 Flags X2DEFAULT(0),
-         float MaxFrequencyRatio X2DEFAULT(XAUDIO2_DEFAULT_FREQ_RATIO),
-         IXAudio2VoiceCallback* pCallback X2DEFAULT(NULL),
-         const XAUDIO2_VOICE_SENDS* pSendList X2DEFAULT(NULL),
-         const XAUDIO2_EFFECT_CHAIN* pEffectChain X2DEFAULT(NULL)) PURE;
-   STDMETHOD(CreateSubmixVoice) (THIS_ IXAudio2SubmixVoice** ppSubmixVoice,
-         UINT32 InputChannels, UINT32 InputSampleRate,
-         UINT32 Flags X2DEFAULT(0), UINT32 ProcessingStage X2DEFAULT(0),
-         const XAUDIO2_VOICE_SENDS* pSendList X2DEFAULT(NULL),
-         const XAUDIO2_EFFECT_CHAIN* pEffectChain X2DEFAULT(NULL)) PURE;
-   STDMETHOD(CreateMasteringVoice) (THIS_ IXAudio2MasteringVoice** ppMasteringVoice,
-         UINT32 InputChannels X2DEFAULT(XAUDIO2_DEFAULT_CHANNELS),
-         UINT32 InputSampleRate X2DEFAULT(XAUDIO2_DEFAULT_SAMPLERATE),
-         UINT32 Flags X2DEFAULT(0), UINT32 DeviceIndex X2DEFAULT(0),
-         const XAUDIO2_EFFECT_CHAIN* pEffectChain X2DEFAULT(NULL)) PURE;
-   STDMETHOD(StartEngine) (THIS) PURE;
-   STDMETHOD_(void, StopEngine) (THIS) PURE;
-   STDMETHOD(CommitChanges) (THIS_ UINT32 OperationSet) PURE;
-   STDMETHOD_(void, GetPerformanceData) (THIS_ XAUDIO2_PERFORMANCE_DATA* pPerfData) PURE;
-   STDMETHOD_(void, SetDebugConfiguration) (THIS_ const XAUDIO2_DEBUG_CONFIGURATION* pDebugConfiguration,
-         void *pReserved X2DEFAULT(NULL)) PURE;
-};
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-/* C++ hooks */
-#define IXAudio2_Initialize(handle,a,b) handle->Initialize(a, b)
-#define IXAudio2SourceVoice_SubmitSourceBuffer(handle, a, b) handle->SubmitSourceBuffer(a, b)
-#define IXAudio2SourceVoice_Stop(handle, a, b) handle->Stop(a, b)
-#define IXAudio2SourceVoice_DestroyVoice(handle) handle->DestroyVoice()
-#define IXAudio2MasteringVoice_DestroyVoice(handle) handle->DestroyVoice()
-#define IXAudio2_Release(handle) handle->Release()
-#define IXAudio2_CreateSourceVoice(handle, a, b, c, d, e, f, g) handle->CreateSourceVoice(a, b, c, d, e, f, g)
-#define IXAudio2_CreateMasteringVoice(handle, a, b, c, d, e, f) handle->CreateMasteringVoice(a, b, c, d, e, f)
-#define IXAudio2SourceVoice_Start(handle, a, b) handle->Start(a, b)
-#else
-/* C hooks */
-#define IXAudio2_Initialize(handle,a,b) (handle)->lpVtbl->Initialize(handle, a, b)
-#define IXAudio2_Release(handle) (handle)->lpVtbl->Release(handle)
-#define IXAudio2_CreateSourceVoice(handle,ppSourceVoice,pSourceFormat,Flags,MaxFrequencyRatio,pCallback,pSendList,pEffectChain) (handle)->lpVtbl->CreateSourceVoice(handle, ppSourceVoice,pSourceFormat,Flags,MaxFrequencyRatio,pCallback,pSendList,pEffectChain)
-#define IXAudio2_CreateMasteringVoice(handle,ppMasteringVoice,InputChannels,InputSampleRate,Flags,DeviceIndex,pEffectChain) (handle)->lpVtbl->CreateMasteringVoice(handle, ppMasteringVoice,InputChannels,InputSampleRate,Flags,DeviceIndex,pEffectChain)
-#define IXAudio2_GetDeviceCount(handle, puCount) (handle)->lpVtbl->GetDeviceCount(handle, puCount)
-#define IXAudio2_GetDeviceDetails(handle, Index,pDeviceDetails) (handle)->lpVtbl->GetDeviceDetails(handle, Index, pDeviceDetails)
-#define IXAudio2SourceVoice_Start(handle, Flags, OperationSet) (handle)->lpVtbl->Start(handle, Flags, OperationSet)
-#define IXAudio2SourceVoice_Stop(handle, Flags, OperationSet) (handle)->lpVtbl->Stop(handle, Flags, OperationSet)
-#define IXAudio2SourceVoice_SubmitSourceBuffer(handle, pBuffer, pBufferWMA) (handle)->lpVtbl->SubmitSourceBuffer(handle, pBuffer, pBufferWMA)
-#define IXAudio2SourceVoice_DestroyVoice(handle) (handle)->lpVtbl->DestroyVoice(handle)
-#define IXAudio2MasteringVoice_DestroyVoice(handle) (handle)->lpVtbl->DestroyVoice(handle)
-#endif
-
-#ifdef _XBOX
-STDAPI XAudio2Create(__deref_out IXAudio2** ppXAudio2, UINT32 Flags X2DEFAULT(0),
-		XAUDIO2_PROCESSOR XAudio2Processor X2DEFAULT(XAUDIO2_DEFAULT_PROCESSOR));
-#else
-static INLINE HRESULT XAudio2Create(IXAudio2 **ppXAudio2, UINT32 flags, XAUDIO2_PROCESSOR proc)
-{
-   IXAudio2 *pXAudio2 = NULL;
-#ifdef __cplusplus
-   HRESULT hr = CoCreateInstance(CLSID_XAudio2, NULL, CLSCTX_INPROC_SERVER, IID_IXAudio2, (void**)&pXAudio2);
-#else
-   HRESULT hr = CoCreateInstance(&CLSID_XAudio2, NULL, CLSCTX_INPROC_SERVER, &IID_IXAudio2, (void**)&pXAudio2);
-#endif
-
-   if (SUCCEEDED(hr))
-   {
-      hr = IXAudio2_Initialize(pXAudio2, 0, XAUDIO2_DEFAULT_PROCESSOR);
-      if (SUCCEEDED(hr))
-         *ppXAudio2 = pXAudio2;
-      else
-         IXAudio2_Release(pXAudio2);
-   }
-   return hr;
-}
-#endif
-
-/* Undo the #pragma pack(push, 1) directive at the top of this file */
-#pragma pack(pop)
-
-#endif
-
@@ -0,0 +1,362 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
+ *  Copyright (C) 2011-2017 - Daniel De Matteis
+ *  Copyright (C) 2010-2014 - OV2
+ *
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/* Kinda stripped down. Only contains the bare essentials used in RetroArch. */
+
+#ifndef XAUDIO2_STRIPPED_H
+#define XAUDIO2_STRIPPED_H
+
+#include <retro_inline.h>
+#include <retro_environment.h>
+
+/* All structures defined in this file use tight field packing */
+#pragma pack(push, 1)
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+#define X2DEFAULT(x) = (x)
+#else
+#define X2DEFAULT(x)
+#endif
+
+#ifdef _XBOX
+#include <xtl.h>
+
+#ifndef __cplusplus
+#define OPAQUE interface
+#endif
+#define DEFINE_CLSID(className, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
+	DEFINE_GUID(CLSID_##className, 0x##l, 0x##w1, 0x##w2, 0x##b1, 0x##b2, 0x##b3, 0x##b4, 0x##b5, 0x##b6, 0x##b7, 0x##b8)
+#define DEFINE_IID(interfaceName, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
+	DEFINE_GUID(IID_##interfaceName, 0x##l, 0x##w1, 0x##w2, 0x##b1, 0x##b2, 0x##b3, 0x##b4, 0x##b5, 0x##b6, 0x##b7, 0x##b8)
+
+DEFINE_CLSID(XAudio2, 3eda9b49, 2085, 498b, 9b, b2, 39, a6, 77, 84, 93, de);
+DEFINE_CLSID(XAudio2_Debug, 47199894, 7cc2, 444d, 98, 73, ce, d2, 56, 2c, c6, 0e);
+DEFINE_IID(IXAudio2, 8bcf1f58, 9fe7, 4583, 8a, c6, e2, ad, c4, 65, c8, bb);
+
+#include <audiodefs.h>      /* Basic audio data types and constants */
+
+#else
+
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#include <basetyps.h>
+#include <objbase.h>
+#include <mmreg.h>
+
+#ifndef __cplusplus
+#undef OPAQUE
+#define OPAQUE struct
+#endif
+
+#define DEFINE_GUID_X(n, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
+   static const GUID n = { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } }
+#define DEFINE_CLSID_X(className, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
+   DEFINE_GUID_X(CLSID_##className, 0x##l, 0x##w1, 0x##w2, 0x##b1, 0x##b2, 0x##b3, 0x##b4, 0x##b5, 0x##b6, 0x##b7, 0x##b8)
+#define DEFINE_IID_X(interfaceName, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
+   DEFINE_GUID_X(IID_##interfaceName, 0x##l, 0x##w1, 0x##w2, 0x##b1, 0x##b2, 0x##b3, 0x##b4, 0x##b5, 0x##b6, 0x##b7, 0x##b8)
+
+#ifndef __cplusplus
+#ifndef INTERFACE
+#define INTERFACE void
+#endif
+#endif
+
+DEFINE_CLSID_X(XAudio2, 5a508685, a254, 4fba, 9b, 82, 9a, 24, b0, 03, 06, af); /* 2.7 */
+DEFINE_IID_X(IXAudio2, 8bcf1f58, 9fe7, 4583, 8a, c6, e2, ad, c4, 65, c8, bb);
+
+#endif
+
+#ifdef _XBOX
+#define XAUDIO2_DEFAULT_FREQ_RATIO      2.0f
+#else
+#define XAUDIO2_DEFAULT_FREQ_RATIO      4.0f
+#endif
+
+#define XAUDIO2_COMMIT_NOW              0
+#define XAUDIO2_DEFAULT_CHANNELS        0
+#define XAUDIO2_DEFAULT_SAMPLERATE      0
+
+#define XAUDIO2_DEBUG_ENGINE            0x0001
+#define XAUDIO2_VOICE_NOSRC             0x0004
+
+typedef enum XAUDIO2_DEVICE_ROLE
+{
+   NotDefaultDevice            = 0x0,
+   DefaultConsoleDevice        = 0x1,
+   DefaultMultimediaDevice     = 0x2,
+   DefaultCommunicationsDevice = 0x4,
+   DefaultGameDevice           = 0x8,
+   GlobalDefaultDevice         = 0xf,
+   InvalidDeviceRole           = ~GlobalDefaultDevice
+} XAUDIO2_DEVICE_ROLE;
+
+#ifdef _XBOX
+typedef enum XAUDIO2_XBOX_HWTHREAD_SPECIFIER
+{
+	XboxThread0 = 0x01,
+	XboxThread1 = 0x02,
+	XboxThread2 = 0x04,
+	XboxThread3 = 0x08,
+	XboxThread4 = 0x10,
+	XboxThread5 = 0x20,
+	XAUDIO2_ANY_PROCESSOR = XboxThread4,
+	XAUDIO2_DEFAULT_PROCESSOR = XAUDIO2_ANY_PROCESSOR
+} XAUDIO2_XBOX_HWTHREAD_SPECIFIER, XAUDIO2_PROCESSOR;
+#else
+typedef enum XAUDIO2_WINDOWS_PROCESSOR_SPECIFIER
+{
+#if defined(__STDC_C89__)
+   XAUDIO2_ANY_PROCESSOR       = 0xffff,
+#else
+   XAUDIO2_ANY_PROCESSOR       = 0xffffffff,
+#endif
+   XAUDIO2_DEFAULT_PROCESSOR   = XAUDIO2_ANY_PROCESSOR
+} XAUDIO2_WINDOWS_PROCESSOR_SPECIFIER, XAUDIO2_PROCESSOR;
+#endif
+
+typedef enum XAUDIO2_FILTER_TYPE {
+   LowPassFilter,
+   BandPassFilter,
+   HighPassFilter
+} XAUDIO2_FILTER_TYPE;
+
+typedef struct XAUDIO2_DEVICE_DETAILS
+{
+   WCHAR DeviceID[256];
+   WCHAR DisplayName[256];
+   XAUDIO2_DEVICE_ROLE Role;
+   WAVEFORMATEXTENSIBLE OutputFormat;
+} XAUDIO2_DEVICE_DETAILS;
+
+/* Forward declarations. */
+#ifdef __cplusplus
+struct XAUDIO2_VOICE_DETAILS;
+struct XAUDIO2_VOICE_SENDS;
+struct XAUDIO2_EFFECT_DESCRIPTOR;
+struct XAUDIO2_EFFECT_CHAIN;
+struct XAUDIO2_FILTER_PARAMETERS;
+struct XAUDIO2_BUFFER_WMA;
+struct XAUDIO2_VOICE_STATE;
+struct XAUDIO2_PERFORMANCE_DATA;
+struct XAUDIO2_DEBUG_CONFIGURATION;
+struct IXAudio2EngineCallback;
+struct IXAudio2SubmixVoice;
+#else
+typedef OPAQUE XAUDIO2_VOICE_DETAILS XAUDIO2_VOICE_DETAILS;
+typedef OPAQUE XAUDIO2_VOICE_SENDS XAUDIO2_VOICE_SENDS;
+typedef OPAQUE XAUDIO2_EFFECT_DESCRIPTOR XAUDIO2_EFFECT_DESCRIPTOR;
+typedef OPAQUE XAUDIO2_EFFECT_CHAIN XAUDIO2_EFFECT_CHAIN;
+typedef OPAQUE XAUDIO2_FILTER_PARAMETERS XAUDIO2_FILTER_PARAMETERS;
+typedef OPAQUE XAUDIO2_BUFFER_WMA XAUDIO2_BUFFER_WMA;
+typedef OPAQUE XAUDIO2_VOICE_STATE XAUDIO2_VOICE_STATE;
+typedef OPAQUE XAUDIO2_PERFORMANCE_DATA XAUDIO2_PERFORMANCE_DATA;
+typedef OPAQUE XAUDIO2_DEBUG_CONFIGURATION XAUDIO2_DEBUG_CONFIGURATION;
+typedef OPAQUE IXAudio2EngineCallback IXAudio2EngineCallback;
+typedef OPAQUE IXAudio2SubmixVoice IXAudio2SubmixVoice;
+#endif
+
+typedef struct XAUDIO2_BUFFER
+{
+   UINT32 Flags;
+   UINT32 AudioBytes;
+   const BYTE* pAudioData;
+   UINT32 PlayBegin;
+   UINT32 PlayLength;
+   UINT32 LoopBegin;
+   UINT32 LoopLength;
+   UINT32 LoopCount;
+   void *pContext;
+} XAUDIO2_BUFFER;
+
+#undef INTERFACE
+#define INTERFACE IXAudio2VoiceCallback
+
+DECLARE_INTERFACE(IXAudio2VoiceCallback)
+{
+   STDMETHOD_(void, OnVoiceProcessingPassStart) (THIS_ UINT32 BytesRequired) PURE;
+   STDMETHOD_(void, OnVoiceProcessingPassEnd) (THIS) PURE;
+   STDMETHOD_(void, OnStreamEnd) (THIS) PURE;
+   STDMETHOD_(void, OnBufferStart) (THIS_ void *pBufferContext) PURE;
+   STDMETHOD_(void, OnBufferEnd) (THIS_ void *pBufferContext) PURE;
+   STDMETHOD_(void, OnLoopEnd) (THIS_ void *pBufferContext) PURE;
+   STDMETHOD_(void, OnVoiceError) (THIS_ void *pBufferContext, HRESULT Error) PURE;
+};
+
+#undef INTERFACE
+#define INTERFACE IXAudio2Voice
+
+DECLARE_INTERFACE(IXAudio2Voice)
+{
+#define Declare_IXAudio2Voice_Methods() \
+   STDMETHOD_(void, GetVoiceDetails) (THIS_ XAUDIO2_VOICE_DETAILS* pVoiceDetails) PURE; \
+   STDMETHOD(SetOutputVoices) (THIS_ const XAUDIO2_VOICE_SENDS* pSendList) PURE; \
+   STDMETHOD(SetEffectChain) (THIS_ const XAUDIO2_EFFECT_CHAIN* pEffectChain) PURE; \
+   STDMETHOD(EnableEffect) (THIS_ UINT32 EffectIndex, \
+         UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE; \
+   STDMETHOD(DisableEffect) (THIS_ UINT32 EffectIndex, \
+         UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE; \
+   STDMETHOD_(void, GetEffectState) (THIS_ UINT32 EffectIndex, BOOL* pEnabled) PURE; \
+   STDMETHOD(SetEffectParameters) (THIS_ UINT32 EffectIndex, \
+         const void *pParameters, \
+         UINT32 ParametersByteSize, \
+         UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE; \
+   STDMETHOD(GetEffectParameters) (THIS_ UINT32 EffectIndex, void *pParameters, \
+         UINT32 ParametersByteSize) PURE; \
+   STDMETHOD(SetFilterParameters) (THIS_ const XAUDIO2_FILTER_PARAMETERS* pParameters, \
+         UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE; \
+   STDMETHOD_(void, GetFilterParameters) (THIS_ XAUDIO2_FILTER_PARAMETERS* pParameters) PURE; \
+   STDMETHOD_(void, SetOutputFilterParameters) (THIS_ IXAudio2Voice *voice, const XAUDIO2_FILTER_PARAMETERS* param, \
+         UINT32 op X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE; \
+   STDMETHOD_(void, GetOutputFilterParameters) (THIS_ IXAudio2Voice *voice, XAUDIO2_FILTER_PARAMETERS* param) PURE; \
+   STDMETHOD(SetVolume) (THIS_ float Volume, \
+         UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE; \
+   STDMETHOD_(void, GetVolume) (THIS_ float* pVolume) PURE; \
+   STDMETHOD(SetChannelVolumes) (THIS_ UINT32 Channels, const float* pVolumes, \
+         UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE; \
+   STDMETHOD_(void, GetChannelVolumes) (THIS_ UINT32 Channels, float* pVolumes) PURE; \
+   STDMETHOD(SetOutputMatrix) (THIS_ IXAudio2Voice* pDestinationVoice, \
+         UINT32 SourceChannels, UINT32 DestinationChannels, \
+         const float* pLevelMatrix, \
+         UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE; \
+   STDMETHOD_(void, GetOutputMatrix) (THIS_ IXAudio2Voice* pDestinationVoice, \
+         UINT32 SourceChannels, UINT32 DestinationChannels, \
+         float* pLevelMatrix) PURE; \
+   STDMETHOD_(void, DestroyVoice) (THIS) PURE
+
+   Declare_IXAudio2Voice_Methods();
+};
+
+#undef INTERFACE
+#define INTERFACE IXAudio2MasteringVoice
+
+DECLARE_INTERFACE_(IXAudio2MasteringVoice, IXAudio2Voice)
+{
+   Declare_IXAudio2Voice_Methods();
+};
+
+#undef INTERFACE
+#define INTERFACE IXAudio2SourceVoice
+
+DECLARE_INTERFACE_(IXAudio2SourceVoice, IXAudio2Voice)
+{
+   Declare_IXAudio2Voice_Methods();
+   STDMETHOD(Start) (THIS_ UINT32 Flags, UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE;
+   STDMETHOD(Stop) (THIS_ UINT32 Flags, UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE;
+   STDMETHOD(SubmitSourceBuffer) (THIS_ const XAUDIO2_BUFFER* pBuffer, const XAUDIO2_BUFFER_WMA* pBufferWMA X2DEFAULT(NULL)) PURE;
+   STDMETHOD(FlushSourceBuffers) (THIS) PURE;
+   STDMETHOD(Discontinuity) (THIS) PURE;
+   STDMETHOD(ExitLoop) (THIS_ UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE;
+   STDMETHOD_(void, GetState) (THIS_ XAUDIO2_VOICE_STATE* pVoiceState) PURE;
+   STDMETHOD(SetFrequencyRatio) (THIS_ float Ratio,
+         UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE;
+   STDMETHOD_(void, GetFrequencyRatio) (THIS_ float* pRatio) PURE;
+};
+
+#undef INTERFACE
+#define INTERFACE IXAudio2
+
+DECLARE_INTERFACE_(IXAudio2, IUnknown)
+{
+   STDMETHOD(QueryInterface) (THIS_ REFIID riid, void** ppvInterface) PURE;
+   STDMETHOD_(ULONG, AddRef) (THIS) PURE;
+   STDMETHOD_(ULONG, Release) (THIS) PURE;
+   STDMETHOD(GetDeviceCount) (THIS_ UINT32* pCount) PURE;
+   STDMETHOD(GetDeviceDetails) (THIS_ UINT32 Index, XAUDIO2_DEVICE_DETAILS* pDeviceDetails) PURE;
+   STDMETHOD(Initialize) (THIS_ UINT32 Flags X2DEFAULT(0),
+         XAUDIO2_PROCESSOR XAudio2Processor X2DEFAULT(XAUDIO2_DEFAULT_PROCESSOR)) PURE;
+   STDMETHOD(RegisterForCallbacks) (IXAudio2EngineCallback* pCallback) PURE;
+   STDMETHOD_(void, UnregisterForCallbacks) (IXAudio2EngineCallback* pCallback) PURE;
+   STDMETHOD(CreateSourceVoice) (THIS_ IXAudio2SourceVoice** ppSourceVoice,
+         const WAVEFORMATEX* pSourceFormat,
+         UINT32 Flags X2DEFAULT(0),
+         float MaxFrequencyRatio X2DEFAULT(XAUDIO2_DEFAULT_FREQ_RATIO),
+         IXAudio2VoiceCallback* pCallback X2DEFAULT(NULL),
+         const XAUDIO2_VOICE_SENDS* pSendList X2DEFAULT(NULL),
+         const XAUDIO2_EFFECT_CHAIN* pEffectChain X2DEFAULT(NULL)) PURE;
+   STDMETHOD(CreateSubmixVoice) (THIS_ IXAudio2SubmixVoice** ppSubmixVoice,
+         UINT32 InputChannels, UINT32 InputSampleRate,
+         UINT32 Flags X2DEFAULT(0), UINT32 ProcessingStage X2DEFAULT(0),
+         const XAUDIO2_VOICE_SENDS* pSendList X2DEFAULT(NULL),
+         const XAUDIO2_EFFECT_CHAIN* pEffectChain X2DEFAULT(NULL)) PURE;
+   STDMETHOD(CreateMasteringVoice) (THIS_ IXAudio2MasteringVoice** ppMasteringVoice,
+         UINT32 InputChannels X2DEFAULT(XAUDIO2_DEFAULT_CHANNELS),
+         UINT32 InputSampleRate X2DEFAULT(XAUDIO2_DEFAULT_SAMPLERATE),
+         UINT32 Flags X2DEFAULT(0), UINT32 DeviceIndex X2DEFAULT(0),
+         const XAUDIO2_EFFECT_CHAIN* pEffectChain X2DEFAULT(NULL)) PURE;
+   STDMETHOD(StartEngine) (THIS) PURE;
+   STDMETHOD_(void, StopEngine) (THIS) PURE;
+   STDMETHOD(CommitChanges) (THIS_ UINT32 OperationSet) PURE;
+   STDMETHOD_(void, GetPerformanceData) (THIS_ XAUDIO2_PERFORMANCE_DATA* pPerfData) PURE;
+   STDMETHOD_(void, SetDebugConfiguration) (THIS_ const XAUDIO2_DEBUG_CONFIGURATION* pDebugConfiguration,
+         void *pReserved X2DEFAULT(NULL)) PURE;
+};
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+/* C++ hooks */
+#define IXAudio2_Initialize(handle,a,b) handle->Initialize(a, b)
+#define IXAudio2SourceVoice_SubmitSourceBuffer(handle, a, b) handle->SubmitSourceBuffer(a, b)
+#define IXAudio2SourceVoice_Stop(handle, a, b) handle->Stop(a, b)
+#define IXAudio2SourceVoice_DestroyVoice(handle) handle->DestroyVoice()
+#define IXAudio2MasteringVoice_DestroyVoice(handle) handle->DestroyVoice()
+#define IXAudio2_Release(handle) handle->Release()
+#define IXAudio2_CreateSourceVoice(handle, a, b, c, d, e, f, g) handle->CreateSourceVoice(a, b, c, d, e, f, g)
+#define IXAudio2_CreateMasteringVoice(handle, a, b, c, d, e, f) handle->CreateMasteringVoice(a, b, c, d, e, f)
+#define IXAudio2SourceVoice_Start(handle, a, b) handle->Start(a, b)
+#else
+/* C hooks */
+#define IXAudio2_Initialize(handle,a,b) (handle)->lpVtbl->Initialize(handle, a, b)
+#define IXAudio2_Release(handle) (handle)->lpVtbl->Release(handle)
+#define IXAudio2_CreateSourceVoice(handle,ppSourceVoice,pSourceFormat,Flags,MaxFrequencyRatio,pCallback,pSendList,pEffectChain) (handle)->lpVtbl->CreateSourceVoice(handle, ppSourceVoice,pSourceFormat,Flags,MaxFrequencyRatio,pCallback,pSendList,pEffectChain)
+#define IXAudio2_CreateMasteringVoice(handle,ppMasteringVoice,InputChannels,InputSampleRate,Flags,DeviceIndex,pEffectChain) (handle)->lpVtbl->CreateMasteringVoice(handle, ppMasteringVoice,InputChannels,InputSampleRate,Flags,DeviceIndex,pEffectChain)
+#define IXAudio2_GetDeviceCount(handle, puCount) (handle)->lpVtbl->GetDeviceCount(handle, puCount)
+#define IXAudio2_GetDeviceDetails(handle, Index,pDeviceDetails) (handle)->lpVtbl->GetDeviceDetails(handle, Index, pDeviceDetails)
+#define IXAudio2SourceVoice_Start(handle, Flags, OperationSet) (handle)->lpVtbl->Start(handle, Flags, OperationSet)
+#define IXAudio2SourceVoice_Stop(handle, Flags, OperationSet) (handle)->lpVtbl->Stop(handle, Flags, OperationSet)
+#define IXAudio2SourceVoice_SubmitSourceBuffer(handle, pBuffer, pBufferWMA) (handle)->lpVtbl->SubmitSourceBuffer(handle, pBuffer, pBufferWMA)
+#define IXAudio2SourceVoice_DestroyVoice(handle) (handle)->lpVtbl->DestroyVoice(handle)
+#define IXAudio2MasteringVoice_DestroyVoice(handle) (handle)->lpVtbl->DestroyVoice(handle)
+#endif
+
+#ifdef _XBOX
+STDAPI XAudio2Create(__deref_out IXAudio2** ppXAudio2, UINT32 Flags X2DEFAULT(0),
+		XAUDIO2_PROCESSOR XAudio2Processor X2DEFAULT(XAUDIO2_DEFAULT_PROCESSOR));
+#else
+static INLINE HRESULT XAudio2Create(IXAudio2 **ppXAudio2, UINT32 flags, XAUDIO2_PROCESSOR proc)
+{
+   IXAudio2 *pXAudio2 = NULL;
+#ifdef __cplusplus
+   HRESULT hr = CoCreateInstance(CLSID_XAudio2, NULL, CLSCTX_INPROC_SERVER, IID_IXAudio2, (void**)&pXAudio2);
+#else
+   HRESULT hr = CoCreateInstance(&CLSID_XAudio2, NULL, CLSCTX_INPROC_SERVER, &IID_IXAudio2, (void**)&pXAudio2);
+#endif
+
+   if (SUCCEEDED(hr))
+   {
+      hr = IXAudio2_Initialize(pXAudio2, 0, XAUDIO2_DEFAULT_PROCESSOR);
+      if (SUCCEEDED(hr))
+         *ppXAudio2 = pXAudio2;
+      else
+         IXAudio2_Release(pXAudio2);
+   }
+   return hr;
+}
+#endif
+
+/* Undo the #pragma pack(push, 1) directive at the top of this file */
+#pragma pack(pop)
+
+#endif
@@ -55,7 +55,6 @@ typedef struct rarch_CC_resampler
   void (*process)(void *re, struct resampler_data *data);
 } rarch_CC_resampler_t;

-
 #ifdef _MIPS_ARCH_ALLEGREX
 static void resampler_CC_process(void *re_, struct resampler_data *data)
 {
@@ -115,7 +114,6 @@ static void resampler_CC_process(void *re_, struct resampler_data *data)

               "vadd.q  c720, c720, c620           \n"

-
               "vadd.s  s730, s730, s730[1]  \n"
               "mfv     %0,   s730           \n"

@@ -216,7 +214,6 @@ static void resampler_CC_downsample(void *re_, struct resampler_data *data)
      vec_ww1 = _mm_mul_ps(vec_w1, vec_w1);
      vec_ww2 = _mm_mul_ps(vec_w2, vec_w2);

-
      vec_ww1 = _mm_mul_ps(vec_ww1, _mm_sub_ps(_mm_set_ps1(3.0),vec_ww1));
      vec_ww2 = _mm_mul_ps(vec_ww2, _mm_sub_ps(_mm_set_ps1(3.0),vec_ww2));

@@ -307,7 +304,6 @@ static void resampler_CC_upsample(void *re_, struct resampler_data *data)
         vec_ww1 = _mm_mul_ps(vec_w1, vec_w1);
         vec_ww2 = _mm_mul_ps(vec_w2, vec_w2);

-
         vec_ww1 = _mm_mul_ps(vec_ww1,_mm_sub_ps(_mm_set_ps1(3.0),vec_ww1));
         vec_ww2 = _mm_mul_ps(vec_ww2,_mm_sub_ps(_mm_set_ps1(3.0),vec_ww2));

@@ -349,7 +345,6 @@ static void resampler_CC_upsample(void *re_, struct resampler_data *data)
   data->output_frames = outp - (audio_frame_float_t*)data->data_out;
 }

-
 #elif defined (__ARM_NEON__) && !defined(DONT_WANT_ARM_OPTIMIZATIONS)

 #define CC_RESAMPLER_IDENT "NEON"
@@ -492,7 +487,6 @@ static void resampler_CC_process(void *re_, struct resampler_data *data)
      re->process(re_, data);
 }

-
 static void *resampler_CC_init(const struct resampler_config *config,
      double bandwidth_mod, 
      enum resampler_quality quality,
@@ -46,14 +46,17 @@
 #define NETWORK_COMPAT_HEADERS 1
 #endif

-
 #ifdef NETWORK_COMPAT_HEADERS
 #include <sys/socket.h>
 #include <netdb.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 #include <arpa/inet.h>
+#ifdef __CELLOS_LV2__
 #include <sys/poll.h>
+#else
+#include <poll.h>
+#endif
 #endif
 #include <fcntl.h>
 #ifdef _WIN32
@@ -158,7 +161,6 @@ static int rsnd_poll(struct pollfd *fd, int numfd, int timeout);
 static void rsnd_cb_thread(void *thread_data);
 static void rsnd_thread(void *thread_data);

-
 /* Determine whether we're running big- or little endian */
 static INLINE int rsnd_is_little_endian(void)
 {
@@ -242,7 +244,6 @@ static int rsnd_connect_server( rsound_t *rd )

   rd->conn_type = RSD_CONN_TCP;

-
   rd->conn.socket = net_socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
   if ( rd->conn.socket < 0 )
      goto error;
@@ -312,7 +313,6 @@ static int rsnd_send_header_info(rsound_t *rd)
 #define FRAMESIZE 34
 #define FORMAT 42

-
   uint32_t temp_rate = rd->rate;
   uint16_t temp_channels = rd->channels;

@@ -980,7 +980,6 @@ static int rsnd_close_ctl(rsound_t *rd)
   return 0;
 }

-
 // Sends delay info request to server on the ctl socket. This code section isn't critical, and will work if it works.
 // It will never block.
 static int rsnd_send_info_query(rsound_t *rd)
@@ -1296,7 +1295,6 @@ static int rsnd_reset(rsound_t *rd)
   return 0;
 }

-
 int rsd_stop(rsound_t *rd)
 {
   retro_assert(rd != NULL);
@@ -1403,7 +1401,6 @@ int rsd_exec(rsound_t *rsound)
   return fd;
 }

-
 /* ioctl()-ish param setting :D */
 int rsd_set_param(rsound_t *rd, enum rsd_settings option, void* param)
 {
@@ -1493,7 +1490,6 @@ void rsd_delay_wait(rsound_t *rd)
      /* Latency of stream in ms */
      int latency_ms = rsd_delay_ms(rd);

-
      /* Should we sleep for a while to keep the latency low? */
      if ( rd->max_latency < latency_ms )
      {
@@ -46,7 +46,6 @@ void _init_vita_heap(void) {
 		_newlib_vm_memblock = 0;
 	}

-
 	// Create a mutex to use inside _sbrk_r
 	if (sceKernelCreateLwMutex((struct SceKernelLwMutexWork*)_newlib_sbrk_mutex, "sbrk mutex", 0, 0, 0) < 0) {
 		goto failure;
@@ -70,7 +70,7 @@ typedef struct video4linux
   char dev_name[255];
 } video4linux_t;

-static int xioctl(int fd, int request, void *args)
+static int xioctl(int fd, unsigned long request, void *args)
 {
   int r;

@@ -91,7 +91,7 @@ static bool init_mmap(void *data)
   req.type                       = V4L2_BUF_TYPE_VIDEO_CAPTURE;
   req.memory                     = V4L2_MEMORY_MMAP;

-   if (xioctl(v4l->fd, (uint8_t)VIDIOC_REQBUFS, &req) == -1)
+   if (xioctl(v4l->fd, VIDIOC_REQBUFS, &req) == -1)
   {
      if (errno == EINVAL)
         RARCH_ERR("[V4L2]: %s does not support memory mapping.\n", v4l->dev_name);
@@ -122,7 +122,7 @@ static bool init_mmap(void *data)
      buf.memory = V4L2_MEMORY_MMAP;
      buf.index  = v4l->n_buffers;

-      if (xioctl(v4l->fd, (uint8_t)VIDIOC_QUERYBUF, &buf) == -1)
+      if (xioctl(v4l->fd, VIDIOC_QUERYBUF, &buf) == -1)
      {
         RARCH_ERR("[V4L2]: Error - xioctl VIDIOC_QUERYBUF.\n");
         return false;
@@ -152,7 +152,7 @@ static bool init_device(void *data)
   struct v4l2_cropcap cropcap = {0};
   video4linux_t          *v4l = (video4linux_t*)data;

-   if (xioctl(v4l->fd, (uint8_t)VIDIOC_QUERYCAP, &cap) < 0)
+   if (xioctl(v4l->fd, VIDIOC_QUERYCAP, &cap) < 0)
   {
      if (errno == EINVAL)
         RARCH_ERR("[V4L2]: %s is no V4L2 device.\n", v4l->dev_name);
@@ -176,7 +176,7 @@ static bool init_device(void *data)

   cropcap.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;

-   if (xioctl(v4l->fd, (uint8_t)VIDIOC_CROPCAP, &cropcap) == 0)
+   if (xioctl(v4l->fd, VIDIOC_CROPCAP, &cropcap) == 0)
   {
      crop.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
      crop.c    = cropcap.defrect;
@@ -190,7 +190,7 @@ static bool init_device(void *data)
   fmt.fmt.pix.pixelformat = V4L2_PIX_FMT_YUYV;
   fmt.fmt.pix.field       = V4L2_FIELD_NONE;

-   if (xioctl(v4l->fd, (uint8_t)VIDIOC_S_FMT, &fmt) < 0)
+   if (xioctl(v4l->fd, VIDIOC_S_FMT, &fmt) < 0)
   {
      RARCH_ERR("[V4L2]: Error - VIDIOC_S_FMT\n");
      return false;
@@ -248,7 +248,7 @@ static bool v4l_start(void *data)
      buf.memory = V4L2_MEMORY_MMAP;
      buf.index  = i;

-      if (xioctl(v4l->fd, (uint8_t)VIDIOC_QBUF, &buf) == -1)
+      if (xioctl(v4l->fd, VIDIOC_QBUF, &buf) == -1)
      {
         RARCH_ERR("[V4L2]: Error - VIDIOC_QBUF.\n");
         return false;
@@ -364,7 +364,7 @@ static bool preprocess_image(void *data)
   buf.type   = V4L2_BUF_TYPE_VIDEO_CAPTURE;
   buf.memory = V4L2_MEMORY_MMAP;

-   if (xioctl(v4l->fd, (uint8_t)VIDIOC_DQBUF, &buf) == -1)
+   if (xioctl(v4l->fd, VIDIOC_DQBUF, &buf) == -1)
   {
      switch (errno)
      {
@@ -384,7 +384,7 @@ static bool preprocess_image(void *data)

   scaler_ctx_scale_direct(ctx, v4l->buffer_output, (const uint8_t*)v4l->buffers[buf.index].start);

-   if (xioctl(v4l->fd, (uint8_t)VIDIOC_QBUF, &buf) == -1)
+   if (xioctl(v4l->fd, VIDIOC_QBUF, &buf) == -1)
      RARCH_ERR("[V4L2]: VIDIOC_QBUF\n");

   return true;
@@ -0,0 +1,59 @@
+#include <file/file_path.h>
+#include <string/stdstring.h>
+#include <streams/file_stream.h>
+
+#ifdef HAVE_MENU
+#include "../menu/menu_driver.h"
+#endif
+
+#include "../file_path_special.h"
+#include "../configuration.h"
+#include "../verbosity.h"
+#include "../network/net_http_special.h"
+
+#include "badges.h"
+
+badges_ctx_t badges_ctx;
+
+bool badge_exists(const char* filepath)
+{
+  return filestream_exists(filepath);
+}
+
+void set_badge_menu_texture(badges_ctx_t * badges, int i)
+{
+   char badge_file[16];
+   char fullpath[PATH_MAX_LENGTH];
+
+   snprintf(badge_file, sizeof(badge_file), "%s%s", badges->badge_id_list[i],
+         badges->badge_locked[i] ? "_lock.png" : ".png");
+
+   fill_pathname_application_special(fullpath,
+         PATH_MAX_LENGTH * sizeof(char),
+         APPLICATION_SPECIAL_DIRECTORY_THUMBNAILS_CHEEVOS_BADGES);
+
+#ifdef HAVE_MENU
+   menu_display_reset_textures_list(badge_file, fullpath,
+         &badges->menu_texture_list[i],TEXTURE_FILTER_MIPMAP_LINEAR);
+#endif
+}
+
+void set_badge_info (badges_ctx_t *badge_struct, int id,
+      const char *badge_id, bool active)
+{
+   if (!badge_struct)
+      return;
+
+   badge_struct->badge_id_list[id] = badge_id;
+   badge_struct->badge_locked[id]  = active;
+   set_badge_menu_texture(badge_struct, id);
+}
+
+menu_texture_item get_badge_texture(int id)
+{
+   settings_t *settings = config_get_ptr();
+   if (!settings || !settings->bools.cheevos_badges_enable)
+      return (menu_texture_item)NULL;
+
+   return badges_ctx.menu_texture_list[id];
+}
@@ -0,0 +1,44 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2015-2018 - Andre Leiradella
+ *
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __RARCH_CHEEVOS_BADGE_H
+#define __RARCH_CHEEVOS_BADGE_H
+
+#include "../menu/menu_driver.h"
+
+#include <retro_common_api.h>
+
+RETRO_BEGIN_DECLS
+
+#define CHEEVOS_BADGE_LIMIT 256
+
+typedef struct
+{
+  bool badge_locked[CHEEVOS_BADGE_LIMIT];
+  const char * badge_id_list[CHEEVOS_BADGE_LIMIT];
+  menu_texture_item menu_texture_list[CHEEVOS_BADGE_LIMIT];
+} badges_ctx_t;
+
+bool badge_exists(const char* filepath);
+void set_badge_menu_texture(badges_ctx_t * badges, int i);
+extern void set_badge_info (badges_ctx_t *badge_struct, int id, const char *badge_id, bool active);
+extern menu_texture_item get_badge_texture(int id);
+
+extern badges_ctx_t badges_ctx;
+static badges_ctx_t new_badges_ctx;
+
+RETRO_END_DECLS
+
+#endif
@@ -0,0 +1,76 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2015-2016 - Andre Leiradella
+ *
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __RARCH_CHEEVOS_CHEEVOS_H
+#define __RARCH_CHEEVOS_CHEEVOS_H
+
+#include <stdint.h>
+#include <stdlib.h>
+
+#include <boolean.h>
+
+#include "../verbosity.h"
+
+#include <retro_common_api.h>
+
+RETRO_BEGIN_DECLS
+
+typedef struct cheevos_ctx_desc
+{
+   unsigned idx;
+   char *s;
+   size_t len;
+} cheevos_ctx_desc_t;
+
+enum
+{
+   CHEEVOS_ACTIVE_SOFTCORE = 1 << 0,
+   CHEEVOS_ACTIVE_HARDCORE = 1 << 1
+};
+
+bool cheevos_load(const void *data);
+
+void cheevos_reset_game(void);
+
+void cheevos_populate_menu(void *data);
+
+bool cheevos_get_description(cheevos_ctx_desc_t *desc);
+
+bool cheevos_apply_cheats(bool *data_bool);
+
+bool cheevos_unload(void);
+
+bool cheevos_toggle_hardcore_mode(void);
+
+void cheevos_test(void);
+
+bool cheevos_set_cheats(void);
+
+void cheevos_set_support_cheevos(bool state);
+
+bool cheevos_get_support_cheevos(void);
+
+int cheevos_get_console(void);
+
+extern bool cheevos_loaded;
+extern bool cheevos_hardcore_active;
+extern bool cheevos_hardcore_paused;
+extern bool cheevos_state_loaded_flag;
+extern int cheats_are_enabled;
+extern int cheats_were_enabled;
+
+RETRO_END_DECLS
+
+#endif /* __RARCH_CHEEVOS_CHEEVOS_H */
@@ -0,0 +1,75 @@
+#ifndef __RARCH_CHEEVOS_CORO_H
+#define __RARCH_CHEEVOS_CORO_H
+
+/*
+Released under the CC0: https://creativecommons.org/publicdomain/zero/1.0/
+*/
+
+/* Use at the beginning of the coroutine, you must have declared a variable coro_t* coro */
+#define CORO_ENTER() \
+  { \
+  CORO_again: ; \
+  switch ( coro->step ) { \
+  case CORO_BEGIN: ;
+
+/* Use to define labels which are targets to GOTO and GOSUB */
+#define CORO_SUB( x ) \
+  case x: ;
+
+/* Use at the end of the coroutine */
+#define CORO_LEAVE() \
+  } } \
+  do { return 0; } while ( 0 )
+
+/* Go to the x label */
+#define CORO_GOTO( x ) \
+  do { \
+    coro->step = ( x ); \
+    goto CORO_again; \
+  } while ( 0 )
+
+/* Go to a subroutine, execution continues until the subroutine returns via RET */
+#define CORO_GOSUB( x ) \
+  do { \
+    coro->stack[ coro->sp++ ] = __LINE__; \
+    coro->step = ( x ); \
+    goto CORO_again; \
+    case __LINE__: ; \
+  } while ( 0 )
+
+/* Returns from a subroutine */
+#define CORO_RET() \
+  do { \
+    coro->step = coro->stack[ --coro->sp ]; \
+    goto CORO_again; \
+  } while ( 0 )
+
+/* Yields to the caller, execution continues from this point when the coroutine is resumed */
+#define CORO_YIELD() \
+  do { \
+    coro->step = __LINE__; \
+    return 1; \
+    case __LINE__: ; \
+  } while ( 0 )
+
+/* The coroutine entry point, never use 0 as a label */
+#define CORO_BEGIN 0
+
+/* Sets up the coroutine */
+#define CORO_SETUP() \
+  do { \
+    coro->step = CORO_BEGIN; \
+    coro->sp   = 0; \
+  } while ( 0 )
+
+#define CORO_STOP() \
+  do { \
+    return 0; \
+  } while ( 0 )
+
+/* Add this macro to your coro_t structure containing the variables for the coroutine */
+#define CORO_FIELDS \
+  int step, sp; \
+  int stack[ 8 ];
+
+#endif /* __RARCH_CHEEVOS_CORO_H */
@@ -0,0 +1,264 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2015-2018 - Andre Leiradella
+ *
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "fixup.h"
+#include "cheevos.h"
+#include "util.h"
+
+#include "../retroarch.h"
+#include "../core.h"
+
+#include <rcheevos.h>
+
+static int cheevos_cmpaddr(const void* e1, const void* e2)
+{
+   const cheevos_fixup_t* f1 = (const cheevos_fixup_t*)e1;
+   const cheevos_fixup_t* f2 = (const cheevos_fixup_t*)e2;
+
+   if (f1->address < f2->address)
+   {
+      return -1;
+   }
+   else if (f1->address > f2->address)
+   {
+      return 1;
+   }
+   else
+   {
+      return 0;
+   }
+}
+
+static size_t cheevos_var_reduce(size_t addr, size_t mask)
+{
+   while (mask)
+   {
+      size_t tmp = (mask - 1) & ~mask;
+      addr = (addr & tmp) | ((addr >> 1) & ~tmp);
+      mask = (mask & (mask - 1)) >> 1;
+   }
+
+   return addr;
+}
+
+static size_t cheevos_var_highest_bit(size_t n)
+{
+   n |= n >>  1;
+   n |= n >>  2;
+   n |= n >>  4;
+   n |= n >>  8;
+   n |= n >> 16;
+
+   return n ^ (n >> 1);
+}
+
+void cheevos_fixup_init(cheevos_fixups_t* fixups)
+{
+   fixups->elements = NULL;
+   fixups->capacity = fixups->count = 0;
+   fixups->dirty = false;
+}
+
+void cheevos_fixup_destroy(cheevos_fixups_t* fixups)
+{
+   CHEEVOS_FREE(fixups->elements);
+   cheevos_fixup_init(fixups);
+}
+
+const uint8_t* cheevos_fixup_find(cheevos_fixups_t* fixups, unsigned address, int console)
+{
+   cheevos_fixup_t key;
+   cheevos_fixup_t* found;
+   const uint8_t* location;
+
+   if (fixups->dirty)
+   {
+      qsort(fixups->elements, fixups->count, sizeof(cheevos_fixup_t), cheevos_cmpaddr);
+      fixups->dirty = false;
+   }
+
+   key.address = address;
+   found = (cheevos_fixup_t*)bsearch(&key, fixups->elements, fixups->count, sizeof(cheevos_fixup_t), cheevos_cmpaddr);
+
+   if (found != NULL)
+   {
+      return found->location;
+   }
+
+   if (fixups->count == fixups->capacity)
+   {
+      unsigned new_capacity = fixups->capacity == 0 ? 16 : fixups->capacity * 2;
+      cheevos_fixup_t* new_elements = (cheevos_fixup_t*)
+         realloc(fixups->elements, new_capacity * sizeof(cheevos_fixup_t));
+
+      if (new_elements == NULL)
+      {
+         return NULL;
+      }
+
+      fixups->elements = new_elements;
+      fixups->capacity = new_capacity;
+   }
+
+   fixups->elements[fixups->count].address = address;
+   fixups->elements[fixups->count++].location = location =
+      cheevos_patch_address(address, console);
+   fixups->dirty = true;
+
+   return location;
+}
+
+const uint8_t* cheevos_patch_address(unsigned address, int console)
+{
+   rarch_system_info_t* system = runloop_get_system_info();
+   const void* pointer = NULL;
+
+   if (console == RC_CONSOLE_NINTENDO)
+   {
+      if (address >= 0x0800 && address < 0x2000)
+      {
+         /* Address in the mirrorred RAM, adjust to real RAM. */
+         CHEEVOS_LOG(CHEEVOS_TAG "NES memory address in mirrorred RAM %X, adjusted to %X\n", address, address & 0x07ff);
+         address &= 0x07ff;
+      }
+   }
+   else if (console == RC_CONSOLE_GAMEBOY_COLOR)
+   {
+      if (address >= 0xe000 && address <= 0xfdff)
+      {
+         /* Address in the echo RAM, adjust to real RAM. */
+         CHEEVOS_LOG(CHEEVOS_TAG "GBC memory address in echo RAM %X, adjusted to %X\n", address, address - 0x2000);
+         address -= 0x2000;
+      }
+   }
+
+   if (system->mmaps.num_descriptors != 0)
+   {
+      /* We have memory descriptors, use it. */
+      const rarch_memory_descriptor_t* desc = NULL;
+      const rarch_memory_descriptor_t* end  = NULL;
+
+      /* Patch the address to correctly map it to the mmaps. */
+      if (console == RC_CONSOLE_GAMEBOY_ADVANCE)
+      {
+         if (address < 0x8000)
+         {
+            /* Internal RAM. */
+            CHEEVOS_LOG(CHEEVOS_TAG "GBA memory address %X adjusted to %X\n", address, address + 0x3000000);
+            address += 0x3000000;
+         }
+         else
+         {
+            /* Work RAM. */
+            CHEEVOS_LOG(CHEEVOS_TAG "GBA memory address %X adjusted to %X\n", address, address + 0x2000000 - 0x8000);
+            address += 0x2000000 - 0x8000;
+         }
+      }
+      else if (console == RC_CONSOLE_PC_ENGINE)
+      {
+         /* RAM. */
+         CHEEVOS_LOG(CHEEVOS_TAG "PCE memory address %X adjusted to %X\n", address, address + 0x1f0000);
+         address += 0x1f0000;
+      }
+      else if (console == RC_CONSOLE_SUPER_NINTENDO)
+      {
+         if (address < 0x020000)
+         {
+            /* Work RAM. */
+            CHEEVOS_LOG(CHEEVOS_TAG "SNES memory address %X adjusted to %X\n", address, address + 0x7e0000);
+            address += 0x7e0000;
+         }
+         else
+         {
+            /* Save RAM. */
+            CHEEVOS_LOG(CHEEVOS_TAG "SNES memory address %X adjusted to %X\n", address, address + 0x006000 - 0x020000);
+            address += 0x006000 - 0x020000;
+         }
+      }
+
+      desc = system->mmaps.descriptors;
+      end  = desc + system->mmaps.num_descriptors;
+
+      for (; desc < end; desc++)
+      {
+         if (((desc->core.start ^ address) & desc->core.select) == 0)
+         {
+            unsigned addr = address;
+            pointer       = desc->core.ptr;
+            
+            address       = (unsigned)cheevos_var_reduce(
+               (addr - desc->core.start) & desc->disconnect_mask,
+               desc->core.disconnect);
+
+            if (address >= desc->core.len)
+               address -= cheevos_var_highest_bit(address);
+
+            address += desc->core.offset;
+
+            CHEEVOS_LOG(CHEEVOS_TAG "address %X set to descriptor %d at offset %X\n", addr, (int)((desc - system->mmaps.descriptors) + 1), address);
+            break;
+         }
+      }
+   }
+   else
+   {
+      unsigned i;
+
+      for (i = 0; i < 4; i++)
+      {
+         retro_ctx_memory_info_t meminfo;
+
+         switch (i)
+         {
+            case 0:
+               meminfo.id = RETRO_MEMORY_SYSTEM_RAM;
+               break;
+            case 1:
+               meminfo.id = RETRO_MEMORY_SAVE_RAM;
+               break;
+            case 2:
+               meminfo.id = RETRO_MEMORY_VIDEO_RAM;
+               break;
+            case 3:
+               meminfo.id = RETRO_MEMORY_RTC;
+               break;
+         }
+
+         core_get_memory(&meminfo);
+
+         if (address < meminfo.size)
+         {
+            pointer = meminfo.data;
+            break;
+         }
+
+         /**
+          * HACK Subtract the correct amount of bytes to reach the save RAM as
+          * it's size is not always set correctly in the core.
+          */
+         if (i == 0 && console == RC_CONSOLE_NINTENDO)
+            address -= 0x6000;
+         else
+            address -= meminfo.size;
+      }
+   }
+
+   if (pointer == NULL)
+   {
+      return NULL;
+   }
+
+   return (const uint8_t*)pointer + address;
+}
@@ -0,0 +1,48 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2015-2018 - Andre Leiradella
+ *
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __RARCH_CHEEVOS_FIXUP_H
+#define __RARCH_CHEEVOS_FIXUP_H
+
+#include <stdint.h>
+#include <boolean.h>
+
+#include <retro_common_api.h>
+
+RETRO_BEGIN_DECLS
+
+typedef struct
+{
+   unsigned address;
+   const uint8_t* location;
+} cheevos_fixup_t;
+
+typedef struct
+{
+   cheevos_fixup_t* elements;
+   unsigned capacity, count;
+   bool dirty;
+} cheevos_fixups_t;
+
+void cheevos_fixup_init(cheevos_fixups_t* fixups);
+void cheevos_fixup_destroy(cheevos_fixups_t* fixups);
+
+const uint8_t* cheevos_fixup_find(cheevos_fixups_t* fixups, unsigned address, int console);
+
+const uint8_t* cheevos_patch_address(unsigned address, int console);
+
+RETRO_END_DECLS
+
+#endif
@@ -0,0 +1,12 @@
+#include "hash.h"
+
+uint32_t cheevos_djb2(const char* str, size_t length)
+{
+   const unsigned char* aux = (const unsigned char*)str;
+   uint32_t            hash = 5381;
+
+   while (length--)
+      hash = ( hash << 5 ) + hash + *aux++;
+
+   return hash;
+}
@@ -0,0 +1,30 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2015-2018 - Andre Leiradella
+ *
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __RARCH_CHEEVOS_HASH_H
+#define __RARCH_CHEEVOS_HASH_H
+
+#include <stdint.h>
+#include <stddef.h>
+
+#include <retro_common_api.h>
+
+RETRO_BEGIN_DECLS
+
+uint32_t cheevos_djb2(const char* str, size_t length);
+
+RETRO_END_DECLS
+
+#endif
@@ -0,0 +1,674 @@
+#include "parser.h"
+
+#include "hash.h"
+#include "util.h"
+
+#include <formats/jsonsax.h>
+#include <string/stdstring.h>
+#include <compat/strl.h>
+
+/* C89 wants only int values in enums. */
+#define CHEEVOS_JSON_KEY_GAMEID       0xb4960eecU
+#define CHEEVOS_JSON_KEY_ACHIEVEMENTS 0x69749ae1U
+#define CHEEVOS_JSON_KEY_ID           0x005973f2U
+#define CHEEVOS_JSON_KEY_MEMADDR      0x1e76b53fU
+#define CHEEVOS_JSON_KEY_TITLE        0x0e2a9a07U
+#define CHEEVOS_JSON_KEY_DESCRIPTION  0xe61a1f69U
+#define CHEEVOS_JSON_KEY_POINTS       0xca8fce22U
+#define CHEEVOS_JSON_KEY_AUTHOR       0xa804edb8U
+#define CHEEVOS_JSON_KEY_MODIFIED     0xdcea4fe6U
+#define CHEEVOS_JSON_KEY_CREATED      0x3a84721dU
+#define CHEEVOS_JSON_KEY_BADGENAME    0x887685d9U
+#define CHEEVOS_JSON_KEY_CONSOLE_ID   0x071656e5U
+#define CHEEVOS_JSON_KEY_TOKEN        0x0e2dbd26U
+#define CHEEVOS_JSON_KEY_FLAGS        0x0d2e96b2U
+#define CHEEVOS_JSON_KEY_LEADERBOARDS 0xf1247d2dU
+#define CHEEVOS_JSON_KEY_MEM          0x0b8807e4U
+#define CHEEVOS_JSON_KEY_FORMAT       0xb341208eU
+#define CHEEVOS_JSON_KEY_SUCCESS      0x110461deU
+#define CHEEVOS_JSON_KEY_ERROR        0x0d2011cfU
+
+/*****************************************************************************
+Gets a value in a JSON
+*****************************************************************************/
+
+typedef struct
+{
+   unsigned    key_hash;
+   int         is_key;
+   const char* value;
+   size_t      length;
+} cheevos_getvalueud_t;
+
+static int cheevos_getvalue_key(void* userdata,
+      const char* name, size_t length)
+{
+   cheevos_getvalueud_t* ud = (cheevos_getvalueud_t*)userdata;
+
+   ud->is_key = cheevos_djb2(name, length) == ud->key_hash;
+   return 0;
+}
+
+static int cheevos_getvalue_string(void* userdata,
+      const char* string, size_t length)
+{
+   cheevos_getvalueud_t* ud = (cheevos_getvalueud_t*)userdata;
+
+   if (ud->is_key)
+   {
+      ud->value  = string;
+      ud->length = length;
+      ud->is_key = 0;
+   }
+
+   return 0;
+}
+
+static int cheevos_getvalue_boolean(void* userdata, int istrue)
+{
+   cheevos_getvalueud_t* ud = (cheevos_getvalueud_t*)userdata;
+
+   if (ud->is_key)
+   {
+      if (istrue)
+      {
+         ud->value  = "true";
+         ud->length = 4;
+      }
+      else
+      {
+         ud->value  = "false";
+         ud->length = 5;
+      }
+
+      ud->is_key    = 0;
+   }
+
+   return 0;
+}
+
+static int cheevos_getvalue_null(void* userdata)
+{
+   cheevos_getvalueud_t* ud = (cheevos_getvalueud_t*)userdata;
+
+   if (ud->is_key )
+   {
+      ud->value = "null";
+      ud->length = 4;
+      ud->is_key = 0;
+   }
+
+   return 0;
+}
+
+static int cheevos_get_value(const char* json, unsigned key_hash,
+      char* value, size_t length)
+{
+   static const jsonsax_handlers_t handlers =
+   {
+      NULL,
+      NULL,
+      NULL,
+      NULL,
+      NULL,
+      NULL,
+      cheevos_getvalue_key,
+      NULL,
+      cheevos_getvalue_string,
+      cheevos_getvalue_string, /* number */
+      cheevos_getvalue_boolean,
+      cheevos_getvalue_null
+   };
+
+   cheevos_getvalueud_t ud;
+
+   ud.key_hash = key_hash;
+   ud.is_key   = 0;
+   ud.value    = NULL;
+   ud.length   = 0;
+   *value      = 0;
+
+   if ((jsonsax_parse(json, &handlers, (void*)&ud) == JSONSAX_OK)
+         && ud.value && ud.length < length)
+   {
+      strlcpy(value, ud.value, ud.length + 1);
+      return 0;
+   }
+
+   return -1;
+}
+
+/*****************************************************************************
+Returns the token of the error message
+*****************************************************************************/
+
+int cheevos_get_token(const char* json, char* token, size_t length)
+{
+   cheevos_get_value(json, CHEEVOS_JSON_KEY_ERROR, token, length);
+
+   if (!string_is_empty(token))
+      return -1;
+   
+   return cheevos_get_value(json, CHEEVOS_JSON_KEY_TOKEN, token, length);
+}
+
+/*****************************************************************************
+Count number of achievements in a JSON file
+*****************************************************************************/
+
+typedef struct
+{
+   int      in_cheevos;
+   int      in_lboards;
+   uint32_t field_hash;
+   unsigned core_count;
+   unsigned unofficial_count;
+   unsigned lboard_count;
+} cheevos_countud_t;
+
+static int cheevos_count_end_array(void* userdata)
+{
+  cheevos_countud_t* ud = (cheevos_countud_t*)userdata;
+
+   ud->in_cheevos       = 0;
+   ud->in_lboards       = 0;
+   return 0;
+}
+
+static int cheevos_count_key(void* userdata,
+      const char* name, size_t length)
+{
+   cheevos_countud_t* ud = (cheevos_countud_t*)userdata;
+
+   ud->field_hash        = cheevos_djb2(name, length);
+
+   if (ud->field_hash == CHEEVOS_JSON_KEY_ACHIEVEMENTS)
+      ud->in_cheevos     = 1;
+   else if (ud->field_hash == CHEEVOS_JSON_KEY_LEADERBOARDS)
+      ud->in_lboards     = 1;
+
+   return 0;
+}
+
+static int cheevos_count_number(void* userdata,
+      const char* number, size_t length)
+{
+   cheevos_countud_t* ud = (cheevos_countud_t*)userdata;
+
+   if (ud->in_cheevos && ud->field_hash == CHEEVOS_JSON_KEY_FLAGS)
+   {
+      long flags = strtol(number, NULL, 10);
+
+      if (flags == 3)
+         ud->core_count++;       /* Core achievements */
+      else if (flags == 5)
+         ud->unofficial_count++; /* Unofficial achievements */
+   }
+   else if (ud->in_lboards && ud->field_hash == CHEEVOS_JSON_KEY_ID)
+      ud->lboard_count++;
+
+   return 0;
+}
+
+static int cheevos_count_cheevos(const char* json,
+      unsigned* core_count, unsigned* unofficial_count,
+      unsigned* lboard_count)
+{
+   static const jsonsax_handlers_t handlers =
+   {
+      NULL,
+      NULL,
+      NULL,
+      NULL,
+      NULL,
+      cheevos_count_end_array,
+      cheevos_count_key,
+      NULL,
+      NULL,
+      cheevos_count_number,
+      NULL,
+      NULL
+   };
+
+   int res;
+   cheevos_countud_t ud;
+   ud.in_cheevos       = 0;
+   ud.in_lboards       = 0;
+   ud.core_count       = 0;
+   ud.unofficial_count = 0;
+   ud.lboard_count     = 0;
+
+   res                 = jsonsax_parse(json, &handlers, (void*)&ud);
+
+   *core_count         = ud.core_count;
+   *unofficial_count   = ud.unofficial_count;
+   *lboard_count       = ud.lboard_count;
+
+   return res;
+}
+
+/*****************************************************************************
+Parses the cheevos in the JSON
+*****************************************************************************/
+
+typedef struct
+{
+   const char* string;
+   size_t      length;
+} cheevos_field_t;
+
+typedef struct
+{
+   int      in_cheevos;
+   int      in_lboards;
+   int      is_console_id;
+   unsigned core_count;
+   unsigned unofficial_count;
+   unsigned lboard_count;
+
+   cheevos_field_t* field;
+   cheevos_field_t  id, memaddr, title, desc, points, author;
+   cheevos_field_t  modified, created, badge, flags, format;
+
+   cheevos_rapatchdata_t* patchdata;
+} cheevos_readud_t;
+
+static const char* cheevos_dupstr(const cheevos_field_t* field)
+{
+   char* string = (char*)malloc(field->length + 1);
+
+   if (!string)
+      return NULL;
+
+   memcpy((void*)string, (void*)field->string, field->length);
+   string[field->length] = 0;
+   return string;
+}
+
+static int cheevos_new_cheevo(cheevos_readud_t* ud)
+{
+   cheevos_racheevo_t* cheevo = NULL;
+   unsigned flags             = (unsigned)strtol(ud->flags.string, NULL, 10);
+
+   if (flags == 3)
+      cheevo = ud->patchdata->core + ud->core_count++;
+   else if (flags == 5)
+      cheevo = ud->patchdata->unofficial + ud->unofficial_count++;
+   else
+      return 0;
+
+   cheevo->title       = cheevos_dupstr(&ud->title);
+   cheevo->description = cheevos_dupstr(&ud->desc);
+   cheevo->badge       = cheevos_dupstr(&ud->badge);
+   cheevo->memaddr     = cheevos_dupstr(&ud->memaddr);
+   cheevo->points      = (unsigned)strtol(ud->points.string, NULL, 10);
+   cheevo->id          = (unsigned)strtol(ud->id.string, NULL, 10);
+
+   if (   !cheevo->title
+       || !cheevo->description
+       || !cheevo->badge
+       || !cheevo->memaddr)
+   {
+      CHEEVOS_FREE(cheevo->title);
+      CHEEVOS_FREE(cheevo->description);
+      CHEEVOS_FREE(cheevo->badge);
+      CHEEVOS_FREE(cheevo->memaddr);
+      return -1;
+   }
+
+   return 0;
+}
+
+static int cheevos_new_lboard(cheevos_readud_t* ud)
+{
+   cheevos_ralboard_t* lboard = ud->patchdata->lboards + ud->lboard_count++;
+
+   lboard->title              = cheevos_dupstr(&ud->title);
+   lboard->description        = cheevos_dupstr(&ud->desc);
+   lboard->format             = cheevos_dupstr(&ud->format);
+   lboard->mem                = cheevos_dupstr(&ud->memaddr);
+   lboard->id                 = (unsigned)strtol(ud->id.string, NULL, 10);
+
+   if (   !lboard->title
+       || !lboard->description
+       || !lboard->format
+       || !lboard->mem)
+   {
+      CHEEVOS_FREE(lboard->title);
+      CHEEVOS_FREE(lboard->description);
+      CHEEVOS_FREE(lboard->format);
+      CHEEVOS_FREE(lboard->mem);
+      return -1;
+   }
+
+   return 0;
+}
+
+static int cheevos_read_end_object(void* userdata)
+{
+   cheevos_readud_t* ud = (cheevos_readud_t*)userdata;
+
+   if (ud->in_cheevos)
+      return cheevos_new_cheevo(ud);
+
+   if (ud->in_lboards)
+      return cheevos_new_lboard(ud);
+
+   return 0;
+}
+
+static int cheevos_read_end_array(void* userdata)
+{
+   cheevos_readud_t* ud = (cheevos_readud_t*)userdata;
+
+   ud->in_cheevos       = 0;
+   ud->in_lboards       = 0;
+   return 0;
+}
+
+static int cheevos_read_key(void* userdata,
+      const char* name, size_t length)
+{
+   cheevos_readud_t* ud = (cheevos_readud_t*)userdata;
+
+   int common           = ud->in_cheevos || ud->in_lboards;
+   uint32_t hash        = cheevos_djb2(name, length);
+   ud->field            = NULL;
+
+   switch (hash)
+   {
+      case CHEEVOS_JSON_KEY_ACHIEVEMENTS:
+         ud->in_cheevos = 1;
+         break;
+      case CHEEVOS_JSON_KEY_LEADERBOARDS:
+         ud->in_lboards = 1;
+         break;
+      case CHEEVOS_JSON_KEY_CONSOLE_ID:
+         ud->is_console_id = 1;
+         break;
+      case CHEEVOS_JSON_KEY_ID:
+         if (common)
+            ud->field = &ud->id;
+         break;
+      case CHEEVOS_JSON_KEY_MEMADDR:
+         if (ud->in_cheevos)
+            ud->field = &ud->memaddr;
+         break;
+      case CHEEVOS_JSON_KEY_MEM:
+         if (ud->in_lboards)
+            ud->field = &ud->memaddr;
+         break;
+      case CHEEVOS_JSON_KEY_TITLE:
+         if (common)
+            ud->field = &ud->title;
+         break;
+      case CHEEVOS_JSON_KEY_DESCRIPTION:
+         if (common)
+            ud->field = &ud->desc;
+         break;
+      case CHEEVOS_JSON_KEY_POINTS:
+         if (ud->in_cheevos)
+            ud->field = &ud->points;
+         break;
+      case CHEEVOS_JSON_KEY_AUTHOR:
+         if (ud->in_cheevos)
+            ud->field = &ud->author;
+         break;
+      case CHEEVOS_JSON_KEY_MODIFIED:
+         if (ud->in_cheevos)
+            ud->field = &ud->modified;
+         break;
+      case CHEEVOS_JSON_KEY_CREATED:
+         if (ud->in_cheevos)
+            ud->field = &ud->created;
+         break;
+      case CHEEVOS_JSON_KEY_BADGENAME:
+         if (ud->in_cheevos)
+            ud->field = &ud->badge;
+         break;
+      case CHEEVOS_JSON_KEY_FLAGS:
+         if (ud->in_cheevos)
+            ud->field = &ud->flags;
+         break;
+      case CHEEVOS_JSON_KEY_FORMAT:
+         if (ud->in_lboards)
+            ud->field = &ud->format;
+         break;
+      default:
+         break;
+   }
+
+   return 0;
+}
+
+static int cheevos_read_string(void* userdata,
+      const char* string, size_t length)
+{
+   cheevos_readud_t* ud = (cheevos_readud_t*)userdata;
+
+   if (ud->field)
+   {
+      ud->field->string = string;
+      ud->field->length = length;
+   }
+
+   return 0;
+}
+
+static int cheevos_read_number(void* userdata,
+      const char* number, size_t length)
+{
+   cheevos_readud_t* ud = (cheevos_readud_t*)userdata;
+
+   if (ud->field)
+   {
+      ud->field->string = number;
+      ud->field->length = length;
+   }
+   else if (ud->is_console_id)
+   {
+      ud->patchdata->console_id = strtol(number, NULL, 10);
+      ud->is_console_id         = 0;
+   }
+
+   return 0;
+}
+
+int cheevos_get_patchdata(const char* json, cheevos_rapatchdata_t* patchdata)
+{
+   static const jsonsax_handlers_t handlers =
+   {
+      NULL,
+      NULL,
+      NULL,
+      cheevos_read_end_object,
+      NULL,
+      cheevos_read_end_array,
+      cheevos_read_key,
+      NULL,
+      cheevos_read_string,
+      cheevos_read_number,
+      NULL,
+      NULL
+   };
+
+   cheevos_readud_t ud;
+   int res;
+
+   /* Count the number of achievements in the JSON file. */
+   res = cheevos_count_cheevos(json, &patchdata->core_count,
+      &patchdata->unofficial_count, &patchdata->lboard_count);
+
+   if (res != JSONSAX_OK)
+      return -1;
+
+   /* Allocate the achievements. */
+
+   patchdata->core = (cheevos_racheevo_t*)
+      calloc(patchdata->core_count, sizeof(cheevos_racheevo_t));
+
+   patchdata->unofficial = (cheevos_racheevo_t*)
+      calloc(patchdata->unofficial_count, sizeof(cheevos_racheevo_t));
+
+   patchdata->lboards = (cheevos_ralboard_t*)
+      calloc(patchdata->lboard_count, sizeof(cheevos_ralboard_t));
+
+   if (!patchdata->core       ||
+       !patchdata->unofficial ||
+       !patchdata->lboards)
+   {
+      CHEEVOS_FREE(patchdata->core);
+      CHEEVOS_FREE(patchdata->unofficial);
+      CHEEVOS_FREE(patchdata->lboards);
+
+      return -1;
+   }
+
+   /* Load the achievements. */
+   ud.in_cheevos       = 0;
+   ud.in_lboards       = 0;
+   ud.is_console_id    = 0;
+   ud.field            = NULL;
+   ud.core_count       = 0;
+   ud.unofficial_count = 0;
+   ud.lboard_count     = 0;
+   ud.patchdata        = patchdata;
+
+   if (jsonsax_parse(json, &handlers, (void*)&ud) != JSONSAX_OK)
+   {
+      cheevos_free_patchdata(patchdata);
+      return -1;
+   }
+
+   return 0;
+}
+
+/*****************************************************************************
+Frees the patchdata
+*****************************************************************************/
+
+void cheevos_free_patchdata(cheevos_rapatchdata_t* patchdata)
+{
+   unsigned i = 0, count = 0;
+   const cheevos_racheevo_t* cheevo = NULL;
+   const cheevos_ralboard_t* lboard = NULL;
+
+   cheevo = patchdata->core;
+
+   for (i = 0, count = patchdata->core_count; i < count; i++, cheevo++)
+   {
+      CHEEVOS_FREE(cheevo->title);
+      CHEEVOS_FREE(cheevo->description);
+      CHEEVOS_FREE(cheevo->badge);
+      CHEEVOS_FREE(cheevo->memaddr);
+   }
+
+   cheevo = patchdata->unofficial;
+
+   for (i = 0, count = patchdata->unofficial_count; i < count; i++, cheevo++)
+   {
+      CHEEVOS_FREE(cheevo->title);
+      CHEEVOS_FREE(cheevo->description);
+      CHEEVOS_FREE(cheevo->badge);
+      CHEEVOS_FREE(cheevo->memaddr);
+   }
+
+   lboard = patchdata->lboards;
+
+   for (i = 0, count = patchdata->lboard_count; i < count; i++, lboard++)
+   {
+      CHEEVOS_FREE(lboard->title);
+      CHEEVOS_FREE(lboard->description);
+      CHEEVOS_FREE(lboard->format);
+      CHEEVOS_FREE(lboard->mem);
+   }
+
+   CHEEVOS_FREE(patchdata->core);
+   CHEEVOS_FREE(patchdata->unofficial);
+   CHEEVOS_FREE(patchdata->lboards);
+
+   patchdata->console_id       = 0;
+   patchdata->core             = NULL;
+   patchdata->unofficial       = NULL;
+   patchdata->lboards          = NULL;
+   patchdata->core_count       = 0;
+   patchdata->unofficial_count = 0;
+   patchdata->lboard_count     = 0;
+}
+
+/*****************************************************************************
+Deactivates unlocked cheevos
+*****************************************************************************/
+
+typedef struct
+{
+   int is_element;
+   cheevos_unlock_cb_t unlock_cb;
+   void* userdata;
+} cheevos_deactivate_t;
+
+static int cheevos_deactivate_index(void* userdata, unsigned int index)
+{
+   cheevos_deactivate_t* ud = (cheevos_deactivate_t*)userdata;
+
+   ud->is_element           = 1;
+   return 0;
+}
+
+static int cheevos_deactivate_number(void* userdata,
+      const char* number, size_t length)
+{
+   cheevos_deactivate_t* ud = (cheevos_deactivate_t*)userdata;
+   unsigned id              = 0;
+
+   if (ud->is_element)
+   {
+      ud->is_element = 0;
+      id             = (unsigned)strtol(number, NULL, 10);
+
+      ud->unlock_cb(id, ud->userdata);
+   }
+
+   return 0;
+}
+
+void cheevos_deactivate_unlocks(const char* json, cheevos_unlock_cb_t unlock_cb, void* userdata)
+{
+   static const jsonsax_handlers_t handlers =
+   {
+      NULL,
+      NULL,
+      NULL,
+      NULL,
+      NULL,
+      NULL,
+      NULL,
+      cheevos_deactivate_index,
+      NULL,
+      cheevos_deactivate_number,
+      NULL,
+      NULL
+   };
+
+   cheevos_deactivate_t ud;
+
+   ud.is_element = 0;
+   ud.unlock_cb  = unlock_cb;
+   ud.userdata   = userdata;
+
+   jsonsax_parse(json, &handlers, (void*)&ud);
+}
+
+/*****************************************************************************
+Returns the game ID
+*****************************************************************************/
+
+unsigned chevos_get_gameid(const char* json)
+{
+   char gameid[32];
+
+   if (cheevos_get_value(json, CHEEVOS_JSON_KEY_GAMEID, gameid, sizeof(gameid)) != 0)
+      return 0;
+
+   return (unsigned)strtol(gameid, NULL, 10);
+}
@@ -0,0 +1,69 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2015-2018 - Andre Leiradella
+ *
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __RARCH_CHEEVOS_PARSER_H
+#define __RARCH_CHEEVOS_PARSER_H
+
+#include <stdint.h>
+#include <stddef.h>
+#include <boolean.h>
+
+#include <retro_common_api.h>
+
+RETRO_BEGIN_DECLS
+
+typedef struct {
+  const char* title;
+  const char* description;
+  const char* badge;
+  const char* memaddr;
+  unsigned points;
+  unsigned id;
+} cheevos_racheevo_t;
+
+typedef struct {
+  const char* title;
+  const char* description;
+  const char* format;
+  const char* mem;
+  unsigned id;
+} cheevos_ralboard_t;
+
+typedef struct {
+   unsigned console_id;
+
+   cheevos_racheevo_t* core;
+   cheevos_racheevo_t* unofficial;
+   cheevos_ralboard_t* lboards;
+
+   unsigned core_count;
+   unsigned unofficial_count;
+   unsigned lboard_count;
+} cheevos_rapatchdata_t;
+
+typedef void (*cheevos_unlock_cb_t)(unsigned id, void* userdata);
+
+int cheevos_get_token(const char* json, char* token, size_t length);
+
+int  cheevos_get_patchdata(const char* json, cheevos_rapatchdata_t* patchdata);
+void cheevos_free_patchdata(cheevos_rapatchdata_t* patchdata);
+
+void cheevos_deactivate_unlocks(const char* json, cheevos_unlock_cb_t unlock_cb, void* userdata);
+
+unsigned chevos_get_gameid(const char* json);
+
+RETRO_END_DECLS
+
+#endif
@@ -0,0 +1,53 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2015-2016 - Andre Leiradella
+ *
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __RARCH_CHEEVOS_UTIL_H
+#define __RARCH_CHEEVOS_UTIL_H
+
+#include <retro_common_api.h>
+
+RETRO_BEGIN_DECLS
+
+/*****************************************************************************
+Setup - mainly for debugging
+*****************************************************************************/
+
+/* Define this macro to get extra-verbose log for cheevos. */
+#undef CHEEVOS_VERBOSE
+
+/*****************************************************************************
+End of setup
+*****************************************************************************/
+
+#define CHEEVOS_TAG "[CHEEVOS]: "
+#define CHEEVOS_FREE(p) do { void* q = (void*)p; if (q != NULL) free(q); } while (0)
+
+#ifdef CHEEVOS_VERBOSE
+
+#define CHEEVOS_LOG RARCH_LOG
+#define CHEEVOS_ERR RARCH_ERR
+
+#else
+
+#define CHEEVOS_LOG cheevos_log
+#define CHEEVOS_ERR RARCH_ERR
+
+void cheevos_log(const char *fmt, ...);
+
+#endif
+
+RETRO_END_DECLS
+
+#endif /* __RARCH_CHEEVOS_UTIL_H */
@@ -1,3 +1,18 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2015-2018 - Andre Leiradella
+ *
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include <file/file_path.h>
 #include <string/stdstring.h>
 #include <streams/file_stream.h>
@@ -1,5 +1,24 @@
-#ifndef __RARCH_BADGE_H
-#define __RARCH_BADGE_H
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2015-2018 - Andre Leiradella
+ *
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __RARCH_CHEEVOS_OLD_BADGE_H
+#define __RARCH_CHEEVOS_OLD_BADGE_H
+
+#ifdef HAVE_NEW_CHEEVOS
+#include "../cheevos-new/badges.h"
+#else

 #include "../menu/menu_driver.h"

@@ -27,3 +46,5 @@ static badges_ctx_t new_badges_ctx;
 RETRO_END_DECLS

 #endif
+
+#endif
@@ -1,5 +1,5 @@
 /*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2015-2016 - Andre Leiradella
+ *  Copyright (C) 2015-2018 - Andre Leiradella
 *
 *  RetroArch is free software: you can redistribute it and/or modify it under the terms
 *  of the GNU General Public License as published by the Free Software Found-
@@ -288,6 +288,7 @@ static cheevos_locals_t cheevos_locals =
 bool cheevos_loaded = false;
 bool cheevos_hardcore_active = false;
 bool cheevos_hardcore_paused = false;
+bool cheevos_state_loaded_flag = false;
 int cheats_are_enabled = 0;
 int cheats_were_enabled = 0;

@@ -1665,7 +1666,7 @@ static void cheevos_test_cheevo_set(const cheevoset_t *set)

            if (settings && settings->bools.cheevos_auto_screenshot)
            {
-               char shotname[256];
+               char shotname[4200];

               snprintf(shotname, sizeof(shotname), "%s/%s-cheevo-%u",
                  settings->paths.directory_screenshot,
@@ -2570,10 +2571,12 @@ enum

 static int cheevos_iterate(coro_t *coro)
 {
-   ssize_t num_read = 0;
-   size_t to_read   = 4096;
-   uint8_t *buffer  = NULL;
-   const char *end  = NULL;
+   const int snes_header_len = 0x200;
+   const int lynx_header_len = 0x40;
+   ssize_t num_read          = 0;
+   size_t to_read            = 4096;
+   uint8_t *buffer           = NULL;
+   const char *end           = NULL;

   static const uint32_t genesis_exts[] =
   {
@@ -2611,18 +2614,16 @@ static int cheevos_iterate(coro_t *coro)

   static cheevos_finder_t finders[] =
   {
-      {SNES_MD5,    "SNES (8Mb padding)",                snes_exts},
+      {SNES_MD5,    "SNES (discards header)",            snes_exts},
      {GENESIS_MD5, "Genesis (6Mb padding)",             genesis_exts},
-      {LYNX_MD5,    "Atari Lynx (only first 512 bytes)", lynx_exts},
-      {NES_MD5,     "NES (discards VROM)",               NULL},
+      {LYNX_MD5,    "Atari Lynx (discards header)",      lynx_exts},
+      {NES_MD5,     "NES (discards header)",             NULL},
      {GENERIC_MD5, "Generic (plain content)",           NULL},
      {FILENAME_MD5, "Generic (filename)",               NULL}
   };

   CORO_ENTER();

-
-
      cheevos_locals.addrs_patched = false;

      coro->settings               = config_get_ptr();
@@ -2901,30 +2902,21 @@ found:

      MD5_Init(&coro->md5);

-      coro->offset = 0;
+      /* Checks for the existence of a headered SNES file.
+         Unheadered files fall back to GENERIC_MD5. */
+
+      if (coro->len < 0x2000 || coro->len % 0x2000 != snes_header_len)
+      {
+          coro->gameid = 0;
+          CORO_RET();
+      }
+
+      coro->offset = 512;
      coro->count  = 0;

      CORO_GOSUB(EVAL_MD5);
-
-      if (coro->count == 0)
-      {
-         MD5_Final(coro->hash, &coro->md5);
-         coro->gameid = 0;
-         CORO_RET();
-      }
-
-      if (coro->count < size_in_megabytes(8))
-      {
-         /*
-            * Inputs:  CHEEVOS_VAR_MD5, CHEEVOS_VAR_OFFSET, CHEEVOS_VAR_COUNT
-            * Outputs: CHEEVOS_VAR_MD5
-            */
-         coro->offset      = 0;
-         coro->count       = size_in_megabytes(8) - coro->count;
-         CORO_GOSUB(FILL_MD5);
-      }
-
      MD5_Final(coro->hash, &coro->md5);
+
      CORO_GOTO(GET_GAMEID);

      /**************************************************************************
@@ -2964,16 +2956,19 @@ found:
         *************************************************************************/
   CORO_SUB(LYNX_MD5)

-      if (coro->len < 0x0240)
+      /* Checks for the existence of a headered Lynx file.
+         Unheadered files fall back to GENERIC_MD5. */
+
+      if (coro->len <= lynx_header_len ||
+        memcmp("LYNX", (void *)coro->data, 5) != 0)
      {
         coro->gameid = 0;
         CORO_RET();
      }

      MD5_Init(&coro->md5);
-
-      coro->offset       = 0x0040;
-      coro->count        = 0x0200;
+      coro->offset = lynx_header_len;
+      coro->count  = coro->len - lynx_header_len;
      CORO_GOSUB(EVAL_MD5);

      MD5_Final(coro->hash, &coro->md5);
@@ -2986,12 +2981,8 @@ found:
         *************************************************************************/
   CORO_SUB(NES_MD5)

-      /* Note about the references to the FCEU emulator below. There is no
-         * core-specific code in this function, it's rather Retro Achievements
-         * specific code that must be followed to the letter so we compute
-         * the correct ROM hash. Retro Achievements does indeed use some
-         * FCEU related method to compute the hash, since its NES emulator
-         * is based on it. */
+      /* Checks for the existence of a headered NES file.
+         Unheadered files fall back to GENERIC_MD5. */

      if (coro->len < sizeof(coro->header))
      {
@@ -3011,37 +3002,11 @@ found:
         CORO_RET();
      }

-      {
-         size_t romsize = 256;
-         /* from FCEU core - compute size using the cart mapper */
-         int mapper     = (coro->header.rom_type >> 4) | (coro->header.rom_type2 & 0xF0);
-
-         if (coro->header.rom_size)
-            romsize     = next_pow2(coro->header.rom_size);
-
-         /* for games not to the power of 2, so we just read enough
-            * PRG rom from it, but we have to keep ROM_size to the power of 2
-            * since PRGCartMapping wants ROM_size to be to the power of 2
-            * so instead if not to power of 2, we just use head.ROM_size when
-            * we use FCEU_read. */
-         coro->round       = mapper != 53 && mapper != 198 && mapper != 228;
-         coro->bytes       = coro->round ? romsize : coro->header.rom_size;
-      }
-
-      /* from FCEU core - check if Trainer included in ROM data */
      MD5_Init(&coro->md5);
-      coro->offset = sizeof(coro->header) + (coro->header.rom_type & 4
-            ? sizeof(coro->header) : 0);
-      coro->count  = 0x4000 * coro->bytes;
+      coro->offset = sizeof(coro->header);
+      coro->count  = coro->len - coro->offset;
      CORO_GOSUB(EVAL_MD5);

-      if (coro->count < 0x4000 * coro->bytes)
-      {
-         coro->offset      = 0xff;
-         coro->count       = 0x4000 * coro->bytes - coro->count;
-         CORO_GOSUB(FILL_MD5);
-      }
-
      MD5_Final(coro->hash, &coro->md5);
      CORO_GOTO(GET_GAMEID);

@@ -3228,7 +3193,10 @@ found:

      {
         settings_t *settings = config_get_ptr();
-         if (!string_is_equal(settings->arrays.menu_driver, "xmb") ||
+         if (!(
+               string_is_equal(settings->arrays.menu_driver, "xmb") ||
+               string_is_equal(settings->arrays.menu_driver, "ozone")
+            ) ||
               !settings->bools.cheevos_badges_enable)
            CORO_RET();
      }
@@ -3389,7 +3357,7 @@ found:

               /* Save token to config and clear pass on success */
               *coro->settings->arrays.cheevos_password = '\0';
-               strlcpy(
+               strncpy(
                     coro->settings->arrays.cheevos_token,
                     cheevos_locals.token, sizeof(coro->settings->arrays.cheevos_token)
               );
@@ -1,163 +1,171 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2015-2016 - Andre Leiradella
- *
- *  RetroArch is free software: you can redistribute it and/or modify it under the terms
- *  of the GNU General Public License as published by the Free Software Found-
- *  ation, either version 3 of the License, or (at your option) any later version.
- *
- *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- *  PURPOSE.  See the GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along with RetroArch.
- *  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __RARCH_CHEEVOS_H
-#define __RARCH_CHEEVOS_H
-
-#include <stdint.h>
-#include <stdlib.h>
-
-#include <boolean.h>
-
-#include <retro_common_api.h>
-
-RETRO_BEGIN_DECLS
-
-/*****************************************************************************
-Setup - mainly for debugging
-*****************************************************************************/
-
-/* Define this macro to get extra-verbose log for cheevos. */
-#undef CHEEVOS_VERBOSE
-
-/*****************************************************************************
-End of setup
-*****************************************************************************/
-
-#define CHEEVOS_TAG "[CHEEVOS]: "
-
-#ifdef CHEEVOS_VERBOSE
-
-#define CHEEVOS_LOG RARCH_LOG
-#define CHEEVOS_ERR RARCH_ERR
-
-#else
-
-void cheevos_log(const char *fmt, ...);
-
-#define CHEEVOS_LOG cheevos_log
-#define CHEEVOS_ERR cheevos_log
-
-#endif
-
-typedef struct cheevos_ctx_desc
-{
-   unsigned idx;
-   char *s;
-   size_t len;
-} cheevos_ctx_desc_t;
-
-typedef enum
-{
-   CHEEVOS_CONSOLE_NONE = 0,
-   /* Don't change those, the values match the console IDs
-    * at retroachievements.org. */
-   CHEEVOS_CONSOLE_MEGA_DRIVE      = 1,
-   CHEEVOS_CONSOLE_NINTENDO_64     = 2,
-   CHEEVOS_CONSOLE_SUPER_NINTENDO  = 3,
-   CHEEVOS_CONSOLE_GAMEBOY         = 4,
-   CHEEVOS_CONSOLE_GAMEBOY_ADVANCE = 5,
-   CHEEVOS_CONSOLE_GAMEBOY_COLOR   = 6,
-   CHEEVOS_CONSOLE_NINTENDO        = 7,
-   CHEEVOS_CONSOLE_PC_ENGINE       = 8,
-   CHEEVOS_CONSOLE_SEGA_CD         = 9,
-   CHEEVOS_CONSOLE_SEGA_32X        = 10,
-   CHEEVOS_CONSOLE_MASTER_SYSTEM   = 11,
-   CHEEVOS_CONSOLE_PLAYSTATION     = 12,
-   CHEEVOS_CONSOLE_ATARI_LYNX      = 13,
-   CHEEVOS_CONSOLE_NEOGEO_POCKET   = 14,
-   CHEEVOS_CONSOLE_GAME_GEAR       = 15,
-   CHEEVOS_CONSOLE_GAMECUBE        = 16,
-   CHEEVOS_CONSOLE_ATARI_JAGUAR    = 17,
-   CHEEVOS_CONSOLE_NINTENDO_DS     = 18,
-   CHEEVOS_CONSOLE_WII             = 19,
-   CHEEVOS_CONSOLE_WII_U           = 20,
-   CHEEVOS_CONSOLE_PLAYSTATION_2   = 21,
-   CHEEVOS_CONSOLE_XBOX            = 22,
-   CHEEVOS_CONSOLE_SKYNET          = 23,
-   CHEEVOS_CONSOLE_XBOX_ONE        = 24,
-   CHEEVOS_CONSOLE_ATARI_2600      = 25,
-   CHEEVOS_CONSOLE_MS_DOS          = 26,
-   CHEEVOS_CONSOLE_ARCADE          = 27,
-   CHEEVOS_CONSOLE_VIRTUAL_BOY     = 28,
-   CHEEVOS_CONSOLE_MSX             = 29,
-   CHEEVOS_CONSOLE_COMMODORE_64    = 30,
-   CHEEVOS_CONSOLE_ZX81            = 31
-} cheevos_console_t;
-
-enum
-{
-   CHEEVOS_DIRTY_TITLE       = 1 << 0,
-   CHEEVOS_DIRTY_DESC        = 1 << 1,
-   CHEEVOS_DIRTY_POINTS      = 1 << 2,
-   CHEEVOS_DIRTY_AUTHOR      = 1 << 3,
-   CHEEVOS_DIRTY_ID          = 1 << 4,
-   CHEEVOS_DIRTY_BADGE       = 1 << 5,
-   CHEEVOS_DIRTY_CONDITIONS  = 1 << 6,
-   CHEEVOS_DIRTY_VOTES       = 1 << 7,
-   CHEEVOS_DIRTY_DESCRIPTION = 1 << 8,
-
-   CHEEVOS_DIRTY_ALL         = (1 << 9) - 1
-};
-
-enum
-{
-   CHEEVOS_ACTIVE_SOFTCORE = 1 << 0,
-   CHEEVOS_ACTIVE_HARDCORE = 1 << 1
-};
-
-enum
-{
-   CHEEVOS_FORMAT_FRAMES = 0,
-   CHEEVOS_FORMAT_SECS,
-   CHEEVOS_FORMAT_MILLIS,
-   CHEEVOS_FORMAT_SCORE,
-   CHEEVOS_FORMAT_VALUE,
-   CHEEVOS_FORMAT_OTHER
-};
-
-bool cheevos_load(const void *data);
-
-void cheevos_reset_game(void);
-
-void cheevos_populate_menu(void *data);
-
-bool cheevos_get_description(cheevos_ctx_desc_t *desc);
-
-bool cheevos_apply_cheats(bool *data_bool);
-
-bool cheevos_unload(void);
-
-bool cheevos_toggle_hardcore_mode(void);
-
-void cheevos_test(void);
-
-bool cheevos_set_cheats(void);
-
-void cheevos_set_support_cheevos(bool state);
-
-bool cheevos_get_support_cheevos(void);
-
-cheevos_console_t cheevos_get_console(void);
-
-extern bool cheevos_loaded;
-extern bool cheevos_hardcore_active;
-extern bool cheevos_hardcore_paused;
-extern int cheats_are_enabled;
-extern int cheats_were_enabled;
-
-RETRO_END_DECLS
-
-#endif /* __RARCH_CHEEVOS_H */
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2015-2018 - Andre Leiradella
+ *
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __RARCH_CHEEVOS_OLD_H
+#define __RARCH_CHEEVOS_OLD_H
+
+#ifdef HAVE_NEW_CHEEVOS
+#include "../cheevos-new/cheevos.h"
+#else
+
+#include <stdint.h>
+#include <stdlib.h>
+
+#include <boolean.h>
+
+#include <retro_common_api.h>
+
+RETRO_BEGIN_DECLS
+
+/*****************************************************************************
+Setup - mainly for debugging
+*****************************************************************************/
+
+/* Define this macro to get extra-verbose log for cheevos. */
+#undef CHEEVOS_VERBOSE
+
+/*****************************************************************************
+End of setup
+*****************************************************************************/
+
+#define CHEEVOS_TAG "[CHEEVOS]: "
+
+#ifdef CHEEVOS_VERBOSE
+
+#define CHEEVOS_LOG RARCH_LOG
+#define CHEEVOS_ERR RARCH_ERR
+
+#else
+
+void cheevos_log(const char *fmt, ...);
+
+#define CHEEVOS_LOG cheevos_log
+#define CHEEVOS_ERR cheevos_log
+
+#endif
+
+typedef struct cheevos_ctx_desc
+{
+   unsigned idx;
+   char *s;
+   size_t len;
+} cheevos_ctx_desc_t;
+
+typedef enum
+{
+   CHEEVOS_CONSOLE_NONE = 0,
+   /* Don't change those, the values match the console IDs
+    * at retroachievements.org. */
+   CHEEVOS_CONSOLE_MEGA_DRIVE      = 1,
+   CHEEVOS_CONSOLE_NINTENDO_64     = 2,
+   CHEEVOS_CONSOLE_SUPER_NINTENDO  = 3,
+   CHEEVOS_CONSOLE_GAMEBOY         = 4,
+   CHEEVOS_CONSOLE_GAMEBOY_ADVANCE = 5,
+   CHEEVOS_CONSOLE_GAMEBOY_COLOR   = 6,
+   CHEEVOS_CONSOLE_NINTENDO        = 7,
+   CHEEVOS_CONSOLE_PC_ENGINE       = 8,
+   CHEEVOS_CONSOLE_SEGA_CD         = 9,
+   CHEEVOS_CONSOLE_SEGA_32X        = 10,
+   CHEEVOS_CONSOLE_MASTER_SYSTEM   = 11,
+   CHEEVOS_CONSOLE_PLAYSTATION     = 12,
+   CHEEVOS_CONSOLE_ATARI_LYNX      = 13,
+   CHEEVOS_CONSOLE_NEOGEO_POCKET   = 14,
+   CHEEVOS_CONSOLE_GAME_GEAR       = 15,
+   CHEEVOS_CONSOLE_GAMECUBE        = 16,
+   CHEEVOS_CONSOLE_ATARI_JAGUAR    = 17,
+   CHEEVOS_CONSOLE_NINTENDO_DS     = 18,
+   CHEEVOS_CONSOLE_WII             = 19,
+   CHEEVOS_CONSOLE_WII_U           = 20,
+   CHEEVOS_CONSOLE_PLAYSTATION_2   = 21,
+   CHEEVOS_CONSOLE_XBOX            = 22,
+   CHEEVOS_CONSOLE_SKYNET          = 23,
+   CHEEVOS_CONSOLE_XBOX_ONE        = 24,
+   CHEEVOS_CONSOLE_ATARI_2600      = 25,
+   CHEEVOS_CONSOLE_MS_DOS          = 26,
+   CHEEVOS_CONSOLE_ARCADE          = 27,
+   CHEEVOS_CONSOLE_VIRTUAL_BOY     = 28,
+   CHEEVOS_CONSOLE_MSX             = 29,
+   CHEEVOS_CONSOLE_COMMODORE_64    = 30,
+   CHEEVOS_CONSOLE_ZX81            = 31,
+   CHEEVOS_CONSOLE_ATARI_7800      = 51
+} cheevos_console_t;
+
+enum
+{
+   CHEEVOS_DIRTY_TITLE       = 1 << 0,
+   CHEEVOS_DIRTY_DESC        = 1 << 1,
+   CHEEVOS_DIRTY_POINTS      = 1 << 2,
+   CHEEVOS_DIRTY_AUTHOR      = 1 << 3,
+   CHEEVOS_DIRTY_ID          = 1 << 4,
+   CHEEVOS_DIRTY_BADGE       = 1 << 5,
+   CHEEVOS_DIRTY_CONDITIONS  = 1 << 6,
+   CHEEVOS_DIRTY_VOTES       = 1 << 7,
+   CHEEVOS_DIRTY_DESCRIPTION = 1 << 8,
+
+   CHEEVOS_DIRTY_ALL         = (1 << 9) - 1
+};
+
+enum
+{
+   CHEEVOS_ACTIVE_SOFTCORE = 1 << 0,
+   CHEEVOS_ACTIVE_HARDCORE = 1 << 1
+};
+
+enum
+{
+   CHEEVOS_FORMAT_FRAMES = 0,
+   CHEEVOS_FORMAT_SECS,
+   CHEEVOS_FORMAT_MILLIS,
+   CHEEVOS_FORMAT_SCORE,
+   CHEEVOS_FORMAT_VALUE,
+   CHEEVOS_FORMAT_OTHER
+};
+
+bool cheevos_load(const void *data);
+
+void cheevos_reset_game(void);
+
+void cheevos_populate_menu(void *data);
+
+bool cheevos_get_description(cheevos_ctx_desc_t *desc);
+
+bool cheevos_apply_cheats(bool *data_bool);
+
+bool cheevos_unload(void);
+
+bool cheevos_toggle_hardcore_mode(void);
+
+void cheevos_test(void);
+
+bool cheevos_set_cheats(void);
+
+void cheevos_set_support_cheevos(bool state);
+
+bool cheevos_get_support_cheevos(void);
+
+cheevos_console_t cheevos_get_console(void);
+
+extern bool cheevos_loaded;
+extern bool cheevos_hardcore_active;
+extern bool cheevos_hardcore_paused;
+extern bool cheevos_state_loaded_flag;
+extern int cheats_are_enabled;
+extern int cheats_were_enabled;
+
+RETRO_END_DECLS
+
+#endif
+
+#endif /* __RARCH_CHEEVOS_H */
@@ -1,189 +1,189 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2015-2017 - Andre Leiradella
- *
- *  RetroArch is free software: you can redistribute it and/or modify it under the terms
- *  of the GNU General Public License as published by the Free Software Found-
- *  ation, either version 3 of the License, or (at your option) any later version.
- *
- *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- *  PURPOSE.  See the GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along with RetroArch.
- *  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "cond.h"
-#include "var.h"
-
-#include "../retroarch.h"
-#include "../verbosity.h"
-
-/*****************************************************************************
-Parsing
-*****************************************************************************/
-
-static cheevos_cond_op_t cheevos_cond_parse_operator(const char** memaddr)
-{
-   const char *str = *memaddr;
-   cheevos_cond_op_t op;
-
-   if (*str == '=' && str[1] == '=')
-   {
-      op = CHEEVOS_COND_OP_EQUALS;
-      str += 2;
-   }
-   else if (*str == '=')
-   {
-      op = CHEEVOS_COND_OP_EQUALS;
-      str++;
-   }
-   else if (*str == '!' && str[1] == '=')
-   {
-      op = CHEEVOS_COND_OP_NOT_EQUAL_TO;
-      str += 2;
-   }
-   else if (*str == '<' && str[1] == '=')
-   {
-      op = CHEEVOS_COND_OP_LESS_THAN_OR_EQUAL;
-      str += 2;
-   }
-   else if (*str == '<')
-   {
-      op = CHEEVOS_COND_OP_LESS_THAN;
-      str++;
-   }
-   else if (*str == '>' && str[1] == '=')
-   {
-      op = CHEEVOS_COND_OP_GREATER_THAN_OR_EQUAL;
-      str += 2;
-   }
-   else if (*str == '>')
-   {
-      op = CHEEVOS_COND_OP_GREATER_THAN;
-      str++;
-   }
-   else
-   {
-      CHEEVOS_ERR(CHEEVOS_TAG "unknown operator %c\n.", *str);
-      op = CHEEVOS_COND_OP_EQUALS;
-   }
-
-   *memaddr = str;
-   return op;
-}
-
-void cheevos_cond_parse(cheevos_cond_t* cond, const char** memaddr)
-{
-   const char* str = *memaddr;
-   cond->type = CHEEVOS_COND_TYPE_STANDARD;
-
-   if (*str != 0 && str[1] == ':')
-   {
-      int skip = 2;
-
-      switch (*str)
-      {
-      case 'R':
-         cond->type = CHEEVOS_COND_TYPE_RESET_IF;
-         break;
-      case 'P':
-         cond->type = CHEEVOS_COND_TYPE_PAUSE_IF;
-         break;
-      case 'A':
-         cond->type = CHEEVOS_COND_TYPE_ADD_SOURCE;
-         break;
-      case 'B':
-         cond->type = CHEEVOS_COND_TYPE_SUB_SOURCE;
-         break;
-      case 'C':
-         cond->type = CHEEVOS_COND_TYPE_ADD_HITS;
-         break;
-      default:
-         skip = 0;
-         break;
-      }
-
-      str += skip;
-   }
-
-   cheevos_var_parse(&cond->source, &str);
-   cond->op = cheevos_cond_parse_operator(&str);
-   cheevos_var_parse(&cond->target, &str);
-   cond->curr_hits = 0;
-
-   if (*str == '(' || *str == '.')
-   {
-      char* end;
-      cond->req_hits = (unsigned)strtol(str + 1, &end, 10);
-      str = end + (*end == ')' || *end == '.');
-   }
-   else
-      cond->req_hits = 0;
-
-   *memaddr = str;
-}
-
-unsigned cheevos_cond_count_in_set(const char* memaddr, unsigned which)
-{
-   cheevos_cond_t dummy;
-   unsigned index = 0;
-   unsigned count = 0;
-
-   for (;;)
-   {
-      for (;;)
-      {
-         cheevos_cond_parse(&dummy, &memaddr);
-
-         if (index == which)
-            count++;
-
-         if (*memaddr != '_')
-            break;
-
-         memaddr++;
-      }
-
-      index++;
-
-      if (*memaddr != 'S')
-         break;
-
-      memaddr++;
-   }
-
-   return count;
-}
-
-void cheevos_cond_parse_in_set(cheevos_cond_t* cond, const char* memaddr, unsigned which)
-{
-   cheevos_cond_t dummy;
-   unsigned index = 0;
-
-   for (;;)
-   {
-      for (;;)
-      {
-         if (index == which)
-         {
-            cheevos_cond_parse(cond, &memaddr);
-            cond++;
-         }
-         else
-            cheevos_cond_parse(&dummy, &memaddr);
-
-         if (*memaddr != '_')
-            break;
-
-         memaddr++;
-      }
-
-      index++;
-
-      if (*memaddr != 'S')
-         break;
-
-      memaddr++;
-   }
-}
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2015-2017 - Andre Leiradella
+ *
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "cond.h"
+#include "var.h"
+
+#include "../retroarch.h"
+#include "../verbosity.h"
+
+/*****************************************************************************
+Parsing
+*****************************************************************************/
+
+static cheevos_cond_op_t cheevos_cond_parse_operator(const char** memaddr)
+{
+   const char *str = *memaddr;
+   cheevos_cond_op_t op;
+
+   if (*str == '=' && str[1] == '=')
+   {
+      op = CHEEVOS_COND_OP_EQUALS;
+      str += 2;
+   }
+   else if (*str == '=')
+   {
+      op = CHEEVOS_COND_OP_EQUALS;
+      str++;
+   }
+   else if (*str == '!' && str[1] == '=')
+   {
+      op = CHEEVOS_COND_OP_NOT_EQUAL_TO;
+      str += 2;
+   }
+   else if (*str == '<' && str[1] == '=')
+   {
+      op = CHEEVOS_COND_OP_LESS_THAN_OR_EQUAL;
+      str += 2;
+   }
+   else if (*str == '<')
+   {
+      op = CHEEVOS_COND_OP_LESS_THAN;
+      str++;
+   }
+   else if (*str == '>' && str[1] == '=')
+   {
+      op = CHEEVOS_COND_OP_GREATER_THAN_OR_EQUAL;
+      str += 2;
+   }
+   else if (*str == '>')
+   {
+      op = CHEEVOS_COND_OP_GREATER_THAN;
+      str++;
+   }
+   else
+   {
+      CHEEVOS_ERR(CHEEVOS_TAG "unknown operator %c\n.", *str);
+      op = CHEEVOS_COND_OP_EQUALS;
+   }
+
+   *memaddr = str;
+   return op;
+}
+
+void cheevos_cond_parse(cheevos_cond_t* cond, const char** memaddr)
+{
+   const char* str = *memaddr;
+   cond->type = CHEEVOS_COND_TYPE_STANDARD;
+
+   if (*str != 0 && str[1] == ':')
+   {
+      int skip = 2;
+
+      switch (*str)
+      {
+      case 'R':
+         cond->type = CHEEVOS_COND_TYPE_RESET_IF;
+         break;
+      case 'P':
+         cond->type = CHEEVOS_COND_TYPE_PAUSE_IF;
+         break;
+      case 'A':
+         cond->type = CHEEVOS_COND_TYPE_ADD_SOURCE;
+         break;
+      case 'B':
+         cond->type = CHEEVOS_COND_TYPE_SUB_SOURCE;
+         break;
+      case 'C':
+         cond->type = CHEEVOS_COND_TYPE_ADD_HITS;
+         break;
+      default:
+         skip = 0;
+         break;
+      }
+
+      str += skip;
+   }
+
+   cheevos_var_parse(&cond->source, &str);
+   cond->op = cheevos_cond_parse_operator(&str);
+   cheevos_var_parse(&cond->target, &str);
+   cond->curr_hits = 0;
+
+   if (*str == '(' || *str == '.')
+   {
+      char* end;
+      cond->req_hits = (unsigned)strtol(str + 1, &end, 10);
+      str = end + (*end == ')' || *end == '.');
+   }
+   else
+      cond->req_hits = 0;
+
+   *memaddr = str;
+}
+
+unsigned cheevos_cond_count_in_set(const char* memaddr, unsigned which)
+{
+   cheevos_cond_t dummy;
+   unsigned index = 0;
+   unsigned count = 0;
+
+   for (;;)
+   {
+      for (;;)
+      {
+         cheevos_cond_parse(&dummy, &memaddr);
+
+         if (index == which)
+            count++;
+
+         if (*memaddr != '_')
+            break;
+
+         memaddr++;
+      }
+
+      index++;
+
+      if (*memaddr != 'S')
+         break;
+
+      memaddr++;
+   }
+
+   return count;
+}
+
+void cheevos_cond_parse_in_set(cheevos_cond_t* cond, const char* memaddr, unsigned which)
+{
+   cheevos_cond_t dummy;
+   unsigned index = 0;
+
+   for (;;)
+   {
+      for (;;)
+      {
+         if (index == which)
+         {
+            cheevos_cond_parse(cond, &memaddr);
+            cond++;
+         }
+         else
+            cheevos_cond_parse(&dummy, &memaddr);
+
+         if (*memaddr != '_')
+            break;
+
+         memaddr++;
+      }
+
+      index++;
+
+      if (*memaddr != 'S')
+         break;
+
+      memaddr++;
+   }
+}
@@ -1,63 +1,63 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2015-2017 - Andre Leiradella
- *
- *  RetroArch is free software: you can redistribute it and/or modify it under the terms
- *  of the GNU General Public License as published by the Free Software Found-
- *  ation, either version 3 of the License, or (at your option) any later version.
- *
- *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- *  PURPOSE.  See the GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along with RetroArch.
- *  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __RARCH_CHEEVOS_COND_H
-#define __RARCH_CHEEVOS_COND_H
-
-#include "var.h"
-
-#include <retro_common_api.h>
-
-RETRO_BEGIN_DECLS
-
-typedef enum
-{
-   CHEEVOS_COND_TYPE_STANDARD,
-   CHEEVOS_COND_TYPE_PAUSE_IF,
-   CHEEVOS_COND_TYPE_RESET_IF,
-   CHEEVOS_COND_TYPE_ADD_SOURCE,
-   CHEEVOS_COND_TYPE_SUB_SOURCE,
-   CHEEVOS_COND_TYPE_ADD_HITS
-} cheevos_cond_type_t;
-
-typedef enum
-{
-   CHEEVOS_COND_OP_EQUALS,
-   CHEEVOS_COND_OP_LESS_THAN,
-   CHEEVOS_COND_OP_LESS_THAN_OR_EQUAL,
-   CHEEVOS_COND_OP_GREATER_THAN,
-   CHEEVOS_COND_OP_GREATER_THAN_OR_EQUAL,
-   CHEEVOS_COND_OP_NOT_EQUAL_TO
-} cheevos_cond_op_t;
-
-typedef struct
-{
-   cheevos_cond_type_t type;
-   unsigned            req_hits;
-   unsigned            curr_hits;
-   char                pause;
-
-   cheevos_var_t       source;
-   cheevos_cond_op_t   op;
-   cheevos_var_t       target;
-} cheevos_cond_t;
-
-void     cheevos_cond_parse(cheevos_cond_t* cond, const char** memaddr);
-unsigned cheevos_cond_count_in_set(const char* memaddr, unsigned which);
-void     cheevos_cond_parse_in_set(cheevos_cond_t* cond, const char* memaddr, unsigned which);
-
-RETRO_END_DECLS
-
-#endif /* __RARCH_CHEEVOS_COND_H */
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2015-2017 - Andre Leiradella
+ *
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __RARCH_CHEEVOS_COND_H
+#define __RARCH_CHEEVOS_COND_H
+
+#include "var.h"
+
+#include <retro_common_api.h>
+
+RETRO_BEGIN_DECLS
+
+typedef enum
+{
+   CHEEVOS_COND_TYPE_STANDARD,
+   CHEEVOS_COND_TYPE_PAUSE_IF,
+   CHEEVOS_COND_TYPE_RESET_IF,
+   CHEEVOS_COND_TYPE_ADD_SOURCE,
+   CHEEVOS_COND_TYPE_SUB_SOURCE,
+   CHEEVOS_COND_TYPE_ADD_HITS
+} cheevos_cond_type_t;
+
+typedef enum
+{
+   CHEEVOS_COND_OP_EQUALS,
+   CHEEVOS_COND_OP_LESS_THAN,
+   CHEEVOS_COND_OP_LESS_THAN_OR_EQUAL,
+   CHEEVOS_COND_OP_GREATER_THAN,
+   CHEEVOS_COND_OP_GREATER_THAN_OR_EQUAL,
+   CHEEVOS_COND_OP_NOT_EQUAL_TO
+} cheevos_cond_op_t;
+
+typedef struct
+{
+   cheevos_cond_type_t type;
+   unsigned            req_hits;
+   unsigned            curr_hits;
+   char                pause;
+
+   cheevos_var_t       source;
+   cheevos_cond_op_t   op;
+   cheevos_var_t       target;
+} cheevos_cond_t;
+
+void     cheevos_cond_parse(cheevos_cond_t* cond, const char** memaddr);
+unsigned cheevos_cond_count_in_set(const char* memaddr, unsigned which);
+void     cheevos_cond_parse_in_set(cheevos_cond_t* cond, const char* memaddr, unsigned which);
+
+RETRO_END_DECLS
+
+#endif /* __RARCH_CHEEVOS_COND_H */
@@ -1,75 +1,75 @@
-#ifndef CORO_H
-#define CORO_H
-
-/*
-Released under the CC0: https://creativecommons.org/publicdomain/zero/1.0/
-*/
-
-/* Use at the beginning of the coroutine, you must have declared a variable coro_t* coro */
-#define CORO_ENTER() \
-  { \
-  CORO_again: ; \
-  switch ( coro->step ) { \
-  case CORO_BEGIN: ;
-
-/* Use to define labels which are targets to GOTO and GOSUB */
-#define CORO_SUB( x ) \
-  case x: ;
-
-/* Use at the end of the coroutine */
-#define CORO_LEAVE() \
-  } } \
-  do { return 0; } while ( 0 )
-
-/* Go to the x label */
-#define CORO_GOTO( x ) \
-  do { \
-    coro->step = ( x ); \
-    goto CORO_again; \
-  } while ( 0 )
-
-/* Go to a subroutine, execution continues until the subroutine returns via RET */
-#define CORO_GOSUB( x ) \
-  do { \
-    coro->stack[ coro->sp++ ] = __LINE__; \
-    coro->step = ( x ); \
-    goto CORO_again; \
-    case __LINE__: ; \
-  } while ( 0 )
-
-/* Returns from a subroutine */
-#define CORO_RET() \
-  do { \
-    coro->step = coro->stack[ --coro->sp ]; \
-    goto CORO_again; \
-  } while ( 0 )
-
-/* Yields to the caller, execution continues from this point when the coroutine is resumed */
-#define CORO_YIELD() \
-  do { \
-    coro->step = __LINE__; \
-    return 1; \
-    case __LINE__: ; \
-  } while ( 0 )
-
-/* The coroutine entry point, never use 0 as a label */
-#define CORO_BEGIN 0
-
-/* Sets up the coroutine */
-#define CORO_SETUP() \
-  do { \
-    coro->step = CORO_BEGIN; \
-    coro->sp   = 0; \
-  } while ( 0 )
-
-#define CORO_STOP() \
-  do { \
-    return 0; \
-  } while ( 0 )
-
-/* Add this macro to your coro_t structure containing the variables for the coroutine */
-#define CORO_FIELDS \
-  int step, sp; \
-  int stack[ 8 ];
-
-#endif /* CORO_H */
+#ifndef CORO_H
+#define CORO_H
+
+/*
+Released under the CC0: https://creativecommons.org/publicdomain/zero/1.0/
+*/
+
+/* Use at the beginning of the coroutine, you must have declared a variable coro_t* coro */
+#define CORO_ENTER() \
+  { \
+  CORO_again: ; \
+  switch ( coro->step ) { \
+  case CORO_BEGIN: ;
+
+/* Use to define labels which are targets to GOTO and GOSUB */
+#define CORO_SUB( x ) \
+  case x: ;
+
+/* Use at the end of the coroutine */
+#define CORO_LEAVE() \
+  } } \
+  do { return 0; } while ( 0 )
+
+/* Go to the x label */
+#define CORO_GOTO( x ) \
+  do { \
+    coro->step = ( x ); \
+    goto CORO_again; \
+  } while ( 0 )
+
+/* Go to a subroutine, execution continues until the subroutine returns via RET */
+#define CORO_GOSUB( x ) \
+  do { \
+    coro->stack[ coro->sp++ ] = __LINE__; \
+    coro->step = ( x ); \
+    goto CORO_again; \
+    case __LINE__: ; \
+  } while ( 0 )
+
+/* Returns from a subroutine */
+#define CORO_RET() \
+  do { \
+    coro->step = coro->stack[ --coro->sp ]; \
+    goto CORO_again; \
+  } while ( 0 )
+
+/* Yields to the caller, execution continues from this point when the coroutine is resumed */
+#define CORO_YIELD() \
+  do { \
+    coro->step = __LINE__; \
+    return 1; \
+    case __LINE__: ; \
+  } while ( 0 )
+
+/* The coroutine entry point, never use 0 as a label */
+#define CORO_BEGIN 0
+
+/* Sets up the coroutine */
+#define CORO_SETUP() \
+  do { \
+    coro->step = CORO_BEGIN; \
+    coro->sp   = 0; \
+  } while ( 0 )
+
+#define CORO_STOP() \
+  do { \
+    return 0; \
+  } while ( 0 )
+
+/* Add this macro to your coro_t structure containing the variables for the coroutine */
+#define CORO_FIELDS \
+  int step, sp; \
+  int stack[ 8 ];
+
+#endif /* CORO_H */
@@ -1,416 +1,415 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2015-2017 - Andre Leiradella
- *
- *  RetroArch is free software: you can redistribute it and/or modify it under the terms
- *  of the GNU General Public License as published by the Free Software Found-
- *  ation, either version 3 of the License, or (at your option) any later version.
- *
- *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- *  PURPOSE.  See the GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along with RetroArch.
- *  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <ctype.h>
-#include <stdint.h>
-
-#include <libretro.h>
-
-#include "var.h"
-
-#include "../retroarch.h"
-#include "../core.h"
-#include "../verbosity.h"
-
-/*****************************************************************************
-Parsing
-*****************************************************************************/
-
-static cheevos_var_size_t cheevos_var_parse_prefix(const char** memaddr)
-{
-   /* Careful not to use ABCDEF here, this denotes part of an actual variable! */
-   const char* str = *memaddr;
-   cheevos_var_size_t size;
-
-   switch (toupper((unsigned char)*str++))
-   {
-      case 'M':
-         size = CHEEVOS_VAR_SIZE_BIT_0;
-         break;
-      case 'N':
-         size = CHEEVOS_VAR_SIZE_BIT_1;
-         break;
-      case 'O':
-         size = CHEEVOS_VAR_SIZE_BIT_2;
-         break;
-      case 'P':
-         size = CHEEVOS_VAR_SIZE_BIT_3;
-         break;
-      case 'Q':
-         size = CHEEVOS_VAR_SIZE_BIT_4;
-         break;
-      case 'R':
-         size = CHEEVOS_VAR_SIZE_BIT_5;
-         break;
-      case 'S':
-         size = CHEEVOS_VAR_SIZE_BIT_6;
-         break;
-      case 'T':
-         size = CHEEVOS_VAR_SIZE_BIT_7;
-         break;
-      case 'L':
-         size = CHEEVOS_VAR_SIZE_NIBBLE_LOWER;
-         break;
-      case 'U':
-         size = CHEEVOS_VAR_SIZE_NIBBLE_UPPER;
-         break;
-      case 'H':
-         size = CHEEVOS_VAR_SIZE_EIGHT_BITS;
-         break;
-      case 'X':
-         size = CHEEVOS_VAR_SIZE_THIRTYTWO_BITS;
-         break;
-      default:
-         str--;
-         /* fall through */
-      case ' ':
-         size = CHEEVOS_VAR_SIZE_SIXTEEN_BITS;
-         break;
-   }
-
-   *memaddr = str;
-   return size;
-}
-
-static size_t cheevos_var_reduce(size_t addr, size_t mask)
-{
-   while (mask)
-   {
-      size_t tmp = (mask - 1) & ~mask;
-      addr = (addr & tmp) | ((addr >> 1) & ~tmp);
-      mask = (mask & (mask - 1)) >> 1;
-   }
-
-   return addr;
-}
-
-static size_t cheevos_var_highest_bit(size_t n)
-{
-   n |= n >>  1;
-   n |= n >>  2;
-   n |= n >>  4;
-   n |= n >>  8;
-   n |= n >> 16;
-
-   return n ^ (n >> 1);
-}
-
-void cheevos_var_parse(cheevos_var_t* var, const char** memaddr)
-{
-   char *end       = NULL;
-   const char *str = *memaddr;
-   unsigned base   = 16;
-
-   var->is_bcd = false;
-
-   if (toupper((unsigned char)*str) == 'D' && str[1] == '0' && toupper((unsigned char)str[2]) == 'X')
-   {
-      /* d0x + 4 hex digits */
-      str += 3;
-      var->type = CHEEVOS_VAR_TYPE_DELTA_MEM;
-   }
-   else if (toupper((unsigned char)*str) == 'B' && str[1] == '0' && toupper((unsigned char)str[2]) == 'X')
-   {
-      /* b0x (binary-coded decimal) */
-      str += 3;
-      var->is_bcd = true;
-      var->type = CHEEVOS_VAR_TYPE_ADDRESS;
-   }
-   else if (*str == '0' && toupper((unsigned char)str[1]) == 'X')
-   {
-      /* 0x + 4 hex digits */
-      str += 2;
-      var->type = CHEEVOS_VAR_TYPE_ADDRESS;
-   }
-   else
-   {
-      var->type = CHEEVOS_VAR_TYPE_VALUE_COMP;
-
-      if (toupper((unsigned char)*str) == 'H')
-         str++;
-      else
-      {
-         if (toupper((unsigned char)*str) == 'V')
-            str++;
-
-         base = 10;
-      }
-   }
-
-   if (var->type != CHEEVOS_VAR_TYPE_VALUE_COMP)
-   {
-      var->size = cheevos_var_parse_prefix(&str);
-   }
-
-   var->value = (unsigned)strtol(str, &end, base);
-   *memaddr   = end;
-}
-
-void cheevos_var_patch_addr(cheevos_var_t* var, cheevos_console_t console)
-{
-   rarch_system_info_t *system = runloop_get_system_info();
-
-   var->bank_id = -1;
-
-   if (console == CHEEVOS_CONSOLE_NINTENDO)
-   {
-      if (var->value >= 0x0800 && var->value < 0x2000)
-      {
-         CHEEVOS_LOG(CHEEVOS_TAG "NES memory address in mirrorred RAM %X, adjusted to %X\n", var->value, var->value & 0x07ff);
-         var->value &= 0x07ff;
-      }
-   }
-   else if (console == CHEEVOS_CONSOLE_GAMEBOY_COLOR)
-   {
-      if (var->value >= 0xe000 && var->value <= 0xfdff)
-      {
-         CHEEVOS_LOG(CHEEVOS_TAG "GBC memory address in echo RAM %X, adjusted to %X\n", var->value, var->value - 0x2000);
-         var->value -= 0x2000;
-      }
-   }
-
-   if (system->mmaps.num_descriptors != 0)
-   {
-      const rarch_memory_descriptor_t *desc = NULL;
-      const rarch_memory_descriptor_t *end  = NULL;
-
-      /* Patch the address to correctly map it to the mmaps */
-      if (console == CHEEVOS_CONSOLE_GAMEBOY_ADVANCE)
-      {
-         if (var->value < 0x8000) /* Internal RAM */
-         {
-            CHEEVOS_LOG(CHEEVOS_TAG "GBA memory address %X adjusted to %X\n", var->value, var->value + 0x3000000);
-            var->value += 0x3000000;
-         }
-         else /* Work RAM */
-         {
-            CHEEVOS_LOG(CHEEVOS_TAG "GBA memory address %X adjusted to %X\n", var->value, var->value + 0x2000000 - 0x8000);
-            var->value += 0x2000000 - 0x8000;
-         }
-      }
-      else if (console == CHEEVOS_CONSOLE_PC_ENGINE)
-      {
-         CHEEVOS_LOG(CHEEVOS_TAG "PCE memory address %X adjusted to %X\n", var->value, var->value + 0x1f0000);
-         var->value += 0x1f0000;
-      }
-      else if (console == CHEEVOS_CONSOLE_SUPER_NINTENDO)
-      {
-         if (var->value < 0x020000) /* Work RAM */
-         {
-            CHEEVOS_LOG(CHEEVOS_TAG "SNES memory address %X adjusted to %X\n", var->value, var->value + 0x7e0000);
-            var->value += 0x7e0000;
-         }
-         else /* Save RAM */
-         {
-            CHEEVOS_LOG(CHEEVOS_TAG "SNES memory address %X adjusted to %X\n", var->value, var->value + 0x006000 - 0x020000);
-            var->value += 0x006000 - 0x020000;
-         }
-      }
-
-      desc = system->mmaps.descriptors;
-      end  = desc + system->mmaps.num_descriptors;
-
-      for (; desc < end; desc++)
-      {
-         if (((desc->core.start ^ var->value) & desc->core.select) == 0)
-         {
-            unsigned addr = var->value;
-            var->bank_id  = (int)(desc - system->mmaps.descriptors);
-            var->value    = (unsigned)cheevos_var_reduce(
-               (addr - desc->core.start) & desc->disconnect_mask,
-               desc->core.disconnect);
-
-            if (var->value >= desc->core.len)
-               var->value -= cheevos_var_highest_bit(var->value);
-
-            var->value += desc->core.offset;
-
-            CHEEVOS_LOG(CHEEVOS_TAG "address %X set to descriptor %d at offset %X\n", addr, var->bank_id + 1, var->value);
-            break;
-         }
-      }
-   }
-   else
-   {
-      unsigned i;
-
-      for (i = 0; i < 4; i++)
-      {
-         retro_ctx_memory_info_t meminfo;
-
-         switch (i)
-         {
-            case 0:
-               meminfo.id = RETRO_MEMORY_SYSTEM_RAM;
-               break;
-            case 1:
-               meminfo.id = RETRO_MEMORY_SAVE_RAM;
-               break;
-            case 2:
-               meminfo.id = RETRO_MEMORY_VIDEO_RAM;
-               break;
-            case 3:
-               meminfo.id = RETRO_MEMORY_RTC;
-               break;
-         }
-
-         core_get_memory(&meminfo);
-
-         if (var->value < meminfo.size)
-         {
-            var->bank_id = i;
-            break;
-         }
-
-         /* HACK subtract the correct amount of bytes to reach the save RAM */
-         if (i == 0 && console == CHEEVOS_CONSOLE_NINTENDO)
-            var->value -= 0x6000;
-         else
-            var->value -= meminfo.size;
-      }
-   }
-}
-
-/*****************************************************************************
-Testing
-*****************************************************************************/
-
-uint8_t* cheevos_var_get_memory(const cheevos_var_t* var)
-{
-   uint8_t* memory = NULL;
-
-   if (var->bank_id >= 0)
-   {
-      rarch_system_info_t* system = runloop_get_system_info();
-
-      if (system->mmaps.num_descriptors != 0)
-         memory = (uint8_t*)system->mmaps.descriptors[var->bank_id].core.ptr;
-      else
-      {
-         retro_ctx_memory_info_t meminfo = {NULL, 0, 0};
-
-         switch (var->bank_id)
-         {
-            case 0:
-               meminfo.id = RETRO_MEMORY_SYSTEM_RAM;
-               break;
-            case 1:
-               meminfo.id = RETRO_MEMORY_SAVE_RAM;
-               break;
-            case 2:
-               meminfo.id = RETRO_MEMORY_VIDEO_RAM;
-               break;
-            case 3:
-               meminfo.id = RETRO_MEMORY_RTC;
-               break;
-            default:
-               CHEEVOS_ERR(CHEEVOS_TAG "invalid bank id: %s\n", var->bank_id);
-               break;
-         }
-
-         core_get_memory(&meminfo);
-         memory = (uint8_t*)meminfo.data;
-      }
-
-      if (memory)
-         memory += var->value;
-   }
-
-   return memory;
-}
-
-unsigned cheevos_var_get_value(cheevos_var_t* var)
-{
-   const uint8_t* memory = NULL;
-   unsigned value        = 0;
-
-   switch (var->type)
-   {
-      case CHEEVOS_VAR_TYPE_VALUE_COMP:
-         value = var->value;
-         break;
-
-      case CHEEVOS_VAR_TYPE_ADDRESS:
-      case CHEEVOS_VAR_TYPE_DELTA_MEM:
-         memory = cheevos_var_get_memory(var);
-
-         if (memory)
-         {
-            value = memory[0];
-
-            switch (var->size)
-            {
-               case CHEEVOS_VAR_SIZE_BIT_0:
-                  value &= 1;
-                  break;
-               case CHEEVOS_VAR_SIZE_BIT_1:
-                  value = (value >> 1) & 1;
-                  break;
-               case CHEEVOS_VAR_SIZE_BIT_2:
-                  value = (value >> 2) & 1;
-                  break;
-               case CHEEVOS_VAR_SIZE_BIT_3:
-                  value = (value >> 3) & 1;
-                  break;
-               case CHEEVOS_VAR_SIZE_BIT_4:
-                  value = (value >> 4) & 1;
-                  break;
-               case CHEEVOS_VAR_SIZE_BIT_5:
-                  value = (value >> 5) & 1;
-                  break;
-               case CHEEVOS_VAR_SIZE_BIT_6:
-                  value = (value >> 6) & 1;
-                  break;
-               case CHEEVOS_VAR_SIZE_BIT_7:
-                  value = (value >> 7) & 1;
-                  break;
-               case CHEEVOS_VAR_SIZE_NIBBLE_LOWER:
-                  value &= 0x0f;
-                  break;
-               case CHEEVOS_VAR_SIZE_NIBBLE_UPPER:
-                  value = (value >> 4) & 0x0f;
-                  break;
-               case CHEEVOS_VAR_SIZE_EIGHT_BITS:
-                  break;
-               case CHEEVOS_VAR_SIZE_SIXTEEN_BITS:
-                  value |= memory[1] << 8;
-                  break;
-               case CHEEVOS_VAR_SIZE_THIRTYTWO_BITS:
-                  value |= memory[1] << 8;
-                  value |= memory[2] << 16;
-                  value |= memory[3] << 24;
-                  break;
-            }
-         }
-
-         if (var->type == CHEEVOS_VAR_TYPE_DELTA_MEM)
-         {
-            unsigned previous = var->previous;
-            var->previous     = value;
-            value = previous;
-         }
-
-         break;
-
-      case CHEEVOS_VAR_TYPE_DYNAMIC_VAR:
-         /* We shouldn't get here... */
-         break;
-   }
-
-   if(var->is_bcd)
-      return (((value >> 4) & 0xf) * 10) + (value & 0xf);
-   else
-      return value;
-}
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2015-2017 - Andre Leiradella
+ *
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <ctype.h>
+#include <stdint.h>
+
+#include <libretro.h>
+
+#include "var.h"
+
+#include "../retroarch.h"
+#include "../core.h"
+#include "../verbosity.h"
+
+/*****************************************************************************
+Parsing
+*****************************************************************************/
+
+static cheevos_var_size_t cheevos_var_parse_prefix(const char** memaddr)
+{
+   /* Careful not to use ABCDEF here, this denotes part of an actual variable! */
+   const char* str = *memaddr;
+   cheevos_var_size_t size;
+
+   switch (toupper((unsigned char)*str++))
+   {
+      case 'M':
+         size = CHEEVOS_VAR_SIZE_BIT_0;
+         break;
+      case 'N':
+         size = CHEEVOS_VAR_SIZE_BIT_1;
+         break;
+      case 'O':
+         size = CHEEVOS_VAR_SIZE_BIT_2;
+         break;
+      case 'P':
+         size = CHEEVOS_VAR_SIZE_BIT_3;
+         break;
+      case 'Q':
+         size = CHEEVOS_VAR_SIZE_BIT_4;
+         break;
+      case 'R':
+         size = CHEEVOS_VAR_SIZE_BIT_5;
+         break;
+      case 'S':
+         size = CHEEVOS_VAR_SIZE_BIT_6;
+         break;
+      case 'T':
+         size = CHEEVOS_VAR_SIZE_BIT_7;
+         break;
+      case 'L':
+         size = CHEEVOS_VAR_SIZE_NIBBLE_LOWER;
+         break;
+      case 'U':
+         size = CHEEVOS_VAR_SIZE_NIBBLE_UPPER;
+         break;
+      case 'H':
+         size = CHEEVOS_VAR_SIZE_EIGHT_BITS;
+         break;
+      case 'X':
+         size = CHEEVOS_VAR_SIZE_THIRTYTWO_BITS;
+         break;
+      default:
+         str--;
+         /* fall through */
+      case ' ':
+         size = CHEEVOS_VAR_SIZE_SIXTEEN_BITS;
+         break;
+   }
+
+   *memaddr = str;
+   return size;
+}
+
+static size_t cheevos_var_reduce(size_t addr, size_t mask)
+{
+   while (mask)
+   {
+      size_t tmp = (mask - 1) & ~mask;
+      addr = (addr & tmp) | ((addr >> 1) & ~tmp);
+      mask = (mask & (mask - 1)) >> 1;
+   }
+
+   return addr;
+}
+
+static size_t cheevos_var_highest_bit(size_t n)
+{
+   n |= n >>  1;
+   n |= n >>  2;
+   n |= n >>  4;
+   n |= n >>  8;
+   n |= n >> 16;
+
+   return n ^ (n >> 1);
+}
+
+void cheevos_var_parse(cheevos_var_t* var, const char** memaddr)
+{
+   char *end       = NULL;
+   const char *str = *memaddr;
+   unsigned base   = 16;
+
+   var->is_bcd = false;
+
+   if (toupper((unsigned char)*str) == 'D' && str[1] == '0' && toupper((unsigned char)str[2]) == 'X')
+   {
+      /* d0x + 4 hex digits */
+      str += 3;
+      var->type = CHEEVOS_VAR_TYPE_DELTA_MEM;
+   }
+   else if (toupper((unsigned char)*str) == 'B' && str[1] == '0' && toupper((unsigned char)str[2]) == 'X')
+   {
+      /* b0x (binary-coded decimal) */
+      str += 3;
+      var->is_bcd = true;
+      var->type = CHEEVOS_VAR_TYPE_ADDRESS;
+   }
+   else if (*str == '0' && toupper((unsigned char)str[1]) == 'X')
+   {
+      /* 0x + 4 hex digits */
+      str += 2;
+      var->type = CHEEVOS_VAR_TYPE_ADDRESS;
+   }
+   else
+   {
+      var->type = CHEEVOS_VAR_TYPE_VALUE_COMP;
+
+      if (toupper((unsigned char)*str) == 'H')
+         str++;
+      else
+      {
+         if (toupper((unsigned char)*str) == 'V')
+            str++;
+
+         base = 10;
+      }
+   }
+
+   if (var->type != CHEEVOS_VAR_TYPE_VALUE_COMP)
+   {
+      var->size = cheevos_var_parse_prefix(&str);
+   }
+
+   var->value = (unsigned)strtol(str, &end, base);
+   *memaddr   = end;
+}
+
+void cheevos_var_patch_addr(cheevos_var_t* var, cheevos_console_t console)
+{
+   rarch_system_info_t *system = runloop_get_system_info();
+
+   var->bank_id = -1;
+
+   if (console == CHEEVOS_CONSOLE_NINTENDO)
+   {
+      if (var->value >= 0x0800 && var->value < 0x2000)
+      {
+         CHEEVOS_LOG(CHEEVOS_TAG "NES memory address in mirrorred RAM %X, adjusted to %X\n", var->value, var->value & 0x07ff);
+         var->value &= 0x07ff;
+      }
+   }
+   else if (console == CHEEVOS_CONSOLE_GAMEBOY_COLOR)
+   {
+      if (var->value >= 0xe000 && var->value <= 0xfdff)
+      {
+         CHEEVOS_LOG(CHEEVOS_TAG "GBC memory address in echo RAM %X, adjusted to %X\n", var->value, var->value - 0x2000);
+         var->value -= 0x2000;
+      }
+   }
+
+   if (system->mmaps.num_descriptors != 0)
+   {
+      const rarch_memory_descriptor_t *desc = NULL;
+      const rarch_memory_descriptor_t *end  = NULL;
+
+      /* Patch the address to correctly map it to the mmaps */
+      if (console == CHEEVOS_CONSOLE_GAMEBOY_ADVANCE)
+      {
+         if (var->value < 0x8000) /* Internal RAM */
+         {
+            CHEEVOS_LOG(CHEEVOS_TAG "GBA memory address %X adjusted to %X\n", var->value, var->value + 0x3000000);
+            var->value += 0x3000000;
+         }
+         else /* Work RAM */
+         {
+            CHEEVOS_LOG(CHEEVOS_TAG "GBA memory address %X adjusted to %X\n", var->value, var->value + 0x2000000 - 0x8000);
+            var->value += 0x2000000 - 0x8000;
+         }
+      }
+      else if (console == CHEEVOS_CONSOLE_PC_ENGINE)
+      {
+         CHEEVOS_LOG(CHEEVOS_TAG "PCE memory address %X adjusted to %X\n", var->value, var->value + 0x1f0000);
+         var->value += 0x1f0000;
+      }
+      else if (console == CHEEVOS_CONSOLE_SUPER_NINTENDO)
+      {
+         if (var->value < 0x020000) /* Work RAM */
+         {
+            CHEEVOS_LOG(CHEEVOS_TAG "SNES memory address %X adjusted to %X\n", var->value, var->value + 0x7e0000);
+            var->value += 0x7e0000;
+         }
+         else /* Save RAM */
+         {
+            CHEEVOS_LOG(CHEEVOS_TAG "SNES memory address %X adjusted to %X\n", var->value, var->value + 0x006000 - 0x020000);
+            var->value += 0x006000 - 0x020000;
+         }
+      }
+
+      desc = system->mmaps.descriptors;
+      end  = desc + system->mmaps.num_descriptors;
+
+      for (; desc < end; desc++)
+      {
+         if (((desc->core.start ^ var->value) & desc->core.select) == 0)
+         {
+            unsigned addr = var->value;
+            var->bank_id  = (int)(desc - system->mmaps.descriptors);
+            var->value    = (unsigned)cheevos_var_reduce(
+               (addr - desc->core.start) & desc->disconnect_mask,
+               desc->core.disconnect);
+
+            if (var->value >= desc->core.len)
+               var->value -= cheevos_var_highest_bit(var->value);
+
+            var->value += desc->core.offset;
+
+            CHEEVOS_LOG(CHEEVOS_TAG "address %X set to descriptor %d at offset %X\n", addr, var->bank_id + 1, var->value);
+            break;
+         }
+      }
+   }
+   else
+   {
+      unsigned i;
+
+      for (i = 0; i < 4; i++)
+      {
+         retro_ctx_memory_info_t meminfo;
+
+         switch (i)
+         {
+            case 0:
+               meminfo.id = RETRO_MEMORY_SYSTEM_RAM;
+               break;
+            case 1:
+               meminfo.id = RETRO_MEMORY_SAVE_RAM;
+               break;
+            case 2:
+               meminfo.id = RETRO_MEMORY_VIDEO_RAM;
+               break;
+            case 3:
+               meminfo.id = RETRO_MEMORY_RTC;
+               break;
+         }
+
+         core_get_memory(&meminfo);
+
+         if (var->value < meminfo.size)
+         {
+            var->bank_id = i;
+            break;
+         }
+
+         /* HACK subtract the correct amount of bytes to reach the save RAM */
+         if (i == 0 && console == CHEEVOS_CONSOLE_NINTENDO)
+            var->value -= 0x6000;
+         else
+            var->value -= meminfo.size;
+      }
+   }
+}
+
+/*****************************************************************************
+Testing
+*****************************************************************************/
+
+uint8_t* cheevos_var_get_memory(const cheevos_var_t* var)
+{
+   uint8_t* memory = NULL;
+
+   if (var->bank_id >= 0)
+   {
+      rarch_system_info_t* system = runloop_get_system_info();
+
+      if (system->mmaps.num_descriptors != 0)
+         memory = (uint8_t*)system->mmaps.descriptors[var->bank_id].core.ptr;
+      else
+      {
+         retro_ctx_memory_info_t meminfo = {NULL, 0, 0};
+
+         switch (var->bank_id)
+         {
+            case 0:
+               meminfo.id = RETRO_MEMORY_SYSTEM_RAM;
+               break;
+            case 1:
+               meminfo.id = RETRO_MEMORY_SAVE_RAM;
+               break;
+            case 2:
+               meminfo.id = RETRO_MEMORY_VIDEO_RAM;
+               break;
+            case 3:
+               meminfo.id = RETRO_MEMORY_RTC;
+               break;
+            default:
+               CHEEVOS_ERR(CHEEVOS_TAG "invalid bank id: %s\n", var->bank_id);
+               break;
+         }
+
+         core_get_memory(&meminfo);
+         memory = (uint8_t*)meminfo.data;
+      }
+
+      if (memory)
+         memory += var->value;
+   }
+
+   return memory;
+}
+
+unsigned cheevos_var_get_value(cheevos_var_t* var)
+{
+   const uint8_t* memory = NULL;
+   unsigned value        = 0;
+
+   switch (var->type)
+   {
+      case CHEEVOS_VAR_TYPE_VALUE_COMP:
+         value = var->value;
+         break;
+
+      case CHEEVOS_VAR_TYPE_ADDRESS:
+      case CHEEVOS_VAR_TYPE_DELTA_MEM:
+         memory = cheevos_var_get_memory(var);
+
+         if (memory)
+         {
+            value = memory[0];
+
+            switch (var->size)
+            {
+               case CHEEVOS_VAR_SIZE_BIT_0:
+                  value &= 1;
+                  break;
+               case CHEEVOS_VAR_SIZE_BIT_1:
+                  value = (value >> 1) & 1;
+                  break;
+               case CHEEVOS_VAR_SIZE_BIT_2:
+                  value = (value >> 2) & 1;
+                  break;
+               case CHEEVOS_VAR_SIZE_BIT_3:
+                  value = (value >> 3) & 1;
+                  break;
+               case CHEEVOS_VAR_SIZE_BIT_4:
+                  value = (value >> 4) & 1;
+                  break;
+               case CHEEVOS_VAR_SIZE_BIT_5:
+                  value = (value >> 5) & 1;
+                  break;
+               case CHEEVOS_VAR_SIZE_BIT_6:
+                  value = (value >> 6) & 1;
+                  break;
+               case CHEEVOS_VAR_SIZE_BIT_7:
+                  value = (value >> 7) & 1;
+                  break;
+               case CHEEVOS_VAR_SIZE_NIBBLE_LOWER:
+                  value &= 0x0f;
+                  break;
+               case CHEEVOS_VAR_SIZE_NIBBLE_UPPER:
+                  value = (value >> 4) & 0x0f;
+                  break;
+               case CHEEVOS_VAR_SIZE_EIGHT_BITS:
+                  break;
+               case CHEEVOS_VAR_SIZE_SIXTEEN_BITS:
+                  value |= memory[1] << 8;
+                  break;
+               case CHEEVOS_VAR_SIZE_THIRTYTWO_BITS:
+                  value |= memory[1] << 8;
+                  value |= memory[2] << 16;
+                  value |= memory[3] << 24;
+                  break;
+            }
+         }
+
+         if (var->type == CHEEVOS_VAR_TYPE_DELTA_MEM)
+         {
+            unsigned previous = var->previous;
+            var->previous     = value;
+            value = previous;
+         }
+
+         break;
+
+      case CHEEVOS_VAR_TYPE_DYNAMIC_VAR:
+         /* We shouldn't get here... */
+         break;
+   }
+
+   if(var->is_bcd)
+      return (((value >> 4) & 0xf) * 10) + (value & 0xf);
+   return value;
+}
@@ -1,78 +1,78 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2015-2017 - Andre Leiradella
- *
- *  RetroArch is free software: you can redistribute it and/or modify it under the terms
- *  of the GNU General Public License as published by the Free Software Found-
- *  ation, either version 3 of the License, or (at your option) any later version.
- *
- *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- *  PURPOSE.  See the GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along with RetroArch.
- *  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __RARCH_CHEEVOS_VAR_H
-#define __RARCH_CHEEVOS_VAR_H
-
-#include <stdint.h>
-
-#include "cheevos.h"
-
-#include <retro_common_api.h>
-
-RETRO_BEGIN_DECLS
-
-typedef enum
-{
-   CHEEVOS_VAR_SIZE_BIT_0 = 0,
-   CHEEVOS_VAR_SIZE_BIT_1,
-   CHEEVOS_VAR_SIZE_BIT_2,
-   CHEEVOS_VAR_SIZE_BIT_3,
-   CHEEVOS_VAR_SIZE_BIT_4,
-   CHEEVOS_VAR_SIZE_BIT_5,
-   CHEEVOS_VAR_SIZE_BIT_6,
-   CHEEVOS_VAR_SIZE_BIT_7,
-   CHEEVOS_VAR_SIZE_NIBBLE_LOWER,
-   CHEEVOS_VAR_SIZE_NIBBLE_UPPER,
-   /* Byte, */
-   CHEEVOS_VAR_SIZE_EIGHT_BITS, /* =Byte, */
-   CHEEVOS_VAR_SIZE_SIXTEEN_BITS,
-   CHEEVOS_VAR_SIZE_THIRTYTWO_BITS
-} cheevos_var_size_t;
-
-typedef enum
-{
-   /* compare to the value of a live address in RAM */
-   CHEEVOS_VAR_TYPE_ADDRESS = 0,
-
-   /* a number. assume 32 bit */
-   CHEEVOS_VAR_TYPE_VALUE_COMP,
-
-   /* the value last known at this address. */
-   CHEEVOS_VAR_TYPE_DELTA_MEM,
-
-   /* a custom user-set variable */
-   CHEEVOS_VAR_TYPE_DYNAMIC_VAR
-} cheevos_var_type_t;
-
-typedef struct
-{
-   cheevos_var_size_t size;
-   cheevos_var_type_t type;
-   int                bank_id;
-   bool               is_bcd;
-   unsigned           value;
-   unsigned           previous;
-} cheevos_var_t;
-
-void cheevos_var_parse(cheevos_var_t* var, const char** memaddr);
-void cheevos_var_patch_addr(cheevos_var_t* var, cheevos_console_t console);
-
-uint8_t* cheevos_var_get_memory(const cheevos_var_t* var);
-unsigned cheevos_var_get_value(cheevos_var_t* var);
-
-RETRO_END_DECLS
-
-#endif /* __RARCH_CHEEVOS_VAR_H */
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2015-2018 - Andre Leiradella
+ *
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __RARCH_CHEEVOS_VAR_H
+#define __RARCH_CHEEVOS_VAR_H
+
+#include <stdint.h>
+
+#include "cheevos.h"
+
+#include <retro_common_api.h>
+
+RETRO_BEGIN_DECLS
+
+typedef enum
+{
+   CHEEVOS_VAR_SIZE_BIT_0 = 0,
+   CHEEVOS_VAR_SIZE_BIT_1,
+   CHEEVOS_VAR_SIZE_BIT_2,
+   CHEEVOS_VAR_SIZE_BIT_3,
+   CHEEVOS_VAR_SIZE_BIT_4,
+   CHEEVOS_VAR_SIZE_BIT_5,
+   CHEEVOS_VAR_SIZE_BIT_6,
+   CHEEVOS_VAR_SIZE_BIT_7,
+   CHEEVOS_VAR_SIZE_NIBBLE_LOWER,
+   CHEEVOS_VAR_SIZE_NIBBLE_UPPER,
+   /* Byte, */
+   CHEEVOS_VAR_SIZE_EIGHT_BITS, /* =Byte, */
+   CHEEVOS_VAR_SIZE_SIXTEEN_BITS,
+   CHEEVOS_VAR_SIZE_THIRTYTWO_BITS
+} cheevos_var_size_t;
+
+typedef enum
+{
+   /* compare to the value of a live address in RAM */
+   CHEEVOS_VAR_TYPE_ADDRESS = 0,
+
+   /* a number. assume 32 bit */
+   CHEEVOS_VAR_TYPE_VALUE_COMP,
+
+   /* the value last known at this address. */
+   CHEEVOS_VAR_TYPE_DELTA_MEM,
+
+   /* a custom user-set variable */
+   CHEEVOS_VAR_TYPE_DYNAMIC_VAR
+} cheevos_var_type_t;
+
+typedef struct
+{
+   cheevos_var_size_t size;
+   cheevos_var_type_t type;
+   int                bank_id;
+   bool               is_bcd;
+   unsigned           value;
+   unsigned           previous;
+} cheevos_var_t;
+
+void cheevos_var_parse(cheevos_var_t* var, const char** memaddr);
+void cheevos_var_patch_addr(cheevos_var_t* var, cheevos_console_t console);
+
+uint8_t* cheevos_var_get_memory(const cheevos_var_t* var);
+unsigned cheevos_var_get_value(cheevos_var_t* var);
+
+RETRO_END_DECLS
+
+#endif /* __RARCH_CHEEVOS_VAR_H */
@@ -41,8 +41,12 @@

 #ifdef HAVE_CHEEVOS
 #include "cheevos/cheevos.h"
+#ifdef HAVE_NEW_CHEEVOS
+#include "cheevos-new/fixup.h"
+#else
 #include "cheevos/var.h"
 #endif
+#endif

 #ifdef HAVE_DISCORD
 #include "discord/discord.h"
@@ -85,6 +89,7 @@
 #include "managers/cheat_manager.h"
 #include "managers/state_manager.h"
 #include "ui/ui_companion_driver.h"
+#include "tasks/task_content.h"
 #include "tasks/tasks_internal.h"
 #include "list_special.h"

@@ -98,6 +103,8 @@
 #define DEFAULT_NETWORK_CMD_PORT 55355
 #define STDIN_BUF_SIZE           4096

+extern bool discord_is_inited;
+
 enum cmd_source_t
 {
   CMD_NONE = 0,
@@ -111,12 +118,14 @@ struct cmd_map
   unsigned id;
 };

+#ifdef HAVE_COMMAND
 struct cmd_action_map
 {
   const char *str;
   bool (*action)(const char *arg);
   const char *arg_desc;
 };
+#endif

 struct command
 {
@@ -131,9 +140,50 @@ struct command
 #endif
 };

-static bool command_version(const char *arg);
+#if defined(HAVE_COMMAND)
+static enum cmd_source_t lastcmd_source;
+#if defined(HAVE_NETWORK_CMD) && defined(HAVE_NETWORKING)
+static int lastcmd_net_fd;
+static struct sockaddr_storage lastcmd_net_source;
+static socklen_t lastcmd_net_source_len;
+#endif

-#if defined(HAVE_COMMAND) && defined(HAVE_CHEEVOS)
+#if defined(HAVE_CHEEVOS) && (defined(HAVE_STDIN_CMD) || defined(HAVE_NETWORK_CMD) && defined(HAVE_NETWORKING))
+static void command_reply(const char * data, size_t len)
+{
+   switch (lastcmd_source)
+   {
+      case CMD_STDIN:
+#ifdef HAVE_STDIN_CMD
+         fwrite(data, 1,len, stdout);
+#endif
+         break;
+      case CMD_NETWORK:
+#if defined(HAVE_NETWORKING) && defined(HAVE_NETWORK_CMD)
+         sendto(lastcmd_net_fd, data, len, 0,
+               (struct sockaddr*)&lastcmd_net_source, lastcmd_net_source_len);
+#endif
+         break;
+      case CMD_NONE:
+      default:
+         break;
+   }
+}
+
+#endif
+static bool command_version(const char* arg)
+{
+   char reply[256] = {0};
+
+   snprintf(reply, sizeof(reply), "%s\n", PACKAGE_VERSION);
+#if defined(HAVE_CHEEVOS) && (defined(HAVE_STDIN_CMD) || defined(HAVE_NETWORK_CMD) && defined(HAVE_NETWORKING))
+   command_reply(reply, strlen(reply));
+#endif
+
+   return true;
+}
+
+#if defined(HAVE_CHEEVOS)
 static bool command_read_ram(const char *arg);
 static bool command_write_ram(const char *arg);
 #endif
@@ -141,7 +191,7 @@ static bool command_write_ram(const char *arg);
 static const struct cmd_action_map action_map[] = {
   { "SET_SHADER",      command_set_shader,  "<shader path>" },
   { "VERSION",         command_version,     "No argument"},
-#if defined(HAVE_COMMAND) && defined(HAVE_CHEEVOS)
+#if defined(HAVE_CHEEVOS)
   { "READ_CORE_RAM",   command_read_ram,    "<address> <number of bytes>" },
   { "WRITE_CORE_RAM",  command_write_ram,   "<address> <byte1> <byte2> ..." },
 #endif
@@ -159,7 +209,7 @@ static const struct cmd_map map[] = {
   { "STATE_SLOT_PLUS",        RARCH_STATE_SLOT_PLUS },
   { "STATE_SLOT_MINUS",       RARCH_STATE_SLOT_MINUS },
   { "REWIND",                 RARCH_REWIND },
-   { "MOVIE_RECORD_TOGGLE",    RARCH_MOVIE_RECORD_TOGGLE },
+   { "BSV_RECORD_TOGGLE",      RARCH_BSV_RECORD_TOGGLE },
   { "PAUSE_TOGGLE",           RARCH_PAUSE_TOGGLE },
   { "FRAMEADVANCE",           RARCH_FRAMEADVANCE },
   { "RESET",                  RARCH_RESET },
@@ -171,6 +221,7 @@ static const struct cmd_map map[] = {
   { "SCREENSHOT",             RARCH_SCREENSHOT },
   { "MUTE",                   RARCH_MUTE },
   { "OSK",                    RARCH_OSK },
+   { "FPS_TOGGLE",             RARCH_FPS_TOGGLE },
   { "NETPLAY_GAME_WATCH",     RARCH_NETPLAY_GAME_WATCH },
   { "VOLUME_UP",              RARCH_VOLUME_UP },
   { "VOLUME_DOWN",            RARCH_VOLUME_DOWN },
@@ -182,6 +233,8 @@ static const struct cmd_map map[] = {
   { "UI_COMPANION_TOGGLE",    RARCH_UI_COMPANION_TOGGLE },
   { "GAME_FOCUS_TOGGLE",      RARCH_GAME_FOCUS_TOGGLE },
   { "MENU_TOGGLE",            RARCH_MENU_TOGGLE },
+   { "RECORDING_TOGGLE",       RARCH_RECORDING_TOGGLE },
+   { "STREAMING_TOGGLE",       RARCH_STREAMING_TOGGLE },
   { "MENU_UP",                RETRO_DEVICE_ID_JOYPAD_UP },
   { "MENU_DOWN",              RETRO_DEVICE_ID_JOYPAD_DOWN },
   { "MENU_LEFT",              RETRO_DEVICE_ID_JOYPAD_LEFT },
@@ -190,40 +243,6 @@ static const struct cmd_map map[] = {
   { "MENU_B",                 RETRO_DEVICE_ID_JOYPAD_B },
   { "MENU_B",                 RETRO_DEVICE_ID_JOYPAD_B },
 };
-
-static enum cmd_source_t lastcmd_source;
-#if defined(HAVE_NETWORKING) && defined(HAVE_NETWORK_CMD)
-static int lastcmd_net_fd;
-static struct sockaddr_storage lastcmd_net_source;
-static socklen_t lastcmd_net_source_len;
-#endif
-
-#if defined(HAVE_CHEEVOS) && (defined(HAVE_STDIN_CMD) || defined(HAVE_NETWORK_CMD) && defined(HAVE_NETWORKING))
-static bool command_reply(const char * data, size_t len)
-{
-   switch (lastcmd_source)
-   {
-      case CMD_NONE:
-         break;
-      case CMD_STDIN:
-#ifdef HAVE_STDIN_CMD
-         fwrite(data, 1,len, stdout);
-         return true;
-#else
-         break;
-#endif
-      case CMD_NETWORK:
-#if defined(HAVE_NETWORKING) && defined(HAVE_NETWORK_CMD)
-         sendto(lastcmd_net_fd, data, len, 0,
-               (struct sockaddr*)&lastcmd_net_source, lastcmd_net_source_len);
-         return true;
-#else
-         break;
-#endif
-   }
-
-   return false;
-}
 #endif

 bool command_set_shader(const char *arg)
@@ -253,48 +272,27 @@ bool command_set_shader(const char *arg)
 #endif
 }

-static bool command_version(const char* arg)
-{
-   char reply[256] = {0};
-
-   sprintf(reply, "%s\n", PACKAGE_VERSION);
-#if defined(HAVE_CHEEVOS) && (defined(HAVE_STDIN_CMD) || defined(HAVE_NETWORK_CMD) && defined(HAVE_NETWORKING))
-   command_reply(reply, strlen(reply));
-#endif
-
-   return true;
-}
-
 #if defined(HAVE_COMMAND) && defined(HAVE_CHEEVOS)
 #define SMY_CMD_STR "READ_CORE_RAM"
 static bool command_read_ram(const char *arg)
 {
-   cheevos_var_t var;
+#if defined(HAVE_NEW_CHEEVOS)
   unsigned i;
   char  *reply            = NULL;
   const uint8_t * data    = NULL;
   char *reply_at          = NULL;
   unsigned int nbytes     = 0;
   unsigned int alloc_size = 0;
-   int          addr       = -1;
+   unsigned int addr    = -1;

   if (sscanf(arg, "%x %d", &addr, &nbytes) != 2)
      return true;

-   alloc_size = 40 + nbytes * 3; /* We alloc more than needed, saving 20 bytes is not really relevant */
-   reply      = (char*) malloc(alloc_size);
-   reply[0]   = '\0';
-   reply_at   = reply + sprintf(reply, SMY_CMD_STR " %x", addr);
-
-   var.value  = addr;
-
-   cheevos_var_patch_addr(&var, cheevos_get_console());
-
-   data       = cheevos_var_get_memory(&var);
+   data = cheevos_patch_address(addr, cheevos_get_console());

   if (data)
   {
-      for (i=0;i<nbytes;i++)
+      for (i = 0; i < nbytes; i++)
         sprintf(reply_at+3*i, " %.2X", data[i]);
      reply_at[3*nbytes] = '\n';
      command_reply(reply, reply_at+3*nbytes+1 - reply);
@@ -305,6 +303,38 @@ static bool command_read_ram(const char *arg)
      command_reply(reply, reply_at+strlen(" -1\n") - reply);
   }
   free(reply);
+#else
+   cheevos_var_t var;
+   unsigned i;
+   char reply[256]      = {0};
+   const uint8_t * data = NULL;
+   char *reply_at       = NULL;
+
+   reply[0]             = '\0';
+
+   strlcpy(reply, "READ_CORE_RAM ", sizeof(reply));
+   reply_at = reply + strlen("READ_CORE_RAM ");
+   strlcpy(reply_at, arg, sizeof(reply)-strlen(reply));
+
+   var.value = strtoul(reply_at, (char**)&reply_at, 16);
+   cheevos_var_patch_addr(&var, cheevos_get_console());
+   data = cheevos_var_get_memory(&var);
+
+   if (data)
+   {
+      unsigned nbytes = strtol(reply_at, NULL, 10);
+
+      for (i = 0; i < nbytes; i++)
+         sprintf(reply_at+3*i, " %.2X", data[i]);
+      reply_at[3*nbytes] = '\n';
+      command_reply(reply, reply_at+3*nbytes+1 - reply);
+   }
+   else
+   {
+      strlcpy(reply_at, " -1\n", sizeof(reply)-strlen(reply));
+      command_reply(reply, reply_at+strlen(" -1\n") - reply);
+   }
+#endif

   return true;
 }
@@ -312,14 +342,19 @@ static bool command_read_ram(const char *arg)

 static bool command_write_ram(const char *arg)
 {
-   cheevos_var_t var;
   unsigned nbytes   = 0;
+#if defined(HAVE_NEW_CHEEVOS)
+   unsigned int addr = strtoul(arg, (char**)&arg, 16);
+   uint8_t *data     = (uint8_t *)cheevos_patch_address(addr, cheevos_get_console());
+#else
+   cheevos_var_t var;
   uint8_t *data     = NULL;

   var.value = strtoul(arg, (char**)&arg, 16);
   cheevos_var_patch_addr(&var, cheevos_get_console());

   data = cheevos_var_get_memory(&var);
+#endif

   if (data)
   {
@@ -389,7 +424,6 @@ static bool command_network_init(command_t *handle, uint16_t port)
         msg_hash_to_str(MSG_BRINGING_UP_COMMAND_INTERFACE_ON_PORT),
         (unsigned short)port);

-
   if (fd < 0)
      goto error;

@@ -610,7 +644,7 @@ bool command_network_new(

   return true;

-#if (defined(HAVE_NETWORK_CMD) && defined(HAVE_NETWORKING)) || defined(HAVE_STDIN_CMD)
+#if defined(HAVE_NETWORKING) && defined(HAVE_NETWORK_CMD) && defined(HAVE_COMMAND) || defined(HAVE_STDIN_CMD)
 error:
   command_free(handle);
   return false;
@@ -1113,7 +1147,6 @@ static void command_event_init_cheats(void)
   cheat_manager_alloc_if_empty() ;
   cheat_manager_load_game_specific_cheats() ;

-
   if (settings != NULL && settings->bools.apply_cheats_after_load)
      cheat_manager_apply_cheats();
 }
@@ -1242,6 +1275,7 @@ static bool event_init_content(void)
 {
   bool contentless = false;
   bool is_inited   = false;
+   settings_t *settings            = config_get_ptr();

   content_get_status(&contentless, &is_inited);

@@ -1268,7 +1302,18 @@ static bool event_init_content(void)
      RARCH_LOG("%s.\n",
            msg_hash_to_str(MSG_SKIPPING_SRAM_LOAD));

+/*
+   Since the operations are asynchronouse we can't guarantee users will not use auto_load_state to cheat on
+   achievements so we forbid auto_load_state from happening if cheevos_enable and cheevos_hardcode_mode_enable
+   are true
+*/
+#ifdef HAVE_CHEEVOS
+   if (!settings->bools.cheevos_enable || !settings->bools.cheevos_hardcore_mode_enable)
+      command_event_load_auto_state();
+#else
   command_event_load_auto_state();
+#endif
+
   command_event(CMD_EVENT_BSV_MOVIE_INIT, NULL);
   command_event(CMD_EVENT_NETPLAY_INIT, NULL);

@@ -1298,7 +1343,6 @@ static bool command_event_init_core(enum rarch_core_type *data)
   if(settings->bools.auto_shaders_enable)
      config_load_shader_preset();

-
   /* reset video format to libretro's default */
   video_driver_set_pixel_format(RETRO_PIXEL_FORMAT_0RGB1555);

@@ -1321,7 +1365,6 @@ static bool command_event_init_core(enum rarch_core_type *data)
   if (!core_load(settings->uints.input_poll_type_behavior))
      return false;

-
   rarch_ctl(RARCH_CTL_SET_FRAME_LIMIT, NULL);
   return true;
 }
@@ -1585,7 +1628,6 @@ static void command_event_save_current_config(enum override_type type)
         break;
   }

-
   if (!string_is_empty(msg))
      runloop_msg_queue_push(msg, 1, 180, true);
 }
@@ -1634,8 +1676,8 @@ static bool command_event_main_state(unsigned cmd)
 {
   retro_ctx_size_info_t info;
   char msg[128];
-   char *state_path           = (char*)malloc(PATH_MAX_LENGTH * sizeof(char));
-   size_t state_path_size     = PATH_MAX_LENGTH * sizeof(char);
+   size_t state_path_size     = 16384 * sizeof(char);
+   char *state_path           = (char*)malloc(state_path_size);
   global_t *global           = global_get_ptr();
   bool ret                   = false;
   bool push_msg              = true;
@@ -1671,6 +1713,9 @@ static bool command_event_main_state(unsigned cmd)
         case CMD_EVENT_LOAD_STATE:
            if (content_load_state(state_path, false, false))
            {
+#ifdef HAVE_CHEEVOS
+               cheevos_state_loaded_flag = true;
+#endif
               ret = true;
 #ifdef HAVE_NETWORKING
               netplay_driver_ctl(RARCH_NETPLAY_CTL_LOAD_SAVESTATE, NULL);
@@ -1722,59 +1767,6 @@ static bool command_event_resize_windowed_scale(void)
   return true;
 }

-void command_playlist_push_write(
-      void *data,
-      const char *path,
-      const char *label,
-      const char *core_path,
-      const char *core_name)
-{
-   playlist_t *playlist = (playlist_t*)data;
-
-   if (!playlist)
-      return;
-
-   if (playlist_push(
-         playlist,
-         path,
-         label,
-         core_path,
-         core_name,
-         NULL,
-         NULL
-         ))
-      playlist_write_file(playlist);
-}
-
-void command_playlist_update_write(
-      void *data,
-      size_t idx,
-      const char *path,
-      const char *label,
-      const char *core_path,
-      const char *core_display_name,
-      const char *crc32,
-      const char *db_name)
-{
-   playlist_t *plist    = (playlist_t*)data;
-   playlist_t *playlist = plist ? plist : playlist_get_cached();
-
-   if (!playlist)
-      return;
-
-   playlist_update(
-         playlist,
-         idx,
-         path,
-         label,
-         core_path,
-         core_display_name,
-         crc32,
-         db_name);
-
-   playlist_write_file(playlist);
-}
-
 /**
 * command_event:
 * @cmd                  : Event command index.
@@ -1785,18 +1777,10 @@ void command_playlist_update_write(
 **/
 bool command_event(enum event_command cmd, void *data)
 {
-#ifdef HAVE_DISCORD
-   static bool discord_inited = false;
-#endif
   bool boolean               = false;

   switch (cmd)
   {
-      case CMD_EVENT_MENU_REFRESH:
-#ifdef HAVE_MENU
-         menu_driver_ctl(RARCH_MENU_CTL_REFRESH, NULL);
-#endif
-         break;
      case CMD_EVENT_SET_PER_GAME_RESOLUTION:
 #if defined(GEKKO)
         {
@@ -1856,7 +1840,11 @@ bool command_event(enum event_command cmd, void *data)
         break;
      case CMD_EVENT_LOAD_CORE:
      {
-         bool success = command_event(CMD_EVENT_LOAD_CORE_PERSIST, NULL);
+	 bool success   = false;
+         subsystem_current_count = 0;
+         content_clear_subsystem();
+         success = command_event(CMD_EVENT_LOAD_CORE_PERSIST, NULL);
+         (void)success;

 #ifndef HAVE_DYNAMIC
         command_event(CMD_EVENT_QUIT, NULL);
@@ -1903,6 +1891,10 @@ bool command_event(enum event_command cmd, void *data)
         command_event_init_controllers();
         break;
      case CMD_EVENT_RESET:
+#ifdef HAVE_CHEEVOS
+         cheevos_state_loaded_flag = false;
+         cheevos_hardcore_paused = false;
+#endif
         RARCH_LOG("%s.\n", msg_hash_to_str(MSG_RESET));
         runloop_msg_queue_push(msg_hash_to_str(MSG_RESET), 1, 120, true);

@@ -1971,15 +1963,28 @@ bool command_event(enum event_command cmd, void *data)
            command_event(CMD_EVENT_RESTORE_REMAPS, NULL);

            if (is_inited)
+            {
               if (!task_push_start_dummy_core(&content_info))
                  return false;
+            }
 #ifdef HAVE_DYNAMIC
            path_clear(RARCH_PATH_CORE);
            rarch_ctl(RARCH_CTL_SYSTEM_INFO_FREE, NULL);
 #endif
-            core_unload_game();
-            if (!rarch_ctl(RARCH_CTL_IS_DUMMY_CORE, NULL))
-               core_unload();
+#ifdef HAVE_DISCORD
+            if (discord_is_inited)
+            {
+               discord_userdata_t userdata;
+               userdata.status = DISCORD_PRESENCE_MENU;
+
+               command_event(CMD_EVENT_DISCORD_UPDATE, &userdata);
+            }
+#endif
+            if (is_inited)
+            {
+               subsystem_current_count = 0;
+               content_clear_subsystem();
+            }
         }
         break;
      case CMD_EVENT_QUIT:
@@ -2120,6 +2125,12 @@ TODO: Add a setting for these tweaks */
            RARCH_LOG("%s\n", msg);
         }
         break;
+      case CMD_EVENT_FPS_TOGGLE:
+         {
+            settings_t *settings           = config_get_ptr();
+            settings->bools.video_fps_show = !(settings->bools.video_fps_show);
+         }
+         break;
      case CMD_EVENT_OVERLAY_DEINIT:
 #ifdef HAVE_OVERLAY
         input_overlay_free(overlay_ptr);
@@ -2160,13 +2171,22 @@ TODO: Add a setting for these tweaks */
         video_driver_gpu_record_deinit();
         break;
      case CMD_EVENT_RECORD_DEINIT:
-         if (!recording_deinit())
-            return false;
+         {
+            recording_set_state(false);
+            streaming_set_state(false);
+            if (!recording_deinit())
+               return false;
+         }
         break;
      case CMD_EVENT_RECORD_INIT:
-         command_event(CMD_EVENT_HISTORY_DEINIT, NULL);
-         if (!recording_init())
-            return false;
+         {
+            recording_set_state(true);
+            if (!recording_init())
+            {
+               command_event(CMD_EVENT_RECORD_DEINIT, NULL);
+               return false;
+            }
+         }
         break;
      case CMD_EVENT_HISTORY_DEINIT:
         if (g_defaults.content_history)
@@ -2379,17 +2399,12 @@ TODO: Add a setting for these tweaks */
         break;
      case CMD_EVENT_ADD_TO_FAVORITES:
      {
-         global_t *global               = global_get_ptr();
-         rarch_system_info_t *sys_info  = runloop_get_system_info();
-         const char *core_name          = NULL;
-         const char *core_path          = NULL;
-         const char *label              = NULL;
-
-         if (sys_info)
-         {
-            core_name = sys_info->info.library_name;
-            core_path = path_get(RARCH_PATH_CORE);
-         }
+         /* TODO/FIXME - does path_get(RARCH_PATH_CORE) depend on the system info struct? Investigate */
+         global_t *global                 = global_get_ptr();
+         struct retro_system_info *system = runloop_get_libretro_system_info();
+         const char *label                = NULL;
+         const char *core_path            = system ? path_get(RARCH_PATH_CORE) : NULL;
+         const char *core_name            = system ? system->library_name : NULL;

         if (!string_is_empty(global->name.label))
            label = global->name.label;
@@ -2432,6 +2447,9 @@ TODO: Add a setting for these tweaks */
         command_event(CMD_EVENT_QUIT, NULL);
 #endif
         break;
+      case CMD_EVENT_MENU_RESET_TO_DEFAULT_CONFIG:
+         config_set_defaults();
+         break;
      case CMD_EVENT_MENU_SAVE_CURRENT_CONFIG:
         command_event_save_current_config(OVERRIDE_NONE);
         break;
@@ -2664,9 +2682,12 @@ TODO: Add a setting for these tweaks */
            settings_t *settings      = config_get_ptr();
            bool new_fullscreen_state = !settings->bools.video_fullscreen
               && !retroarch_is_forced_fullscreen();
+
            if (!video_driver_has_windowed())
               return false;

+            retroarch_set_switching_display_mode();
+
            /* we toggled manually, write the new value to settings */
            configuration_set_bool(settings, settings->bools.video_fullscreen,
                  new_fullscreen_state);
@@ -2682,6 +2703,8 @@ TODO: Add a setting for these tweaks */
               video_driver_hide_mouse();
            else
               video_driver_show_mouse();
+
+            retroarch_unset_switching_display_mode();
         }
         break;
      case CMD_EVENT_COMMAND_DEINIT:
@@ -2900,26 +2923,24 @@ TODO: Add a setting for these tweaks */

            if (!settings->bools.discord_enable)
               return false;
-            if (discord_inited)
+            if (discord_is_ready())
               return true;

            discord_init();
-            discord_inited = true;
         }
 #endif
         break;
      case CMD_EVENT_DISCORD_DEINIT:
 #ifdef HAVE_DISCORD
-         if (!discord_inited)
+         if (!discord_is_ready())
            return false;

         discord_shutdown();
-         discord_inited = false;
 #endif
         break;
      case CMD_EVENT_DISCORD_UPDATE:
 #ifdef HAVE_DISCORD
-         if (!data || !discord_inited)
+         if (!data || !discord_is_ready())
            return false;

         {
@@ -83,6 +83,8 @@ enum event_command
   CMD_EVENT_AUDIO_START,
   /* Mutes audio. */
   CMD_EVENT_AUDIO_MUTE_TOGGLE,
+   /* Toggles FPS counter. */
+   CMD_EVENT_FPS_TOGGLE,
   /* Initializes overlay. */
   CMD_EVENT_OVERLAY_INIT,
   /* Deinitializes overlay. */
@@ -147,6 +149,7 @@ enum event_command
   /* Unpauses retroArch. */
   CMD_EVENT_PAUSE,
   CMD_EVENT_PAUSE_CHECKS,
+   CMD_EVENT_MENU_RESET_TO_DEFAULT_CONFIG,
   CMD_EVENT_MENU_SAVE_CURRENT_CONFIG,
   CMD_EVENT_MENU_SAVE_CURRENT_CONFIG_OVERRIDE_CORE,
   CMD_EVENT_MENU_SAVE_CURRENT_CONFIG_OVERRIDE_CONTENT_DIR,
@@ -155,7 +158,6 @@ enum event_command
   CMD_EVENT_MENU_PAUSE_LIBRETRO,
   /* Toggles menu on/off. */
   CMD_EVENT_MENU_TOGGLE,
-   CMD_EVENT_MENU_REFRESH,
   /* Applies shader changes. */
   CMD_EVENT_SHADERS_APPLY_CHANGES,
   /* A new shader preset has been loaded */
@@ -268,23 +270,6 @@ bool command_free(command_t *handle);
 **/
 bool command_event(enum event_command action, void *data);

-void command_playlist_push_write(
-      void *data,
-      const char *path,
-      const char *label,
-      const char *core_path,
-      const char *core_name);
-
-void command_playlist_update_write(
-      void *data,
-      size_t idx,
-      const char *path,
-      const char *label,
-      const char *core_path,
-      const char *core_display_name,
-      const char *crc32,
-      const char *db_name);
-
 RETRO_END_DECLS

 #endif
@@ -1,7 +1,7 @@
 /*  RetroArch - A frontend for libretro.
 *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
 *  Copyright (C) 2011-2016 - Daniel De Matteis
- *  Copyright (C) 2016 - Brad Parker
+ *  Copyright (C) 2016-2019 - Brad Parker
 *
 *  RetroArch is free software: you can redistribute it and/or modify it under the terms
 *  of the GNU General Public License as published by the Free Software Found-
@@ -20,6 +20,7 @@

 #include <boolean.h>
 #include <audio/audio_resampler.h>
+#include "configuration.h"
 #include "gfx/video_defines.h"
 #include "input/input_driver.h"

@@ -47,7 +48,7 @@
 #define DEFAULT_ASPECT_RATIO -1.0f
 #endif

-#ifdef RARCH_MOBILE
+#if defined(RARCH_MOBILE) || defined(HAVE_LIBNX)
 static const bool pointer_enable = true;
 #else
 static const bool pointer_enable = false;
@@ -67,15 +68,15 @@ static bool bundle_assets_extract_enable = false;
 static bool materialui_icons_enable      = true;
 #endif

-static const bool crt_switch_resolution = false; 	
+static const unsigned crt_switch_resolution  = CRT_SWITCH_NONE; 	
 static const int crt_switch_resolution_super = 2560; 
+static const int crt_switch_center_adjust    = 0;

+static const bool def_history_list_enable    = true;
+static const bool def_playlist_entry_remove  = true;
+static const bool def_playlist_entry_rename  = true;

-static const bool def_history_list_enable = true;
-static const bool def_playlist_entry_remove = true;
-static const bool def_playlist_entry_rename = true;
-
-static const unsigned int def_user_language = 0;
+static const unsigned int def_user_language  = 0;

 #if (defined(_WIN32) && !defined(_XBOX)) || (defined(__linux) && !defined(ANDROID) && !defined(HAVE_LAKKA)) || (defined(__MACH__) && !defined(IOS)) || defined(EMSCRIPTEN)
 static const bool def_mouse_enable = true;
@@ -116,14 +117,18 @@ static const unsigned monitor_index = 0;
 /* Window */
 /* Window size. A value of 0 uses window scale
 * multiplied by the core framebuffer size. */
-static const unsigned window_x = 0;
-static const unsigned window_y = 0;
+static const unsigned window_width = 1280;
+static const unsigned window_height = 720;

 /* Fullscreen resolution. A value of 0 uses the desktop
 * resolution. */
 static const unsigned fullscreen_x = 0;
 static const unsigned fullscreen_y = 0;

+/* Number of threads to use for video recording */
+
+static const unsigned video_record_threads = 2;
+
 /* Amount of transparency to use for the main window.
 * 1 is the most transparent while 100 is opaque.
 */
@@ -147,6 +152,8 @@ static const bool vsync = true;

 static const unsigned max_swapchain_images = 3;

+static const bool adaptive_vsync = false;
+
 /* Attempts to hard-synchronize CPU and GPU.
 * Can reduce latency at cost of performance. */
 static const bool hard_sync = false;
@@ -178,10 +185,14 @@ static unsigned swap_interval = 1;
 /* Threaded video. Will possibly increase performance significantly
 * at the cost of worse synchronization and latency.
 */
+#if defined(HAVE_LIBNX)
+static const bool video_threaded = true;
+#else
 static const bool video_threaded = false;
+#endif

 #if defined(HAVE_THREADS)
-#if defined(GEKKO) || defined(PSP)
+#if defined(GEKKO) || defined(PSP) || defined(PS2)
 /* For single-core consoles right now it's better to have this be disabled. */
 static const bool threaded_data_runloop_enable = false;
 #else
@@ -233,6 +244,11 @@ static const bool aspect_ratio_auto = false;
 static unsigned aspect_ratio_idx = ASPECT_RATIO_16_9;
 #elif defined(PSP)
 static unsigned aspect_ratio_idx = ASPECT_RATIO_CORE;
+#elif defined(_3DS)
+/* Previously defaulted to ASPECT_RATIO_4_3.
+ * Non-4:3 content looks dreadful when stretched
+ * to 4:3 on the 3DS screen... */
+static unsigned aspect_ratio_idx = ASPECT_RATIO_CORE;
 #elif defined(RARCH_CONSOLE)
 static unsigned aspect_ratio_idx = ASPECT_RATIO_4_3;
 #else
@@ -259,15 +275,26 @@ static const float default_input_overlay_opacity = 0.7f;

 static bool default_block_config_read    = true;

-static bool quick_menu_show_take_screenshot      = true;
-static bool quick_menu_show_save_load_state      = true;
-static bool quick_menu_show_undo_save_load_state = true;
-static bool quick_menu_show_add_to_favorites     = true;
-static bool quick_menu_show_options              = true;
-static bool quick_menu_show_controls             = true;
-static bool quick_menu_show_cheats               = true;
-static bool quick_menu_show_shaders              = true;
-static bool quick_menu_show_information          = true;
+#ifdef HAVE_LIBNX
+static bool menu_use_preferred_system_color_theme = true;
+#else
+static bool menu_use_preferred_system_color_theme = false;
+#endif
+
+static bool quick_menu_show_take_screenshot             = true;
+static bool quick_menu_show_save_load_state             = true;
+static bool quick_menu_show_undo_save_load_state        = true;
+static bool quick_menu_show_add_to_favorites            = true;
+static bool quick_menu_show_start_recording             = true;
+static bool quick_menu_show_start_streaming             = true;
+static bool quick_menu_show_reset_core_association      = true;
+static bool quick_menu_show_options                     = true;
+static bool quick_menu_show_controls                    = true;
+static bool quick_menu_show_cheats                      = true;
+static bool quick_menu_show_shaders                     = true;
+static bool quick_menu_show_information                 = true;
+static bool quick_menu_show_recording                   = true;
+static bool quick_menu_show_streaming                   = true;

 static bool quick_menu_show_save_core_overrides         = true;
 static bool quick_menu_show_save_game_overrides         = true;
@@ -275,6 +302,7 @@ static bool quick_menu_show_save_content_dir_overrides  = true;

 static bool kiosk_mode_enable            = false;

+static bool menu_horizontal_animation    = true;
 static bool menu_show_online_updater     = true;
 static bool menu_show_load_core          = true;
 static bool menu_show_load_content       = true;
@@ -283,7 +311,11 @@ static bool menu_show_configurations     = true;
 static bool menu_show_help               = true;
 static bool menu_show_quit_retroarch     = true;
 static bool menu_show_reboot             = true;
+#ifdef HAVE_LAKKA_SWITCH
+static bool menu_show_shutdown           = false;
+#else
 static bool menu_show_shutdown           = true;
+#endif
 #if defined(HAVE_LAKKA) || defined(VITA) || defined(_3DS)
 static bool menu_show_core_updater       = false;
 #else
@@ -341,9 +373,7 @@ static unsigned menu_shader_pipeline = 2;
 #endif

 static bool show_advanced_settings            = false;
-static const uint32_t menu_entry_normal_color = 0xffffffff;
-static const uint32_t menu_entry_hover_color  = 0xff64ff64;
-static const uint32_t menu_title_color        = 0xff64ff64;
+static unsigned rgui_color_theme = RGUI_THEME_CLASSIC_GREEN;

 #else
 static bool default_block_config_read = false;
@@ -365,10 +395,14 @@ static bool default_screenshots_in_content_dir = false;

 #if defined(__CELLOS_LV2__) || defined(_XBOX1) || defined(_XBOX360)
 static unsigned menu_toggle_gamepad_combo    = INPUT_TOGGLE_L3_R3;
+#elif defined(PS2) || defined(PSP)
+static unsigned menu_toggle_gamepad_combo    = INPUT_TOGGLE_HOLD_START;
 #elif defined(VITA)
 static unsigned menu_toggle_gamepad_combo    = INPUT_TOGGLE_L1_R1_START_SELECT;
-#elif defined(SWITCH)
+#elif defined(SWITCH) || defined(ORBIS)
 static unsigned menu_toggle_gamepad_combo    = INPUT_TOGGLE_START_SELECT;
+#elif TARGET_OS_TV
+static unsigned menu_toggle_gamepad_combo    = INPUT_TOGGLE_DOWN_Y_L_R;
 #else
 static unsigned menu_toggle_gamepad_combo    = INPUT_TOGGLE_NONE;
 #endif
@@ -447,9 +481,11 @@ static const bool font_enable = true;
 * If your monitor does not run at 60Hz, or something close to it,
 * disable VSync, and leave this at its default. */
 #ifdef _3DS
-static const float refresh_rate = (32730.0 * 8192.0) / 4481134.0 ;
+static const float refresh_rate     = (32730.0 * 8192.0) / 4481134.0 ;
+static const float crt_refresh_rate = (32730.0 * 8192.0) / 4481134.0 ;
 #else
-static const float refresh_rate = 60/1.001;
+static const float refresh_rate     = 60/1.001;
+static const float crt_refresh_rate = 60/1.001;
 #endif

 /* Allow games to set rotation. If false, rotation requests are
@@ -457,11 +493,23 @@ static const float refresh_rate = 60/1.001;
 * Used for setups where one manually rotates the monitor. */
 static const bool allow_rotate = true;

+#ifdef _3DS
+/* Enable bottom LCD screen */
+static const bool video_3ds_lcd_bottom = true;
+#endif
+
 /* AUDIO */

 /* Will enable audio or not. */
 static const bool audio_enable = true;

+/* Enable menu audio sounds. */
+static const bool audio_enable_menu = false;
+static const bool audio_enable_menu_ok = false;
+static const bool audio_enable_menu_cancel = false;
+static const bool audio_enable_menu_notice = false;
+static const bool audio_enable_menu_bgm = false;
+
 /* Output samplerate. */
 #ifdef GEKKO
 static const unsigned out_rate = 32000;
@@ -519,8 +567,11 @@ static const int wasapi_sh_buffer_length = -16; /* auto */
 /* Enables displaying the current frames per second. */
 static const bool fps_show = false;

-/* Show frame count on FPS display */
-static const bool framecount_show = true;
+/* Enables displaying the current frame count. */
+static const bool framecount_show = false;
+
+/* Includes displaying the current memory usage/total with FPS/Frames. */
+static const bool memory_show = false;

 /* Enables use of rewind. This will incur some memory footprint
 * depending on the save state buffer. */
@@ -551,7 +602,13 @@ static const bool pause_nonactive = true;

 /* Saves non-volatile SRAM at a regular interval.
 * It is measured in seconds. A value of 0 disables autosave. */
+#if defined(__i386__) || defined(__i486__) || defined(__i686__) || defined(__x86_64__) || defined(_M_X64) || defined(_WIN32) || defined(OSX) || defined(ANDROID) || defined(IOS)
+/* Flush to file every 10 seconds on modern platforms by default */
+static const unsigned autosave_interval = 10;
+#else
+/* Default to disabled on I/O-constrained platforms */
 static const unsigned autosave_interval = 0;
+#endif

 /* Publicly announce netplay */
 static const bool netplay_public_announce = true;
@@ -634,6 +691,9 @@ static const uint16_t network_remote_base_port = 55400;
 /* Number of entries that will be kept in content history playlist file. */
 static const unsigned default_content_history_size = 100;

+/* File format to use when writing playlists to disk */
+static const bool playlist_use_old_format = false;
+
 /* Show Menu start-up screen on boot. */
 static const bool default_menu_show_start_screen = true;

@@ -654,6 +714,10 @@ static const unsigned libretro_log_level = 1;
 #define RARCH_DEFAULT_PORT 55435
 #endif

+#ifndef RARCH_STREAM_DEFAULT_PORT
+#define RARCH_STREAM_DEFAULT_PORT 56400
+#endif
+
 /* KEYBINDS, JOYPAD */

 /* Axis threshold (between 0.0 and 1.0)
@@ -686,8 +750,12 @@ static const unsigned menu_thumbnails_default = 3;

 static const unsigned menu_left_thumbnails_default = 0;

+static const unsigned menu_timedate_style = 5;
+
 static const bool xmb_vertical_thumbnails = false;

+static unsigned rgui_thumbnail_downscaler = RGUI_THUMB_SCALE_POINT;
+
 #ifdef IOS
 static const bool ui_companion_start_on_boot = false;
 #else
@@ -704,7 +772,7 @@ static const bool desktop_menu_enable = true;

 #if defined(__QNX__) || defined(_XBOX1) || defined(_XBOX360) || defined(__CELLOS_LV2__) || (defined(__MACH__) && defined(IOS)) || defined(ANDROID) || defined(WIIU) || defined(HAVE_NEON) || defined(GEKKO) || defined(__ARM_NEON__)
 static enum resampler_quality audio_resampler_quality_level = RESAMPLER_QUALITY_LOWER;
-#elif defined(PSP) || defined(_3DS) || defined(VITA)
+#elif defined(PSP) || defined(_3DS) || defined(VITA) || defined(PS2)
 static enum resampler_quality audio_resampler_quality_level = RESAMPLER_QUALITY_LOWEST;
 #else
 static enum resampler_quality audio_resampler_quality_level = RESAMPLER_QUALITY_NORMAL;
@@ -747,7 +815,23 @@ static char buildbot_server_url[] = "http://bot.libretro.com/nightly/apple/osx/x
 static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/apple/osx/ppc/latest/";
 #endif
 #elif defined(_WIN32) && !defined(_XBOX)
-#if _MSC_VER == 1600
+#if _MSC_VER >= 1910
+#ifndef __WINRT__
+#if defined(__x86_64__) || defined(_M_X64)
+static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows-msvc2017-desktop/x86_64/latest/";
+#elif defined(__i386__) || defined(__i486__) || defined(__i686__) || defined(_M_IX86) || defined(_M_IA64)
+static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows-msvc2017-desktop/x86/latest/";
+#endif
+#else
+#if defined(__x86_64__) || defined(_M_X64)
+static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows-msvc2017-uwp/x86_64/latest/";
+#elif defined(__i386__) || defined(__i486__) || defined(__i686__) || defined(_M_IX86) || defined(_M_IA64)
+static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows-msvc2017-uwp/x86/latest/";
+#elif  defined(__arm__) || defined(_M_ARM)
+static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows-msvc2017-uwp/arm/latest/";
+#endif
+#endif
+#elif _MSC_VER == 1600
 #if defined(__x86_64__) || defined(_M_X64)
 static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows-msvc2010/x86_64/latest/";
 #elif defined(__i386__) || defined(__i486__) || defined(__i686__) || defined(_M_IX86) || defined(_M_IA64)
@@ -776,6 +860,8 @@ static char buildbot_server_url[] = "";
 #endif
 #elif defined(WIIU)
 static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/nintendo/wiiu/latest/";
+#elif defined(HAVE_LIBNX)
+static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/nintendo/switch/libnx/latest/";
 #elif defined(__CELLOS_LV2__) && defined(DEX_BUILD)
 static char buildbot_server_url[] = "http://libretro.xbins.org/libretro/nightly/playstation/ps3/latest/dex-ps3/";
 #elif defined(__CELLOS_LV2__) && defined(CEX_BUILD)
@@ -788,4 +874,6 @@ static char buildbot_server_url[] = "";

 static char buildbot_assets_server_url[] = "http://buildbot.libretro.com/assets/";

+static char default_discord_app_id[] = "475456035851599874";
+
 #endif
@@ -75,7 +75,7 @@ static const struct retro_keybind retro_keybinds_1[] = {
   { true, RARCH_STATE_SLOT_PLUS,          MENU_ENUM_LABEL_VALUE_INPUT_META_STATE_SLOT_PLUS,      RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
   { true, RARCH_STATE_SLOT_MINUS,         MENU_ENUM_LABEL_VALUE_INPUT_META_STATE_SLOT_MINUS,     RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
   { true, RARCH_REWIND,                   MENU_ENUM_LABEL_VALUE_INPUT_META_REWIND,               RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_MOVIE_RECORD_TOGGLE,      MENU_ENUM_LABEL_VALUE_INPUT_META_MOVIE_RECORD_TOGGLE,  RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_BSV_RECORD_TOGGLE,        MENU_ENUM_LABEL_VALUE_INPUT_META_BSV_RECORD_TOGGLE,    RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
   { true, RARCH_PAUSE_TOGGLE,             MENU_ENUM_LABEL_VALUE_INPUT_META_PAUSE_TOGGLE,         RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
   { true, RARCH_FRAMEADVANCE,             MENU_ENUM_LABEL_VALUE_INPUT_META_FRAMEADVANCE,         RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
   { true, RARCH_RESET,                    MENU_ENUM_LABEL_VALUE_INPUT_META_RESET,                RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
@@ -87,6 +87,7 @@ static const struct retro_keybind retro_keybinds_1[] = {
   { true, RARCH_SCREENSHOT,               MENU_ENUM_LABEL_VALUE_INPUT_META_SCREENSHOT,           RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
   { true, RARCH_MUTE,                     MENU_ENUM_LABEL_VALUE_INPUT_META_MUTE,                 RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
   { true, RARCH_OSK,                      MENU_ENUM_LABEL_VALUE_INPUT_META_OSK,                  RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_FPS_TOGGLE,               MENU_ENUM_LABEL_VALUE_INPUT_META_FPS_TOGGLE,           RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
   { true, RARCH_NETPLAY_GAME_WATCH,       MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_GAME_WATCH,   RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
   { true, RARCH_ENABLE_HOTKEY,            MENU_ENUM_LABEL_VALUE_INPUT_META_ENABLE_HOTKEY,        RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
   { true, RARCH_VOLUME_UP,                MENU_ENUM_LABEL_VALUE_INPUT_META_VOLUME_UP,            RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
@@ -99,6 +100,8 @@ static const struct retro_keybind retro_keybinds_1[] = {
   { true, RARCH_GAME_FOCUS_TOGGLE,        MENU_ENUM_LABEL_VALUE_INPUT_META_GAME_FOCUS_TOGGLE,    RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
   { true, RARCH_UI_COMPANION_TOGGLE,      MENU_ENUM_LABEL_VALUE_INPUT_META_UI_COMPANION_TOGGLE,  RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
   { true, RARCH_MENU_TOGGLE,              MENU_ENUM_LABEL_VALUE_INPUT_META_MENU_TOGGLE,          RETROK_SPACE,   NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_RECORDING_TOGGLE,         MENU_ENUM_LABEL_VALUE_INPUT_META_RECORDING_TOGGLE,     RETROK_UNKNOWN,      NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_STREAMING_TOGGLE,         MENU_ENUM_LABEL_VALUE_INPUT_META_STREAMING_TOGGLE,     RETROK_UNKNOWN,      NO_BTN, NO_BTN, 0, AXIS_NONE },
 #else
   { true, RETRO_DEVICE_ID_JOYPAD_B,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_B,              RETROK_z,       NO_BTN, NO_BTN, 0, AXIS_NONE },
   { true, RETRO_DEVICE_ID_JOYPAD_Y,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_Y,              RETROK_a,       NO_BTN, NO_BTN, 0, AXIS_NONE },
@@ -151,7 +154,7 @@ static const struct retro_keybind retro_keybinds_1[] = {
   { true, RARCH_STATE_SLOT_PLUS,          MENU_ENUM_LABEL_VALUE_INPUT_META_STATE_SLOT_PLUS,      RETROK_F7,      NO_BTN, NO_BTN, 0, AXIS_NONE },
   { true, RARCH_STATE_SLOT_MINUS,         MENU_ENUM_LABEL_VALUE_INPUT_META_STATE_SLOT_MINUS,     RETROK_F6,      NO_BTN, NO_BTN, 0, AXIS_NONE },
   { true, RARCH_REWIND,                   MENU_ENUM_LABEL_VALUE_INPUT_META_REWIND,               RETROK_r,       NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_MOVIE_RECORD_TOGGLE,      MENU_ENUM_LABEL_VALUE_INPUT_META_MOVIE_RECORD_TOGGLE,  RETROK_o,       NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_BSV_RECORD_TOGGLE,        MENU_ENUM_LABEL_VALUE_INPUT_META_BSV_RECORD_TOGGLE,  RETROK_o,       NO_BTN, NO_BTN, 0, AXIS_NONE },
   { true, RARCH_PAUSE_TOGGLE,             MENU_ENUM_LABEL_VALUE_INPUT_META_PAUSE_TOGGLE,         RETROK_p,       NO_BTN, NO_BTN, 0, AXIS_NONE },
   { true, RARCH_FRAMEADVANCE,             MENU_ENUM_LABEL_VALUE_INPUT_META_FRAMEADVANCE,         RETROK_k,       NO_BTN, NO_BTN, 0, AXIS_NONE },
   { true, RARCH_RESET,                    MENU_ENUM_LABEL_VALUE_INPUT_META_RESET,                RETROK_h,       NO_BTN, NO_BTN, 0, AXIS_NONE },
@@ -163,6 +166,7 @@ static const struct retro_keybind retro_keybinds_1[] = {
   { true, RARCH_SCREENSHOT,               MENU_ENUM_LABEL_VALUE_INPUT_META_SCREENSHOT,           RETROK_F8,      NO_BTN, NO_BTN, 0, AXIS_NONE },
   { true, RARCH_MUTE,                     MENU_ENUM_LABEL_VALUE_INPUT_META_MUTE,                 RETROK_F9,      NO_BTN, NO_BTN, 0, AXIS_NONE },
   { true, RARCH_OSK,                      MENU_ENUM_LABEL_VALUE_INPUT_META_OSK,                  RETROK_F12,     NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_FPS_TOGGLE,               MENU_ENUM_LABEL_VALUE_INPUT_META_FPS_TOGGLE,           RETROK_F3,      NO_BTN, NO_BTN, 0, AXIS_NONE },
   { true, RARCH_NETPLAY_GAME_WATCH,       MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_GAME_WATCH,   RETROK_i,       NO_BTN, NO_BTN, 0, AXIS_NONE },
   { true, RARCH_ENABLE_HOTKEY,            MENU_ENUM_LABEL_VALUE_INPUT_META_ENABLE_HOTKEY,        RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
   { true, RARCH_VOLUME_UP,                MENU_ENUM_LABEL_VALUE_INPUT_META_VOLUME_UP,            RETROK_KP_PLUS, NO_BTN, NO_BTN, 0, AXIS_NONE },
@@ -175,6 +179,8 @@ static const struct retro_keybind retro_keybinds_1[] = {
   { true, RARCH_GAME_FOCUS_TOGGLE,        MENU_ENUM_LABEL_VALUE_INPUT_META_GAME_FOCUS_TOGGLE,    RETROK_SCROLLOCK,  NO_BTN, NO_BTN, 0, AXIS_NONE },
   { true, RARCH_UI_COMPANION_TOGGLE,      MENU_ENUM_LABEL_VALUE_INPUT_META_UI_COMPANION_TOGGLE,  RETROK_F5,      NO_BTN, NO_BTN, 0, AXIS_NONE },
   { true, RARCH_MENU_TOGGLE,              MENU_ENUM_LABEL_VALUE_INPUT_META_MENU_TOGGLE,          RETROK_F1,      NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_RECORDING_TOGGLE,         MENU_ENUM_LABEL_VALUE_INPUT_META_RECORDING_TOGGLE,     RETROK_UNKNOWN,      NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_STREAMING_TOGGLE,         MENU_ENUM_LABEL_VALUE_INPUT_META_STREAMING_TOGGLE,     RETROK_UNKNOWN,      NO_BTN, NO_BTN, 0, AXIS_NONE },
 #endif
 };

@@ -152,6 +152,12 @@ static const bool _coreaudio_supp = true;
 static const bool _coreaudio_supp = false;
 #endif

+#ifdef HAVE_COREAUDIO3
+static const bool _coreaudio3_supp = true;
+#else
+static const bool _coreaudio3_supp = false;
+#endif
+
 #if defined(HAVE_OSS) || defined(HAVE_OSS_BSD)
 static const bool _oss_supp = true;
 #else
@@ -290,6 +296,12 @@ static const bool _freetype_supp = true;
 static const bool _freetype_supp = false;
 #endif

+#ifdef HAVE_STB_FONT
+static const bool _stbfont_supp = true;
+#else
+static const bool _stbfont_supp = false;
+#endif
+
 #ifdef HAVE_NETWORKING
 static const bool _netplay_supp = true;
 #else
@@ -302,7 +314,7 @@ static const bool _python_supp = true;
 static const bool _python_supp = false;
 #endif

-#if defined(HAVE_COCOA) || defined(HAVE_COCOATOUCH)
+#if defined(HAVE_COCOA) || defined(HAVE_COCOATOUCH) || defined(HAVE_COCOA_METAL)
 static const bool _cocoa_supp = true;
 #else
 static const bool _cocoa_supp = false;
@@ -3,7 +3,7 @@
 *  Copyright (C) 2011-2017 - Daniel De Matteis
 *  Copyright (C) 2014-2017 - Jean-André Santoni
 *  Copyright (C) 2015-2017 - Andrés Suárez
- *  Copyright (C) 2016-2017 - Brad Parker
+ *  Copyright (C) 2016-2019 - Brad Parker
 *
 *  RetroArch is free software: you can redistribute it and/or modify it under the terms
 *  of the GNU General Public License as published by the Free Software Found-
@@ -50,10 +50,17 @@
 #include "verbosity.h"
 #include "lakka.h"

+#include "tasks/task_content.h"
 #include "tasks/tasks_internal.h"

 #include "../list_special.h"

+#include "record/record_driver.h"
+
+#if defined(__WINRT__) || defined(WINAPI_FAMILY) && WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP
+#include "uwp/uwp_func.h"
+#endif
+
 static const char* invalid_filename_chars[] = {
   /* https://support.microsoft.com/en-us/help/905231/information-about-the-characters-that-you-cannot-use-in-site-names--fo */
   "~", "#", "%", "&", "*", "{", "}", "\\", ":", "[", "]", "?", "/", "|", "\'", "\"",
@@ -146,6 +153,7 @@ enum video_driver_enum
   VIDEO_XENON360,
   VIDEO_PSP1,
   VIDEO_VITA2D,
+   VIDEO_PS2,
   VIDEO_CTR,
   VIDEO_SWITCH,
   VIDEO_D3D8,
@@ -183,12 +191,14 @@ enum audio_driver_enum
   AUDIO_DSOUND,
   AUDIO_WASAPI,
   AUDIO_COREAUDIO,
+   AUDIO_COREAUDIO3,
   AUDIO_PS3,
   AUDIO_XENON360,
   AUDIO_WII,
   AUDIO_WIIU,
   AUDIO_RWEBAUDIO,
   AUDIO_PSP,
+   AUDIO_PS2,
   AUDIO_CTR,
   AUDIO_SWITCH,
   AUDIO_NULL
@@ -210,14 +220,17 @@ enum input_driver_enum
   INPUT_X,
   INPUT_WAYLAND,
   INPUT_DINPUT,
+   INPUT_PS4,
   INPUT_PS3,
   INPUT_PSP,
+   INPUT_PS2,
   INPUT_CTR,
   INPUT_SWITCH,
   INPUT_XENON360,
   INPUT_WII,
   INPUT_WIIU,
   INPUT_XINPUT,
+   INPUT_UWP,
   INPUT_UDEV,
   INPUT_LINUXRAW,
   INPUT_COCOA,
@@ -234,7 +247,9 @@ enum joypad_driver_enum
   JOYPAD_GX,
   JOYPAD_WIIU,
   JOYPAD_XDK,
+   JOYPAD_PS4,
   JOYPAD_PSP,
+   JOYPAD_PS2,
   JOYPAD_CTR,
   JOYPAD_SWITCH,
   JOYPAD_DINPUT,
@@ -285,7 +300,7 @@ enum menu_driver_enum
   MENU_MATERIALUI,
   MENU_XMB,
   MENU_STRIPES,
-   MENU_NUKLEAR,
+   MENU_OZONE,
   MENU_NULL
 };

@@ -298,6 +313,7 @@ enum record_driver_enum
 enum midi_driver_enum
 {
   MIDI_WINMM               = RECORD_NULL + 1,
+   MIDI_ALSA,
   MIDI_NULL
 };

@@ -311,6 +327,13 @@ static enum video_driver_enum VIDEO_DEFAULT_DRIVER = VIDEO_WII;
 static enum video_driver_enum VIDEO_DEFAULT_DRIVER = VIDEO_WIIU;
 #elif defined(XENON)
 static enum video_driver_enum VIDEO_DEFAULT_DRIVER = VIDEO_XENON360;
+#elif defined(HAVE_D3D12) && false
+/* FIXME: DX12 performance on Xbox is horrible for some reason, so use d3d11 as default */
+static enum video_driver_enum VIDEO_DEFAULT_DRIVER = VIDEO_D3D12;
+#elif defined(HAVE_D3D11)
+static enum video_driver_enum VIDEO_DEFAULT_DRIVER = VIDEO_D3D11;
+#elif defined(HAVE_D3D10)
+static enum video_driver_enum VIDEO_DEFAULT_DRIVER = VIDEO_D3D10;
 #elif defined(HAVE_D3D9)
 static enum video_driver_enum VIDEO_DEFAULT_DRIVER = VIDEO_D3D9;
 #elif defined(HAVE_D3D8)
@@ -321,6 +344,8 @@ static enum video_driver_enum VIDEO_DEFAULT_DRIVER = VIDEO_VG;
 static enum video_driver_enum VIDEO_DEFAULT_DRIVER = VIDEO_VITA2D;
 #elif defined(PSP)
 static enum video_driver_enum VIDEO_DEFAULT_DRIVER = VIDEO_PSP1;
+#elif defined(PS2)
+static enum video_driver_enum VIDEO_DEFAULT_DRIVER = VIDEO_PS2;
 #elif defined(_3DS)
 static enum video_driver_enum VIDEO_DEFAULT_DRIVER = VIDEO_CTR;
 #elif defined(SWITCH)
@@ -349,8 +374,10 @@ static enum audio_driver_enum AUDIO_DEFAULT_DRIVER = AUDIO_XENON360;
 static enum audio_driver_enum AUDIO_DEFAULT_DRIVER = AUDIO_WII;
 #elif defined(WIIU)
 static enum audio_driver_enum AUDIO_DEFAULT_DRIVER = AUDIO_WIIU;
-#elif defined(PSP) || defined(VITA)
+#elif defined(PSP) || defined(VITA) || defined(ORBIS)
 static enum audio_driver_enum AUDIO_DEFAULT_DRIVER = AUDIO_PSP;
+#elif defined(PS2)
+static enum audio_driver_enum AUDIO_DEFAULT_DRIVER = AUDIO_PS2;
 #elif defined(_3DS)
 static enum audio_driver_enum AUDIO_DEFAULT_DRIVER = AUDIO_CTR;
 #elif defined(SWITCH)
@@ -367,6 +394,8 @@ static enum audio_driver_enum AUDIO_DEFAULT_DRIVER = AUDIO_TINYALSA;
 static enum audio_driver_enum AUDIO_DEFAULT_DRIVER = AUDIO_OSS;
 #elif defined(HAVE_JACK)
 static enum audio_driver_enum AUDIO_DEFAULT_DRIVER = AUDIO_JACK;
+#elif defined(HAVE_COREAUDIO3)
+static enum audio_driver_enum AUDIO_DEFAULT_DRIVER = AUDIO_COREAUDIO3;
 #elif defined(HAVE_COREAUDIO)
 static enum audio_driver_enum AUDIO_DEFAULT_DRIVER = AUDIO_COREAUDIO;
 #elif defined(HAVE_XAUDIO)
@@ -409,11 +438,15 @@ static enum record_driver_enum RECORD_DEFAULT_DRIVER = RECORD_NULL;

 #ifdef HAVE_WINMM
 static enum midi_driver_enum MIDI_DEFAULT_DRIVER = MIDI_WINMM;
+#elif defined HAVE_ALSA
+static enum midi_driver_enum MIDI_DEFAULT_DRIVER = MIDI_ALSA;
 #else
 static enum midi_driver_enum MIDI_DEFAULT_DRIVER = MIDI_NULL;
 #endif

-#if defined(XENON)
+#if defined(__WINRT__) || defined(WINAPI_FAMILY) && WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP
+static enum input_driver_enum INPUT_DEFAULT_DRIVER = INPUT_UWP;
+#elif defined(XENON)
 static enum input_driver_enum INPUT_DEFAULT_DRIVER = INPUT_XENON360;
 #elif defined(_XBOX360) || defined(_XBOX) || defined(HAVE_XINPUT2) || defined(HAVE_XINPUT_XBOX1)
 static enum input_driver_enum INPUT_DEFAULT_DRIVER = INPUT_XINPUT;
@@ -425,10 +458,14 @@ static enum input_driver_enum INPUT_DEFAULT_DRIVER = INPUT_SDL2;
 static enum input_driver_enum INPUT_DEFAULT_DRIVER = INPUT_RWEBINPUT;
 #elif defined(_WIN32)
 static enum input_driver_enum INPUT_DEFAULT_DRIVER = INPUT_DINPUT;
+#elif defined(ORBIS)
+static enum input_driver_enum INPUT_DEFAULT_DRIVER = INPUT_PS4;
 #elif defined(__CELLOS_LV2__)
 static enum input_driver_enum INPUT_DEFAULT_DRIVER = INPUT_PS3;
 #elif defined(PSP) || defined(VITA)
 static enum input_driver_enum INPUT_DEFAULT_DRIVER = INPUT_PSP;
+#elif defined(PS2)
+static enum input_driver_enum INPUT_DEFAULT_DRIVER = INPUT_PS2;
 #elif defined(_3DS)
 static enum input_driver_enum INPUT_DEFAULT_DRIVER = INPUT_CTR;
 #elif defined(SWITCH)
@@ -445,7 +482,7 @@ static enum input_driver_enum INPUT_DEFAULT_DRIVER = INPUT_UDEV;
 static enum input_driver_enum INPUT_DEFAULT_DRIVER = INPUT_LINUXRAW;
 #elif defined(HAVE_WAYLAND)
 static enum input_driver_enum INPUT_DEFAULT_DRIVER = INPUT_WAYLAND;
-#elif defined(HAVE_COCOA) || defined(HAVE_COCOATOUCH)
+#elif defined(HAVE_COCOA) || defined(HAVE_COCOATOUCH) || defined(HAVE_COCOA_METAL)
 static enum input_driver_enum INPUT_DEFAULT_DRIVER = INPUT_COCOA;
 #elif defined(__QNX__)
 static enum input_driver_enum INPUT_DEFAULT_DRIVER = INPUT_QNX;
@@ -469,8 +506,12 @@ static enum joypad_driver_enum JOYPAD_DEFAULT_DRIVER = JOYPAD_GX;
 static enum joypad_driver_enum JOYPAD_DEFAULT_DRIVER = JOYPAD_WIIU;
 #elif defined(_XBOX)
 static enum joypad_driver_enum JOYPAD_DEFAULT_DRIVER = JOYPAD_XDK;
+#elif defined(ORBIS)
+static enum joypad_driver_enum JOYPAD_DEFAULT_DRIVER = JOYPAD_PS4;
 #elif defined(PSP) || defined(VITA)
 static enum joypad_driver_enum JOYPAD_DEFAULT_DRIVER = JOYPAD_PSP;
+#elif defined(PS2)
+static enum joypad_driver_enum JOYPAD_DEFAULT_DRIVER = JOYPAD_PS2;
 #elif defined(_3DS)
 static enum joypad_driver_enum JOYPAD_DEFAULT_DRIVER = JOYPAD_CTR;
 #elif defined(SWITCH)
@@ -487,14 +528,14 @@ static enum joypad_driver_enum JOYPAD_DEFAULT_DRIVER = JOYPAD_ANDROID;
 static enum joypad_driver_enum JOYPAD_DEFAULT_DRIVER = JOYPAD_SDL;
 #elif defined(DJGPP)
 static enum joypad_driver_enum JOYPAD_DEFAULT_DRIVER = JOYPAD_DOS;
+#elif defined(IOS)
+static enum joypad_driver_enum JOYPAD_DEFAULT_DRIVER = JOYPAD_MFI;
 #elif defined(HAVE_HID)
 static enum joypad_driver_enum JOYPAD_DEFAULT_DRIVER = JOYPAD_HID;
 #elif defined(__QNX__)
 static enum joypad_driver_enum JOYPAD_DEFAULT_DRIVER = JOYPAD_QNX;
 #elif defined(EMSCRIPTEN)
 static enum joypad_driver_enum JOYPAD_DEFAULT_DRIVER = JOYPAD_RWEBPAD;
-#elif defined(IOS)
-static enum joypad_driver_enum JOYPAD_DEFAULT_DRIVER = JOYPAD_MFI;
 #else
 static enum joypad_driver_enum JOYPAD_DEFAULT_DRIVER = JOYPAD_NULL;
 #endif
@@ -505,7 +546,7 @@ static enum camera_driver_enum CAMERA_DEFAULT_DRIVER = CAMERA_V4L2;
 static enum camera_driver_enum CAMERA_DEFAULT_DRIVER = CAMERA_RWEBCAM;
 #elif defined(ANDROID)
 static enum camera_driver_enum CAMERA_DEFAULT_DRIVER = CAMERA_ANDROID;
-#elif defined(HAVE_AVFOUNDATION) && (defined(HAVE_COCOA) || defined(HAVE_COCOATOUCH))
+#elif defined(HAVE_AVFOUNDATION) && (defined(HAVE_COCOA) || defined(HAVE_COCOATOUCH) || defined(HAVE_COCOA_METAL))
 static enum camera_driver_enum CAMERA_DEFAULT_DRIVER = CAMERA_AVFOUNDATION;
 #else
 static enum camera_driver_enum CAMERA_DEFAULT_DRIVER = CAMERA_NULL;
@@ -519,16 +560,21 @@ static enum wifi_driver_enum WIFI_DEFAULT_DRIVER = WIFI_NULL;

 #if defined(ANDROID)
 static enum location_driver_enum LOCATION_DEFAULT_DRIVER = LOCATION_ANDROID;
-#elif defined(HAVE_CORELOCATION) && (defined(HAVE_COCOA) || defined(HAVE_COCOATOUCH))
+#elif defined(HAVE_CORELOCATION) && (defined(HAVE_COCOA) || defined(HAVE_COCOATOUCH) || defined(HAVE_COCOA_METAL))
 static enum location_driver_enum LOCATION_DEFAULT_DRIVER = LOCATION_CORELOCATION;
 #else
 static enum location_driver_enum LOCATION_DEFAULT_DRIVER = LOCATION_NULL;
 #endif

+#if defined(_3DS) && defined(HAVE_RGUI)
+static enum menu_driver_enum MENU_DEFAULT_DRIVER = MENU_RGUI;
+#else
 #if defined(HAVE_XUI)
 static enum menu_driver_enum MENU_DEFAULT_DRIVER = MENU_XUI;
 #elif defined(HAVE_MATERIALUI) && defined(RARCH_MOBILE)
 static enum menu_driver_enum MENU_DEFAULT_DRIVER = MENU_MATERIALUI;
+#elif defined(HAVE_OZONE) && (defined(HAVE_LIBNX) || TARGET_OS_TV) 
+static enum menu_driver_enum MENU_DEFAULT_DRIVER = MENU_OZONE;
 #elif defined(HAVE_XMB) && !defined(_XBOX)
 static enum menu_driver_enum MENU_DEFAULT_DRIVER = MENU_XMB;
 #elif defined(HAVE_RGUI)
@@ -536,7 +582,7 @@ static enum menu_driver_enum MENU_DEFAULT_DRIVER = MENU_RGUI;
 #else
 static enum menu_driver_enum MENU_DEFAULT_DRIVER = MENU_NULL;
 #endif
-
+#endif

 #define GENERAL_SETTING(key, configval, default_enable, default_setting, type, handle_setting) \
 { \
@@ -623,6 +669,8 @@ const char *config_get_default_audio(void)
         return "roar";
      case AUDIO_COREAUDIO:
         return "coreaudio";
+      case AUDIO_COREAUDIO3:
+         return "coreaudio3";
      case AUDIO_AL:
         return "openal";
      case AUDIO_SL:
@@ -650,13 +698,17 @@ const char *config_get_default_audio(void)
      case AUDIO_WIIU:
         return "AX";
      case AUDIO_PSP:
-#ifdef VITA
+#if defined(VITA)
         return "vita";
+#elif defined(ORBIS)
+         return "orbis";
 #else
         return "psp";
 #endif
+      case AUDIO_PS2:
+         return "ps2";
      case AUDIO_CTR:
-         return "csnd";
+         return "dsp";
      case AUDIO_SWITCH:
         return "switch";
      case AUDIO_RWEBAUDIO:
@@ -750,6 +802,8 @@ const char *config_get_default_video(void)
         return "d3d12";
      case VIDEO_PSP1:
         return "psp1";
+      case VIDEO_PS2:
+         return "ps2";
      case VIDEO_VITA2D:
         return "vita2d";
      case VIDEO_CTR:
@@ -802,6 +856,8 @@ const char *config_get_default_input(void)
   {
      case INPUT_ANDROID:
         return "android";
+      case INPUT_PS4:
+         return "ps4";
      case INPUT_PS3:
         return "ps3";
      case INPUT_PSP:
@@ -810,6 +866,8 @@ const char *config_get_default_input(void)
 #else
         return "psp";
 #endif
+      case INPUT_PS2:
+         return "ps2";
      case INPUT_CTR:
         return "ctr";
      case INPUT_SWITCH:
@@ -828,6 +886,8 @@ const char *config_get_default_input(void)
         return "xenon360";
      case INPUT_XINPUT:
         return "xinput";
+      case INPUT_UWP:
+         return "uwp";
      case INPUT_WII:
         return "gx";
      case INPUT_WIIU:
@@ -864,6 +924,8 @@ const char *config_get_default_joypad(void)

   switch (default_driver)
   {
+      case JOYPAD_PS4:
+         return "ps4";
      case JOYPAD_PS3:
         return "ps3";
      case JOYPAD_XINPUT:
@@ -880,6 +942,8 @@ const char *config_get_default_joypad(void)
 #else
         return "psp";
 #endif
+      case JOYPAD_PS2:
+         return "ps2";
      case JOYPAD_CTR:
         return "ctr";
      case JOYPAD_SWITCH:
@@ -915,7 +979,6 @@ const char *config_get_default_joypad(void)
   return "null";
 }

-
 /**
 * config_get_default_camera:
 *
@@ -1023,14 +1086,14 @@ const char *config_get_default_menu(void)
         return "rgui";
      case MENU_XUI:
         return "xui";
+      case MENU_OZONE:
+         return "ozone";
      case MENU_MATERIALUI:
         return "glui";
      case MENU_XMB:
         return "xmb";
      case MENU_STRIPES:
         return "stripes";
-      case MENU_NUKLEAR:
-         return "nuklear";
      case MENU_NULL:
         break;
   }
@@ -1047,6 +1110,8 @@ const char *config_get_default_midi(void)
   {
      case MIDI_WINMM:
         return "winmm";
+      case MIDI_ALSA:
+         return "alsa";
      case MIDI_NULL:
         break;
   }
@@ -1071,6 +1136,9 @@ static struct config_array_setting *populate_settings_array(settings_t *settings
   unsigned count                        = 0;
   struct config_array_setting  *tmp    = (struct config_array_setting*)calloc(1, (*size + 1) * sizeof(struct config_array_setting));

+   if (!tmp)
+      return NULL;
+
   /* Arrays */
   SETTING_ARRAY("playlist_names",           settings->arrays.playlist_names, false, NULL, true);
   SETTING_ARRAY("playlist_cores",           settings->arrays.playlist_cores, false, NULL, true);
@@ -1103,6 +1171,8 @@ static struct config_array_setting *populate_settings_array(settings_t *settings
   SETTING_ARRAY("midi_driver",              settings->arrays.midi_driver, false, NULL, true);
   SETTING_ARRAY("midi_input",               settings->arrays.midi_input, true, midi_input, true);
   SETTING_ARRAY("midi_output",              settings->arrays.midi_output, true, midi_output, true);
+   SETTING_ARRAY("youtube_stream_key",       settings->arrays.youtube_stream_key, true, NULL, true);
+   SETTING_ARRAY("discord_app_id",           settings->arrays.discord_app_id, true, default_discord_app_id, true);
   *size = count;

   return tmp;
@@ -1114,6 +1184,9 @@ static struct config_path_setting *populate_settings_path(settings_t *settings,
   global_t   *global                  = global_get_ptr();
   struct config_path_setting  *tmp    = (struct config_path_setting*)calloc(1, (*size + 1) * sizeof(struct config_path_setting));

+   if (!tmp)
+      return NULL;
+
   /* Paths */
 #ifdef HAVE_XMB
   SETTING_PATH("xmb_font",                   settings->paths.path_menu_xmb_font, false, NULL, true);
@@ -1145,6 +1218,8 @@ static struct config_path_setting *populate_settings_path(settings_t *settings,
 #ifdef HAVE_MENU
   SETTING_PATH("menu_wallpaper",
         settings->paths.path_menu_wallpaper, false, NULL, true);
+   SETTING_PATH("rgui_menu_theme_preset",
+         settings->paths.path_rgui_theme_preset, false, NULL, true);
 #endif
   SETTING_PATH("content_history_path",
         settings->paths.path_content_history, false, NULL, true);
@@ -1160,6 +1235,12 @@ static struct config_path_setting *populate_settings_path(settings_t *settings,
   SETTING_PATH("input_overlay",
         settings->paths.path_overlay, false, NULL, true);
 #endif
+   SETTING_PATH("video_record_config",
+         settings->paths.path_record_config, false, NULL, true);
+   SETTING_PATH("video_stream_config",
+         settings->paths.path_stream_config, false, NULL, true);
+   SETTING_PATH("video_stream_url",
+         settings->paths.path_stream_url, false, NULL, true);
   SETTING_PATH("video_font_path",
         settings->paths.path_font, false, NULL, true);
   SETTING_PATH("cursor_directory",
@@ -1234,6 +1315,7 @@ static struct config_bool_setting *populate_settings_bool(settings_t *settings,
   struct config_bool_setting  *tmp    = (struct config_bool_setting*)malloc((*size + 1) * sizeof(struct config_bool_setting));
   unsigned count                      = 0;

+   SETTING_BOOL("crt_switch_resolution_use_custom_refresh_rate", &settings->bools.crt_switch_custom_refresh_enable, true, false, false);
   SETTING_BOOL("automatically_add_content_to_playlist", &settings->bools.automatically_add_content_to_playlist, true, automatically_add_content_to_playlist, false);
   SETTING_BOOL("ui_companion_start_on_boot",    &settings->bools.ui_companion_start_on_boot, true, ui_companion_start_on_boot, false);
   SETTING_BOOL("ui_companion_enable",           &settings->bools.ui_companion_enable, true, ui_companion_enable, false);
@@ -1276,7 +1358,8 @@ static struct config_bool_setting *populate_settings_bool(settings_t *settings,
   SETTING_BOOL("builtin_imageviewer_enable",    &settings->bools.multimedia_builtin_imageviewer_enable, true, true, false);
   SETTING_BOOL("fps_show",                      &settings->bools.video_fps_show, true, false, false);
   SETTING_BOOL("statistics_show",               &settings->bools.video_statistics_show, true, false, false);
-   SETTING_BOOL("framecount_show",               &settings->bools.video_framecount_show, true, true, false);
+   SETTING_BOOL("framecount_show",               &settings->bools.video_framecount_show, true, false, false);
+   SETTING_BOOL("memory_show",                   &settings->bools.video_memory_show, true, false, false);
   SETTING_BOOL("ui_menubar_enable",             &settings->bools.ui_menubar_enable, true, true, false);
   SETTING_BOOL("suspend_screensaver_enable",    &settings->bools.ui_suspend_screensaver_enable, true, true, false);
   SETTING_BOOL("rewind_enable",                 &settings->bools.rewind_enable, true, rewind_enable, false);
@@ -1306,9 +1389,9 @@ static struct config_bool_setting *populate_settings_bool(settings_t *settings,
   SETTING_BOOL("video_fullscreen",              &settings->bools.video_fullscreen, true, fullscreen, false);
   SETTING_BOOL("bundle_assets_extract_enable",  &settings->bools.bundle_assets_extract_enable, true, bundle_assets_extract_enable, false);
   SETTING_BOOL("video_vsync",                   &settings->bools.video_vsync, true, vsync, false);
+   SETTING_BOOL("video_adaptive_vsync",          &settings->bools.video_adaptive_vsync, true, adaptive_vsync, false);
   SETTING_BOOL("video_hard_sync",               &settings->bools.video_hard_sync, true, hard_sync, false);
   SETTING_BOOL("video_black_frame_insertion",   &settings->bools.video_black_frame_insertion, true, black_frame_insertion, false);
-   SETTING_BOOL("crt_switch_resolution",  		 &settings->bools.crt_switch_resolution, true, crt_switch_resolution, false);
   SETTING_BOOL("video_disable_composition",     &settings->bools.video_disable_composition, true, disable_composition, false);
   SETTING_BOOL("pause_nonactive",               &settings->bools.pause_nonactive, true, pause_nonactive, false);
   SETTING_BOOL("video_gpu_screenshot",          &settings->bools.video_gpu_screenshot, true, gpu_screenshot, false);
@@ -1316,7 +1399,11 @@ static struct config_bool_setting *populate_settings_bool(settings_t *settings,
   SETTING_BOOL("keyboard_gamepad_enable",       &settings->bools.input_keyboard_gamepad_enable, true, true, false);
   SETTING_BOOL("core_set_supports_no_game_enable", &settings->bools.set_supports_no_game_enable, true, true, false);
   SETTING_BOOL("audio_enable",                  &settings->bools.audio_enable, true, audio_enable, false);
-   SETTING_BOOL("audio_enable_menu",             &settings->bools.audio_enable_menu, true, false, false);
+   SETTING_BOOL("audio_enable_menu",             &settings->bools.audio_enable_menu, true, audio_enable_menu, false);
+   SETTING_BOOL("audio_enable_menu_ok",          &settings->bools.audio_enable_menu_ok, true, audio_enable_menu_ok, false);
+   SETTING_BOOL("audio_enable_menu_cancel",      &settings->bools.audio_enable_menu_cancel, true, audio_enable_menu_cancel, false);
+   SETTING_BOOL("audio_enable_menu_notice",      &settings->bools.audio_enable_menu_notice, true, audio_enable_menu_notice, false);
+   SETTING_BOOL("audio_enable_menu_bgm",         &settings->bools.audio_enable_menu_bgm, true, audio_enable_menu_bgm, false);
   SETTING_BOOL("audio_mute_enable",             audio_get_bool_ptr(AUDIO_ACTION_MUTE_ENABLE), true, false, false);
   SETTING_BOOL("audio_mixer_mute_enable",       audio_get_bool_ptr(AUDIO_ACTION_MIXER_MUTE_ENABLE), true, false, false);
   SETTING_BOOL("location_allow",                &settings->bools.location_allow, true, false, false);
@@ -1334,11 +1421,11 @@ static struct config_bool_setting *populate_settings_bool(settings_t *settings,
 #ifdef GEKKO
   SETTING_BOOL("video_vfilter",                 &settings->bools.video_vfilter, true, video_vfilter, false);
 #endif
-#ifdef HAVE_MENU
-   SETTING_BOOL("menu_unified_controls",         &settings->bools.menu_unified_controls, true, false, false);
 #ifdef HAVE_THREADS
   SETTING_BOOL("threaded_data_runloop_enable",  &settings->bools.threaded_data_runloop_enable, true, threaded_data_runloop_enable, false);
 #endif
+#ifdef HAVE_MENU
+   SETTING_BOOL("menu_unified_controls",         &settings->bools.menu_unified_controls, true, false, false);
   SETTING_BOOL("menu_throttle_framerate",       &settings->bools.menu_throttle_framerate, true, true, false);
   SETTING_BOOL("menu_linear_filter",            &settings->bools.menu_linear_filter, true, true, false);
   SETTING_BOOL("menu_horizontal_animation",     &settings->bools.menu_horizontal_animation, true, true, false);
@@ -1350,10 +1437,16 @@ static struct config_bool_setting *populate_settings_bool(settings_t *settings,
   SETTING_BOOL("menu_battery_level_enable",     &settings->bools.menu_battery_level_enable, true, true, false);
   SETTING_BOOL("menu_core_enable",              &settings->bools.menu_core_enable, true, true, false);
   SETTING_BOOL("menu_dynamic_wallpaper_enable", &settings->bools.menu_dynamic_wallpaper_enable, true, false, false);
+   SETTING_BOOL("quick_menu_show_recording",      &settings->bools.quick_menu_show_recording, true, quick_menu_show_recording, false);
+   SETTING_BOOL("quick_menu_show_streaming",      &settings->bools.quick_menu_show_streaming, true, quick_menu_show_streaming, false);
+   SETTING_BOOL("quick_menu_show_save_load_state",      &settings->bools.quick_menu_show_save_load_state, true, quick_menu_show_save_load_state, false);
   SETTING_BOOL("quick_menu_show_take_screenshot",      &settings->bools.quick_menu_show_take_screenshot, true, quick_menu_show_take_screenshot, false);
   SETTING_BOOL("quick_menu_show_save_load_state",      &settings->bools.quick_menu_show_save_load_state, true, quick_menu_show_save_load_state, false);
   SETTING_BOOL("quick_menu_show_undo_save_load_state", &settings->bools.quick_menu_show_undo_save_load_state, true, quick_menu_show_undo_save_load_state, false);
   SETTING_BOOL("quick_menu_show_add_to_favorites",     &settings->bools.quick_menu_show_add_to_favorites, true, quick_menu_show_add_to_favorites, false);
+   SETTING_BOOL("quick_menu_show_start_recording",      &settings->bools.quick_menu_show_start_recording, true, quick_menu_show_start_recording, false);
+   SETTING_BOOL("quick_menu_show_start_streaming",      &settings->bools.quick_menu_show_start_streaming, true, quick_menu_show_start_streaming, false);
+   SETTING_BOOL("quick_menu_show_reset_core_association", &settings->bools.quick_menu_show_reset_core_association, true, quick_menu_show_reset_core_association, false);
   SETTING_BOOL("quick_menu_show_options",       &settings->bools.quick_menu_show_options, true, quick_menu_show_options, false);
   SETTING_BOOL("quick_menu_show_controls",      &settings->bools.quick_menu_show_controls, true, quick_menu_show_controls, false);
   SETTING_BOOL("quick_menu_show_cheats",        &settings->bools.quick_menu_show_cheats, true, quick_menu_show_cheats, false);
@@ -1363,6 +1456,7 @@ static struct config_bool_setting *populate_settings_bool(settings_t *settings,
   SETTING_BOOL("quick_menu_show_save_content_dir_overrides",  &settings->bools.quick_menu_show_save_content_dir_overrides, true, quick_menu_show_save_content_dir_overrides, false);
   SETTING_BOOL("quick_menu_show_information",   &settings->bools.quick_menu_show_information, true, quick_menu_show_information, false);
   SETTING_BOOL("kiosk_mode_enable",             &settings->bools.kiosk_mode_enable, true, kiosk_mode_enable, false);
+   SETTING_BOOL("menu_use_preferred_system_color_theme",         &settings->bools.menu_use_preferred_system_color_theme, true, menu_use_preferred_system_color_theme, false);
   SETTING_BOOL("content_show_settings",         &settings->bools.menu_content_show_settings, true, content_show_settings, false);
   SETTING_BOOL("content_show_favorites",        &settings->bools.menu_content_show_favorites, true, content_show_favorites, false);
 #ifdef HAVE_IMAGEVIEWER
@@ -1469,9 +1563,16 @@ static struct config_bool_setting *populate_settings_bool(settings_t *settings,

   SETTING_BOOL("video_msg_bgcolor_enable",      &settings->bools.video_msg_bgcolor_enable, true, message_bgcolor_enable, false);
   SETTING_BOOL("video_window_show_decorations", &settings->bools.video_window_show_decorations, true, window_decorations, false);
+   SETTING_BOOL("video_window_save_positions", &settings->bools.video_window_save_positions, true, false, false);

   SETTING_BOOL("sustained_performance_mode",    &settings->bools.sustained_performance_mode, true, sustained_performance_mode, false);

+#ifdef _3DS
+   SETTING_BOOL("video_3ds_lcd_bottom",          &settings->bools.video_3ds_lcd_bottom, true, video_3ds_lcd_bottom, false);
+#endif
+
+   SETTING_BOOL("playlist_use_old_format",       &settings->bools.playlist_use_old_format, true, playlist_use_old_format, false);
+
   *size = count;

   return tmp;
@@ -1482,8 +1583,12 @@ static struct config_float_setting *populate_settings_float(settings_t *settings
   unsigned count = 0;
   struct config_float_setting  *tmp      = (struct config_float_setting*)calloc(1, (*size + 1) * sizeof(struct config_float_setting));

+   if (!tmp)
+      return NULL;
+
   SETTING_FLOAT("video_aspect_ratio",       &settings->floats.video_aspect_ratio, true, aspect_ratio, false);
   SETTING_FLOAT("video_scale",              &settings->floats.video_scale, false, 0.0f, false);
+   SETTING_FLOAT("crt_video_refresh_rate",   &settings->floats.crt_video_refresh_rate, true, crt_refresh_rate, false);
   SETTING_FLOAT("video_refresh_rate",       &settings->floats.video_refresh_rate, true, refresh_rate, false);
   SETTING_FLOAT("audio_rate_control_delta", audio_get_float_ptr(AUDIO_ACTION_RATE_CONTROL_DELTA), true, rate_control_delta, false);
   SETTING_FLOAT("audio_max_timing_skew",    &settings->floats.audio_max_timing_skew, true, max_timing_skew, false);
@@ -1517,6 +1622,13 @@ static struct config_uint_setting *populate_settings_uint(settings_t *settings,
   unsigned count                     = 0;
   struct config_uint_setting  *tmp   = (struct config_uint_setting*)malloc((*size + 1) * sizeof(struct config_uint_setting));

+   if (!tmp)
+      return NULL;
+
+#ifdef HAVE_NETWORKING
+   SETTING_UINT("streaming_mode",  		         &settings->uints.streaming_mode, true, STREAMING_MODE_TWITCH, false);
+#endif
+   SETTING_UINT("crt_switch_resolution",  		&settings->uints.crt_switch_resolution, true, crt_switch_resolution, false);
   SETTING_UINT("input_bind_timeout",           &settings->uints.input_bind_timeout,     true, input_bind_timeout, false);
   SETTING_UINT("input_bind_hold",              &settings->uints.input_bind_hold,        true, input_bind_hold, false);
   SETTING_UINT("input_turbo_period",           &settings->uints.input_turbo_period,     true, turbo_period, false);
@@ -1535,8 +1647,6 @@ static struct config_uint_setting *populate_settings_uint(settings_t *settings,
   SETTING_UINT("video_monitor_index",          &settings->uints.video_monitor_index, true, monitor_index, false);
   SETTING_UINT("video_fullscreen_x",           &settings->uints.video_fullscreen_x,  true, fullscreen_x, false);
   SETTING_UINT("video_fullscreen_y",           &settings->uints.video_fullscreen_y,  true, fullscreen_y, false);
-   SETTING_UINT("video_window_x",               &settings->uints.video_window_x,  true, fullscreen_x, false);
-   SETTING_UINT("video_window_y",               &settings->uints.video_window_y,  true, fullscreen_y, false);
   SETTING_UINT("video_window_opacity",         &settings->uints.video_window_opacity, true, window_opacity, false);
 #ifdef HAVE_COMMAND
   SETTING_UINT("network_cmd_port",             &settings->uints.network_cmd_port,    true, network_cmd_port, false);
@@ -1550,6 +1660,19 @@ static struct config_uint_setting *populate_settings_uint(settings_t *settings,
 #ifdef HAVE_MENU
   SETTING_UINT("dpi_override_value",           &settings->uints.menu_dpi_override_value, true, menu_dpi_override_value, false);
   SETTING_UINT("menu_thumbnails",              &settings->uints.menu_thumbnails, true, menu_thumbnails_default, false);
+   SETTING_UINT("menu_timedate_style", &settings->uints.menu_timedate_style, true, menu_timedate_style, false);
+   SETTING_UINT("rgui_menu_color_theme",        &settings->uints.menu_rgui_color_theme, true, rgui_color_theme, false);
+   SETTING_UINT("rgui_thumbnail_downscaler",    &settings->uints.menu_rgui_thumbnail_downscaler, true, rgui_thumbnail_downscaler, false);
+#ifdef HAVE_LIBNX
+   SETTING_UINT("split_joycon_p1", &settings->uints.input_split_joycon[0], true, 0, false);
+   SETTING_UINT("split_joycon_p2", &settings->uints.input_split_joycon[1], true, 0, false);
+   SETTING_UINT("split_joycon_p3", &settings->uints.input_split_joycon[2], true, 0, false);
+   SETTING_UINT("split_joycon_p4", &settings->uints.input_split_joycon[3], true, 0, false);
+   SETTING_UINT("split_joycon_p5", &settings->uints.input_split_joycon[4], true, 0, false);
+   SETTING_UINT("split_joycon_p6", &settings->uints.input_split_joycon[5], true, 0, false);
+   SETTING_UINT("split_joycon_p7", &settings->uints.input_split_joycon[6], true, 0, false);
+   SETTING_UINT("split_joycon_p8", &settings->uints.input_split_joycon[7], true, 0, false);
+#endif
 #ifdef HAVE_XMB
   SETTING_UINT("menu_left_thumbnails",         &settings->uints.menu_left_thumbnails, true, menu_left_thumbnails_default, false);
   SETTING_UINT("xmb_alpha_factor",             &settings->uints.menu_xmb_alpha_factor, true, xmb_alpha_factor, false);
@@ -1563,6 +1686,9 @@ static struct config_uint_setting *populate_settings_uint(settings_t *settings,
 #endif
   SETTING_UINT("materialui_menu_color_theme",  &settings->uints.menu_materialui_color_theme, true, MATERIALUI_THEME_BLUE, false);
   SETTING_UINT("menu_shader_pipeline",         &settings->uints.menu_xmb_shader_pipeline, true, menu_shader_pipeline, false);
+#ifdef HAVE_OZONE
+   SETTING_UINT("ozone_menu_color_theme",       &settings->uints.menu_ozone_color_theme, true, 1, false);
+#endif
 #endif
   SETTING_UINT("audio_out_rate",               &settings->uints.audio_out_rate, true, out_rate, false);
   SETTING_UINT("custom_viewport_width",        &settings->video_viewport_custom.width, false, 0 /* TODO */, false);
@@ -1599,6 +1725,22 @@ static struct config_uint_setting *populate_settings_uint(settings_t *settings,

   SETTING_UINT("midi_volume",                  &settings->uints.midi_volume, true, midi_volume, false);

+   SETTING_UINT("video_stream_port",            &settings->uints.video_stream_port,    true, RARCH_STREAM_DEFAULT_PORT, false);
+   SETTING_UINT("video_record_quality",            &settings->uints.video_record_quality,    true, RECORD_CONFIG_TYPE_RECORDING_LOSSLESS_QUALITY, false);
+   SETTING_UINT("video_stream_quality",            &settings->uints.video_stream_quality,    true, RECORD_CONFIG_TYPE_STREAMING_LOW_QUALITY, false);
+   SETTING_UINT("video_record_scale_factor",            &settings->uints.video_record_scale_factor,    true, 1, false);
+   SETTING_UINT("video_stream_scale_factor",            &settings->uints.video_stream_scale_factor,    true, 1, false);
+   SETTING_UINT("video_windowed_position_x",            &settings->uints.window_position_x,    true, 0, false);
+   SETTING_UINT("video_windowed_position_y",            &settings->uints.window_position_y,    true, 0, false);
+   SETTING_UINT("video_windowed_position_width",            &settings->uints.window_position_width,    true, window_width, false);
+   SETTING_UINT("video_windowed_position_height",            &settings->uints.window_position_height,    true, window_height, false);
+
+   SETTING_UINT("video_record_threads",            &settings->uints.video_record_threads,    true, video_record_threads, false);
+
+#ifdef HAVE_LIBNX
+   SETTING_UINT("libnx_overclock",  &settings->uints.libnx_overclock, true, SWITCH_DEFAULT_CPU_PROFILE, false);
+#endif
+
   *size = count;

   return tmp;
@@ -1609,6 +1751,9 @@ static struct config_size_setting *populate_settings_size(settings_t *settings,
   unsigned count                     = 0;
   struct config_size_setting  *tmp   = (struct config_size_setting*)calloc((*size + 1), sizeof(struct config_size_setting));

+   if (!tmp)
+      return NULL;
+
   SETTING_SIZE("rewind_buffer_size",           &settings->sizes.rewind_buffer_size, true, rewind_buffer_size, false);

   *size = count;
@@ -1621,6 +1766,9 @@ static struct config_int_setting *populate_settings_int(settings_t *settings, in
   unsigned count                     = 0;
   struct config_int_setting  *tmp    = (struct config_int_setting*)calloc((*size + 1), sizeof(struct config_int_setting));

+   if (!tmp)
+      return NULL;
+
   SETTING_INT("state_slot",                   &settings->ints.state_slot, false, 0 /* TODO */, false);
 #ifdef HAVE_NETWORKING
   SETTING_INT("netplay_check_frames",         &settings->ints.netplay_check_frames, true, netplay_check_frames, false);
@@ -1629,6 +1777,7 @@ static struct config_int_setting *populate_settings_int(settings_t *settings, in
 #ifdef HAVE_WASAPI
   SETTING_INT("audio_wasapi_sh_buffer_length", &settings->ints.audio_wasapi_sh_buffer_length, true, wasapi_sh_buffer_length, false);
 #endif
+   SETTING_INT("crt_switch_center_adjust",      &settings->ints.crt_switch_center_adjust, false, 0 /* TODO */, false);

   *size = count;

@@ -1640,7 +1789,7 @@ static struct config_int_setting *populate_settings_int(settings_t *settings, in
 *
 * Set 'default' configuration values.
 **/
-static void config_set_defaults(void)
+void config_set_defaults(void)
 {
   unsigned i, j;
 #ifdef HAVE_MENU
@@ -1772,6 +1921,9 @@ static void config_set_defaults(void)
   *settings->paths.path_menu_xmb_font            = '\0';
 #endif

+   strlcpy(settings->arrays.discord_app_id,
+      default_discord_app_id,  sizeof(settings->arrays.discord_app_id));
+
 #ifdef HAVE_MATERIALUI
   if (g_defaults.menu.materialui.menu_color_theme_enable)
      settings->uints.menu_materialui_color_theme = g_defaults.menu.materialui.menu_color_theme;
@@ -1817,9 +1969,6 @@ static void config_set_defaults(void)
 #ifdef HAVE_MENU
   if (first_initialized)
      settings->bools.menu_show_start_screen   = default_menu_show_start_screen;
-   settings->uints.menu_entry_normal_color     = menu_entry_normal_color;
-   settings->uints.menu_entry_hover_color      = menu_entry_hover_color;
-   settings->uints.menu_title_color            = menu_title_color;
 #endif

 #ifdef HAVE_CHEEVOS
@@ -1853,7 +2002,11 @@ static void config_set_defaults(void)
   for (i = 0; i < MAX_USERS; i++)
   {
      settings->uints.input_joypad_map[i] = i;
+#ifdef SWITCH /* Switch prefered default dpad mode */
+      settings->uints.input_analog_dpad_mode[i] = ANALOG_DPAD_LSTICK;
+#else
      settings->uints.input_analog_dpad_mode[i] = ANALOG_DPAD_NONE;
+#endif
      input_config_set_device(i, RETRO_DEVICE_JOYPAD);
      settings->uints.input_mouse_index[i] = 0;
   }
@@ -1918,8 +2071,12 @@ static void config_set_defaults(void)
 #endif
   *settings->paths.path_cheat_database    = '\0';
   *settings->paths.path_menu_wallpaper    = '\0';
+   *settings->paths.path_rgui_theme_preset = '\0';
   *settings->paths.path_content_database  = '\0';
   *settings->paths.path_overlay           = '\0';
+   *settings->paths.path_record_config     = '\0';
+   *settings->paths.path_stream_config     = '\0';
+   *settings->paths.path_stream_url     = '\0';
   *settings->paths.path_softfilter_plugin = '\0';

   *settings->arrays.playlist_names = '\0';
@@ -2116,8 +2273,13 @@ static config_file_t *open_default_config_file(void)

   (void)path_size;

-#if defined(_WIN32) && !defined(_XBOX) && !defined(__WINRT__)
-   fill_pathname_application_path(app_path, path_size);
+#if defined(_WIN32) && !defined(_XBOX)
+#if defined(__WINRT__) || defined(WINAPI_FAMILY) && WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP
+   /* On UWP, the app install directory is not writable so use the writable LocalState dir instead */
+   fill_pathname_home_dir(app_path, path_size);
+#else
+   fill_pathname_application_dir(app_path, path_size);
+#endif
   fill_pathname_resolve_relative(conf_path, app_path,
         file_path_str(FILE_PATH_MAIN_CONFIG), path_size);

@@ -2141,7 +2303,6 @@ static config_file_t *open_default_config_file(void)
      /* Try to create a new config file. */
      conf = config_file_new(NULL);

-
      if (conf)
      {
         /* Since this is a clean config file, we can
@@ -2149,7 +2310,7 @@ static config_file_t *open_default_config_file(void)
         fill_pathname_resolve_relative(conf_path, app_path,
               file_path_str(FILE_PATH_MAIN_CONFIG), path_size);
         config_set_bool(conf, "config_save_on_exit", true);
-         saved = config_file_write(conf, conf_path);
+         saved = config_file_write(conf, conf_path, true);
      }

      if (!saved)
@@ -2185,7 +2346,7 @@ static config_file_t *open_default_config_file(void)
      if (conf)
      {
         config_set_bool(conf, "config_save_on_exit", true);
-         saved = config_file_write(conf, conf_path);
+         saved = config_file_write(conf, conf_path, true);
      }

      if (!saved)
@@ -2260,7 +2421,7 @@ static config_file_t *open_default_config_file(void)
         {
            /* Since this is a clean config file, we can safely use config_save_on_exit. */
            config_set_bool(conf, "config_save_on_exit", true);
-            saved = config_file_write(conf, conf_path);
+            saved = config_file_write(conf, conf_path, true);
         }

         if (!saved)
@@ -2302,6 +2463,36 @@ error:
   return NULL;
 }

+#if defined(HAVE_MENU) && defined(HAVE_RGUI)
+static bool check_menu_driver_compatibility(void)
+{
+   settings_t *settings = config_get_ptr();
+   char *video_driver   = settings->arrays.video_driver;
+   char *menu_driver    = settings->arrays.menu_driver;
+
+   if (string_is_equal  (menu_driver, "rgui") ||
+         string_is_equal(menu_driver, "null") ||
+         string_is_equal(video_driver, "null"))
+      return true;
+
+   /* TODO/FIXME - maintenance hazard */
+   if (string_is_equal(video_driver, "d3d9")   ||
+         string_is_equal(video_driver, "d3d10")  ||
+         string_is_equal(video_driver, "d3d11")  ||
+         string_is_equal(video_driver, "d3d12")  ||
+         string_is_equal(video_driver, "gdi")    ||
+         string_is_equal(video_driver, "gl")     ||
+         string_is_equal(video_driver, "gx2")    ||
+         string_is_equal(video_driver, "vulkan") ||
+         string_is_equal(video_driver, "metal")  ||
+         string_is_equal(video_driver, "ctr")    ||
+         string_is_equal(video_driver, "vita2d"))
+      return true;   
+
+   return false;
+}
+#endif
+
 static void read_keybinds_keyboard(config_file_t *conf, unsigned user,
      unsigned idx, struct retro_keybind *bind)
 {
@@ -2465,6 +2656,8 @@ static void config_file_dump_all(config_file_t *conf)
 }
 #endif

+/*
+ * This is no longer used, so comment out to silence warnings...
 #ifdef HAVE_MENU
 static void config_get_hex_base(config_file_t *conf,
      const char *key, unsigned *base)
@@ -2476,7 +2669,7 @@ static void config_get_hex_base(config_file_t *conf,
      *base = tmp;
 }
 #endif
-
+*/

 /**
 * config_load:
@@ -2552,11 +2745,11 @@ static bool config_load_file(const char *path, bool set_defaults,

      while (extra_path)
      {
-         bool ret = config_append_file(conf, extra_path);
+         bool result = config_append_file(conf, extra_path);

         RARCH_LOG("Config: appending config \"%s\"\n", extra_path);

-         if (!ret)
+         if (!result)
            RARCH_ERR("Config: failed to append config \"%s\"\n", extra_path);
         extra_path = strtok_r(NULL, "|", &save);
      }
@@ -2684,7 +2877,6 @@ static bool config_load_file(const char *path, bool set_defaults,
      CONFIG_GET_INT_BASE(conf, settings, uints.led_map[i], buf);
   }

-
   /* Hexadecimal settings  */

   if (config_get_hex(conf, "video_message_color", &msg_color))
@@ -2693,14 +2885,6 @@ static bool config_load_file(const char *path, bool set_defaults,
      settings->floats.video_msg_color_g = ((msg_color >>  8) & 0xff) / 255.0f;
      settings->floats.video_msg_color_b = ((msg_color >>  0) & 0xff) / 255.0f;
   }
-#ifdef HAVE_MENU
-   config_get_hex_base(conf, "menu_entry_normal_color",
-         &settings->uints.menu_entry_normal_color);
-   config_get_hex_base(conf, "menu_entry_hover_color",
-         &settings->uints.menu_entry_hover_color);
-   config_get_hex_base(conf, "menu_title_color",
-         &settings->uints.menu_title_color);
-#endif

   /* Float settings */
   for (i = 0; i < (unsigned)float_settings_size; i++)
@@ -2860,7 +3044,6 @@ static bool config_load_file(const char *path, bool set_defaults,
      }
   }

-
   if (!string_is_empty(settings->paths.directory_screenshot))
   {
      if (string_is_equal(settings->paths.directory_screenshot, "default"))
@@ -2890,6 +3073,8 @@ static bool config_load_file(const char *path, bool set_defaults,

   if (string_is_equal(settings->paths.path_menu_wallpaper, "default"))
      *settings->paths.path_menu_wallpaper = '\0';
+   if (string_is_equal(settings->paths.path_rgui_theme_preset, "default"))
+      *settings->paths.path_rgui_theme_preset = '\0';
   if (string_is_equal(settings->paths.directory_video_shader, "default"))
      *settings->paths.directory_video_shader = '\0';
   if (string_is_equal(settings->paths.directory_video_filter, "default"))
@@ -2927,7 +3112,6 @@ static bool config_load_file(const char *path, bool set_defaults,
   if (settings->floats.fastforward_ratio < 0.0f)
      configuration_set_float(settings, settings->floats.fastforward_ratio, 0.0f);

-
 #ifdef HAVE_LAKKA
   settings->bools.ssh_enable       = filestream_exists(LAKKA_SSH_PATH);
   settings->bools.samba_enable     = filestream_exists(LAKKA_SAMBA_PATH);
@@ -3007,11 +3191,22 @@ static bool config_load_file(const char *path, bool set_defaults,
      }
   }

+#if defined(HAVE_MENU) && defined(HAVE_RGUI)
+   if (!check_menu_driver_compatibility())
+      strlcpy(settings->arrays.menu_driver, "rgui", sizeof(settings->arrays.menu_driver));
+#endif
+
+#ifdef HAVE_LIBNX
+   // Apply initial clocks
+   extern void libnx_apply_overclock();
+   libnx_apply_overclock();
+#endif
+
   frontend_driver_set_sustained_performance_mode(settings->bools.sustained_performance_mode);
+   recording_driver_update_streaming_url();

   ret = true;

-
 end:
   if (conf)
      config_file_free(conf);
@@ -3322,7 +3517,6 @@ bool config_load_remap(void)
      malloc(PATH_MAX_LENGTH * sizeof(char));
   remap_directory[0] = core_path[0] = game_path[0] = '\0';

-
   strlcpy(remap_directory,
         settings->paths.directory_input_remapping,
         path_size);
@@ -3389,7 +3583,6 @@ bool config_load_remap(void)
      input_remapping_set_defaults(false);
   }

-
   /* Create a new config file from core_path */
   new_conf = config_file_new(core_path);

@@ -3615,8 +3808,6 @@ static void parse_config_file(void)
         path_get(RARCH_PATH_CONFIG));
 }

-
-
 static void save_keybind_key(config_file_t *conf, const char *prefix,
      const char *base, const struct retro_keybind *bind)
 {
@@ -3870,13 +4061,12 @@ static bool config_save_keybinds_file(const char *path)
   for (i = 0; i < MAX_USERS; i++)
      save_keybinds_user(conf, i);

-   ret = config_file_write(conf, path);
+   ret = config_file_write(conf, path, true);
   config_file_free(conf);
   return ret;
 }
 #endif

-
 /**
 * config_save_autoconf_profile:
 * @path            : Path that shall be written to.
@@ -3979,7 +4169,7 @@ bool config_save_autoconf_profile(const char *path, unsigned user)
            &input_config_binds[user][i], false, false);
   }

-   ret = config_file_write(conf, autoconf_file);
+   ret = config_file_write(conf, autoconf_file, false);

   config_file_free(conf);
   free(buf);
@@ -3994,7 +4184,6 @@ error:
   return false;
 }

-
 /**
 * config_save_file:
 * @path            : Path that shall be written to.
@@ -4185,15 +4374,6 @@ bool config_save_file(const char *path)

   /* Hexadecimal settings */
   config_set_hex(conf, "video_message_color", msg_color);
-#ifdef HAVE_MENU
-   config_set_hex(conf, "menu_entry_normal_color",
-         settings->uints.menu_entry_normal_color);
-   config_set_hex(conf, "menu_entry_hover_color",
-         settings->uints.menu_entry_hover_color);
-   config_set_hex(conf, "menu_title_color",
-         settings->uints.menu_title_color);
-#endif
-

   video_driver_save_settings(conf);

@@ -4221,7 +4401,7 @@ bool config_save_file(const char *path)
   for (i = 0; i < MAX_USERS; i++)
      save_keybinds_user(conf, i);

-   ret = config_file_write(conf, path);
+   ret = config_file_write(conf, path, true);
   config_file_free(conf);

   return ret;
@@ -4467,7 +4647,6 @@ bool config_save_overrides(int override_type)
            config_set_int(conf, cfg, overrides->uints.input_joypad_map[i]);
         }

-
         /* blacklist these since they are handled by remaps */
         /* to-do: add setting to control blacklisting
         if (settings->uints.input_libretro_device[i]
@@ -4493,17 +4672,17 @@ bool config_save_overrides(int override_type)
         case OVERRIDE_CORE:
            /* Create a new config file from core_path */
            RARCH_LOG ("[overrides] path %s\n", core_path);
-            ret = config_file_write(conf, core_path);
+            ret = config_file_write(conf, core_path, true);
            break;
         case OVERRIDE_GAME:
            /* Create a new config file from core_path */
            RARCH_LOG ("[overrides] path %s\n", game_path);
-            ret = config_file_write(conf, game_path);
+            ret = config_file_write(conf, game_path, true);
            break;
         case OVERRIDE_CONTENT_DIR:
            /* Create a new config file from content_path */
            RARCH_LOG ("[overrides] path %s\n", content_path);
-            ret = config_file_write(conf, content_path);
+            ret = config_file_write(conf, content_path, true);
            break;
         default:
            break;
@@ -4552,7 +4731,7 @@ bool config_save_overrides(int override_type)
 /* Replaces currently loaded configuration file with
 * another one. Will load a dummy core to flush state
 * properly. */
-bool config_replace(bool config_save_on_exit, char *path)
+bool config_replace(bool config_replace_save_on_exit, char *path)
 {
   content_ctx_info_t content_info = {0};

@@ -4564,7 +4743,7 @@ bool config_replace(bool config_save_on_exit, char *path)
   if (string_is_equal(path, path_get(RARCH_PATH_CONFIG)))
      return false;

-   if (config_save_on_exit && !path_is_empty(RARCH_PATH_CONFIG))
+   if (config_replace_save_on_exit && !path_is_empty(RARCH_PATH_CONFIG))
      config_save_file(path_get(RARCH_PATH_CONFIG));

   path_set(RARCH_PATH_CONFIG, path);
@@ -2,7 +2,7 @@
 *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
 *  Copyright (C) 2011-2016 - Daniel De Matteis
 *  Copyright (C) 2014-2016 - Jean-André Santoni
- *  Copyright (C) 2016 - Brad Parker
+ *  Copyright (C) 2016-2019 - Brad Parker
 *
 *  RetroArch is free software: you can redistribute it and/or modify it under the terms
 *  of the GNU General Public License as published by the Free Software Found-
@@ -25,7 +25,7 @@
 #include <retro_common_api.h>
 #include <retro_miscellaneous.h>

-#include "gfx/video_driver.h"
+#include "gfx/video_defines.h"
 #include "input/input_defines.h"
 #include "led/led_defines.h"

@@ -53,6 +53,13 @@
   var = newvar; \
 }

+enum crt_switch_type
+{
+   CRT_SWITCH_NONE = 0,
+   CRT_SWITCH_15KHZ,
+   CRT_SWITCH_31KHZ
+};
+
 enum override_type
 {
   OVERRIDE_NONE = 0,
@@ -73,6 +80,7 @@ typedef struct settings
      bool video_fullscreen;
      bool video_windowed_fullscreen;
      bool video_vsync;
+      bool video_adaptive_vsync;
      bool video_hard_sync;
      bool video_black_frame_insertion;
      bool video_vfilter;
@@ -95,12 +103,17 @@ typedef struct settings
      bool video_fps_show;
      bool video_statistics_show;
      bool video_framecount_show;
+      bool video_memory_show;
      bool video_msg_bgcolor_enable;
-      bool crt_switch_resolution;
+      bool video_3ds_lcd_bottom;

      /* Audio */
      bool audio_enable;
      bool audio_enable_menu;
+      bool audio_enable_menu_ok;
+      bool audio_enable_menu_cancel;
+      bool audio_enable_menu_notice;
+      bool audio_enable_menu_bgm;
      bool audio_sync;
      bool audio_rate_control;
      bool audio_wasapi_exclusive_mode;
@@ -168,11 +181,16 @@ typedef struct settings
      bool menu_content_show_history;
      bool menu_content_show_add;
      bool menu_content_show_playlists;
+      bool menu_use_preferred_system_color_theme;
+      bool menu_preferred_system_color_theme_set;
      bool menu_unified_controls;
      bool quick_menu_show_take_screenshot;
      bool quick_menu_show_save_load_state;
      bool quick_menu_show_undo_save_load_state;
      bool quick_menu_show_add_to_favorites;
+      bool quick_menu_show_start_recording;
+      bool quick_menu_show_start_streaming;
+      bool quick_menu_show_reset_core_association;
      bool quick_menu_show_options;
      bool quick_menu_show_controls;
      bool quick_menu_show_cheats;
@@ -181,8 +199,12 @@ typedef struct settings
      bool quick_menu_show_save_game_overrides;
      bool quick_menu_show_save_content_dir_overrides;
      bool quick_menu_show_information;
+      bool quick_menu_show_recording;
+      bool quick_menu_show_streaming;
      bool kiosk_mode_enable;

+      bool crt_switch_custom_refresh_enable;
+
      /* Netplay */
      bool netplay_public_announce;
      bool netplay_start_as_spectator;
@@ -279,8 +301,10 @@ typedef struct settings

      bool automatically_add_content_to_playlist;
      bool video_window_show_decorations;
+      bool video_window_save_positions;

      bool sustained_performance_mode;
+      bool playlist_use_old_format;
   } bools;

   struct
@@ -289,6 +313,7 @@ typedef struct settings
      float video_scale;
      float video_aspect_ratio;
      float video_refresh_rate;
+      float crt_video_refresh_rate;
      float video_font_size;
      float video_msg_pos_x;
      float video_msg_pos_y;
@@ -321,6 +346,7 @@ typedef struct settings
      int location_update_interval_distance;
      int state_slot;
      int audio_wasapi_sh_buffer_length;
+      int crt_switch_center_adjust;
   } ints;

   struct
@@ -356,9 +382,8 @@ typedef struct settings
      unsigned network_cmd_port;
      unsigned network_remote_base_port;
      unsigned keymapper_port;
-      unsigned video_window_x;
-      unsigned video_window_y;
      unsigned video_window_opacity;
+      unsigned crt_switch_resolution;
      unsigned crt_switch_resolution_super;
      unsigned video_monitor_index;
      unsigned video_fullscreen_x;
@@ -373,13 +398,18 @@ typedef struct settings
      unsigned video_msg_bgcolor_red;
      unsigned video_msg_bgcolor_green;
      unsigned video_msg_bgcolor_blue;
+      unsigned video_stream_port;
+      unsigned video_record_quality;
+      unsigned video_stream_quality;
+      unsigned video_record_scale_factor;
+      unsigned video_stream_scale_factor;

+      unsigned menu_timedate_style;
      unsigned menu_thumbnails;
      unsigned menu_left_thumbnails;
+      unsigned menu_rgui_thumbnail_downscaler;
      unsigned menu_dpi_override_value;
-      unsigned menu_entry_normal_color;
-      unsigned menu_entry_hover_color;
-      unsigned menu_title_color;
+      unsigned menu_rgui_color_theme;
      unsigned menu_xmb_layout;
      unsigned menu_xmb_shader_pipeline;
      unsigned menu_xmb_scale_factor;
@@ -387,6 +417,7 @@ typedef struct settings
      unsigned menu_xmb_theme;
      unsigned menu_xmb_color_theme;
      unsigned menu_materialui_color_theme;
+      unsigned menu_ozone_color_theme;
      unsigned menu_font_color_red;
      unsigned menu_font_color_green;
      unsigned menu_font_color_blue;
@@ -396,6 +427,7 @@ typedef struct settings

      unsigned input_overlay_show_physical_inputs_port;

+      unsigned input_split_joycon[MAX_USERS];
      unsigned input_joypad_map[MAX_USERS];
      unsigned input_device[MAX_USERS];
      unsigned input_mouse_index[MAX_USERS];
@@ -413,6 +445,16 @@ typedef struct settings
      unsigned run_ahead_frames;

      unsigned midi_volume;
+      unsigned streaming_mode;
+
+      unsigned window_position_x;
+      unsigned window_position_y;
+      unsigned window_position_width;
+      unsigned window_position_height;
+
+      unsigned video_record_threads;
+
+      unsigned libnx_overclock;
   } uints;

   struct
@@ -457,6 +499,11 @@ typedef struct settings

      char midi_input[32];
      char midi_output[32];
+
+      char youtube_stream_key[PATH_MAX_LENGTH];
+      char twitch_stream_key[PATH_MAX_LENGTH];
+
+      char discord_app_id[PATH_MAX_LENGTH];
   } arrays;

   struct
@@ -477,6 +524,9 @@ typedef struct settings
      char path_cheat_database[PATH_MAX_LENGTH];
      char path_content_database[PATH_MAX_LENGTH];
      char path_overlay[PATH_MAX_LENGTH];
+      char path_record_config[PATH_MAX_LENGTH];
+      char path_stream_config[PATH_MAX_LENGTH];
+      char path_stream_url[8192];
      char path_menu_wallpaper[PATH_MAX_LENGTH];
      char path_audio_dsp_plugin[PATH_MAX_LENGTH];
      char path_softfilter_plugin[PATH_MAX_LENGTH];
@@ -490,7 +540,7 @@ typedef struct settings
      char path_cheat_settings[PATH_MAX_LENGTH];
      char path_shader[PATH_MAX_LENGTH];
      char path_font[PATH_MAX_LENGTH];
-
+      char path_rgui_theme_preset[PATH_MAX_LENGTH];

      char directory_audio_filter[PATH_MAX_LENGTH];
      char directory_autoconfig[PATH_MAX_LENGTH];
@@ -513,6 +563,7 @@ typedef struct settings
      char directory_thumbnails[PATH_MAX_LENGTH];
      char directory_menu_config[PATH_MAX_LENGTH];
      char directory_menu_content[PATH_MAX_LENGTH];
+      char streaming_title[PATH_MAX_LENGTH];
   } paths;

   bool modified;
@@ -694,6 +745,8 @@ bool config_init(void);

 bool config_overlay_enable_default(void);

+void config_set_defaults(void);
+
 void config_free(void);

 settings_t *config_get_ptr(void);
@@ -4,6 +4,8 @@ PACKAGE_NAME=retroarch

 cat /dev/null > config.log

+. qb/qb.init.sh
+
 . qb/qb.system.sh

 . qb/qb.params.sh
@@ -11,3 +13,7 @@ cat /dev/null > config.log
 . qb/qb.comp.sh

 . qb/qb.libs.sh
+
+. qb/qb.moc.sh
+
+. qb/qb.make.sh
@@ -82,10 +82,13 @@ bool content_reset_savestate_backups(void);
 bool content_undo_load_buf_is_empty(void);
 bool content_undo_save_buf_is_empty(void);

-/* Clears the pending subsystem rom buffer*/
+/* Checks if launched from the commandline */
+bool content_launched_from_cli(void);
+
+/* Clears the pending subsystem rom buffer */
 bool content_is_subsystem_pending_load(void);

-/* Clears the pending subsystem rom buffer*/
+/* Clears the pending subsystem rom buffer */
 void content_clear_subsystem(void);

 /* Set the current subsystem*/
@@ -103,6 +106,12 @@ unsigned content_get_subsystem_rom_id(void);
 /* Set environment variables before a subsystem load */
 void content_set_subsystem_info(void);

+/* Get the path to the last selected subsystem rom */
+char* content_get_subsystem_rom(unsigned index);
+
+/* Sets the subsystem by name */
+bool content_set_subsystem_by_name(const char* subsystem_name);
+
 RETRO_END_DECLS

 #endif
@@ -65,6 +65,8 @@ typedef struct rarch_system_info
   const char *input_desc_btn[MAX_USERS][RARCH_FIRST_META_KEY];
   char valid_extensions[255];

+   bool supports_vfs;
+
   struct retro_disk_control_callback  disk_control_cb;
   struct retro_location_callback      location_cb;

@@ -43,6 +43,7 @@
 #include "verbosity.h"
 #include "gfx/video_driver.h"
 #include "audio/audio_driver.h"
+#include "tasks/tasks_internal.h"

 #ifdef HAVE_RUNAHEAD
 #include "runahead/copy_load_info.h"
@@ -133,7 +134,6 @@ bool core_set_default_callbacks(struct retro_callbacks *cbs)
   return true;
 }

-
 bool core_deinit(void *data)
 {
   struct retro_callbacks *cbs = (struct retro_callbacks*)data;
@@ -298,6 +298,7 @@ bool core_load_game(retro_ctx_load_content_info_t *load_info)
 #endif

   content_get_status(&contentless, &is_inited);
+   set_save_state_in_background(false);

   if (load_info && load_info->special)
      current_core.game_loaded = current_core.retro_load_game_special(
@@ -394,20 +395,23 @@ bool core_unload(void)
 {
   video_driver_set_cached_frame_ptr(NULL);

-   current_core.retro_deinit();
+   if (current_core.inited)
+      current_core.retro_deinit();
+
   return true;
 }

-
 bool core_unload_game(void)
 {
   video_driver_free_hw_context();

   video_driver_set_cached_frame_ptr(NULL);

-   current_core.retro_unload_game();
-
-   current_core.game_loaded = false;
+   if (current_core.game_loaded)
+   {
+      current_core.retro_unload_game();
+      current_core.game_loaded = false;
+   }

   audio_driver_stop();

@@ -32,6 +32,10 @@
 #include "core_info.h"
 #include "file_path_special.h"

+#if defined(__WINRT__) || defined(WINAPI_FAMILY) && WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP
+#include "uwp/uwp_func.h"
+#endif
+
 static const char *core_info_tmp_path               = NULL;
 static const struct string_list *core_info_tmp_list = NULL;
 static core_info_t *core_info_current               = NULL;
@@ -197,7 +201,7 @@ static bool core_info_list_iterate(
   if (!current_path)
      return false;

-   info_path_base             = (char*)malloc(PATH_MAX_LENGTH * sizeof(char));
+   info_path_base             = (char*)malloc(info_path_base_size);

   info_path_base[0] = '\0';

@@ -205,7 +209,7 @@ static bool core_info_list_iterate(
         current_path,
         info_path_base_size);

-#if defined(RARCH_MOBILE) || (defined(RARCH_CONSOLE) && !defined(PSP) && !defined(_3DS) && !defined(VITA) && !defined(HW_WUP))
+#if defined(RARCH_MOBILE) || (defined(RARCH_CONSOLE) && !defined(PSP) && !defined(_3DS) && !defined(VITA) && !defined(PS2) && !defined(HW_WUP))
   substr = strrchr(info_path_base, '_');
   if (substr)
      *substr = '\0';
@@ -226,17 +230,35 @@ static bool core_info_list_iterate(
 static core_info_list_t *core_info_list_new(const char *path,
      const char *libretro_info_dir,
      const char *exts,
-      bool show_hidden_files)
+      bool dir_show_hidden_files)
 {
   size_t i;
   core_info_t *core_info           = NULL;
   core_info_list_t *core_info_list = NULL;
   const char       *path_basedir   = libretro_info_dir;
-   struct string_list *contents     = dir_list_new(
-                                      path, exts,
-                                      false,
-                                      show_hidden_files,
-                                      false, false);
+   struct string_list *contents     = string_list_new();
+   bool                          ok = dir_list_append(contents, path, exts,
+         false, dir_show_hidden_files, false, false);
+
+#if defined(__WINRT__) || defined(WINAPI_FAMILY) && WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP
+   /* UWP: browse the optional packages for additional cores */
+   struct string_list *core_packages = string_list_new();
+   uwp_fill_installed_core_packages(core_packages);
+   for (i = 0; i < core_packages->size; i++)
+   {
+      dir_list_append(contents, core_packages->elems[i].data, exts,
+            false, dir_show_hidden_files, false, false);
+   }
+   string_list_free(core_packages);
+#else
+   /* Keep the old 'directory not found' behavior */
+   if (!ok)
+   {
+      string_list_free(contents);
+      contents = NULL;
+   }
+#endif
+
   if (!contents)
      return NULL;

@@ -430,12 +452,12 @@ static core_info_list_t *core_info_list_new(const char *path,
      core_info_list_resolve_all_firmware(core_info_list);
   }

-   dir_list_free(contents);
+   string_list_free(contents);
   return core_info_list;

 error:
   if (contents)
-      dir_list_free(contents);
+      string_list_free(contents);
   core_info_list_free(core_info_list);
   return NULL;
 }
@@ -550,7 +572,11 @@ static bool core_info_list_update_missing_firmware_internal(
   if (!info)
      return false;

-   path                   = (char*)malloc(PATH_MAX_LENGTH * sizeof(char));
+   path                   = (char*)malloc(path_size);
+
+   if (!path)
+      return false;
+
   path[0]                = '\0';

   for (i = 0; i < info->firmware_count; i++)
@@ -652,12 +678,12 @@ void core_info_deinit_list(void)
 }

 bool core_info_init_list(const char *path_info, const char *dir_cores,
-      const char *exts, bool show_hidden_files)
+      const char *exts, bool dir_show_hidden_files)
 {
   if (!(core_info_curr_list = core_info_list_new(dir_cores,
               !string_is_empty(path_info) ? path_info : dir_cores,
               exts,
-               show_hidden_files)))
+               dir_show_hidden_files)))
      return false;
   return true;
 }
@@ -773,13 +799,13 @@ void core_info_list_get_supported_cores(core_info_list_t *core_info_list,

 void core_info_get_name(const char *path, char *s, size_t len,
      const char *path_info, const char *dir_cores,
-      const char *exts, bool show_hidden_files)
+      const char *exts, bool dir_show_hidden_files)
 {
   size_t i;
   const char       *path_basedir   = !string_is_empty(path_info) ?
      path_info : dir_cores;
   struct string_list *contents     = dir_list_new(
-         dir_cores, exts, false, show_hidden_files, false, false);
+         dir_cores, exts, false, dir_show_hidden_files, false, false);
   if (!contents)
      return;