Qt: add fallback path for older versions

2026-11-08 17:28:49 -10:00 · 2018-09-17 23:12:08 -04:00
2606 changed files with 115116 additions and 506559 deletions
@@ -2,34 +2,34 @@
 - Only RetroArch bugs should be filed here. Not core bugs or game bugs
 - This is not a forum or a help section, this is strictly developer oriented

-## Description
-
-[Description of the bug]
-
-### Expected behavior
-
-[What you expected to happen]
-
-### Actual behavior
-
-[What is actually happening]
-
-### Steps to reproduce the bug
-
-1. [First step]
-2. [Second step]
-3. [and so on...]
-
-### Bisect Results
-
-[Try to bisect and tell us when this started happening]
-
-### Version/Commit
-You can find this information under Information/System Information
-
- RetroArch: [version/commit]
-
-### Environment information
+## Description
+
+[Description of the bug]
+
+### Expected behavior
+
+[What you expected to happen]
+
+### Actual behavior
+
+[What is actually happening]
+
+### Steps to reproduce the bug
+
+1. [First step]
+2. [Second step]
+3. [and so on...]
+
+### Bisect Results

+[Try to bisect and tell us when this started happening]
+
+### Version/Commit
+You can find this information under Information/System Information
+
+- RetroArch: [version/commit]
+
+### Environment information
+
 - OS: [The operating system you're running]
- Compiler: [In case you are running local builds]
+- Compiler: [In case you are running local builds]
@@ -4,6 +4,7 @@
 2. If you are sending several unrelated fixes or features, use a branch and a separate pull request for each
 3. If possible try squashing everything in a single commit. This is particularly beneficial in the case of feature merges since it allows easy bisecting when a problem arises

+
 ## Description

 [Description of the pull request, detail any issues you are fixing or any features you are implementing]
@@ -11,8 +11,6 @@
 .tmp
 .tmp.c
 .tmp.cxx
-.moc.h
-.moc.cpp
 config.log
 /.project
 /.externalToolBuilders/
@@ -55,6 +53,7 @@ DerivedData
 apple/tmp
 apple/*.mobileprovision
 apple/RetroArch_iOS.xcodeproj/project.xcworkspace/*
+menu/driverspzarch.c
 /Cg/
 /GL/
 /SDL/
@@ -62,6 +61,7 @@ apple/RetroArch_iOS.xcodeproj/project.xcworkspace/*
 /freetype2/
 /ft2build.h
 /iconv.h
+/libxml2/
 /phoenix/
 /python/
 /rsound.h
@@ -74,12 +74,6 @@ libretro-super
 run.sh
 convert_rumble.awk
 *~
-assets
-info
-content_image_history.lpl
-saves
-screenshots
-

 # Wii U
 *.depend
@@ -91,6 +85,7 @@ wiiu/wut/elf2rpl/elf2rpl
 /pkg/wiiu/rpx
 /wiiu-devel.properties

+
 # 3ds
 /.lst
 *.3dsx
@@ -124,6 +119,7 @@ wiiu/wut/elf2rpl/elf2rpl
 /media/libretrodb/

 pkg/apple/iOS/build/
+pkg/apple/iOS/modules/
 pkg/apple/build/
 ui/drivers/qt/moc_*
 ui/drivers/moc_*
@@ -167,17 +163,3 @@ retroarch_switch.lst
 retroarch_switch.nacp
 retroarch_switch.nro
 retroarch_switch.nso
-
-# PS2
-ps2/irx/*.c
-ps2/libcdvd/lib/
-
-# 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
@@ -4,104 +4,72 @@ language: generic
 matrix:
  include:
    - compiler: mingw-x86
-      addons: true
-      env: CROSS_COMPILE=i686-w64-mingw32- CFLAGS="-D_WIN32_WINNT=0x0501"
-    - compiler: mingw-x86
-      addons: true
-      env: C89_BUILD=1 CROSS_COMPILE=i686-w64-mingw32- CFLAGS="-D_WIN32_WINNT=0x0501"
-    - compiler: mingw-x86
-      addons: true
-      env: CXX_BUILD=1 CROSS_COMPILE=i686-w64-mingw32- CFLAGS="-D_WIN32_WINNT=0x0501"
-    - compiler: mingw-x64
-      addons: true
-      env: CROSS_COMPILE=x86_64-w64-mingw32- CFLAGS="-D_WIN32_WINNT=0x0501"
-    - compiler: mingw-x64
-      addons: true
-      env: C89_BUILD=1 CROSS_COMPILE=x86_64-w64-mingw32- CFLAGS="-D_WIN32_WINNT=0x0501"
-    - compiler: mingw-x64
-      addons: true
-      env: CXX_BUILD=1 CROSS_COMPILE=x86_64-w64-mingw32- CFLAGS="-D_WIN32_WINNT=0x0501"
-    - compiler: gcc
-      env: CC=gcc-8 CXX=g++-8
-    - compiler: gcc
-      env: C89_BUILD=1 CC=gcc-8 CXX=g++-8
-    - compiler: gcc
-      env: CXX_BUILD=1 CC=gcc-8 CXX=g++-8
-    - compiler: gcc
-      env: DISABLE_MENU=1 CC=gcc-8 CXX=g++-8
-    - compiler: clang
-      env: CC=clang-6.0 CXX=clang++-6.0
-    - compiler: clang
-      env: C89_BUILD=1 CC=clang-6.0 CXX=clang++-6.0
-    - compiler: clang
-      env: CXX_BUILD=1 CC=clang-6.0 CXX=clang++-6.0
-    - os: osx
-      osx_image: xcode8
+      addons:
+        apt:
+          packages:
+            - g++-mingw-w64-i686
+            - mingw-w64-i686-dev
      script:
-        - xcodebuild -target RetroArch -configuration Release -project pkg/apple/RetroArch.xcodeproj
-    - os: osx
-      osx_image: xcode10.1
+        - 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
+    - compiler: mingw-x64
+      addons:
+        apt:
+          packages:
+            - 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
+    - compiler: gcc
+    - 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
+    - os: osx
+      osx_image: xcode7.3
+      script:
+          - xcodebuild -target RetroArch -configuration Release -project pkg/apple/RetroArch.xcodeproj
+    - os: osx
+      osx_image: xcode9.3
+      script:
+        - cd ~/
        - brew install --force-bottle qt5
-        - xcodebuild -target RetroArchQt -configuration Release -project pkg/apple/RetroArch_Metal.xcodeproj
+        - git clone --depth=50 https://github.com/libretro/libretro-super
+        - cd libretro-super/travis
+        - ./build-retroarch-metal.sh
      deploy:
        skip_cleanup: true
        provider: script
-        script: bash travis_metal_deploy.sh
+        script: cd ../retroarch; bash travis_metal_deploy.sh
        on:
          branch: master

-before_install:
-  - |
-     if [ "$CC" = gcc-8 ]; then
-       # Install a more recent gcc than the default
-       sudo apt-get install -y g++-8
-     elif [ "$CC" = clang-6.0 ]; then
-       # Install a more recent clang than the default
-       sudo apt-get install -y libstdc++-7-dev
-       sudo apt-get install -y clang-6.0
-     elif [ "$CROSS_COMPILE" = i686-w64-mingw32- ]; then
-       sudo apt-get install -y g++-mingw-w64-i686
-       sudo apt-get install -y mingw-w64-i686-dev
-     elif [ "$CROSS_COMPILE" = x86_64-w64-mingw32- ]; then
-       sudo apt-get install -y g++-mingw-w64-x86-64
-       sudo apt-get install -y mingw-w64-x86-64-dev
-     fi
-
 script:
-  - |
-     if [ -n "$CROSS_COMPILE" ]; then
-       ARGS="$ARGS --disable-d3d8 --disable-d3d9 --disable-d3d10 --disable-d3d11 --disable-d3d12 --enable-builtinzlib"
-     fi
-  - |
-     if [ -n "$DISABLE_MENU" ]; then
-       ARGS="$ARGS --disable-menu"
-     fi
-  - ./configure $ARGS
-  - |
-     if [ -n "$C89_BUILD" ]; then
-       make C89_BUILD=1
-     elif [ -n "$CXX_BUILD" ]; then
-       make CXX_BUILD=1
-     else
-       make
-     fi
+  - ./configure
+  - make

 env:
  global:
-   - ARGS=""
   - MAKEFLAGS="-j2"
   - secure: "qc91ReC3OlzSh2gFaSH6TYzC2qIQvgA2AZff6J13eaH8xijAhuMzttZ0rMQJ0DWCIhPeUb0kIzVyaGoe4MwPALzpw1C1AznIWiZJ53HN+hWCOcS/af7YVPk6HPySnwqrS+Wv3AIIvIKFV2mxv21F/JbT/N+pArlRrp904Xj+KPo="
 addons:
  apt:
    packages:
-      - libsdl2-dev
+      - 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
      - libusb-1.0-0-dev
-      - qtbase5-dev
-      - qtdeclarative5-dev
-    sources:
-      - ubuntu-toolchain-r-test
-      - llvm-toolchain-trusty-6.0
  coverity_scan:
    project:
      name: "RetroArch"
@@ -1,155 +1,128 @@
 {
-   "configurations": [
-      {
-         "name": "Mac",
-         "includePath": [
-            "/usr/include",
-            "/usr/local/include",
-            "${workspaceRoot}",
-            "${workspaceRoot}/libretro-common/include"
-         ],
-         "defines": [],
-         "intelliSenseMode": "clang-x64",
-         "browse": {
-            "path": [
-               "/usr/include",
-               "/usr/local/include",
-               "${workspaceRoot}"
+    "configurations": [
+        {
+            "name": "Mac",
+            "includePath": [
+                "/usr/include",
+                "/usr/local/include",
+                "${workspaceRoot}",
+                "${workspaceRoot}/libretro-common/include"
            ],
-            "limitSymbolsToIncludedHeaders": true,
-            "databaseFilename": ""
-         },
-         "macFrameworkPath": [
-            "/System/Library/Frameworks",
-            "/Library/Frameworks"
-         ]
-      },
-      {
-         "name": "Linux",
-         "includePath": [
-            "/usr/include",
-            "/usr/local/include",
-            "${workspaceRoot}",
-            "${workspaceFolder}/libretro-common/include",
-            "${workspaceRoot}/libretro-common/include"
-         ],
-         "defines": [],
-         "intelliSenseMode": "clang-x64",
-         "browse": {
-            "path": [
-               "/usr/include",
-               "/usr/local/include",
-               "${workspaceRoot}"
+            "defines": [],
+            "intelliSenseMode": "clang-x64",
+            "browse": {
+                "path": [
+                    "/usr/include",
+                    "/usr/local/include",
+                    "${workspaceRoot}"
+                ],
+                "limitSymbolsToIncludedHeaders": true,
+                "databaseFilename": ""
+            },
+            "macFrameworkPath": [
+                "/System/Library/Frameworks",
+                "/Library/Frameworks"
+            ]
+        },
+        {
+            "name": "Linux",
+            "includePath": [
+                "/usr/include",
+                "/usr/local/include",
+                "${workspaceRoot}"
            ],
-            "limitSymbolsToIncludedHeaders": true,
-            "databaseFilename": ""
-         }
-      },
-      {
-         "name": "Win32",
-         "includePath": [
-            "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/um",
-            "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}",
-            "${workspaceFolder}/libretro-common/include"
-         ],
-         "defines": [
-            "_DEBUG",
-            "UNICODE"
-         ],
-         "intelliSenseMode": "msvc-x64",
-         "browse": {
-            "path": [
-               "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/um",
-               "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}"
+            "defines": [],
+            "intelliSenseMode": "clang-x64",
+            "browse": {
+                "path": [
+                    "/usr/include",
+                    "/usr/local/include",
+                    "${workspaceRoot}"
+                ],
+                "limitSymbolsToIncludedHeaders": true,
+                "databaseFilename": ""
+            }
+        },
+        {
+            "name": "Win32",
+            "includePath": [
+                "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/um",
+                "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}"
            ],
-            "limitSymbolsToIncludedHeaders": true,
-            "databaseFilename": ""
-         },
-         "cStandard": "c11",
-         "cppStandard": "c++17"
-      },
-      {
-         "name": "msys2-mingw32",
-         "includePath": [
-            "C:/msys64/mingw32/include",
-            "C:/msys64/mingw32/i686-w64-mingw32/include",
-            "${workspaceRoot}/libretro-common/include",
-            "${workspaceRoot}/include",
-            "${workspaceRoot}"
-         ],
-         "defines": [
-            "_DEBUG",
-            "UNICODE"
-         ],
-         "intelliSenseMode": "msvc-x64",
-         "browse": {
-            "path": [
-               "C:/msys64/mingw32/include",
-               "C:/msys64/mingw32/i686-w64-mingw32/include",
-               "${workspaceRoot}/libretro-common/include",
-               "${workspaceRoot}/include",
-               "${workspaceRoot}"
+            "defines": [
+                "_DEBUG",
+                "UNICODE"
            ],
-            "limitSymbolsToIncludedHeaders": true,
-            "databaseFilename": ""
-         }
-      },
-      {
-         "name": "msys2-mingw64",
-         "includePath": [
-            "C:/msys64/mingw64/include",
-            "C:/msys64/mingw64/x86_64-w64-mingw32/include",
-            "${workspaceRoot}/libretro-common/include",
-            "${workspaceRoot}/include",
-            "${workspaceRoot}"
-         ],
-         "defines": [
-            "_DEBUG",
-            "UNICODE"
-         ],
-         "intelliSenseMode": "msvc-x64",
-         "browse": {
-            "path": [
-               "C:/msys64/mingw64/include",
-               "C:/msys64/mingw64/x86_64-w64-mingw32/include",
-               "${workspaceRoot}/libretro-common/include",
-               "${workspaceRoot}/include",
-               "${workspaceRoot}"
+            "intelliSenseMode": "msvc-x64",
+            "browse": {
+                "path": [
+                    "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/um",
+                    "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}"
+                ],
+                "limitSymbolsToIncludedHeaders": true,
+                "databaseFilename": ""
+            },
+            "cStandard": "c11",
+            "cppStandard": "c++17"
+        },
+        {
+            "name": "msys2-mingw32",
+            "includePath": [
+                "C:/msys64/mingw32/include",
+                "C:/msys64/mingw32/i686-w64-mingw32/include",
+                "${workspaceRoot}/libretro-common/include",
+                "${workspaceRoot}/include",
+                "${workspaceRoot}"
            ],
-            "limitSymbolsToIncludedHeaders": true,
-            "databaseFilename": ""
-         }
-      },
-      {
-         "name": "Switch",
-         "includePath": [
-            "/opt/devkitpro/devkitA64/aarch64-none-elf/include",
-            "/opt/devkitpro/devkitA64/lib/gcc/aarch64-none-elf/8.3.0/include",
-            "/opt/devkitpro/libnx/include",
-            "/opt/devkitpro/portlibs/switch/include",
-            "/opt/devkitpro/portlibs/switch/include/freetype2",
-            "${workspaceFolder}/**"
-         ],
-         "defines": [
-            "_DEBUG",
-            "UNICODE",
-            "_UNICODE",
-            "__aarch64__",
-            "__SWITCH__",
-            "HAVE_LIBNX"
-         ],
-         "windowsSdkVersion": "10.0.17763.0",
-         "compilerPath": "/opt/devkitpro/devkitA64/bin/aarch64-none-elf-gcc",
-         "cStandard": "c11",
-         "cppStandard": "c++11",
-         "intelliSenseMode": "gcc-x64"
-      }
-   ],
-   "version": 4
+            "defines": [
+                "_DEBUG",
+                "UNICODE"
+            ],
+            "intelliSenseMode": "msvc-x64",
+            "browse": {
+                "path": [
+                    "C:/msys64/mingw32/include",
+                    "C:/msys64/mingw32/i686-w64-mingw32/include",
+                    "${workspaceRoot}/libretro-common/include",
+                    "${workspaceRoot}/include",
+                    "${workspaceRoot}"
+                ],
+                "limitSymbolsToIncludedHeaders": true,
+                "databaseFilename": ""
+            }
+        },
+        {
+            "name": "msys2-mingw64",
+            "includePath": [
+                "C:/msys64/mingw64/include",
+                "C:/msys64/mingw64/x86_64-w64-mingw32/include",
+                "${workspaceRoot}/libretro-common/include",
+                "${workspaceRoot}/include",
+                "${workspaceRoot}"
+            ],
+            "defines": [
+                "_DEBUG",
+                "UNICODE"
+            ],
+            "intelliSenseMode": "msvc-x64",
+            "browse": {
+                "path": [
+                    "C:/msys64/mingw64/include",
+                    "C:/msys64/mingw64/x86_64-w64-mingw32/include",
+                    "${workspaceRoot}/libretro-common/include",
+                    "${workspaceRoot}/include",
+                    "${workspaceRoot}"
+                ],
+                "limitSymbolsToIncludedHeaders": true,
+                "databaseFilename": ""
+            }
+        }
+    ],
+    "version": 4
 }
@@ -13,7 +13,7 @@
         "stopAtEntry": false,
         "cwd": "${workspaceFolder}",
         "environment": [],
-         "externalConsole": true,
+         "externalConsole": false,
         "MIMode": "gdb",
         "miDebuggerPath": "c:\\msys64\\mingw64\\bin\\gdb.exe",
         "setupCommands": [
@@ -24,7 +24,7 @@
             }
         ]
      },
-      {
+      { 
         "name": "(gdb) Attach",
         "type": "cppdbg",
         "request": "attach",
@@ -7,7 +7,6 @@
   "terminal.integrated.cursorBlinking": true,

   "editor.tabSize": 3,
-   "editor.detectIndentation": false,
   "editor.renderWhitespace": "all",
   "editor.insertSpaces": true,
   "files.associations": {
@@ -20,55 +19,7 @@
      "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",
-      "menu_widgets.h": "c",
-      "message_queue.h": "c",
-      "task_queue.h": "c",
-      "fifo_queue.h": "c",
-      "file_list.h": "c",
-      "strl.h": "c",
-      "configuration.h": "c",
-      "ozone_display.h": "c",
-      "verbosity.h": "c",
-      "retroarch.h": "c",
-      "menu_animation.h": "c",
-      "audio_driver.h": "c",
-      "netplay.h": "c",
-      "scaler.h": "c",
-      "deque": "c",
-      "vector": "c",
-      "xhash": "c",
-      "xiosbase": "c",
-      "xstring": "c",
-      "xtree": "c",
-      "xutility": "c",
-      "menu_input_dialog.h": "c",
-      "menu_filebrowser.h": "c",
-      "ozone_sidebar.h": "c",
-      "menu_thumbnail_path.h": "c",
-      "badges.h": "c"
+      "ios": "c"
   },
   "C_Cpp.dimInactiveRegions": false,
 }
@@ -4,49 +4,12 @@
   "version": "2.0.0",
   "tasks": [
      {
-         "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",
+         "taskName": "msys2-mingw64 build",
         "type": "shell",

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

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

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

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

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

         "group": {
@@ -1,96 +0,0 @@
-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,7 +25,6 @@ Amiga1200Gamer (amigagamer)
 Andre Leiradella (leiradel)
 Andrés (fr500)
 Anthony J. Bentley (bentley)
-Antonio Jose Ramos Marquez (psxdev)
 AridRayne
 Arto Vainiolehto (arakerlu)
 asako (asakous)
@@ -95,7 +94,6 @@ FIX94
 Flame Sage (chris062689)
 flyinghead
 Francisco José García García (frangarcj)
-Francisco Javier Trujillo Mata (fjtrujy)
 GameDragon2k
 Garrett Brown (garbear)
 gblues
@@ -143,7 +141,6 @@ JuanVCS
 Justin Jacobs (dorkster)
 Justin Weiss (justinweiss)
 Ken Rossato (rossato)
-Krzysztof Haładyn (krzys_h)
 kurumushi
 kwyxz
 l3iggs
@@ -1,253 +1,22 @@
-# 1.7.8 (future)
-
-# 1.7.7
- 3DS: Add unique IDs to prevent cores overwriting each other.
- 3DS: Fix screen tearing when running 50Hz content.
- ANDROID: We now target API level 26 (minimum is still API level 9).
- ANDROID: Add option to vibrate on touch (works in menu or overlay).
- ANDROID: Add device vibration option for cores that support rumble.
- ANDROID: Add gamepad vibration support for cores that support rumble.
- ANDROID: Allow stylus/pen to move mouse without pressing down.
- AUDIO: Avoid deadlocks in certain audio drivers when toggling menu sounds on.
- BLISS-BOX: Support PSX Jogcon (requires firmware 3.0).
- CHEEVOS: Fix crash when reading memory that is out of range.
- CHEEVOS: New Cheevos implementation enabled by default.
- CHEEVOS: Pop-up badges when an achievement is triggered.
- CRT: Dynamic super resolution support.
- DISCORD: Fix potential crash when username is empty and discord is disabled.
- DISCORD: Ask to join support for Linux.
- INPUT/ANDROID: Add "Input Block Timeout" option.
- COMMON: For platforms without HAVE_THREADS, don't automatically resume content when saving/loading states
- COMMON: Make playlist sorting optional and consistent.
- COMMON: Fix sorting of playlists with blank labels.
- COMMON: Fix content scanner creating false positive playlist entries that also have wrong label and crc32.
- COMMON: Add some MMX-optimized pixel conversion routines.
- COMMON: Fix typo preventing some SSE2-optimized pixel conversions from being used.
- COMMON: Add option to track how long content has been running over time.
- COMMON: Fix buffer overflows in system information.
- COMMON: Add option to change screen orientation via the windowing system (Android, Windows, X11).
- COMMON: Show CPU model name in log.
- COMMON: Add "Help -> Send Debug Info" option (and F10 hotkey) to send diagnostic info to the RetroArch team for help with problems.
- COMMON: Show GPU device name/version in log.
- COMMON: Add menu option to write log info to a file.
- COMMON: Add subsystem support for playlists. Subsystem info is automatically saved to the history playlist for easy relaunching.
- GL: Add new "gl1" OpenGL 1.1 compliant video driver for legacy GPUs and software renderers
- GL: Add a new "glcore" driver with slang support (requires GL 3.2+ or GLES3).
- GL: Draw OSD on top of overlay.
- GONG: Add savestate support.
- GONG: Add video refresh rate core options.
- GONG: Two player support via core option.
- GUI: Fix text alignment when using stb_unicode.
- GUI: Fix text display issues when using Japanese (and other unicode-dependent language) text with stb_unicode.
- GUI: Set language on first startup to the user's preferred OS language (Windows, *nix and Android).
- INPUT: Add (scaled radial) analog deadzone and sensitivity options.
- LIBRETRO: Add Turkish language support.
- LIBRETRO: Allow non-accelerated video to rotate the display.
- LOCALIZATION: Update Chinese (Simplified) translation.
- LOCALIZATION: Update Chinese (Traditional) translation.
- LOCALIZATION: Update Dutch translation.
- LOCALIZATION: Update French translation.
- LOCALIZATION: Update German translation.
- LOCALIZATION: Update Japanese translation.
- LOCALIZATION: Update Polish translation.
- LOCALIZATION: Update Russian translation.
- LOCALIZATION: Update Spanish translation.
- LOCALIZATION: Add new Turkish translation.
- MIDI: Fix startup crash in midi driver.
- MENU: Bugfix - you can no longer get stuck in Online Updater -> Update Core screen when toggling between ingame and menu.
- MENU: Selectively hide 'Take Screenshot' for video drivers that don't support taking screenshots.
- MENU: Framerate independent menu rendering. MaterialUI/Ozone/XMB/RGUI can now run at higher framerates.
- MENU: Thumbnails work in history list.
- MENU: Menu widgets.
- MENU: Add memory statistics support to more context drivers.
- MENU: Enable ozone driver for UWP builds.
- MENU: Add optional "looping" menu text ticker with configurable speed.
- MENU: Fix core video rendering when using ozone with GL cores that implement the scissor test.
- MENU: Add optional playlist sublabels (associated core + play time, where available).
- MENU: Dropdown list settings now apply immediately.
- MENU: Add setting to require pressing the "Exit RetroArch" hotkey twice to confirm.
- MENU: Now able to run at higher refresh rates than 60Hz.
- MENU: Enable "Add to Favorites" without loading a core.
- MENU: Allow core name to be hidden on history/favorites playlists.
- MENU: Populate crc32 and db_name fields when adding history/favourites playlist entries.
- MENU: Fix TTF files not showing in OSD/menu font selection screen.
- MENU: Fix audio/video filters not showing in file browser.
- MENU/MaterialUI: Add subsystem support.
- MENU/MaterialUI: Add currently selected entry in dropdown menus.
- MENU/OZONE: Add mouse support on entries (no sidebar yet).
- MENU/OZONE: Allow collapsing the sidebar.
- MENU/OZONE: Add thumbnail support.
- MENU/OZONE: Battery notifications.
- MENU/OZONE: Add wifi icon for network entries.
- MENU/QT/WIMP: Add git version and build date to Help->About window.
- MENU/QT/WIMP: Fix content loading via the file browser.
- MENU/QT/WIMP: Add new settings window to control all RetroArch settings.
- MENU/RGUI: Improve playlist titles.
- MENU/RGUI: Add option to hide associated cores in playlists.
- MENU/RGUI: Add internal upscaling option.
- MENU/RGUI: Add subsystem support.
- MENU/RGUI: Add menu sublabel support.
- MENU/RGUI: Re-enable "Load Core" option when content is loaded.
- MENU/RGUI: Add optional "Collections" entry to main menu.
- MENU/RGUI: Add "Lock Menu Aspect Ratio" option.
- MENU/RGUI: Add "full width" layout option.
- MENU/RGUI: Ensure menu color theme is applied immediately.
- MENU/RGUI: Fix "Lock Menu Aspect Ratio" option when using custom viewports.
- MENU/RGUI: Add widescreen support.
- MENU/RGUI: Allow text to be centred when selecting widescreen layouts.
- MENU/RGUI: Add inline playlist thumbnail support.
- MENU/RGUI: Add optional shadow effects.
- MENU/RGUI: Performance optimizations.
- MENU/RGUI: Add optional extended ASCII support.
- MENU/RGUI: Add optional delay when loading thumbnails.
- MENU/RGUI: Add on-screen keyboard.
- MENU/RGUI: Battery notifications.
- MENU/XMB: Prevent crashes when resizing to a tiny window.
- MENU/XMB: XMB honors the 'show menu sublabels' setting now - was previously RGUI only
- NETPLAY: Fix stall-out causing total disconnection with >2 players.
- NETPLAY: Different (more intuitive?) default netplay share policy.
- NETPLAY: Add hotkey option to toggle hosting on/off.
- NETWORKING: Encode URLs to allow for spaces in directory names.
- OSX: Prevent crash on exit.
- OSX: Metal is now the default video driver for the RetroArch Metal build.
- OSX: Enable CoreAudio v3 driver for Metal.
- OSX/MACOS/IOS: Now uses the STB Unicode font driver.
- PS2: CDFS support.
- PS2: Implemented analog support for ps2 controllers.
- PS2: Fix audio freeze after restarting core.
- PS2: Fix issues with load state and the font driver.
- PS2: File I/O now works for USB and network host.
- PS2: Support cores with extra padding in their frame buffers.
- SCANNER: New option 'Scan without core match'. When this is enabled,
-supported extensions by all installed cores are not checked, and instead
-it will add all content it finds to a playlist. This way, you can install the core you need later on after scanning. Not enabled by default.
- SHADERS: Don't alphabetize shader presets.
- SWITCH: Add rumble support.
- SWITCH: Add USB keyboard support.
- VITA: Add bluetooth mouse and keyboard support.
- VULKAN: Fix color issues with RGBA8888 swapchains in readback (screenshots).
- WII: Don't init overlay when RAM is beyond 72MB.
- WII: Skip CRC calculation on content load, can improve load times of larger games by several seconds.
- WINDOWS: Fall back to gl1 driver if accelerated GPU driver is unavailable.
- WINDOWS: Allow winraw and xinput to work without dinput (needed for WinRT).
- WINDOWS: Add MSVC2017 ARM desktop support.
- UWP: Fix rewind by opting for slower codepath.
- UWP: Fix relative path name issues when loading shaders.
- UWP: Optimizations for VFS system.
-
-# 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
+# 1.7.5 (future)
 - 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.
+- CHEEVOS: Support headerless NES hashing.
 - 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.
@@ -1,58 +1,58 @@
-# Contributing to RetroArch
-
-If you are a developer and want to contribute to the development of RetroArch, please read this.
-If you have found a bug and want to submit a minor patch or a bug report, please read this as well.
-
-# Submitting a bug report
-When submitting a bug report, make sure that the bug is local to RetroArch.
-A bug in a libretro core or something deemed to be external is likely to be closed very fast.
-If you still suspect a bug in RetroArch, make sure to test with several cores to make sure.
-
-If you have troubles building RetroArch on Linux/BSD/OSX, make sure to paste shell output of ./configure,
-as well as config.log and shell output of make. If building on Windows, just paste shell output of make.
-
-If the issue occurs during runtime, make sure to paste RetroArch's verbose log.
-If using Phoenix frontend, you can find log in (File -> Show Log) after running.
-In console, make sure to run with verbose (-v) flag.
-
-# Pull Requests
-Outside contributions are generally only accepted in the form of a pull request. The process is very simple.
-Fork RetroArch, make your changes, and issue a pull request on GitHub. This can all be done within the browser.
-The changes are reviewed, and might be merged in. If the pull request isn't acceptable at the time,
-note that it's possible to continue pushing up commits to your branch.
-
-If you want to develop a larger feature,
-we'd like to discuss this first (ideally on IRC) so that you don't risk developing something
-that won't be merged. A pull request with a proof-of-concept is fine, but please indicate so.
-
-## libretro API
-If you wish to add functionality to libretro's API, it can take some time to merge in, because changes
-to libretro API will affect other projects as well, and we highly value API/ABI stability.
-Features will only be added when deemed *necessary* for a concrete libretro core to function properly.
-Features will not be added on basis of hypothetical libretro implementations.
-
-# Coding style
-Having a consistent code style throughout the code base is highly valued.
-Please look through the code to get a feel for the coding style.
-A pull request may be asked to fix the coding style before submission.
-In other cases, a pull request may be followed up with a "style nit commit".
-
-## Non-obvious things:
-  - Code should be both ISO C99 and ISO C++ compatible. This dual requirement is for XBox360 and MSVC in general. Think of it as a C++ compatible subset of C99.
-  - Warnings are not allowed (-Wall). Make sure your code is warning-free. Note that warning sensitivity differs a bit across compiler versions.
-  - Using deprecated APIs is discouraged.
-
-# Copyright Headers and AUTHORS
-If you have contributed to a part of a source file (a chunk of code that's written by you),
-you should add yourself to the copyright header in that file.
-If you have contributed significantly
-(a feature, a contribution you can "name", e.g. "Added audio driver foo"), you should add yourself to AUTHORS file.
-We'd like your full name and email, and which features you have been part of.
-
-# IRC
-Active development happens on IRC. (#retroarch @ irc.freenode.org)
-We value discussing things in "real-time".
-
-# Commit Access
-Contributors who show a track record of making good pull requests over time will eventually get commit access to the repo.
+# Contributing to RetroArch
+
+If you are a developer and want to contribute to the development of RetroArch, please read this.
+If you have found a bug and want to submit a minor patch or a bug report, please read this as well.
+
+# Submitting a bug report
+When submitting a bug report, make sure that the bug is local to RetroArch.
+A bug in a libretro core or something deemed to be external is likely to be closed very fast.
+If you still suspect a bug in RetroArch, make sure to test with several cores to make sure.
+
+If you have troubles building RetroArch on Linux/BSD/OSX, make sure to paste shell output of ./configure,
+as well as config.log and shell output of make. If building on Windows, just paste shell output of make.
+
+If the issue occurs during runtime, make sure to paste RetroArch's verbose log.
+If using Phoenix frontend, you can find log in (File -> Show Log) after running.
+In console, make sure to run with verbose (-v) flag.
+
+# Pull Requests
+Outside contributions are generally only accepted in the form of a pull request. The process is very simple.
+Fork RetroArch, make your changes, and issue a pull request on GitHub. This can all be done within the browser.
+The changes are reviewed, and might be merged in. If the pull request isn't acceptable at the time,
+note that it's possible to continue pushing up commits to your branch.
+
+If you want to develop a larger feature,
+we'd like to discuss this first (ideally on IRC) so that you don't risk developing something
+that won't be merged. A pull request with a proof-of-concept is fine, but please indicate so.
+
+## libretro API
+If you wish to add functionality to libretro's API, it can take some time to merge in, because changes
+to libretro API will affect other projects as well, and we highly value API/ABI stability.
+Features will only be added when deemed *necessary* for a concrete libretro core to function properly.
+Features will not be added on basis of hypothetical libretro implementations.
+
+# Coding style
+Having a consistent code style throughout the code base is highly valued.
+Please look through the code to get a feel for the coding style.
+A pull request may be asked to fix the coding style before submission.
+In other cases, a pull request may be followed up with a "style nit commit".
+
+## Non-obvious things:
+  - Code should be both ISO C99 and ISO C++ compatible. This dual requirement is for XBox360 and MSVC in general. Think of it as a C++ compatible subset of C99.
+  - Warnings are not allowed (-Wall). Make sure your code is warning-free. Note that warning sensitivity differs a bit across compiler versions.
+  - Using deprecated APIs is discouraged.
+
+# Copyright Headers and AUTHORS
+If you have contributed to a part of a source file (a chunk of code that's written by you),
+you should add yourself to the copyright header in that file.
+If you have contributed significantly
+(a feature, a contribution you can "name", e.g. "Added audio driver foo"), you should add yourself to AUTHORS file.
+We'd like your full name and email, and which features you have been part of.
+
+# IRC
+Active development happens on IRC. (#retroarch @ irc.freenode.org)
+We value discussing things in "real-time".
+
+# Commit Access
+Contributors who show a track record of making good pull requests over time will eventually get commit access to the repo.
 This typically happens when the "overhead" of looking through pull requests over time becomes a burden.
@@ -16,36 +16,26 @@ 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)),)
-   DEF_FLAGS += -DBSD
+   CFLAGS += -DBSD
   LDFLAGS += -L/usr/local/lib
-   UDEV_CFLAGS += -I/usr/local/include/libepoll-shim
-   UDEV_LIBS += -lepoll-shim
 endif

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

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

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

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

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

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

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

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

@@ -251,18 +243,12 @@ 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 && test $(HAVE_ASSETS); then \
+	@if test -d media/assets; then \
 		echo "Installing media 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; \
+		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; \
 		cp media/assets/COPYING $(DESTDIR)$(DOC_DIR)/COPYING.assets; \
 		echo "Asset copying done."; \
 	fi
@@ -19,6 +19,6 @@ $(foreach x,$(join $(addsuffix :,$(MOC_SRC)),$(MOC_HEADERS)),$(eval $x))

 generate: $(MOC_SRC)
 	@echo $(MOC_SRC)
-
+	
 print-%:
-	@echo '$*=$($*)'
+	@echo '$*=$($*)'
@@ -1,93 +0,0 @@
-# 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-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)
-CLASSIC_MODS_NAME := RetroArch v$(RARCH_VERSION) (Official Optimised)
-CLASSIC_VERSION := $(RARCH_VERSION)
-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
-
-# 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:
-	#Build the RetroArch Binary for cross platform classics (ARMv7 Cortex A7)
-	patchelf --version #Check if you have patchelf installed... (sudo apt-get install patchelf)
-	CFLAGS="-marm -mtune=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard" ./configure --host=arm-linux-gnueabihf --enable-mali_fbdev --disable-freetype --enable-opengles --enable-udev --enable-alsa --enable-neon --enable-floathard --disable-discord
-	make 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
-
-	@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
-
@@ -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 -DRC_DISABLE_LUA -DHAVE_SOCKET_LEGACY -DHAVE_THREADS
-	#-DHAVE_SSL -DHAVE_BUILTINMBEDTLS -DMBEDTLS_SSL_DEBUG_ALL
+	DEFINES += -DHAVE_NETWORKING -DHAVE_CHEEVOS -DHAVE_SOCKET_LEGACY -DHAVE_THREADS
+	#-DHAVE_SSL -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,25 +62,23 @@ 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_BUILTINMBEDTLS = 1
+	HAVE_NETWORKING = 1
+	HAVE_CHEEVOS = 1
+	HAVE_SOCKET_LEGACY = 1
+	HAVE_THREADS = 1
+	HAVE_SSL = 1

 	include Makefile.common
-	CFLAGS += $(DEF_FLAGS)
 	BLACKLIST :=
 	BLACKLIST += input/input_overlay.o
 	BLACKLIST += tasks/task_overlay.o
@@ -106,6 +104,7 @@ 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 \
@@ -131,12 +130,7 @@ 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)
@@ -148,6 +142,7 @@ 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)
@@ -156,6 +151,7 @@ else
 	LIBS	+= -lctru
 endif

+
 ifeq ($(BUILD_3DSX), 1)
 	TARGET_3DSX := $(TARGET).3dsx $(TARGET).smdh
 endif
@@ -265,6 +261,7 @@ $(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
@@ -278,3 +275,5 @@ clean:
 	rm -f ctr/3dsx_custom_crt0.o

 .PHONY: clean
+
+
@@ -27,7 +27,6 @@ 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 \
@@ -40,7 +39,7 @@ OBJ := ctr/ctr_system.o \
 		 libretro-common/hash/rhash.o \
 		 file_path_str.o \
 		 verbosity.o
-
+		 
 OBJ += ctr/exec-3dsx/exec_cia.o \
 	ctr/exec-3dsx/exec_3dsx.o \
 	ctr/exec-3dsx/mini-hb-menu/launch.o \
@@ -95,8 +94,10 @@ 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
@@ -219,3 +220,5 @@ 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 -DHAVE_STB_FONT
+DEFINES += -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DHAVE_GLSL -DHAVE_FILTERS_BUILTIN

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

 PRECISE_F32 = 1

@@ -59,7 +56,7 @@ endif

 include Makefile.common

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

 ifneq ($(V), 1)
@@ -89,8 +89,6 @@ else ifeq ($(platform), wii)
   libogc_platform    := 1
 endif

-HAVE_MENU_WIDGETS := 1
-
 # PS3
 ifeq ($(platform), ps3)
   #TODO
@@ -114,7 +112,7 @@ else ifeq ($(libogc_platform), 1)
   EXT_INTER_TARGET := $(TARGET_NAME)_$(platform).elf

   INCLUDE += -I. -I$(DEVKITPRO)/libogc/include -Ideps/libz -Iwii/libogc/include
-
+ 
   ifeq ($(EXTERNAL_LIBOGC), 1)
      CFLAGS   += -DEXTERNAL_LIBOGC
      CXXFLAGS += -DEXTERNAL_LIBOGC
@@ -160,6 +158,8 @@ else ifeq ($(libogc_platform), 1)
      endif
   endif

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

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

   HAVE_RUNAHEAD            := 1
@@ -195,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
@@ -252,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)
@@ -273,7 +271,7 @@ else ifeq ($(platform), vita)
   PLATCFLAGS := -mfloat-abi=hard -fsingle-precision-constant \
        -mword-relocations -fno-unwind-tables -fno-asynchronous-unwind-tables -ftree-vectorize -fno-optimize-sibling-calls
   LIBS += -lSceDisplay_stub -lSceGxm_stub -lSceNet_stub -lSceNetCtl_stub\
-           -lSceSysmodule_stub -lSceCtrl_stub -lSceHid_stub -lSceTouch_stub -lSceAudio_stub -lSceFiber_stub\
+           -lSceSysmodule_stub -lSceCtrl_stub -lSceTouch_stub -lSceAudio_stub -lSceFiber_stub\
           -lScePower_stub -lSceRtc_stub -lSceCommonDialog_stub -lScePgf_stub \
           -lSceMotion_stub -lSceAppMgr_stub -lpng -lm -lc

@@ -322,7 +320,6 @@ 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
@@ -364,7 +361,6 @@ 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
@@ -386,7 +382,7 @@ else ifeq ($(platform), windows_msvc2003_x86)

   PLATCFLAGS += -D_WIN32 -DWINVER=0x0400 -D_WIN32_WINNT=0x0400 -D__STDC_CONSTANT_MACROS -D_MBCS -D_VC80_UPGRADE=0x0710
   LDFLAGS += shell32.lib user32.lib gdi32.lib comdlg32.lib winmm.lib ole32.lib
-
+   
   PATH := $(shell IFS=$$'\n'; cygpath "$(VS71COMNTOOLS)../../Vc7/bin"):$(PATH)
   PATH := $(PATH):$(shell IFS=$$'\n'; cygpath "$(VS71COMNTOOLS)../IDE")
   INCLUDE := $(shell IFS=$$'\n'; cygpath -w "$(VS71COMNTOOLS)../../Vc7/include")
@@ -411,7 +407,6 @@ 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
@@ -432,9 +427,9 @@ 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 -DHAVE_EASTEREGG -D__MMX__ -D__SSE__ -DHAVE_OPENGL -DHAVE_OPENGL1 -DHAVE_GLSL -DHAVE_SHADERPIPELINE -DHAVE_OZONE
-   LDFLAGS += shell32.lib user32.lib gdi32.lib comdlg32.lib winmm.lib ole32.lib msimg32.lib
-
+   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
+   
   PATH := $(shell IFS=$$'\n'; cygpath "$(VS80COMNTOOLS)../../VC/bin"):$(PATH)
   PATH := $(PATH):$(shell IFS=$$'\n'; cygpath "$(VS80COMNTOOLS)../IDE")
   INCLUDE := $(shell IFS=$$'\n'; cygpath -w "$(VS80COMNTOOLS)../../VC/include")
@@ -459,7 +454,6 @@ 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
@@ -481,7 +475,7 @@ else ifneq (,$(findstring windows_msvc2010,$(platform)))
   LD = link.exe

   PLATCFLAGS += -D_WIN32 -D__STDC_CONSTANT_MACROS -D_MBCS
-   PLATCFLAGS += -D__i686__ -D__MMX__ -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
+   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
   LDFLAGS += shell32.lib user32.lib gdi32.lib comdlg32.lib winmm.lib ole32.lib iphlpapi.lib

   PlatformSuffix = $(subst windows_msvc2010_,,$(platform))
@@ -530,7 +524,6 @@ 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
@@ -552,7 +545,7 @@ else ifneq (,$(findstring windows_msvc2012,$(platform)))
   LD = link.exe

   PLATCFLAGS += -D_WIN32 -D__STDC_CONSTANT_MACROS -D_MBCS
-   PLATCFLAGS += -D__i686__ -D__MMX__ -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
+   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
   LDFLAGS += shell32.lib user32.lib gdi32.lib comdlg32.lib winmm.lib ole32.lib iphlpapi.lib

   PlatformSuffix = $(subst windows_msvc2012_,,$(platform))
@@ -605,7 +598,6 @@ 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
@@ -627,7 +619,7 @@ else ifneq (,$(findstring windows_msvc2013,$(platform)))
   LD = link.exe

   PLATCFLAGS += -D_WIN32 -D__STDC_CONSTANT_MACROS -D_MBCS
-   PLATCFLAGS += -D__i686__ -D__MMX__ -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
+   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
   LDFLAGS += shell32.lib user32.lib gdi32.lib comdlg32.lib winmm.lib ole32.lib iphlpapi.lib

   PlatformSuffix = $(subst windows_msvc2013_,,$(platform))
@@ -680,7 +672,6 @@ 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
@@ -702,7 +693,7 @@ else ifneq (,$(findstring windows_msvc2015,$(platform)))
   LD = link.exe

   PLATCFLAGS += -D_WIN32 -D__STDC_CONSTANT_MACROS -D_MBCS
-   PLATCFLAGS += -D__i686__ -D__MMX__ -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
+   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
   LDFLAGS += shell32.lib user32.lib gdi32.lib comdlg32.lib winmm.lib ole32.lib iphlpapi.lib

   PlatformSuffix = $(subst windows_msvc2015_,,$(platform))
@@ -768,7 +759,7 @@ else
   CFLAGS += -Wall -std=gnu99 $(MACHDEP) $(PLATCFLAGS) $(INCLUDE)
   INCLUDE += -I./libretro-common/include \
 				  -Ideps \
-				  -Ideps/stb
+				  -Ideps/stb 
 endif

 OBJ = griffin/griffin.o  $(PLATOBJS)
@@ -866,10 +857,6 @@ ifeq ($(HAVE_NETWORKING), 1)
   CFLAGS      += -DHAVE_NETWORKING
 endif

-ifeq ($(HAVE_NETPLAYDISCOVERY), 1)
-   CFLAGS      += -DHAVE_NETPLAYDISCOVERY
-endif
-
 ifeq ($(RARCH_CONSOLE), 1)
   CFLAGS += -DRARCH_CONSOLE
 endif
@@ -975,8 +962,8 @@ ifneq (,$(findstring msvc,$(platform)))
 	LINKOUT = -out:
 	LINK = link.exe
 else
-	OBJOUT   = -o
-	LINKOUT  = -o
+	OBJOUT   = -o 
+	LINKOUT  = -o 
 	LINK = $(CXX)
 endif

@@ -1076,6 +1063,7 @@ overlays-checkout:
      $(GIT) clone git://github.com/libretro/common-overlays.git $(OVERLAY_DIR); \
   fi

+
 clean:
 	rm -f $(EXT_TARGET)
 	rm -f $(EXT_INTER_TARGET)
@@ -1,5 +1,3 @@
-include version.all
-
 #---------------------------------------------------------------------------------
 .SUFFIXES:
 #---------------------------------------------------------------------------------
@@ -17,9 +15,12 @@ DEBUG                  ?= 0
 WHOLE_ARCHIVE_LINK      = 0
 GRIFFIN_BUILD           = 0

-OBJ :=
+OBJ := 

-DEFINES := -D__SWITCH__=1 -U__linux__ -U__linux -DGLM_FORCE_PURE=1 -DRARCH_CONSOLE -DRARCH_INTERNAL -DGLOBAL_CONFIG_DIR='"/switch"' -DHAVE_STB_VORBIS
+# 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 := -U__linux__ -U__linux -DRARCH_INTERNAL -DGLOBAL_CONFIG_DIR='"/switch"' $(DEFINES_THREAD)

 HAVE_CC_RESAMPLER = 1
 HAVE_MENU_COMMON = 1
@@ -27,48 +28,30 @@ HAVE_RTGA = 1
 HAVE_RPNG = 1
 HAVE_RJPEG = 1
 HAVE_RBMP = 1
+HAVE_RGUI = 1
 HAVE_ZLIB = 1
 HAVE_BUILTINZLIB = 1
 HAVE_LIBRETRODB = 1
+HAVE_ZARCH = 0
+HAVE_MATERIALUI = 0
+HAVE_XMB = 0
 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_OVERLAY = 0
 HAVE_THREADS = 1
 HAVE_PTHREADS = 1
 HAVE_FREETYPE = 0
 HAVE_SWITCH = 1
 HAVE_LIBNX = 1
-HAVE_OPENGL = 1
-HAVE_LANGEXTRA = 1
-HAVE_MENU_WIDGETS = 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 :=
+#BLACKLIST += input/input_overlay.o
+#BLACKLIST += tasks/task_overlay.o

 OBJ := $(filter-out $(BLACKLIST),$(OBJ))

@@ -101,34 +84,26 @@ EXEFS_SRC := exefs_src
 #ROMFS := switch/romfs

 APP_TITLE := RetroArch
-APP_VERSION := $(RARCH_VERSION)
+APP_VERSION := 1.0.0
 APP_AUTHOR := libretro Team
-APP_ICON := pkg/libnx/retroarch.jpg
+NO_ICON := 1

 #---------------------------------------------------------------------------------
 # 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	:=	-g -Wall -O3 -ffast-math -ffunction-sections \
+			$(ARCH) $(DEFINES) -Ideps -Ideps/libz -Ilibretro-common/include -Ideps/stb -I$(LIBNX)/include -include $(LIBNX)/include/switch.h #$(shell $(DEVKITPRO)/portlibs/switch/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
+CFLAGS	+=	$(INCLUDE) -DSWITCH=1 -DHAVE_LIBNX=1 -DNXLINK=1

 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	:= -lswresample -lavformat -lavcodec -lavutil -lswscale -lstdc++ -lbz2 -lpng -lz -lnx -lm
-
-ifeq ($(HAVE_OPENGL), 1)
-  LIBS := -lEGL -lglapi -ldrm_nouveau $(LIBS)
-endif
+LIBS	:= -lnx -lm -lstdc++ -lbz2 -lpng -lz

 #---------------------------------------------------------------------------------
 # list of directories containing libraries, this must be the top level containing
@@ -170,12 +145,7 @@ else
 endif
 #---------------------------------------------------------------------------------

-export OFILES 	:=	$(OBJ)
-
-ifeq ($(strip $(HAVE_STATIC_DUMMY)),)
-  OFILES += libretro_libnx.a
-endif
-
+export OFILES 	:=	$(OBJ) libretro_switch.a
 export HFILES_BIN	:=	$(addsuffix .h,$(subst .,_,$(BINFILES)))

 export INCLUDE	:=	$(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \
@@ -215,8 +185,7 @@ ifneq ($(ROMFS),)
 	export NROFLAGS += --romfsdir=$(CURDIR)/$(ROMFS)
 endif

-DEPENDS_TMP  := $(OFILES:.o=.d)
-DEPENDS      := $(filter-out libretro_libnx.a,$(DEPENDS_TMP))
+DEPENDS	:=	$(OFILES:.o=.d)

 .PHONY: clean all

@@ -238,7 +207,7 @@ endif
 $(OUTPUT).elf	:	$(OBJ)

 clean:
-	rm -f $(DEPENDS) $(OBJ) $(OUTPUT).pfs0 $(OUTPUT).nro $(OUTPUT).elf
+	rm -f $(OBJ) $(OUTPUT).pfs0 $(OUTPUT).nro $(OUTPUT).elf

 #---------------------------------------------------------------------------------
 # you need a rule like this for each extension you use as binary data
@@ -29,7 +29,7 @@ ifneq (,$(findstring Darwin,$(UNAME_S)))
 endif

 #---------------------------------------------------------------------------------
-# path to tools
+# path to tools 
 #---------------------------------------------------------------------------------
 export PORTLIBS	:=	$(DEVKITPRO)/portlibs/ppc
 export PATH	:=	$(DEVKITPPC)/bin:$(PORTLIBS)/bin:$(PATH)
@@ -45,6 +45,7 @@ export CXX	:=	$(PREFIX)g++
 export AR	:=	$(PREFIX)ar
 export OBJCOPY	:=	$(PREFIX)objcopy

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

 #---------------------------------------------------------------------------------
@@ -56,7 +57,7 @@ ISVC=$(or $(VCBUILDHELPER_COMMAND),$(MSBUILDEXTENSIONSPATH32),$(MSBUILDEXTENSION
 #---------------------------------------------------------------------------------
 %.o: %.cpp
 	$(CXX) $(CXXFLAGS) -c $< -o $@
-
+	
 #---------------------------------------------------------------------------------
 %.o: %.c
 	$(CC) $(CFLAGS) -c $< -o $@
@@ -130,6 +131,7 @@ INCLUDES	:=	$(DEFINCS) \

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

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

+
 #---------------------------------------------------------------------------------
 SOURCES_LWIP := $(LWIPDIR)/network.c \
 					 $(LWIPDIR)/netio.c \
@@ -261,6 +264,7 @@ 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,6 +7,7 @@ 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)
@@ -19,8 +20,6 @@ HAVE_D3D11               := 1
 HAVE_D3D12               := 1
 HAVE_CG                  := 1
 HAVE_OPENGL              := 1
-HAVE_OPENGL1             := 1
-HAVE_MENU_WIDGETS			 := 1
 HAVE_VULKAN              := 1
 HAVE_XAUDIO              := 1
 HAVE_XINPUT              := 1
@@ -31,7 +30,6 @@ HAVE_WINMM               := 1
 HAVE_RPNG                := 1
 HAVE_ZLIB                := 1
 WANT_ZLIB                := 1
-HAVE_MENU                := 1
 HAVE_RGUI                := 1
 HAVE_XMB                 := 1
 HAVE_MATERIALUI          := 1
@@ -61,7 +59,7 @@ HAVE_IMAGEVIEWER         := 1

 include Makefile.common
 INCLUDE_DIRS := $(patsubst  -isystem%,-I%,$(INCLUDE_DIRS))
-CFLAGS       := $(filter-out  -Wno-unknown-pragmas,$(DEF_FLAGS))
+CFLAGS       := $(filter-out  -Wno-unknown-pragmas,$(CFLAGS))
 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))

@@ -92,12 +90,14 @@ 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,6 +144,7 @@ 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
@@ -154,6 +155,7 @@ else
   FLAGS += -MD
 endif

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

+
 ifeq ($(GRIFFIN_BUILD), 1)
   OBJ       := griffin/griffin.o griffin/griffin_cpp.o
   DEFINES   += -DHAVE_GRIFFIN -DUSE_MATH_DEFINES
@@ -185,6 +188,9 @@ 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))
@@ -192,6 +198,7 @@ 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))
@@ -0,0 +1,62 @@
+# 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
@@ -1,167 +0,0 @@
-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_MENU_WIDGETS := 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)
@@ -36,7 +36,7 @@ retroarch.pnd: install
 	pnd_make -c -p retroarch.pnd -d $(PNDDIR)/ -x $(PNDDIR)/PXML.xml -i $(PNDDIR)/icon.png

 clean:
-	rm -f *.o
+	rm -f *.o 
 	rm -f audio/*.o
 	rm -f conf/*.o
 	rm -f gfx/*.o
@@ -52,3 +52,4 @@ clean:
 	rm -f $(BINDIR)/retroarch-joyconfig
 	rm -f $(PNDDIR)/readme.html
 	rm -f retroarch
+
@@ -1,120 +0,0 @@
-BUILD_PRX          = 0
-DEBUG              = 0
-HAVE_KERNEL_PRX    = 0
-HAVE_LOGGER        = 0
-HAVE_FILE_LOGGER   = 0
-HAVE_THREADS       = 0
-BIG_STACK          = 0
-MUTE_WARNINGS      = 1
-PS2_IP = 192.168.1.150
-
-TARGET = retroarchps2.elf
-TARGET_RELEASE = retroarchps2-release.elf
-
-# Lib CDVD
-CDVD_DIR = ps2/libcdvd
-
-# Compile the IRXs first
-IRX_DIR = ps2/irx
-IRX_FILES = $(wildcard ps2/irx/*.c)
-
-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 -I$(CDVD_DIR)/ee
-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$(CDVD_DIR)/lib -L.
-LIBS += -lretro_ps2 -lgskit -ldmakit -lgskit_toolkit -laudsrv -lmf -lpadx -lmtap -lmc -lhdd -lsdl -lfileXio 
-LIBS += -lcdvdfs -lpatches -lpoweroff
-
-
-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)
-
-# All the IRX objects
-EE_OBJS += $(IRX_DIR)/freemtap_irx.o $(IRX_DIR)/freepad_irx.o $(IRX_DIR)/freesio2_irx.o $(IRX_DIR)/iomanX_irx.o
-EE_OBJS += $(IRX_DIR)/fileXio_irx.o $(IRX_DIR)/mcman_irx.o $(IRX_DIR)/mcserv_irx.o $(IRX_DIR)/usbd_irx.o
-EE_OBJS += $(IRX_DIR)/usbhdfsd_irx.o $(IRX_DIR)/freesd_irx.o $(IRX_DIR)/audsrv_irx.o $(IRX_DIR)/poweroff_irx.o
-EE_OBJS += $(IRX_DIR)/cdvd_irx.o
-
-# Missing objecst on the PS2SDK
-EE_OBJS += ps2/compat_files/compat_ctype.o ps2/compat_files/time.o ps2/compat_files/ps2_devices.o 
-EE_OBJS += ps2/compat_files/fileXio_cdvd.o ps2/compat_files/ps2_descriptor.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_BIN = $(TARGET)
-EE_GPVAL = $(GPVAL)
-
-
-all: irxdir $(EE_BIN)
-
-irxdir:
-	$(MAKE) -C $(IRX_DIR)
-
-clean:
-	rm -f $(EE_BIN) $(EE_OBJS)
-	$(MAKE) -C $(IRX_DIR) clean
-
-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
-
-#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)
@@ -33,13 +33,7 @@ EBOOT_PATH		= pkg/ps3/USRDIR/EBOOT.BIN
 CORE_PATH		= pkg/ps3/USRDIR/cores/CORE.SELF

 LDDIRS = -L. -L$(CELL_SDK)/target/ppu/lib/PSGL/RSX/ultra-opt
-INCDIRS = -I. \
-			 -Idefines \
-			 -Ideps \
-			 -Ideps/libz \
-			 -Ideps/stb \
-			 -Ideps/rcheevos/include \
-			 -Ilibretro-common/include
+INCDIRS = -I. -Idefines -Ideps/libz -Ilibretro-common/include -Ideps -Ideps/stb

 # system platform
 system_platform = unix
@@ -69,7 +63,7 @@ endif

 PPU_SRCS		= griffin/griffin.c

-DEFINES += -DHAVE_MENU -DHAVE_MENU_WIDGETS -DHAVE_RGUI -DHAVE_XMB -DHAVE_LIBRETRODB -DHAVE_MATERIALUI -DHAVE_SHADERPIPELINE -DRARCH_INTERNAL -DMSB_FIRST -DHAVE_OVERLAY -DHAVE_CC_RESAMPLER -DHAVE_STB_VORBIS -DHAVE_STB_FONT -DHAVE_RUNAHEAD -DHAVE_DR_MP3 -DHAVE_DR_FLAC
+DEFINES += -DHAVE_MENU -DHAVE_RGUI -DHAVE_XMB -DHAVE_LIBRETRODB -DHAVE_MATERIALUI -DHAVE_SHADERPIPELINE -DRARCH_INTERNAL -DMSB_FIRST -DHAVE_OVERLAY -DHAVE_CC_RESAMPLER -DHAVE_STB_VORBIS -DHAVE_STB_FONT -DHAVE_RUNAHEAD -DHAVE_DR_MP3 -DHAVE_DR_FLAC

 ifeq ($(DEX_BUILD), 1)
 DEFINES += -DDEX_BUILD
@@ -118,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 -DRC_DISABLE_LUA
+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_IMAGEVIEWER

@@ -165,7 +159,7 @@ create-core:

 create-npdrm-salamander:
 	$(MAKE_FSELF_NPDRM) $(SALAMANDER_TARGET) $(EBOOT_PATH)
-
+	
 create-salamander:
 	$(MAKE_SELF) $(SALAMANDER_TARGET) $(EBOOT_PATH) $(CONTENT_ID_FULL)

@@ -155,7 +155,7 @@ create-core:

 create-npdrm-salamander:
 	$(MAKE_FSELF_NPDRM) $(SALAMANDER_TARGET) $(EBOOT_PATH)
-
+	
 create-salamander:
 	$(MAKE_SELF) $(SALAMANDER_TARGET) $(EBOOT_PATH) $(CONTENT_ID_FULL)

@@ -1,91 +1,90 @@
-CELL_BUILD_TOOLS	= GCC
-CELL_SDK		?= /usr/local/cell
-HAVE_LOGGER		= 0
-CELL_MK_DIR ?= $(CELL_SDK)/samples/mk
-
-include $(CELL_MK_DIR)/sdk.makedef.mk
-
-# system platform
-system_platform = unix
-ifeq ($(shell uname -a),)
-EXE_EXT = .exe
-   system_platform = win
-else ifneq ($(findstring Darwin,$(shell uname -a)),)
-   system_platform = osx
-else ifneq ($(findstring MINGW,$(shell uname -a)),)
-   system_platform = win
-endif
-
-ifeq ($(DEBUG), 1)
-	PPU_OPTIMIZE_LV := -O0 -g
-else
-	PPU_OPTIMIZE_LV := -O2 -DNDEBUG
-endif
-
-STRIP			= $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-strip.exe
-
-INCFLAGS    = -I. -Idefines -Ilibretro-common/include -Ideps/libz
-DEFINES     = -D__CELLOS_LV2__ -DIS_SALAMANDER -DRARCH_CONSOLE -DHAVE_SYSUTILS -DHAVE_SYSMODULES -DHAVE_RARCH_EXEC
-
-ifeq ($(DEX_BUILD), 1)
-DEFINES += -DDEX_BUILD
-endif
-
-ifeq ($(CEX_BUILD), 1)
-DEFINES += -DCEX_BUILD
-endif
-
-ifeq ($(ODE_BUILD), 1)
-DEFINES += -DODE_BUILD
-endif
-
-PPU_CFLAGS	:= $(PPU_OPTIMIZE_LV) $(INCFLAGS) $(DEFINES)
-PPU_CXXFLAGS := $(PPU_OPTIMIZE_LV) $(INCFLAGS) $(DEFINES)
-
-PPU_SRCS		= frontend/frontend_salamander.c \
-				  frontend/frontend_driver.c \
-				  frontend/drivers/platform_ps3.c \
-				  frontend/drivers/platform_null.c \
-				  libretro-common/file/file_path.c \
-				  libretro-common/lists/dir_list.c \
-				  libretro-common/lists/string_list.c \
-				  libretro-common/file/retro_dirent.c \
-				  libretro-common/hash/rhash.c \
-				  libretro-common/string/stdstring.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 \
-				  file_path_str.c \
-				  verbosity.c
-
-ifeq ($(HAVE_LOGGER), 1)
-PPU_CFLAGS		+= -DHAVE_LOGGER
-PPU_SRCS		   += network/net_logger.c \
-						libretro-common/net/net_compat.c \
-						libretro-common/net/net_socket.c
-endif
-
-PPU_TARGET		= retroarch-salamander_ps3.elf
-
-ifeq ($(CELL_BUILD_TOOLS),SNC)
-	PPU_CFLAGS		+= -Xbranchless=1 -Xfastmath=1 -Xassumecorrectsign=1 -Xassumecorrectalignment=1 -Xunroll=1 -Xautovecreg=1
-	PPU_CXXFLAGS		+= -Xbranchless=1 -Xfastmath=1 -Xassumecorrectsign=1 -Xassumecorrectalignment=1 -Xunroll=1 -Xautovecreg=1
-	PPU_CXXLD = $(CELL_SDK)/host-win32/sn/bin/ps3ppuld.exe
-	PPU_CLD = $(CELL_SDK)/host-win32/sn/bin/ps3ppuld.exe
-	PPU_CC = $(CELL_SDK)/host-win32/sn/bin/ps3ppusnc.exe
-else
-	PPU_CFLAGS += -std=gnu99
-	PPU_CC = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-gcc.exe
-	PPU_CLD = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ld.exe
-	PPU_CXXLD = $(CELL_SDK)/host-win32/sn/bin/ps3ppuld.exe
-endif
-
-PPU_LDLIBS		+= -lm -lnet_stub -lnetctl_stub -lio_stub -lsysmodule_stub -lsysutil_stub -lsysutil_game_stub -lfs_stub -lsysutil_np_stub
-
-MAKE_FSELF = $(CELL_SDK)/host-win32/bin/make_fself.exe
-
-include $(CELL_MK_DIR)/sdk.target.mk
+CELL_BUILD_TOOLS	= GCC
+CELL_SDK		?= /usr/local/cell
+HAVE_LOGGER		= 0
+CELL_MK_DIR ?= $(CELL_SDK)/samples/mk
+
+include $(CELL_MK_DIR)/sdk.makedef.mk
+
+# system platform
+system_platform = unix
+ifeq ($(shell uname -a),)
+EXE_EXT = .exe
+   system_platform = win
+else ifneq ($(findstring Darwin,$(shell uname -a)),)
+   system_platform = osx
+else ifneq ($(findstring MINGW,$(shell uname -a)),)
+   system_platform = win
+endif
+
+ifeq ($(DEBUG), 1)
+	PPU_OPTIMIZE_LV := -O0 -g
+else
+	PPU_OPTIMIZE_LV := -O2 -DNDEBUG
+endif
+
+STRIP			= $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-strip.exe
+
+INCFLAGS    = -I. -Idefines -Ilibretro-common/include -Ideps/libz
+DEFINES     = -D__CELLOS_LV2__ -DIS_SALAMANDER -DRARCH_CONSOLE -DHAVE_SYSUTILS -DHAVE_SYSMODULES -DHAVE_RARCH_EXEC
+
+ifeq ($(DEX_BUILD), 1)
+DEFINES += -DDEX_BUILD
+endif
+
+ifeq ($(CEX_BUILD), 1)
+DEFINES += -DCEX_BUILD
+endif
+
+ifeq ($(ODE_BUILD), 1)
+DEFINES += -DODE_BUILD
+endif
+
+PPU_CFLAGS	:= $(PPU_OPTIMIZE_LV) $(INCFLAGS) $(DEFINES)
+PPU_CXXFLAGS := $(PPU_OPTIMIZE_LV) $(INCFLAGS) $(DEFINES)
+
+PPU_SRCS		= frontend/frontend_salamander.c \
+				  frontend/frontend_driver.c \
+				  frontend/drivers/platform_ps3.c \
+				  frontend/drivers/platform_null.c \
+				  libretro-common/file/file_path.c \
+				  libretro-common/lists/dir_list.c \
+				  libretro-common/lists/string_list.c \
+				  libretro-common/file/retro_dirent.c \
+				  libretro-common/hash/rhash.c \
+				  libretro-common/string/stdstring.c \
+				  libretro-common/encodings/encoding_utf.c \
+				  libretro-common/compat/compat_strl.c \
+				  libretro-common/compat/compat_strcasestr.c \
+				  libretro-common/streams/file_stream.c \
+				  libretro-common/vfs/vfs_implementation.c \
+				  libretro-common/file/config_file.c \
+				  file_path_str.c \
+				  verbosity.c
+
+ifeq ($(HAVE_LOGGER), 1)
+PPU_CFLAGS		+= -DHAVE_LOGGER 
+PPU_SRCS		   += network/net_logger.c \
+						libretro-common/net/net_compat.c \
+						libretro-common/net/net_socket.c
+endif
+
+PPU_TARGET		= retroarch-salamander_ps3.elf
+
+ifeq ($(CELL_BUILD_TOOLS),SNC)
+	PPU_CFLAGS		+= -Xbranchless=1 -Xfastmath=1 -Xassumecorrectsign=1 -Xassumecorrectalignment=1 -Xunroll=1 -Xautovecreg=1 
+	PPU_CXXFLAGS		+= -Xbranchless=1 -Xfastmath=1 -Xassumecorrectsign=1 -Xassumecorrectalignment=1 -Xunroll=1 -Xautovecreg=1
+	PPU_CXXLD = $(CELL_SDK)/host-win32/sn/bin/ps3ppuld.exe
+	PPU_CLD = $(CELL_SDK)/host-win32/sn/bin/ps3ppuld.exe
+	PPU_CC = $(CELL_SDK)/host-win32/sn/bin/ps3ppusnc.exe
+else
+	PPU_CFLAGS += -std=gnu99
+	PPU_CC = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-gcc.exe
+	PPU_CLD = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ld.exe
+	PPU_CXXLD = $(CELL_SDK)/host-win32/sn/bin/ps3ppuld.exe
+endif
+
+PPU_LDLIBS		+= -lm -lnet_stub -lnetctl_stub -lio_stub -lsysmodule_stub -lsysutil_stub -lsysutil_game_stub -lfs_stub -lsysutil_np_stub
+
+MAKE_FSELF = $(CELL_SDK)/host-win32/bin/make_fself.exe
+
+include $(CELL_MK_DIR)/sdk.target.mk
@@ -96,7 +96,7 @@ CXXFLAGS += $(SHARED_FLAGS)
 ifeq ($(DEBUG), 1)
   CFLAGS += -O0 -g
 else
-   CFLAGS += -O3 -g
+   CFLAGS += -O3 -g 
   CXXFLAGS += -03 -g
 endif

@@ -128,3 +128,4 @@ clean:
 	rm -f $(OBJ)

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

 CFLAGS += $(RARCH_DEFINES)

+
 EXTRA_TARGETS = EBOOT.PBP
 PSP_EBOOT_TITLE = RetroArch PSP1

@@ -25,7 +25,7 @@ ifeq ($(HAVE_FILE_LOGGER), 1)
 CFLAGS		+= -DHAVE_FILE_LOGGER
 endif

-CFLAGS += $(RARCH_DEFINES)
+CFLAGS += $(RARCH_DEFINES) 

 EXTRA_TARGETS   = EBOOT.PBP
 PSP_EBOOT_TITLE = RetroArch
@@ -42,7 +42,6 @@ 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 \
@@ -51,7 +50,7 @@ OBJS = frontend/frontend_salamander.o \
 		 libretro-common/hash/rhash.o \
 		 file_path_str.o \
 		 verbosity.o \
-		 bootstrap/psp1/kernel_functions.o
+		 bootstrap/psp1/kernel_functions.o 

 PSPSDK=$(shell psp-config --pspsdk-path)
 include $(PSPSDK)/lib/build.mak
@@ -24,6 +24,7 @@ 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
@@ -33,13 +34,13 @@ else
 	HAVE_DYNAMIC = 1

 	include Makefile.common
-	CFLAGS += $(DEF_FLAGS)
-	BLACKLIST :=
+        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/to/libtransistor/dist/>")
 endif
@@ -17,7 +17,7 @@ ifeq ($(GRIFFIN_BUILD), 1)
 	OBJ += griffin/griffin.o
 	DEFINES += -DHAVE_GRIFFIN=1
 	DEFINES += -DHAVE_NEON -DHAVE_MENU -DHAVE_XMB -DHAVE_MATERIALUI -DHAVE_LIBRETRODB DEFINES -DHAVE_KEYMAPPER
-	DEFINES += -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DWANT_ZLIB -DHAVE_CC_RESAMPLER -DHAVE_UPDATE_ASSETS
+	DEFINES += -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DWANT_ZLIB -DHAVE_CC_RESAMPLER
 	ifeq ($(DEBUG), 1)
 		DEFINES += -DHAVE_NETLOGGER
 	endif
@@ -55,7 +55,6 @@ else
 	endif

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

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

+
 ifeq ($(strip $(VITASDK)),)
 $(error "Please set VITASDK in your environment. export VITASDK=<path to>vitasdk")
 endif
@@ -116,7 +116,7 @@ endif
 CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions

 VITA_LIBS := -lSceDisplay_stub -lSceGxm_stub -lSceNet_stub -lSceNetCtl_stub \
-	-lSceSysmodule_stub -lSceCtrl_stub -lSceHid_stub -lSceTouch_stub -lSceAudio_stub \
+	-lSceSysmodule_stub -lSceCtrl_stub -lSceTouch_stub -lSceAudio_stub \
 	-lScePower_stub -lSceRtc_stub -lSceCommonDialog_stub -lScePgf_stub \
 	-lSceFiber_stub -lSceMotion_stub -lSceAppMgr_stub -lpthread -lpng -lz

@@ -127,6 +127,7 @@ TARGETS := $(TARGET).vpk
 DEPFLAGS    = -MT $@ -MMD -MP -MF $*.Tdepend
 POSTCOMPILE = mv -f $*.Tdepend $*.depend

+
 all: $(TARGETS)

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

+
 %.o: %.S
 %.o: %.S %.depend
 	$(CC) -c -o $@ $< $(ASFLAGS) $(INCDIRS) $(DEPFLAGS)
@@ -22,7 +22,7 @@ RARCH_DEFINES = -DVITA -DIS_SALAMANDER -DRARCH_CONSOLE
 LIBDIR =
 LDFLAGS =
 LIBS = -lSceDisplay_stub -lSceGxm_stub -lSceNet_stub -lSceNetCtl_stub\
-     -lSceSysmodule_stub -lSceCtrl_stub -lSceHid_stub -lSceAudio_stub -lSceFiber_stub\
+     -lSceSysmodule_stub -lSceCtrl_stub -lSceAudio_stub -lSceFiber_stub\
     -lScePower_stub -lSceRtc_stub -lSceCommonDialog_stub -lScePgf_stub \
     -lSceMotion_stub -lSceAppMgr_stub -lfreetype -lpng -lm -lc

@@ -44,7 +44,6 @@ 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 \
@@ -32,23 +32,22 @@ ELF_TARGET := retroarch-salamander_wii.elf

 INCLUDE := -I. -Ilibretro-common/include -Ideps/libz
 ifeq ($(EXTERNAL_LIBOGC), 1)
-INCLUDE += -I$(DEVKITPRO)/libogc/include
+INCLUDE += -I$(DEVKITPRO)/libogc/include 
 LIBDIRS := -L$(DEVKITPRO)/libogc/lib/wii -L.
 else
-INCLUDE += -Iwii/libogc/include
+INCLUDE += -Iwii/libogc/include 
 LIBDIRS := -Lwii/libogc/libs/wii -L.
 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 \
@@ -67,7 +66,6 @@ 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,7 +64,6 @@ 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
@@ -106,7 +105,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 -DHAVE_NETPLAYDISCOVERY
+   	DEFINES += -DHAVE_STB_FONT -DHAVE_STB_VORBIS -DHAVE_LANGEXTRA -DHAVE_LIBRETRODB -DHAVE_NETWORKING
   #	DEFINES += -DWANT_IFADDRS
   #	DEFINES += -DHAVE_FREETYPE
   	DEFINES += -DHAVE_XMB -DHAVE_MATERIALUI
@@ -116,12 +115,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
@@ -129,7 +128,6 @@ endif
   	HAVE_LANGEXTRA = 1
   	HAVE_LIBRETRODB = 1
   	HAVE_NETWORKING = 1
-		HAVE_NETPLAYDISCOVERY = 1
   	HAVE_CHEEVOS = 1
   #	WANT_IFADDRS = 1
   	HAVE_OVERLAY = 1
@@ -139,6 +137,8 @@ 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,6 +242,7 @@ 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

@@ -263,11 +264,13 @@ 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,11 +8,9 @@ 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
@@ -32,6 +30,7 @@ HAVE_FREETYPE := 1
 HAVE_FFMPEG   := 0

 HAVE_CG       := 1
+HAVE_LIBXML2  := 0
 HAVE_ZLIB     := 1
 WANT_ZLIB     := 1
 HAVE_CC_RESAMPLER := 1
@@ -45,6 +44,11 @@ FREETYPE_CFLAGS  := -DHAVE_FREETYPE -Ifreetype2
 FREETYPE_LIBS    := -lfreetype
 endif

+ifeq ($(HAVE_LIBXML2), 1)
+LIBXML2_CFLAGS   := -Ilibxml2 -DHAVE_LIBXML2 -DHAVE_GLSL
+LIBXML2_LIBS     := -lxml2 -liconv
+endif
+
 ifeq ($(HAVE_SDL), 1)
 SDL_LIBS         := -lSDL
 SDL_CFLAGS       := -ISDL -DHAVE_SDL
@@ -97,6 +101,7 @@ else
   WINDRES = windres
 endif

+
 libretro ?= -lretro

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

-CFLAGS += $(DEF_FLAGS) -Wall -Wno-unused-result -Wno-unused-variable -I. -Ideps
+CFLAGS += -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
@@ -166,3 +171,4 @@ clean:
 	rm -f *.d

 .PHONY: all install uninstall clean
+
@@ -1,7 +1,7 @@
 USAGE NOTES
 ===========

-This driver is meant for devices with Allwinner SoCs with Mali400 3D block and a
+This driver is meant for devices with Allwinner SoCs with Mali400 3D block and a 
 good fbdev implementation. It is derived from the old Android GLES driver.

 It was meant to be used on Cubieboard/Cubieboard2/Cubietruck, but it should not
@@ -19,7 +19,7 @@ First we will clone and build the kernel:
 git clone https://github.com/mireq/linux-sunxi.git -b sunxi-3.4 --depth 1

 Now we edit drivers/video/sunxi/disp/dev_fb.c, and uncomment the line 1074:
-// Fb_wait_for_vsync(info);
+// Fb_wait_for_vsync(info); 

 It is assumed you have a cross-compiler installed, so we configure and build the kernel and modules:

@@ -50,7 +50,7 @@ Now we need the headers. We can get them from here:

 http://malideveloper.arm.com/develop-for-mali/sdks/opengl-es-sdk-for-linux/#opengl-es-sdk-for-linux-download

-Download whatever version you want. We just get the headers from here, not machine-dependant compiled code.
+Download whatever version you want. We just get the headers from here, not machine-dependant compiled code. 

 Extract the files and copy the directories inside inc to /usr/include .

@@ -60,27 +60,27 @@ In the end you should have this on your system:

   /usr/include/EGL/
      eglext.h
-      egl.h
-      eglplatform.h
+      egl.h           
+      eglplatform.h   
      fbdev_window.h
   /usr/include/GLES/
      glext.h
-      gl.h
+      gl.h  
      glplatform.h
   /usr/include/GLES2
      gl2ext.h
-      gl2.h
+      gl2.h  
      gl2platform.h
   /usr/include/GLES3
      gl3ext.h
-      gl3.h
+      gl3.h  
      gl3platform.h

 To enable mali_fbdev you must configure RetroArch with --enable-gles and --enable-mali_fbdev.

 This is an example of what you would use on a CubieBoard2 for a lightweight RetroArch:

-./configure --enable-gles --enable-mali_fbdev --disable-x11 --disable-sdl2 --enable-floathard --disable-ffmpeg --disable-netplay --enable-udev --disable-sdl --disable-pulse --disable-oss --disable-freetype --disable-7zip
+./configure --enable-gles --enable-mali_fbdev --disable-x11 --disable-sdl2 --enable-floathard --disable-ffmpeg --disable-netplay --enable-udev --disable-sdl --disable-pulse --disable-oss --disable-freetype --disable-7zip --disable-libxml2

 NOTE: A TTY hack is used to auto-clean the console on exit, and the fbdev ioctls are used to retrieve
 current video mode. Both things work good, but they are not exactly ideal solutions.
@@ -31,7 +31,7 @@ Latest binaries are currently hosted on the [buildbot](http://buildbot.libretro.

 ## Support

-To reach developers, either make an issue here on GitHub, make a thread on the [forum](http://www.libretro.com/forums/), chat on [discord](https://discord.gg/C4amCeV), or visit our IRC channel: #retroarch @ irc.freenode.org.
+To reach developers, either make an issue here on GitHub, make a thread on the [forum](http://www.libretro.com/forums/), chat on [Discord](https://discord.gg/C4amCeV), or visit our IRC channel: #retroarch @ irc.freenode.org.

 ## Documentation

@@ -105,6 +105,7 @@ OSX port of RetroArch requires latest versions of XCode to build.
 RetroArch can utilize these libraries if enabled:

   - nvidia-cg-toolkit
+   - libxml2 (GLSL XML shaders)
   - libfreetype2 (TTF font rendering on screen)

 RetroArch needs at least one of these audio driver libraries:
@@ -147,7 +148,7 @@ Instructions for compiling and installing RetroArch can be found in the [Libretr

 ## CRT 15Khz Resolution Switching

-CRT SwitchRes will turn on, on the fly. However, you will need to restart RetroArch to disable it. With CRT SwitchRes enable RetroArch will start in 2560 x 480 @ 60.
+CRT SwitchRes will turn on, on the fly. However, you will need to restart RetroArch to disable it. With CRT SwitchRes enable RetroArch will start in 2560 x 480 @ 60.  

 If you are running Windows, before enabling the CRT SwitchRes options please make sure you have installed CRTEmudriver and installed some modelines. The minimum modelines for all games to switch correctly are:

@@ -188,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:

- 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 224 @ 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 192 @ 59.922745 MDntsc
- 256 x 224 @ 59.922745 MDntsc
- 320 x 224 @ 59.922745 MDntsc
+- 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 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
 - 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
- 320 x 576 @ 49.701458 MDpal
+- 256 x 224 @ 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 576 @ 50.000000 n64pal
+- 640 x 288 @ 50.000000 n64pal

 - 256 x 252 @ 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
+- 320 x 252 @ 49.759998 PSXpal
+- 640 x 252 @ 49.759998 PSXpal

 - 384 x 240 @ 59.941002 PSXntsc
 - 256 x 480 @ 59.941002 PSXntsc
@@ -1,88 +0,0 @@
-/*  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,12 +21,10 @@
 #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"
@@ -37,8 +35,6 @@
 #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"
@@ -46,13 +42,9 @@
 #include "../retroarch.h"
 #include "../verbosity.h"
 #include "../list_special.h"
-#include "../file_path_special.h"
-#include "../content.h"

 #define AUDIO_BUFFER_FREE_SAMPLES_COUNT (8 * 1024)

-#define MENU_SOUND_FORMATS "ogg|mod|xm|s3m|mp3|flac"
-
 /**
 * db_to_gain:
 * @db          : Decibels.
@@ -73,9 +65,6 @@ 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
@@ -85,9 +74,6 @@ 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
@@ -130,25 +116,22 @@ static const audio_driver_t *audio_drivers[] = {
 #ifdef EMSCRIPTEN
   &audio_rwebaudio,
 #endif
-#if defined(PSP) || defined(VITA) || defined(ORBIS)
+#if defined(PSP) || defined(VITA)
  &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,
+   &audio_switch_thread,
 #endif
   &audio_null,
   NULL,
 };

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

 static size_t audio_driver_chunk_size                    = 0;
 static size_t audio_driver_chunk_nonblock_size           = 0;
@@ -171,6 +154,7 @@ static bool audio_driver_mixer_mute_enable               = false;
 static bool audio_driver_mute_enable                     = false;
 static bool audio_driver_use_float                       = false;
 static bool audio_driver_active                          = false;
+static bool audio_driver_data_own                        = false;
 static bool audio_mixer_active                           = false;

 static float audio_driver_rate_control_delta             = 0.0f;
@@ -195,16 +179,13 @@ 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;

 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);

-static enum resampler_quality audio_driver_get_resampler_quality(void)
+enum resampler_quality audio_driver_get_resampler_quality(void)
 {
   settings_t *settings = config_get_ptr();

@@ -216,14 +197,14 @@ static 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_SYSTEM_STREAMS-1))
+   if (i > (AUDIO_MIXER_MAX_STREAMS-1))
      return NULL;
   return &audio_mixer_streams[i];
 }

 const char *audio_driver_mixer_get_stream_name(unsigned i)
 {
-   if (i > (AUDIO_MIXER_MAX_SYSTEM_STREAMS-1))
+   if (i > (AUDIO_MIXER_MAX_STREAMS-1))
      return "N/A";
   if (!string_is_empty(audio_mixer_streams[i].name))
      return audio_mixer_streams[i].name;
@@ -253,12 +234,12 @@ bool compute_audio_buffer_statistics(audio_statistics_t *stats)
   stats->samples                = (unsigned)audio_driver_free_samples_count;

 #ifdef WARPUP
-   /* uint64 to double not implemented, fair chance
+   /* uint64 to double not implemented, fair chance 
    * signed int64 to double doesn't exist either */
   /* https://forums.libretro.com/t/unsupported-platform-help/13903/ */
   (void)stddev;
 #elif defined(_MSC_VER) && _MSC_VER <= 1200
-   /* FIXME: error C2520: conversion from unsigned __int64
+   /* FIXME: error C2520: conversion from unsigned __int64 
    * to double not implemented, use signed __int64 */
   (void)stddev;
 #else
@@ -276,9 +257,9 @@ bool compute_audio_buffer_statistics(audio_statistics_t *stats)
   stddev                                = (unsigned)
      sqrt((double)accum_var / (samples - 2));

-   stats->average_buffer_saturation      = (1.0f - (float)avg
+   stats->average_buffer_saturation      = (1.0f - (float)avg 
         / audio_driver_buffer_size) * 100.0;
-   stats->std_deviation_percentage       = ((float)stddev
+   stats->std_deviation_percentage       = ((float)stddev 
         / audio_driver_buffer_size)  * 100.0;
 #endif

@@ -405,11 +386,12 @@ static bool audio_driver_deinit_internal(void)
   return true;
 }

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

+
 static bool audio_driver_init_internal(bool audio_cb_inited)
 {
   unsigned new_rate     = 0;
@@ -460,7 +442,6 @@ 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,
@@ -479,7 +460,6 @@ 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,
@@ -624,7 +604,6 @@ 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 ?
@@ -651,6 +630,7 @@ static void audio_driver_flush(const int16_t *data, size_t samples)
   src_data.data_in                  = audio_driver_input_data;
   src_data.input_frames             = samples >> 1;

+
   if (audio_driver_dsp)
   {
      struct retro_dsp_data dsp_data;
@@ -713,9 +693,7 @@ static void audio_driver_flush(const int16_t *data, size_t samples)

   audio_driver_resampler->process(audio_driver_resampler_data, &src_data);

-   is_active = audio_mixer_active;
-
-   if (is_active)
+   if (audio_mixer_active)
   {
      bool override     = audio_driver_mixer_mute_enable ? true :
         (audio_driver_mixer_volume_gain != 1.0f) ? true : false;
@@ -771,8 +749,9 @@ 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)
@@ -817,9 +796,6 @@ 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;
 }
@@ -843,10 +819,7 @@ 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++)
-   {
-      if (audio_driver_rewind_ptr > 0)
-         audio_driver_rewind_buf[--audio_driver_rewind_ptr] = data[i];
-   }
+      audio_driver_rewind_buf[--audio_driver_rewind_ptr] = data[i];

   return frames;
 }
@@ -907,7 +880,7 @@ void audio_driver_monitor_adjust_system_rates(void)
   float video_refresh_rate               = settings->floats.video_refresh_rate;
   float max_timing_skew                  = settings->floats.audio_max_timing_skew;
   struct retro_system_av_info   *av_info = video_viewport_get_system_av_info();
-   const struct retro_system_timing *info =
+   const struct retro_system_timing *info = 
      (const struct retro_system_timing*)&av_info->timing;

   if (info->sample_rate <= 0.0)
@@ -932,13 +905,11 @@ void audio_driver_setup_rewind(void)

   for (i = 0; i < audio_driver_data_ptr; i += 2)
   {
-      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 + 1];

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

   audio_driver_data_ptr = 0;
@@ -1070,7 +1041,7 @@ static int audio_mixer_find_index(audio_mixer_sound_t *sound)
 {
   unsigned i;

-   for (i = 0; i < AUDIO_MIXER_MAX_SYSTEM_STREAMS; i++)
+   for (i = 0; i < AUDIO_MIXER_MAX_STREAMS; i++)
   {
      audio_mixer_sound_t *handle = audio_mixer_streams[i].handle;
      if (handle == sound)
@@ -1112,28 +1083,6 @@ 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)
 {
@@ -1151,11 +1100,6 @@ 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;
@@ -1166,7 +1110,7 @@ static void audio_mixer_play_stop_sequential_cb(

            i++;

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

-static bool audio_driver_mixer_get_free_stream_slot(unsigned *id, enum audio_mixer_stream_type type)
+bool audio_driver_mixer_get_free_stream_slot(unsigned *id)
 {
-   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++)
+   unsigned i;
+   for (i = 0; i < AUDIO_MIXER_MAX_STREAMS; i++)
   {
      if (audio_mixer_streams[i].state == AUDIO_STREAM_STATE_NONE)
      {
@@ -1207,23 +1150,10 @@ 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 (params->stream_type == AUDIO_STREAM_TYPE_NONE)
+   
+   if (!audio_driver_mixer_get_free_stream_slot(&free_slot))
      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;

@@ -1284,12 +1214,10 @@ bool audio_driver_mixer_add_stream(audio_mixer_stream_params_t *params)

   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;
@@ -1299,7 +1227,7 @@ bool audio_driver_mixer_add_stream(audio_mixer_stream_params_t *params)

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

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

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

   switch (audio_mixer_streams[i].state)
@@ -1331,129 +1259,12 @@ 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(retro_task_t *task,
-      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;
-   unsigned 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;
@@ -1468,7 +1279,7 @@ void audio_driver_mixer_play_stream_sequential(unsigned i)

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

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

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

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

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

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

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

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

   audio_mixer_active = false;

-   for (i = 0; i < AUDIO_MIXER_MAX_SYSTEM_STREAMS; i++)
+   for (i = 0; i < AUDIO_MIXER_MAX_STREAMS; i++)
   {
      audio_driver_mixer_stop_stream(i);
      audio_driver_mixer_remove_stream(i);
@@ -1578,7 +1389,6 @@ bool audio_driver_deinit(void)
 {
   audio_driver_mixer_deinit();
   audio_driver_free_devices_list();
-
   if (!audio_driver_deinit_internal())
      return false;
   return true;
@@ -1680,6 +1490,7 @@ error:
   return false;
 }

+
 bool audio_driver_stop(void)
 {
   if (!current_audio || !current_audio->stop
@@ -1709,6 +1520,21 @@ void audio_driver_destroy_data(void)
   audio_driver_context_audio_data = NULL;
 }

+void audio_driver_set_own_driver(void)
+{
+   audio_driver_data_own = true;
+}
+
+void audio_driver_unset_own_driver(void)
+{
+   audio_driver_data_own = false;
+}
+
+bool audio_driver_owns_driver(void)
+{
+   return audio_driver_data_own;
+}
+
 void audio_driver_suspend(void)
 {
   audio_suspended = true;
@@ -1737,6 +1563,7 @@ bool audio_driver_is_active(void)
 void audio_driver_destroy(void)
 {
   audio_driver_active   = false;
+   audio_driver_data_own = false;
   current_audio         = NULL;
 }

@@ -1753,6 +1580,7 @@ void audio_set_bool(enum audio_action action, bool val)
   }
 }

+
 void audio_set_float(enum audio_action action, float val)
 {
   switch (action)
@@ -1801,11 +1629,3 @@ bool *audio_get_bool_ptr(enum audio_action action)

   return NULL;
 }
-
-const char* audio_driver_get_ident(void)
-{
-   if (!current_audio)
-      return NULL;
-
-   return current_audio->ident;
-}
@@ -22,21 +22,46 @@
 #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;
@@ -44,19 +69,14 @@ typedef struct audio_mixer_stream
   size_t bufsize;
 } audio_mixer_stream_t;

-typedef struct audio_mixer_stream_params
+typedef struct audio_statistics
 {
-   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;
+   float average_buffer_saturation;
+   float std_deviation_percentage;
+   float close_to_underrun;
+   float close_to_blocking;
+   unsigned samples;
+} audio_statistics_t;

 typedef struct audio_driver
 {
@@ -140,8 +160,23 @@ 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);
+
+void audio_driver_unset_own_driver(void);
+
 void audio_driver_suspend(void);

 bool audio_driver_is_suspended(void);
@@ -232,6 +267,8 @@ bool audio_driver_start(bool is_shutdown);

 bool audio_driver_stop(void);

+bool audio_driver_owns_driver(void);
+
 void audio_driver_unset_callback(void);

 void audio_driver_frame_is_reverse(void);
@@ -258,10 +295,6 @@ 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);
@@ -274,18 +307,15 @@ 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);
-
-const char* audio_driver_get_ident(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;
@@ -300,13 +330,11 @@ 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;
@@ -43,3 +43,4 @@ bool audio_init_thread(const audio_driver_t **out_driver, void **out_data,
      const audio_driver_t *driver);

 #endif
+
@@ -180,7 +180,6 @@ error:
 #define BYTES_TO_FRAMES(bytes, frame_bits)  ((bytes) * 8 / frame_bits)
 #define FRAMES_TO_BYTES(frames, frame_bits) ((frames) * frame_bits / 8)

-static bool alsa_start(void *data, bool is_shutdown);
 static ssize_t alsa_write(void *data, const void *buf_, size_t size_)
 {
   alsa_t *alsa              = (alsa_t*)data;
@@ -189,12 +188,6 @@ static ssize_t alsa_write(void *data, const void *buf_, size_t size_)
   snd_pcm_sframes_t size    = BYTES_TO_FRAMES(size_, alsa->frame_bits);
   size_t frames_size        = alsa->has_float ? sizeof(float) : sizeof(int16_t);

-   /* Workaround buggy menu code.
-    * If a write happens while we're paused, we might never progress. */
-   if (alsa->is_paused)
-      if (!alsa_start(alsa, false))
-         return -1;
-
   if (alsa->nonblock)
   {
      while (size)
@@ -276,8 +269,6 @@ static bool alsa_alive(void *data)
 static bool alsa_stop(void *data)
 {
   alsa_t *alsa = (alsa_t*)data;
-   if (alsa->is_paused)
-	  return true;

   if (alsa->can_pause
         && !alsa->is_paused)
@@ -302,8 +293,6 @@ static void alsa_set_nonblock_state(void *data, bool state)
 static bool alsa_start(void *data, bool is_shutdown)
 {
   alsa_t *alsa = (alsa_t*)data;
-   if (!alsa->is_paused)
-	  return true;

   if (alsa->can_pause
         && alsa->is_paused)
@@ -219,6 +219,7 @@ 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;
@@ -327,6 +328,7 @@ 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;
@@ -1,204 +0,0 @@
-/*  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,6 +15,7 @@
 */
 #include <stdlib.h>

+
 #if TARGET_OS_IPHONE
 #include <AudioToolbox/AudioToolbox.h>
 #else
@@ -125,9 +126,7 @@ 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)
@@ -220,7 +219,7 @@ static void *coreaudio_init(const char *device,
   dev->lock = slock_new();
   dev->cond = scond_new();

-#if TARGET_OS_IOS
+#if TARGET_OS_IPHONE
   if (!session_initialized)
   {
      session_initialized = true;
@@ -1,392 +0,0 @@
-/*  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);
-   memset(r, 0, 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))
-      {
-         const float quiet = 0.0f;
-         size_t fill;
-
-         /* we got more data */
-         if (rb_len(r) > 0)
-            continue;
-
-         /* underflow */
-         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])
-   {
-      NSError *err;
-      AUAudioUnit *au;
-      AudioComponentDescription desc;
-      AVAudioFormat *format, *renderFormat;
-
-      _sema        = dispatch_semaphore_create(0);
-
-      _bufferSize  = (latency * rate) / 1000;
-      _bufferSize *= 2; /* stereo */
-      rb_init(&_rb, _bufferSize);
-
-      desc.componentType          = kAudioUnitType_Output;
-      desc.componentSubType       = kAudioUnitSubType_DefaultOutput;
-      desc.componentManufacturer  = kAudioUnitManufacturer_Apple;
-
-      au = [[AUAudioUnit alloc] initWithComponentDescription:desc error:&err];
-      if (err != nil)
-         return nil;
-
-      format = au.outputBusses[0].format;
-      if (format.channelCount != 2)
-         return nil;
-
-      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",
-   NULL, /* device_list_new */
-   NULL, /* device_list_free */
-   coreaudio3_write_avail,
-   coreaudio3_buffer_size,
-};
@@ -56,6 +56,7 @@ 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)
 {
@@ -288,6 +289,7 @@ 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,6 +195,7 @@ 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,
@@ -210,3 +211,4 @@ audio_driver_t audio_ctr_dsp = {
   ctr_dsp_audio_write_avail,
   ctr_dsp_audio_buffer_size
 };
+
@@ -51,6 +51,7 @@
 #pragma comment(lib, "dxguid")
 #endif

+
 typedef struct dsound
 {
   LPDIRECTSOUND ds;
@@ -173,6 +174,7 @@ 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,6 +39,7 @@ typedef struct
   volatile unsigned dma_write;
   size_t write_ptr;

+   OSCond cond;
   bool nonblock;
   bool is_paused;
 } gx_audio_t;
@@ -62,6 +63,8 @@ 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,
@@ -92,6 +95,8 @@ 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;
@@ -128,7 +133,8 @@ 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);
+               wa->dma_write == wa->dma_busy) && !wa->nonblock)
+         OSSleepThread(wa->cond);

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

@@ -199,6 +205,10 @@ 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.\n");
+   RARCH_ERR("Using the null audio driver. RetroArch will be silent.");

   (void)device;
   (void)rate;
@@ -232,6 +232,7 @@ 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;
@@ -1,177 +0,0 @@
-/*  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"
-
-#define AUDIO_BUFFER 128 * 1024
-#define AUDIO_CHANNELS 2
-#define AUDIO_BITS 16
-
-typedef struct ps2_audio
-{
-   bool nonblocking;
-   bool running;
-
-} ps2_audio_t;
-
-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 *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;
-
-   audioConfigure(ps2, rate);
-
-   return ps2;
-}
-
-static void ps2_audio_free(void *data)
-{
-   ps2_audio_t* ps2 = (ps2_audio_t*)data;
-   if(!ps2)
-      return;
-
-   ps2->running = false;
-   audsrv_stop_audio();
-   free(ps2);
-}
-
-static ssize_t ps2_audio_write(void *data, const void *buf, size_t size)
-{
-   int bytes_sent;
-   ps2_audio_t* ps2 = (ps2_audio_t*)data;
-
-   if (!ps2->running)
-      return -1;
-
-   bytes_sent = audsrv_play_audio(buf, size);
-
-   return bytes_sent;
-}
-
-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)
-   {
-      audsrv_stop_audio();
-      ps2->running = false;
-   }
-
-   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)
-   {
-      ps2->running = true;
-   }
-
-   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)
-   {
-      return AUDIO_BUFFER;
-   }
-
-   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,28 +16,21 @@
 */

 #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>

-#if defined(VITA)
+#ifdef VITA
 #include <psp2/kernel/processmgr.h>
 #include <psp2/kernel/threadmgr.h>
 #include <psp2/kernel/sysmem.h>
 #include <psp2/audioout.h>
-#elif defined(PSP)
+#else
 #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"
@@ -71,14 +64,10 @@ static void audioMainLoop(void *data)
 {
   psp_audio_t* psp = (psp_audio_t*)data;

-#if defined(VITA)
+#ifdef 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
@@ -106,7 +95,7 @@ static void audioMainLoop(void *data)
      scond_signal(psp->cond);
      slock_unlock(psp->cond_lock);

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

-#if defined(VITA)
+#ifdef VITA
   sceAudioOutReleasePort(port);
-#elif defined(ORBIS)
-   sceAudioOutClose(port);
 #else
   sceAudioSRCChRelease();
 #endif
@@ -140,23 +127,12 @@ 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;
@@ -186,7 +162,7 @@ static void psp_audio_free(void *data)
            psp->running = false;
            sthread_join(psp->worker_thread);
      }
-
+      
      if (psp->cond)
            scond_free(psp->cond);
      if (psp->fifo_lock)
@@ -205,7 +181,7 @@ static ssize_t psp_audio_write(void *data, const void *buf, size_t size)
   psp_audio_t* psp = (psp_audio_t*)data;
   uint16_t write_pos   = psp->write_pos;
   uint16_t sampleCount = size / sizeof(uint32_t);
-
+   
   if (!psp->running)
      return -1;

@@ -241,6 +217,7 @@ static ssize_t psp_audio_write(void *data, const void *buf, size_t size)
   slock_unlock(psp->fifo_lock);
   return size;

+   
 }

 static bool psp_audio_alive(void *data)
@@ -251,6 +228,7 @@ 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;
@@ -316,6 +294,7 @@ 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,
@@ -325,10 +304,8 @@ audio_driver_t audio_psp = {
   psp_audio_set_nonblock_state,
   psp_audio_free,
   psp_audio_use_float,
-#if defined(VITA)
+#ifdef VITA
   "vita",
-#elif defined(ORBIS)
-   "orbis",
 #else
   "psp",
 #endif
@@ -237,19 +237,12 @@ error:
   return NULL;
 }

-static bool pulse_start(void *data, bool is_shutdown);
 static ssize_t pulse_write(void *data, const void *buf_, size_t size)
 {
   pa_t           *pa = (pa_t*)data;
   const uint8_t *buf = (const uint8_t*)buf_;
   size_t     written = 0;

-   /* Workaround buggy menu code.
-    * If a write happens while we're paused, we might never progress. */
-   if (pa->is_paused)
-      if (!pulse_start(pa, false))
-         return -1;
-
   pa_threaded_mainloop_lock(pa->mainloop);
   while (size)
   {
@@ -277,8 +270,6 @@ static bool pulse_stop(void *data)
 {
   bool ret;
   pa_t *pa = (pa_t*)data;
-   if (pa->is_paused)
-      return true;

   RARCH_LOG("[PulseAudio]: Pausing.\n");

@@ -305,8 +296,6 @@ static bool pulse_start(void *data, bool is_shutdown)
 {
   bool ret;
   pa_t *pa = (pa_t*)data;
-   if (!pa->is_paused)
-      return true;

   RARCH_LOG("[PulseAudio]: Unpausing.\n");

@@ -94,6 +94,8 @@ 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 handle_idx = 0;
@@ -120,7 +122,7 @@ static ssize_t switch_audio_write(void *data, const void *buf, size_t 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
@@ -137,7 +139,7 @@ static ssize_t switch_audio_write(void *data, const void *buf, size_t size)
 	}

 	swa->last_append = svcGetSystemTick();
-
+	
 	return to_write;
 }

@@ -328,7 +330,7 @@ static void *switch_audio_init(const char *device,
   swa->is_paused      = true;

   RARCH_LOG("[Audio]: Audio initialized\n");
-
+   
   return swa;

 fail_audio_output:
@@ -80,6 +80,7 @@ static void mainLoop(void* data)

   RARCH_LOG("[Audio]: start mainLoop cpu %u tid %u\n", svcGetCurrentProcessorNumber(), swa->thread.handle);

+
   while (swa->running)
   {
      size_t buf_avail, avail, to_write;
@@ -237,7 +238,7 @@ static void *switch_thread_audio_init(const char *device, unsigned rate, unsigne
      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);

@@ -296,6 +296,7 @@
 #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.
@@ -2169,9 +2170,10 @@ static void * tinyalsa_init(const char *devicestr, unsigned rate,
   unsigned int device          = 0;
   unsigned int frames_per_ms   = 0;
   unsigned int orig_rate       = rate;
-   unsigned int max_rate, min_rate, buffer_size;
+   unsigned int max_rate, min_rate;
   float initial_latency;

+   snd_pcm_uframes_t         buffer_size;
   struct pcm_config         config;

   tinyalsa_t *tinyalsa      = (tinyalsa_t*)calloc(1, sizeof(tinyalsa_t));
@@ -29,15 +29,6 @@
 #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>

@@ -589,6 +580,7 @@ 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;
@@ -600,6 +592,11 @@ 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);
@@ -679,6 +676,8 @@ error:
   if (w->buffer)
      fifo_free(w->buffer);
   free(w);
+   if (com_initialized)
+      CoUninitialize();

   return NULL;
 }
@@ -890,6 +889,7 @@ 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,6 +318,7 @@ static size_t ax_audio_buffer_size(void* data)
   return AX_AUDIO_COUNT;
 }

+
 audio_driver_t audio_ax =
 {
   ax_audio_init,
@@ -202,6 +202,10 @@ 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
@@ -218,13 +222,8 @@ 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, (LPCWSTR)(uintptr_t)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);

@@ -315,7 +314,7 @@ static void *xa_init(const char *device, unsigned rate, unsigned latency,

   bufsize = latency * rate / 1000;

-   RARCH_LOG("[XAudio2]: Requesting %u ms latency, using %d ms latency.\n",
+   RARCH_LOG("XAudio2: Requesting %u ms latency, using %d ms latency.\n",
         latency, (int)bufsize * 1000 / rate);

   xa->bufsize = bufsize * 2 * sizeof(float);
@@ -1,5 +1,7 @@
 /*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2018 - Krzysztof Haładyn
+ *  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-
@@ -13,14 +15,350 @@
 *  If not, see <http://www.gnu.org/licenses/>.
 */

-#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"
+/* 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
-/* The old version still has to be there since XAudio 2.8 is not available
- * on Windows 7 and earlier */
-#include "xaudio27.h"
+#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
+
@@ -1,362 +0,0 @@
-/*  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,6 +55,7 @@ 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)
 {
@@ -114,6 +115,7 @@ 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"

@@ -149,7 +151,7 @@ done:
 }

 static void *resampler_CC_init(const struct resampler_config *config,
-      double bandwidth_mod,
+      double bandwidth_mod, 
      enum resampler_quality quality,
      resampler_simd_mask_t mask)
 {
@@ -214,6 +216,7 @@ 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));

@@ -304,6 +307,7 @@ 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));

@@ -345,6 +349,7 @@ 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"
@@ -487,8 +492,9 @@ 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,
+      double bandwidth_mod, 
      enum resampler_quality quality,
      resampler_simd_mask_t mask)
 {
@@ -78,6 +78,7 @@
 #      d23: (temp)               #      d31: buffer[6]
 #           (temp)               #           buffer[7]

+
 resampler_CC_downsample_neon:
 _resampler_CC_downsample_neon:

@@ -88,6 +89,7 @@ push {r4}

 mov r4, r0

+
 veor q0, q0, q0
 vmov.f32 s1, #1.0
 vmov.f32 s2, #2.0
@@ -100,15 +102,18 @@ vmov.f32 q5, #1.0
 vmov.f32 q6, #3.0
 vmov.f32 q7, #0.25

+
 vldr s5, [r2, #32]
 vdiv.f32 s6, s20, s4
 vadd.f32 s7, s6, s8
 vdup.f32 q4, d2[0]
 vmin.f32 q4, q4, q5

+
 lsl r3, #3
 add r3, r3, r1

+
 cmp r3, r1
 beq 3f
 1:
@@ -194,6 +199,7 @@ vpop {q4,q5,q6,q7}

 bx lr

+
 .align 4
 .globl resampler_CC_upsample_neon
 #ifndef __MACH__
@@ -250,6 +256,7 @@ bx lr
 #      d23: (temp)               #      d31: buffer[6]
 #           (temp)               #           buffer[7]

+
 resampler_CC_upsample_neon:
 _resampler_CC_upsample_neon:

@@ -260,6 +267,7 @@ push {r4}

 mov r4, r0

+
 veor q0, q0, q0
 vmov.f32 s0, #1.0
 vmov.f32 s2, #-1.0
@@ -272,15 +280,18 @@ vmov.f32 q5, #1.0
 vmov.f32 q6, #3.0
 vmov.f32 q7, #0.25

+
 vldr s5, [r2, #32]
 vdiv.f32 s6, s20, s4
 vadd.f32 s7, s6, s8
 vdup.f32 q4, d2[0]
 vmin.f32 q4, q4, q5

+
 lsl r3, #3
 add r3, r3, r1

+
 cmp r3, r1
 beq 4f
 1:
@@ -345,6 +356,7 @@ vst1.f32 d20, [r4, :64]!

 vadd.f32 s5, s5, s6

+
 vcmpe.f32	s5, s20
 vmrs	APSR_nzcv, fpscr
 blt 2b
@@ -356,6 +368,7 @@ vsub.f32 s5, s5, s20
 cmp r3, r1
 bne 1b

+
 4:
 vst1.f32 {q14-q15}, [r2, :256]
 vstr s5, [r2, #32]
@@ -46,17 +46,14 @@
 #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
@@ -161,6 +158,7 @@ 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)
 {
@@ -244,6 +242,7 @@ 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;
@@ -313,6 +312,7 @@ 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,6 +980,7 @@ 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)
@@ -1295,6 +1296,7 @@ static int rsnd_reset(rsound_t *rd)
   return 0;
 }

+
 int rsd_stop(rsound_t *rd)
 {
   retro_assert(rd != NULL);
@@ -1401,6 +1403,7 @@ 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)
 {
@@ -1490,6 +1493,7 @@ 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 )
      {
@@ -86,7 +86,7 @@ SECTIONS
 		KEEP (*(.fini))
 		. = ALIGN(32);   /* REQUIRED. LD is flaky without it. */
 	} = 0
-
+	
 	PROVIDE (__etext = .);
 	PROVIDE (_etext = .);
 	PROVIDE (etext = .);
@@ -167,6 +167,7 @@ SECTIONS
 	.jcr            : { KEEP (*(.jcr)) }
 	.got		  : { *(.got.plt) *(.got) }

+
 	/*	We want the small data sections together, so single-instruction offsets
 		can access them all, and initialized data all before uninitialized, so
 		we can shorten the on-disk segment size.  */
@@ -181,7 +182,7 @@ SECTIONS

 	_edata = .;
 	PROVIDE (edata = .);
-
+	
 	.sbss      :
 	{
 		__sbss_start = .;
@@ -97,7 +97,7 @@ SECTIONS
 		KEEP (*(.fini))
 		. = ALIGN(32);   /* REQUIRED. LD is flaky without it. */
 	} = 0
-
+	
 	PROVIDE (__etext = .);
 	PROVIDE (_etext = .);
 	PROVIDE (etext = .);
@@ -178,6 +178,7 @@ SECTIONS
 	.jcr            : { KEEP (*(.jcr)) }
 	.got		  : { *(.got.plt) *(.got) }

+
 	/*	We want the small data sections together, so single-instruction offsets
 		can access them all, and initialized data all before uninitialized, so
 		we can shorten the on-disk segment size.  */
@@ -192,7 +193,7 @@ SECTIONS

 	_edata = .;
 	PROVIDE (edata = .);
-
+	
 	.sbss      :
 	{
 		__sbss_start = .;
@@ -56,7 +56,7 @@ void exitspawn_kernel(const char *fileName, SceSize args, void *argp)
   game_param.unk5 = 0x10000;

   int k1 = pspSdkSetK1(0);
-   //sceKernelSuspendAllUserThreads();
+   //sceKernelSuspendAllUserThreads(); 
   int ret = sceKernelLoadExecVSHMs2(fileName, &game_param);
   pspSdkSetK1(k1);
 }
@@ -46,6 +46,7 @@ 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;
@@ -37,6 +37,11 @@ static const camera_driver_t *camera_drivers[] = {
 #endif
 #ifdef ANDROID
   &camera_android,
+#endif
+#if defined(HAVE_AVFOUNDATION)
+#if defined(HAVE_COCOA) || defined(HAVE_COCOATOUCH)
+    &camera_avfoundation,
+#endif
 #endif
   &camera_null,
   NULL,
@@ -46,6 +51,7 @@ static struct retro_camera_callback camera_cb;
 static const camera_driver_t *camera_driver   = NULL;
 static void *camera_data                      = NULL;
 static bool camera_driver_active              = false;
+static bool camera_driver_data_own            = false;

 /**
 * camera_driver_find_handle:
@@ -120,9 +126,18 @@ bool camera_driver_ctl(enum rarch_camera_ctl_state state, void *data)
   {
      case RARCH_CAMERA_CTL_DESTROY:
         camera_driver_active   = false;
+         camera_driver_data_own = false;
         camera_driver          = NULL;
         camera_data            = NULL;
         break;
+      case RARCH_CAMERA_CTL_SET_OWN_DRIVER:
+         camera_driver_data_own = true;
+         break;
+      case RARCH_CAMERA_CTL_UNSET_OWN_DRIVER:
+         camera_driver_data_own = false;
+         break;
+      case RARCH_CAMERA_CTL_OWNS_DRIVER:
+         return camera_driver_data_own;
      case RARCH_CAMERA_CTL_SET_ACTIVE:
         camera_driver_active = true;
         break;
@@ -191,8 +206,7 @@ bool camera_driver_ctl(enum rarch_camera_ctl_state state, void *data)
              return camera_driver->start(camera_data);

           runloop_msg_queue_push(
-                 "Camera is explicitly disabled.\n", 1, 180, false,
-                 NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
+                 "Camera is explicitly disabled.\n", 1, 180, false);
        }
        break;
      case RARCH_CAMERA_CTL_SET_CB:
@@ -30,6 +30,9 @@ enum rarch_camera_ctl_state
   RARCH_CAMERA_CTL_NONE = 0,
   RARCH_CAMERA_CTL_DESTROY,
   RARCH_CAMERA_CTL_DEINIT,
+   RARCH_CAMERA_CTL_SET_OWN_DRIVER,
+   RARCH_CAMERA_CTL_UNSET_OWN_DRIVER,
+   RARCH_CAMERA_CTL_OWNS_DRIVER,
   RARCH_CAMERA_CTL_SET_ACTIVE,
   RARCH_CAMERA_CTL_UNSET_ACTIVE,
   RARCH_CAMERA_CTL_IS_ACTIVE,
@@ -1,59 +0,0 @@
-#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, NULL, NULL);
-#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];
-}
@@ -1,44 +0,0 @@
-/*  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 <retro_common_api.h>
-
-#include "../menu/menu_driver.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
@@ -1,76 +0,0 @@
-/*  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 rcheevos_ctx_desc
-{
-   unsigned idx;
-   char *s;
-   size_t len;
-} rcheevos_ctx_desc_t;
-
-enum
-{
-   RCHEEVOS_ACTIVE_SOFTCORE = 1 << 0,
-   RCHEEVOS_ACTIVE_HARDCORE = 1 << 1
-};
-
-bool rcheevos_load(const void *data);
-
-void rcheevos_reset_game(void);
-
-void rcheevos_populate_menu(void *data);
-
-bool rcheevos_get_description(rcheevos_ctx_desc_t *desc);
-
-bool rcheevos_apply_cheats(bool *data_bool);
-
-bool rcheevos_unload(void);
-
-bool rcheevos_toggle_hardcore_mode(void);
-
-void rcheevos_test(void);
-
-bool rcheevos_set_cheats(void);
-
-void rcheevos_set_support_cheevos(bool state);
-
-bool rcheevos_get_support_cheevos(void);
-
-int rcheevos_get_console(void);
-
-extern bool rcheevos_loaded;
-extern bool rcheevos_hardcore_active;
-extern bool rcheevos_hardcore_paused;
-extern bool rcheevos_state_loaded_flag;
-extern int rcheevos_cheats_are_enabled;
-extern int rcheevos_cheats_were_enabled;
-
-RETRO_END_DECLS
-
-#endif /* __RARCH_CHEEVOS_CHEEVOS_H */
@@ -1,75 +0,0 @@
-#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 rcheevos_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 rcheevos_coro_t structure containing the variables for the coroutine */
-#define CORO_FIELDS \
-  int step, sp; \
-  int stack[ 8 ];
-
-#endif /* __RARCH_CHEEVOS_CORO_H */
@@ -1,264 +0,0 @@
-/*  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 "../deps/rcheevos/include/rcheevos.h"
-
-static int rcheevos_cmpaddr(const void* e1, const void* e2)
-{
-   const rcheevos_fixup_t* f1 = (const rcheevos_fixup_t*)e1;
-   const rcheevos_fixup_t* f2 = (const rcheevos_fixup_t*)e2;
-
-   if (f1->address < f2->address)
-   {
-      return -1;
-   }
-   else if (f1->address > f2->address)
-   {
-      return 1;
-   }
-   else
-   {
-      return 0;
-   }
-}
-
-static size_t rcheevos_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 rcheevos_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 rcheevos_fixup_init(rcheevos_fixups_t* fixups)
-{
-   fixups->elements = NULL;
-   fixups->capacity = fixups->count = 0;
-   fixups->dirty = false;
-}
-
-void rcheevos_fixup_destroy(rcheevos_fixups_t* fixups)
-{
-   CHEEVOS_FREE(fixups->elements);
-   rcheevos_fixup_init(fixups);
-}
-
-const uint8_t* rcheevos_fixup_find(rcheevos_fixups_t* fixups, unsigned address, int console)
-{
-   rcheevos_fixup_t key;
-   rcheevos_fixup_t* found;
-   const uint8_t* location;
-
-   if (fixups->dirty)
-   {
-      qsort(fixups->elements, fixups->count, sizeof(rcheevos_fixup_t), rcheevos_cmpaddr);
-      fixups->dirty = false;
-   }
-
-   key.address = address;
-   found = (rcheevos_fixup_t*)bsearch(&key, fixups->elements, fixups->count, sizeof(rcheevos_fixup_t), rcheevos_cmpaddr);
-
-   if (found != NULL)
-   {
-      return found->location;
-   }
-
-   if (fixups->count == fixups->capacity)
-   {
-      unsigned new_capacity = fixups->capacity == 0 ? 16 : fixups->capacity * 2;
-      rcheevos_fixup_t* new_elements = (rcheevos_fixup_t*)
-         realloc(fixups->elements, new_capacity * sizeof(rcheevos_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 =
-      rcheevos_patch_address(address, console);
-   fixups->dirty = true;
-
-   return location;
-}
-
-const uint8_t* rcheevos_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(RCHEEVOS_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(RCHEEVOS_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(RCHEEVOS_TAG "GBA memory address %X adjusted to %X\n", address, address + 0x3000000);
-            address += 0x3000000;
-         }
-         else
-         {
-            /* Work RAM. */
-            CHEEVOS_LOG(RCHEEVOS_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(RCHEEVOS_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(RCHEEVOS_TAG "SNES memory address %X adjusted to %X\n", address, address + 0x7e0000);
-            address += 0x7e0000;
-         }
-         else
-         {
-            /* Save RAM. */
-            CHEEVOS_LOG(RCHEEVOS_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)rcheevos_var_reduce(
-               (addr - desc->core.start) & desc->disconnect_mask,
-               desc->core.disconnect);
-
-            if (address >= desc->core.len)
-               address -= rcheevos_var_highest_bit(address);
-
-            address += desc->core.offset;
-
-            CHEEVOS_LOG(RCHEEVOS_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;
-}
@@ -1,48 +0,0 @@
-/*  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;
-} rcheevos_fixup_t;
-
-typedef struct
-{
-   rcheevos_fixup_t* elements;
-   unsigned capacity, count;
-   bool dirty;
-} rcheevos_fixups_t;
-
-void rcheevos_fixup_init(rcheevos_fixups_t* fixups);
-void rcheevos_fixup_destroy(rcheevos_fixups_t* fixups);
-
-const uint8_t* rcheevos_fixup_find(rcheevos_fixups_t* fixups, unsigned address, int console);
-
-const uint8_t* rcheevos_patch_address(unsigned address, int console);
-
-RETRO_END_DECLS
-
-#endif
@@ -1,12 +0,0 @@
-#include "hash.h"
-
-uint32_t rcheevos_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;
-}
@@ -1,674 +0,0 @@
-#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;
-} rcheevos_getvalueud_t;
-
-static int rcheevos_getvalue_key(void* userdata,
-      const char* name, size_t length)
-{
-   rcheevos_getvalueud_t* ud = (rcheevos_getvalueud_t*)userdata;
-
-   ud->is_key = rcheevos_djb2(name, length) == ud->key_hash;
-   return 0;
-}
-
-static int rcheevos_getvalue_string(void* userdata,
-      const char* string, size_t length)
-{
-   rcheevos_getvalueud_t* ud = (rcheevos_getvalueud_t*)userdata;
-
-   if (ud->is_key)
-   {
-      ud->value  = string;
-      ud->length = length;
-      ud->is_key = 0;
-   }
-
-   return 0;
-}
-
-static int rcheevos_getvalue_boolean(void* userdata, int istrue)
-{
-   rcheevos_getvalueud_t* ud = (rcheevos_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 rcheevos_getvalue_null(void* userdata)
-{
-   rcheevos_getvalueud_t* ud = (rcheevos_getvalueud_t*)userdata;
-
-   if (ud->is_key )
-   {
-      ud->value = "null";
-      ud->length = 4;
-      ud->is_key = 0;
-   }
-
-   return 0;
-}
-
-static int rcheevos_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,
-      rcheevos_getvalue_key,
-      NULL,
-      rcheevos_getvalue_string,
-      rcheevos_getvalue_string, /* number */
-      rcheevos_getvalue_boolean,
-      rcheevos_getvalue_null
-   };
-
-   rcheevos_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 rcheevos_get_token(const char* json, char* token, size_t length)
-{
-   rcheevos_get_value(json, CHEEVOS_JSON_KEY_ERROR, token, length);
-
-   if (!string_is_empty(token))
-      return -1;
-
-   return rcheevos_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;
-} rcheevos_countud_t;
-
-static int rcheevos_count_end_array(void* userdata)
-{
-  rcheevos_countud_t* ud = (rcheevos_countud_t*)userdata;
-
-   ud->in_cheevos       = 0;
-   ud->in_lboards       = 0;
-   return 0;
-}
-
-static int rcheevos_count_key(void* userdata,
-      const char* name, size_t length)
-{
-   rcheevos_countud_t* ud = (rcheevos_countud_t*)userdata;
-
-   ud->field_hash        = rcheevos_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 rcheevos_count_number(void* userdata,
-      const char* number, size_t length)
-{
-   rcheevos_countud_t* ud = (rcheevos_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 rcheevos_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,
-      rcheevos_count_end_array,
-      rcheevos_count_key,
-      NULL,
-      NULL,
-      rcheevos_count_number,
-      NULL,
-      NULL
-   };
-
-   int res;
-   rcheevos_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;
-} rcheevos_field_t;
-
-typedef struct
-{
-   int      in_cheevos;
-   int      in_lboards;
-   int      is_console_id;
-   unsigned core_count;
-   unsigned unofficial_count;
-   unsigned lboard_count;
-
-   rcheevos_field_t* field;
-   rcheevos_field_t  id, memaddr, title, desc, points, author;
-   rcheevos_field_t  modified, created, badge, flags, format;
-
-   rcheevos_rapatchdata_t* patchdata;
-} rcheevos_readud_t;
-
-static const char* rcheevos_dupstr(const rcheevos_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 rcheevos_new_cheevo(rcheevos_readud_t* ud)
-{
-   rcheevos_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       = rcheevos_dupstr(&ud->title);
-   cheevo->description = rcheevos_dupstr(&ud->desc);
-   cheevo->badge       = rcheevos_dupstr(&ud->badge);
-   cheevo->memaddr     = rcheevos_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 rcheevos_new_lboard(rcheevos_readud_t* ud)
-{
-   rcheevos_ralboard_t* lboard = ud->patchdata->lboards + ud->lboard_count++;
-
-   lboard->title              = rcheevos_dupstr(&ud->title);
-   lboard->description        = rcheevos_dupstr(&ud->desc);
-   lboard->format             = rcheevos_dupstr(&ud->format);
-   lboard->mem                = rcheevos_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 rcheevos_read_end_object(void* userdata)
-{
-   rcheevos_readud_t* ud = (rcheevos_readud_t*)userdata;
-
-   if (ud->in_cheevos)
-      return rcheevos_new_cheevo(ud);
-
-   if (ud->in_lboards)
-      return rcheevos_new_lboard(ud);
-
-   return 0;
-}
-
-static int rcheevos_read_end_array(void* userdata)
-{
-   rcheevos_readud_t* ud = (rcheevos_readud_t*)userdata;
-
-   ud->in_cheevos       = 0;
-   ud->in_lboards       = 0;
-   return 0;
-}
-
-static int rcheevos_read_key(void* userdata,
-      const char* name, size_t length)
-{
-   rcheevos_readud_t* ud = (rcheevos_readud_t*)userdata;
-
-   int common           = ud->in_cheevos || ud->in_lboards;
-   uint32_t hash        = rcheevos_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 rcheevos_read_string(void* userdata,
-      const char* string, size_t length)
-{
-   rcheevos_readud_t* ud = (rcheevos_readud_t*)userdata;
-
-   if (ud->field)
-   {
-      ud->field->string = string;
-      ud->field->length = length;
-   }
-
-   return 0;
-}
-
-static int rcheevos_read_number(void* userdata,
-      const char* number, size_t length)
-{
-   rcheevos_readud_t* ud = (rcheevos_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 rcheevos_get_patchdata(const char* json, rcheevos_rapatchdata_t* patchdata)
-{
-   static const jsonsax_handlers_t handlers =
-   {
-      NULL,
-      NULL,
-      NULL,
-      rcheevos_read_end_object,
-      NULL,
-      rcheevos_read_end_array,
-      rcheevos_read_key,
-      NULL,
-      rcheevos_read_string,
-      rcheevos_read_number,
-      NULL,
-      NULL
-   };
-
-   rcheevos_readud_t ud;
-   int res;
-
-   /* Count the number of achievements in the JSON file. */
-   res = rcheevos_count_cheevos(json, &patchdata->core_count,
-      &patchdata->unofficial_count, &patchdata->lboard_count);
-
-   if (res != JSONSAX_OK)
-      return -1;
-
-   /* Allocate the achievements. */
-
-   patchdata->core = (rcheevos_racheevo_t*)
-      calloc(patchdata->core_count, sizeof(rcheevos_racheevo_t));
-
-   patchdata->unofficial = (rcheevos_racheevo_t*)
-      calloc(patchdata->unofficial_count, sizeof(rcheevos_racheevo_t));
-
-   patchdata->lboards = (rcheevos_ralboard_t*)
-      calloc(patchdata->lboard_count, sizeof(rcheevos_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)
-   {
-      rcheevos_free_patchdata(patchdata);
-      return -1;
-   }
-
-   return 0;
-}
-
-/*****************************************************************************
-Frees the patchdata
-*****************************************************************************/
-
-void rcheevos_free_patchdata(rcheevos_rapatchdata_t* patchdata)
-{
-   unsigned i = 0, count = 0;
-   const rcheevos_racheevo_t* cheevo = NULL;
-   const rcheevos_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;
-   rcheevos_unlock_cb_t unlock_cb;
-   void* userdata;
-} rcheevos_deactivate_t;
-
-static int rcheevos_deactivate_index(void* userdata, unsigned int index)
-{
-   rcheevos_deactivate_t* ud = (rcheevos_deactivate_t*)userdata;
-
-   ud->is_element           = 1;
-   return 0;
-}
-
-static int rcheevos_deactivate_number(void* userdata,
-      const char* number, size_t length)
-{
-   rcheevos_deactivate_t* ud = (rcheevos_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 rcheevos_deactivate_unlocks(const char* json, rcheevos_unlock_cb_t unlock_cb, void* userdata)
-{
-   static const jsonsax_handlers_t handlers =
-   {
-      NULL,
-      NULL,
-      NULL,
-      NULL,
-      NULL,
-      NULL,
-      NULL,
-      rcheevos_deactivate_index,
-      NULL,
-      rcheevos_deactivate_number,
-      NULL,
-      NULL
-   };
-
-   rcheevos_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 (rcheevos_get_value(json, CHEEVOS_JSON_KEY_GAMEID, gameid, sizeof(gameid)) != 0)
-      return 0;
-
-   return (unsigned)strtol(gameid, NULL, 10);
-}
@@ -1,69 +0,0 @@
-/*  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;
-} rcheevos_racheevo_t;
-
-typedef struct {
-  const char* title;
-  const char* description;
-  const char* format;
-  const char* mem;
-  unsigned id;
-} rcheevos_ralboard_t;
-
-typedef struct {
-   unsigned console_id;
-
-   rcheevos_racheevo_t* core;
-   rcheevos_racheevo_t* unofficial;
-   rcheevos_ralboard_t* lboards;
-
-   unsigned core_count;
-   unsigned unofficial_count;
-   unsigned lboard_count;
-} rcheevos_rapatchdata_t;
-
-typedef void (*rcheevos_unlock_cb_t)(unsigned id, void* userdata);
-
-int rcheevos_get_token(const char* json, char* token, size_t length);
-
-int  rcheevos_get_patchdata(const char* json, rcheevos_rapatchdata_t* patchdata);
-void rcheevos_free_patchdata(rcheevos_rapatchdata_t* patchdata);
-
-void rcheevos_deactivate_unlocks(const char* json, rcheevos_unlock_cb_t unlock_cb, void* userdata);
-
-unsigned chevos_get_gameid(const char* json);
-
-RETRO_END_DECLS
-
-#endif
@@ -1,53 +0,0 @@
-/*  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. */
-#define CHEEVOS_VERBOSE
-
-/*****************************************************************************
-End of setup
-*****************************************************************************/
-
-#define RCHEEVOS_TAG "[RCHEEVOS]: "
-#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 rcheevos_log
-#define CHEEVOS_ERR RARCH_ERR
-
-void rcheevos_log(const char *fmt, ...);
-
-#endif
-
-RETRO_END_DECLS
-
-#endif /* __RARCH_CHEEVOS_UTIL_H */
@@ -1,18 +1,3 @@
-/*  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>
@@ -47,9 +32,9 @@ void set_badge_menu_texture(badges_ctx_t * badges, int i)
         PATH_MAX_LENGTH * sizeof(char),
         APPLICATION_SPECIAL_DIRECTORY_THUMBNAILS_CHEEVOS_BADGES);

-#if defined(HAVE_MENU) || defined(HAVE_MENU_WIDGETS)
+#ifdef HAVE_MENU
   menu_display_reset_textures_list(badge_file, fullpath,
-         &badges->menu_texture_list[i],TEXTURE_FILTER_MIPMAP_LINEAR, NULL, NULL);
+         &badges->menu_texture_list[i],TEXTURE_FILTER_MIPMAP_LINEAR);
 #endif
 }

@@ -1,20 +1,5 @@
-/*  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
+#ifndef __RARCH_BADGE_H
+#define __RARCH_BADGE_H

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

@@ -1,5 +1,5 @@
 /*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2015-2018 - Andre Leiradella
+ *  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-
@@ -36,9 +36,6 @@
 #ifdef HAVE_MENU
 #include "../menu/menu_driver.h"
 #include "../menu/menu_entries.h"
-#ifdef HAVE_MENU_WIDGETS
-#include "../menu/widgets/menu_widgets.h"
-#endif
 #endif

 #ifdef HAVE_THREADS
@@ -291,7 +288,6 @@ 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;

@@ -1592,8 +1588,7 @@ static void cheevos_make_unlock_url(const cheevo_t *cheevo,
 #endif
 }

-static void cheevos_unlocked(retro_task_t *task,
-      void *task_data, void *user_data,
+static void cheevos_unlocked(void *task_data, void *user_data,
      const char *error)
 {
   cheevo_t *cheevo = (cheevo_t *)user_data;
@@ -1646,8 +1641,9 @@ static void cheevos_test_cheevo_set(const cheevoset_t *set)
         }
         else if (valid)
         {
+            char msg[256];
            char url[256];
-            url[0] = '\0';
+            msg[0] = url[0] = '\0';

            cheevo->active &= ~mode;

@@ -1657,18 +1653,11 @@ static void cheevos_test_cheevo_set(const cheevoset_t *set)
            CHEEVOS_LOG("[CHEEVOS]: awarding cheevo %u: %s (%s).\n",
                  cheevo->id, cheevo->title, cheevo->description);

-#if defined(HAVE_MENU) && defined(HAVE_MENU_WIDGETS)
-            if (!menu_widgets_push_achievement(cheevo->title, cheevo->badge))
-#endif
-            {
-               char msg[256];
-               msg[0] = '\0';
-               snprintf(msg, sizeof(msg), "Achievement Unlocked: %s",
-                     cheevo->title);
-               msg[sizeof(msg) - 1] = 0;
-               runloop_msg_queue_push(msg, 0, 2 * 60, false, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
-               runloop_msg_queue_push(cheevo->description, 0, 3 * 60, false, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
-            }
+            snprintf(msg, sizeof(msg), "Achievement Unlocked: %s",
+                  cheevo->title);
+            msg[sizeof(msg) - 1] = 0;
+            runloop_msg_queue_push(msg, 0, 2 * 60, false);
+            runloop_msg_queue_push(cheevo->description, 0, 3 * 60, false);

            cheevos_make_unlock_url(cheevo, url, sizeof(url));
            task_push_http_transfer(url, true, NULL,
@@ -1676,7 +1665,7 @@ static void cheevos_test_cheevo_set(const cheevoset_t *set)

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

               snprintf(shotname, sizeof(shotname), "%s/%s-cheevo-%u",
                  settings->paths.directory_screenshot,
@@ -1828,8 +1817,7 @@ static void cheevos_make_lboard_url(const cheevos_leaderboard_t *lboard,
 #endif
 }

-static void cheevos_lboard_submit(retro_task_t *task,
-      void *task_data, void *user_data,
+static void cheevos_lboard_submit(void *task_data, void *user_data,
      const char *error)
 {
   cheevos_leaderboard_t *lboard = (cheevos_leaderboard_t *)user_data;
@@ -1862,6 +1850,8 @@ static void cheevos_test_leaderboards(void)

         if (value != lboard->last_value)
         {
+            CHEEVOS_LOG("[CHEEVOS]: value lboard  %s %u\n",
+                  lboard->title, value);
            lboard->last_value = value;
         }

@@ -1875,8 +1865,7 @@ static void cheevos_test_leaderboards(void)
               CHEEVOS_LOG("[CHEEVOS]: error: lboard %s tried to submit 0\n",
                     lboard->title);
               runloop_msg_queue_push("Leaderboard attempt cancelled!",
-                     0, 2 * 60, false,
-                     NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
+                     0, 2 * 60, false);
            }
            else
            {
@@ -1894,7 +1883,7 @@ static void cheevos_test_leaderboards(void)
               snprintf(msg, sizeof(msg), "Submitted %s for %s",
                     formatted_value, lboard->title);
               msg[sizeof(msg) - 1] = 0;
-               runloop_msg_queue_push(msg, 0, 2 * 60, false, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
+               runloop_msg_queue_push(msg, 0, 2 * 60, false);
            }
         }

@@ -1903,8 +1892,7 @@ static void cheevos_test_leaderboards(void)
            CHEEVOS_LOG("[CHEEVOS]: cancel lboard %s\n", lboard->title);
            lboard->active = 0;
            runloop_msg_queue_push("Leaderboard attempt cancelled!",
-                  0, 2 * 60, false,
-                  NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
+                  0, 2 * 60, false);
         }
      }
      else
@@ -1920,8 +1908,8 @@ static void cheevos_test_leaderboards(void)
            snprintf(msg, sizeof(msg),
                  "Leaderboard Active: %s", lboard->title);
            msg[sizeof(msg) - 1] = 0;
-            runloop_msg_queue_push(msg, 0, 2 * 60, false, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
-            runloop_msg_queue_push(lboard->description, 0, 3*60, false, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
+            runloop_msg_queue_push(msg, 0, 2 * 60, false);
+            runloop_msg_queue_push(lboard->description, 0, 3*60, false);
         }
      }
   }
@@ -2063,21 +2051,22 @@ static int cheevos_deactivate_unlocks(const char* json, unsigned mode)

 void cheevos_reset_game(void)
 {
-   cheevo_t *cheevo;
-   cheevos_leaderboard_t *lboard;
-   unsigned i;
+   cheevo_t *end       = NULL;
+   cheevo_t *cheevo    = cheevos_locals.core.cheevos;

-   cheevo = cheevos_locals.core.cheevos;
-   for (i = 0; i < cheevos_locals.core.count; i++, cheevo++)
+   if (!cheevo)
+      return;
+
+   end                 = cheevo + cheevos_locals.core.count;
+
+   for (; cheevo < end; cheevo++)
      cheevo->last     = 1;

-   cheevo = cheevos_locals.unofficial.cheevos;
-   for (i = 0; i < cheevos_locals.unofficial.count; i++, cheevo++)
-      cheevo->last = 1;
+   cheevo              = cheevos_locals.unofficial.cheevos;
+   end                 = cheevo + cheevos_locals.unofficial.count;

-   lboard = cheevos_locals.leaderboards;
-   for (i = 0; i < cheevos_locals.lboard_count; i++, lboard++)
-      lboard->active = 0;
+   for (; cheevo < end; cheevo++)
+      cheevo->last = 1;
 }

 void cheevos_populate_menu(void *data)
@@ -2289,7 +2278,7 @@ bool cheevos_toggle_hardcore_mode(void)
         command_event(CMD_EVENT_REWIND_DEINIT, NULL);

      CHEEVOS_LOG("%s\n", msg);
-      runloop_msg_queue_push(msg, 0, 3 * 60, true, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
+      runloop_msg_queue_push(msg, 0, 3 * 60, true);
   }
   else
   {
@@ -2581,12 +2570,10 @@ enum

 static int cheevos_iterate(coro_t *coro)
 {
-   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;
+   ssize_t num_read = 0;
+   size_t to_read   = 4096;
+   uint8_t *buffer  = NULL;
+   const char *end  = NULL;

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

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

   CORO_ENTER();

+
+
      cheevos_locals.addrs_patched = false;

      coro->settings               = config_get_ptr();
@@ -2820,7 +2809,7 @@ found:

      if (!coro->json)
      {
-         runloop_msg_queue_push("Error loading achievements.", 0, 5 * 60, false, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
+         runloop_msg_queue_push("Error loading achievements.", 0, 5 * 60, false);
         CHEEVOS_ERR("[CHEEVOS]: error loading achievements.\n");
         CORO_STOP();
      }
@@ -2849,8 +2838,7 @@ found:
      {
         runloop_msg_queue_push(
               "This game has no achievements.",
-               0, 5 * 60, false,
-               NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
+               0, 5 * 60, false);

         cheevos_free_cheevo_set(&cheevos_locals.core);
         cheevos_free_cheevo_set(&cheevos_locals.unofficial);
@@ -2887,10 +2875,6 @@ found:
         const cheevo_t* end          = cheevo + cheevos_locals.core.count;
         int number_of_unlocked       = cheevos_locals.core.count;

-         snprintf(msg, sizeof(msg), "cheevos: using the old implementation.");
-         msg[sizeof(msg) - 1] = 0;
-         runloop_msg_queue_push(msg, 0, 3 * 60, false, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
-
         if (coro->settings->bools.cheevos_hardcore_mode_enable && !cheevos_hardcore_paused)
            mode = CHEEVOS_ACTIVE_HARDCORE;

@@ -2902,7 +2886,7 @@ found:
               "You have %d of %d achievements unlocked.",
               number_of_unlocked, cheevos_locals.core.count);
         msg[sizeof(msg) - 1] = 0;
-         runloop_msg_queue_push(msg, 0, 6 * 60, false, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
+         runloop_msg_queue_push(msg, 0, 6 * 60, false);
      }

      CORO_GOSUB(GET_BADGES);
@@ -2917,21 +2901,30 @@ found:

      MD5_Init(&coro->md5);

-      /* 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->offset = 0;
      coro->count  = 0;

      CORO_GOSUB(EVAL_MD5);
-      MD5_Final(coro->hash, &coro->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);

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

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

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

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

-      /* Checks for the existence of a headered NES file.
-         Unheadered files fall back to GENERIC_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. */

      if (coro->len < sizeof(coro->header))
      {
@@ -3007,23 +3001,84 @@ found:

      memcpy((void*)&coro->header, coro->data,
            sizeof(coro->header));
-
-      if (     coro->header.id[0] != 'N'
-            || coro->header.id[1] != 'E'
-            || coro->header.id[2] != 'S'
-            || coro->header.id[3] != 0x1a)
+      
+      if (coro->header.id[0] == 'N'
+        && coro->header.id[1] == 'E'
+        && coro->header.id[2] == 'S'
+        && coro->header.id[3] == 0x1a)
      {
-         coro->gameid = 0;
-         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;
+         
+         coro->offset = sizeof(coro->header) + (coro->header.rom_type & 4
+            ? sizeof(coro->header) : 0);
+            
+          /* from FCEU core - check if Trainer included in ROM data */
+          MD5_Init(&coro->md5);
+          coro->count  = 0x4000 * coro->bytes;
+          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);
      }
+      else
+      {
+         unsigned i;
+          size_t chunks     = coro->len >> 14;
+          size_t chunk_size = 0x4000;

-      MD5_Init(&coro->md5);
-      coro->offset = sizeof(coro->header);
-      coro->count  = coro->len - coro->offset;
-      CORO_GOSUB(EVAL_MD5);
+          /* Fall back to headerless hashing
+           * PRG ROM size is unknown, so test by 16KB chunks */

-      MD5_Final(coro->hash, &coro->md5);
-      CORO_GOTO(GET_GAMEID);
+          coro->round       = 0;
+          coro->offset      = 0;
+          
+          for (i = 0; i < chunks; i++)
+          {
+              MD5_Init(&coro->md5);
+              
+              coro->bytes = i + 1;
+              coro->count = coro->bytes * chunk_size;
+              
+              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_GOSUB(GET_GAMEID);
+              
+              if (coro->gameid > 0)
+              {
+                  break;
+              }
+          }
+
+          CORO_RET();
+      }

      /**************************************************************************
       * Info   Tries to identify a "generic" game
@@ -3206,15 +3261,9 @@ found:

      badges_ctx = new_badges_ctx;

-#ifdef HAVE_MENU_WIDGETS
-      if (false) /* we always want badges if menu widgets are enabled */
-#endif
      {
         settings_t *settings = config_get_ptr();
-         if (!(
-               string_is_equal(settings->arrays.menu_driver, "xmb") ||
-               string_is_equal(settings->arrays.menu_driver, "ozone")
-            ) ||
+         if (!string_is_equal(settings->arrays.menu_driver, "xmb") ||
               !settings->bools.cheevos_badges_enable)
            CORO_RET();
      }
@@ -3310,12 +3359,10 @@ found:
         {
            runloop_msg_queue_push(
                  "Missing RetroAchievements account information.",
-                  0, 5 * 60, false,
-                  NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
+                  0, 5 * 60, false);
            runloop_msg_queue_push(
                  "Please fill in your account information in Settings.",
-                  0, 5 * 60, false,
-                  NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
+                  0, 5 * 60, false);
            CHEEVOS_ERR("[CHEEVOS]: login info not informed.\n");
            CORO_STOP();
         }
@@ -3372,12 +3419,12 @@ found:
                        "RetroAchievements: Logged in as \"%s\".",
                        coro->settings->arrays.cheevos_username);
                  msg[sizeof(msg) - 1] = 0;
-                  runloop_msg_queue_push(msg, 0, 3 * 60, false, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
+                  runloop_msg_queue_push(msg, 0, 3 * 60, false);
               }

               /* Save token to config and clear pass on success */
               *coro->settings->arrays.cheevos_password = '\0';
-               strncpy(
+               strlcpy(
                     coro->settings->arrays.cheevos_token,
                     cheevos_locals.token, sizeof(coro->settings->arrays.cheevos_token)
               );
@@ -3393,13 +3440,13 @@ found:
               "RetroAchievements: %s",
               error_response);
         error_message[sizeof(error_message) - 1] = 0;
-         runloop_msg_queue_push(error_message, 0, 5 * 60, false, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
+         runloop_msg_queue_push(error_message, 0, 5 * 60, false);
         *coro->settings->arrays.cheevos_token = '\0';

         CORO_STOP();
      }

-      runloop_msg_queue_push("RetroAchievements: Error contacting server.", 0, 5 * 60, false, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
+      runloop_msg_queue_push("RetroAchievements: Error contacting server.", 0, 5 * 60, false);
      CHEEVOS_ERR("[CHEEVOS]: error getting user token.\n");

      CORO_STOP();
@@ -3656,7 +3703,7 @@ bool cheevos_load(const void *data)
   if (!coro)
      return false;

-   task = task_init();
+   task = (retro_task_t*)calloc(1, sizeof(*task));

   if (!task)
   {
@@ -1,5 +1,5 @@
 /*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2015-2018 - Andre Leiradella
+ *  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-
@@ -13,8 +13,8 @@
 *  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef __RARCH_CHEEVOS_OLD_H
-#define __RARCH_CHEEVOS_OLD_H
+#ifndef __RARCH_CHEEVOS_H
+#define __RARCH_CHEEVOS_H

 #include <stdint.h>
 #include <stdlib.h>
@@ -30,7 +30,7 @@ Setup - mainly for debugging
 *****************************************************************************/

 /* Define this macro to get extra-verbose log for cheevos. */
-#define CHEEVOS_VERBOSE
+#undef CHEEVOS_VERBOSE

 /*****************************************************************************
 End of setup
@@ -94,8 +94,7 @@ typedef enum
   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_ZX81            = 31
 } cheevos_console_t;

 enum
@@ -156,7 +155,6 @@ 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;

@@ -289,53 +289,46 @@ Testing

 uint8_t* cheevos_var_get_memory(const cheevos_var_t* var)
 {
-   rarch_system_info_t *system = NULL;
-   uint8_t             *memory = NULL;
-   size_t               length = 0;
+   uint8_t* memory = NULL;

-   if (var->bank_id < 0)
-      return NULL;
-
-   system = runloop_get_system_info();
-
-   if (system->mmaps.num_descriptors != 0)
+   if (var->bank_id >= 0)
   {
-      memory = (uint8_t*)system->mmaps.descriptors[var->bank_id].core.ptr;
-      length = system->mmaps.descriptors[var->bank_id].core.len;
-   }
-   else
-   {
-      retro_ctx_memory_info_t meminfo = {NULL, 0, 0};
+      rarch_system_info_t* system = runloop_get_system_info();

-      switch (var->bank_id)
+      if (system->mmaps.num_descriptors != 0)
+         memory = (uint8_t*)system->mmaps.descriptors[var->bank_id].core.ptr;
+      else
      {
-         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: %d\n", var->bank_id);
-            break;
+         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;
      }

-      core_get_memory(&meminfo);
-
-      memory = (uint8_t*)meminfo.data;
-      length = meminfo.size;
+      if (memory)
+         memory += var->value;
   }

-   if (memory == NULL || var->value >= length)
-      return NULL;
-
-   return memory + var->value;
+   return memory;
 }

 unsigned cheevos_var_get_value(cheevos_var_t* var)
@@ -418,5 +411,6 @@ unsigned cheevos_var_get_value(cheevos_var_t* var)

   if(var->is_bcd)
      return (((value >> 4) & 0xf) * 10) + (value & 0xf);
-   return value;
+   else
+      return value;
 }
@@ -1,5 +1,5 @@
 /*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2015-2018 - Andre Leiradella
+ *  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-
@@ -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-2019 - Brad Parker
+ *  Copyright (C) 2016 - 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-
@@ -27,6 +27,8 @@
 #include "config.h"
 #endif

+#include "playlist.h"
+
 RETRO_BEGIN_DECLS

 typedef struct command command_t;
@@ -83,12 +85,6 @@ enum event_command
   CMD_EVENT_AUDIO_START,
   /* Mutes audio. */
   CMD_EVENT_AUDIO_MUTE_TOGGLE,
-   /* Toggles FPS counter. */
-   CMD_EVENT_FPS_TOGGLE,
-   /* Gathers diagnostic info about the system and RetroArch configuration, then sends it to our servers. */
-   CMD_EVENT_SEND_DEBUG_INFO,
-   /* Toggles netplay hosting. */
-   CMD_EVENT_NETPLAY_HOST_TOGGLE,
   /* Initializes overlay. */
   CMD_EVENT_OVERLAY_INIT,
   /* Deinitializes overlay. */
@@ -153,7 +149,6 @@ 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,
@@ -162,6 +157,7 @@ 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 */
@@ -192,10 +188,6 @@ enum event_command
   CMD_EVENT_NETPLAY_DEINIT,
   /* Switch between netplay gaming and watching. */
   CMD_EVENT_NETPLAY_GAME_WATCH,
-   /* Start hosting netplay. */
-   CMD_EVENT_NETPLAY_ENABLE_HOST,
-   /* Disconnect from the netplay host. */
-   CMD_EVENT_NETPLAY_DISCONNECT,
   /* Initializes BSV movie. */
   CMD_EVENT_BSV_MOVIE_INIT,
   /* Deinitializes BSV movie. */
@@ -278,6 +270,23 @@ bool command_free(command_t *handle);
 **/
 bool command_event(enum event_command action, void *data);

+void command_playlist_push_write(
+      playlist_t *playlist,
+      const char *path,
+      const char *label,
+      const char *core_path,
+      const char *core_name);
+
+void command_playlist_update_write(
+      playlist_t *playlist,
+      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-2019 - Brad Parker
+ *  Copyright (C) 2016 - 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-
@@ -32,11 +32,6 @@
 #include "network/netplay/netplay.h"
 #endif

-/* Required for 3DS display mode setting */
-#if defined(_3DS)
-#include "gfx/common/ctr_common.h"
-#endif
-
 #if defined(HW_RVL)
 #define MAX_GAMMA_SETTING 30
 #elif defined(GEKKO)
@@ -53,7 +48,7 @@
 #define DEFAULT_ASPECT_RATIO -1.0f
 #endif

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

-static const unsigned crt_switch_resolution  = CRT_SWITCH_NONE;
-static const int crt_switch_resolution_super = 2560;
+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;
@@ -122,18 +117,14 @@ 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_width = 1280;
-static const unsigned window_height = 720;
+static const unsigned window_x = 0;
+static const unsigned window_y = 0;

 /* 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.
 */
@@ -157,8 +148,6 @@ 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;
@@ -190,14 +179,10 @@ 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) || defined(PS2)
+#if defined(GEKKO) || defined(PSP)
 /* For single-core consoles right now it's better to have this be disabled. */
 static const bool threaded_data_runloop_enable = false;
 #else
@@ -249,11 +234,6 @@ 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
@@ -277,27 +257,13 @@ static const float default_input_overlay_opacity = 0.7f;

 #ifdef HAVE_MENU
 #include "menu/menu_driver.h"
-#include "menu/menu_animation.h"

 static bool default_block_config_read    = true;

-#ifdef HAVE_LIBNX
-static bool menu_use_preferred_system_color_theme = true;
-#else
-static bool menu_use_preferred_system_color_theme = false;
-#endif
-
-#ifdef HAVE_OZONE
-static bool ozone_collapse_sidebar = 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;
@@ -312,7 +278,6 @@ 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;
@@ -321,20 +286,12 @@ 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
 static bool menu_show_core_updater       = true;
 #endif
-static bool menu_show_sublabels          = true;
-
-static unsigned menu_ticker_type         = TICKER_TYPE_BOUNCE;
-static float menu_ticker_speed           = 1.0f;

 static bool content_show_settings    = true;
 static bool content_show_favorites   = true;
@@ -386,20 +343,10 @@ static unsigned menu_shader_pipeline = 1;
 static unsigned menu_shader_pipeline = 2;
 #endif

-static bool show_advanced_settings        = false;
-
-static unsigned rgui_color_theme          = RGUI_THEME_CLASSIC_GREEN;
-static bool rgui_inline_thumbnails = false;
-static bool rgui_swap_thumbnails = false;
-static unsigned rgui_thumbnail_downscaler = RGUI_THUMB_SCALE_POINT;
-static unsigned rgui_thumbnail_delay = 0;
-static unsigned rgui_internal_upscale_level = RGUI_UPSCALE_NONE;
-static bool rgui_full_width_layout = true;
-static unsigned rgui_aspect = RGUI_ASPECT_RATIO_4_3;
-static unsigned rgui_aspect_lock = RGUI_ASPECT_RATIO_LOCK_NONE;
-static bool rgui_shadows = false;
-static unsigned rgui_particle_effect = RGUI_PARTICLE_EFFECT_NONE;
-static bool rgui_extended_ascii = false;
+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;

 #else
 static bool default_block_config_read = false;
@@ -421,14 +368,10 @@ 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) || defined(ORBIS)
+#elif defined(SWITCH)
 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
@@ -448,11 +391,6 @@ static bool menu_swap_ok_cancel_buttons = true;
 static bool menu_swap_ok_cancel_buttons = false;
 #endif

-static bool quit_press_twice = false;
-
-static bool default_log_to_file = false;
-static bool log_to_file_timestamp = false;
-
 /* Crop overscanned frames. */
 static const bool crop_overscan = true;

@@ -524,31 +462,11 @@ static const float crt_refresh_rate = 60/1.001;
 * Used for setups where one manually rotates the monitor. */
 static const bool allow_rotate = true;

-#if defined(_3DS)
-/* Enable bottom LCD screen */
-static const bool video_3ds_lcd_bottom = true;
-/* Sets video display mode (3D, 2D, etc.) */
-static const unsigned video_3ds_display_mode = CTR_VIDEO_MODE_3D;
-#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;
-
-#ifdef HAVE_MENU_WIDGETS
-static const bool menu_enable_widgets      = true;
-#else
-static const bool menu_enable_widgets      = false;
-#endif
-
 /* Output samplerate. */
 #ifdef GEKKO
 static const unsigned out_rate = 32000;
@@ -606,14 +524,8 @@ static const int wasapi_sh_buffer_length = -16; /* auto */
 /* Enables displaying the current frames per second. */
 static const bool fps_show = false;

-/* 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 displaying various timing statistics. */
-static const bool statistics_show = false;
+/* Show frame count on FPS display */
+static const bool framecount_show = true;

 /* Enables use of rewind. This will incur some memory footprint
 * depending on the save state buffer. */
@@ -644,13 +556,7 @@ 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;
@@ -733,26 +639,6 @@ 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;

-/* Sort all playlists (apart from histories) alphabetically */
-static const bool playlist_sort_alphabetical = true;
-
-/* File format to use when writing playlists to disk */
-static const bool playlist_use_old_format = false;
-
-#ifdef HAVE_MENU
-/* Specify when to display 'core name' inline on playlist entries */
-static const unsigned playlist_show_inline_core_name = PLAYLIST_INLINE_CORE_DISPLAY_HIST_FAV;
-
-/* Specifies which runtime record to use on playlist sublabels */
-static const unsigned playlist_sublabel_runtime_type = PLAYLIST_RUNTIME_PER_CORE;
-#endif
-
-static const bool scan_without_core_match      = false;
-
-static const bool playlist_show_sublabels      = false;
-
-static const bool playlist_fuzzy_archive_match = false;
-
 /* Show Menu start-up screen on boot. */
 static const bool default_menu_show_start_screen = true;

@@ -781,11 +667,7 @@ static const unsigned libretro_log_level = 1;

 /* Axis threshold (between 0.0 and 1.0)
 * How far an axis must be tilted to result in a button press. */
-static const float axis_threshold = 0.5f;
-
-static const float analog_deadzone = 0.0f;
-
-static const float analog_sensitivity = 1.0f;
+static const float axis_threshold = 0.5;

 /* Describes speed of which turbo-enabled buttons toggle. */
 static const unsigned turbo_period = 6;
@@ -807,14 +689,12 @@ static const unsigned input_poll_type_behavior = 2;

 static const unsigned input_bind_timeout = 5;

-static const unsigned input_bind_hold = 1;
+static const unsigned input_bind_hold = 2;

 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;

 #ifdef IOS
@@ -831,15 +711,9 @@ static const bool ui_companion_toggle = false;
 /* Only init the WIMP UI for this session if this is enabled */
 static const bool desktop_menu_enable = true;

-/* Keep track of how long each core+content has been running for over time */
-static const bool content_runtime_log = false;
-
-/* Keep track of how long each content has been running for over time (ignores core) */
-static const bool content_runtime_log_aggregate = false;
-
 #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) || defined(PS2)
+#elif defined(PSP) || defined(_3DS) || defined(VITA)
 static enum resampler_quality audio_resampler_quality_level = RESAMPLER_QUALITY_LOWEST;
 #else
 static enum resampler_quality audio_resampler_quality_level = RESAMPLER_QUALITY_NORMAL;
@@ -853,9 +727,6 @@ static const unsigned midi_volume = 100;
 /* Only applies to Android 7.0 (API 24) and up */
 static const bool sustained_performance_mode = false;

-static const bool vibrate_on_keypress = false;
-static const bool enable_device_vibration = false;
-
 #if defined(HAKCHI)
 static char buildbot_server_url[] = "http://hakchicloud.com/Libretro_Cores/";
 #elif defined(ANDROID)
@@ -885,25 +756,7 @@ 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 >= 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/";
-#elif  defined(__arm__) || defined(_M_ARM)
-static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows-msvc2017-desktop/arm/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 _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)
@@ -932,8 +785,6 @@ 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)
@@ -946,6 +797,4 @@ static char buildbot_server_url[] = "";

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

-static char default_discord_app_id[] = "475456035851599874";
-
 #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-2019 - Brad Parker
+ *  Copyright (C) 2016 - 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-
@@ -87,9 +87,6 @@ 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_SEND_DEBUG_INFO,          MENU_ENUM_LABEL_VALUE_INPUT_META_SEND_DEBUG_INFO,      RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_NETPLAY_HOST_TOGGLE,      MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_HOST_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 },
@@ -102,8 +99,6 @@ 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 },
@@ -168,9 +163,6 @@ 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_SEND_DEBUG_INFO,          MENU_ENUM_LABEL_VALUE_INPUT_META_SEND_DEBUG_INFO,      RETROK_F10,     NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_NETPLAY_HOST_TOGGLE,      MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_HOST_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_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 },
@@ -183,8 +175,6 @@ 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,12 +152,6 @@ 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
@@ -260,6 +254,12 @@ static const bool _hlsl_supp = true;
 static const bool _hlsl_supp = false;
 #endif

+#ifdef HAVE_LIBXML2
+static const bool _libxml2_supp = true;
+#else
+static const bool _libxml2_supp = false;
+#endif
+
 #ifdef HAVE_SDL_IMAGE
 static const bool _sdl_image_supp = true;
 #else
@@ -290,12 +290,6 @@ 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
@@ -308,7 +302,7 @@ static const bool _python_supp = true;
 static const bool _python_supp = false;
 #endif

-#if defined(HAVE_COCOA) || defined(HAVE_COCOATOUCH) || defined(HAVE_COCOA_METAL)
+#if defined(HAVE_COCOA) || defined(HAVE_COCOATOUCH)
 static const bool _cocoa_supp = true;
 #else
 static const bool _cocoa_supp = false;
@@ -350,6 +344,12 @@ static const bool _coretext_supp = true;
 static const bool _coretext_supp = false;
 #endif

+#ifdef HAVE_AVFOUNDATION
+static const bool _avfoundation_supp = true;
+#else
+static const bool _avfoundation_supp = false;
+#endif
+
 #if !defined(_WIN32) && !defined(GLOBAL_CONFIG_DIR)
 #if defined(__HAIKU__)
 #define GLOBAL_CONFIG_DIR "/system/settings"