Update CHANGES.md

Merge pull request #9401 from jdgleaver/favorites-fix
(Favourites) Fix 'remove entry' deleting wrong item
2026-11-09 03:29:43 -10:00 · 2019-08-31 21:12:14 +02:00 · 2019-08-30 17:34:26 +02:00 · 2019-08-30 15:43:17 +01:00 · 2019-08-30 16:19:23 +02:00 · 2019-08-30 15:55:36 +02:00
2542 changed files with 163288 additions and 99035 deletions
@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: libretro
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+custom: # Replace with a single custom sponsorship URL
@@ -115,6 +115,10 @@ wiiu/wut/elf2rpl/elf2rpl
 /pkg/android/phoenix/bin/
 /pkg/android/phoenix/gen/
 /pkg/android/phoenix/local.properties
+/pkg/android/phoenix/gradle.properties
+/pkg/android/phoenix/.gradle
+/pkg/android/phoenix/.externalNativeBuild
+/pkg/android/phoenix/build

 # Cloned by libretro-fetch.sh
 /media/assets/
@@ -0,0 +1,8 @@
+before_script:
+  - apt-get update -qq && apt-get install -y -qq git build-essential
+  - apt-get update -qq && apt-get build-dep -y retroarch
+
+build:
+  script:
+    - ./configure
+    - make -j2
@@ -1,6 +1,9 @@
 # Use 'generic' to be able to override CC/CXX for clang
 language: generic

+# Use a release with a longer normal LTS
+dist: xenial
+
 matrix:
  include:
    - compiler: mingw-x86
@@ -29,12 +32,22 @@ matrix:
      env: CXX_BUILD=1 CC=gcc-8 CXX=g++-8
    - compiler: gcc
      env: DISABLE_MENU=1 CC=gcc-8 CXX=g++-8
+    - compiler: gcc
+      env: DISABLE_OVERLAY=1 CC=gcc-8 CXX=g++-8
+    - compiler: gcc
+      env: DISABLE_CDROM=1 CC=gcc-8 CXX=g++-8
+    - compiler: gcc
+      env: ENABLE_GLES=1 CC=gcc-8 CXX=g++-8
+    - compiler: gcc
+      env: ENABLE_GLES=1 ENABLE_GLES3=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
+      env: CC=clang CXX=clang++
    - os: osx
      osx_image: xcode8
      script:
@@ -50,6 +63,21 @@ matrix:
        script: bash travis_metal_deploy.sh
        on:
          branch: master
+    - language: android
+      # Android builds are only supported on Trusty
+      dist: trusty
+      android:
+        components:
+          - tools
+          - build-tools-28.0.3
+          - android-28
+      install:
+        - echo y | sdkmanager "ndk-bundle"
+      before_script:
+        - export ANDROID_NDK_HOME=$ANDROID_HOME/ndk-bundle
+      script:
+        - cd pkg/android/phoenix
+        - ./gradlew assembleNormalRelease

 before_install:
  - |
@@ -58,25 +86,38 @@ before_install:
       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
+       sudo update-alternatives --set i686-w64-mingw32-g++ /usr/bin/i686-w64-mingw32-g++-posix
     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
+       sudo update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix
     fi

 script:
  - |
     if [ -n "$CROSS_COMPILE" ]; then
-       ARGS="$ARGS --disable-d3d8 --disable-d3d9 --disable-d3d10 --disable-d3d11 --disable-d3d12 --enable-builtinzlib"
+       ARGS="$ARGS --disable-d3d8 --disable-d3d9 --disable-d3d10 --disable-d3d11 --disable-d3d12"
     fi
  - |
     if [ -n "$DISABLE_MENU" ]; then
       ARGS="$ARGS --disable-menu"
     fi
+  - |
+     if [ -n "$DISABLE_OVERLAY" ]; then
+       ARGS="$ARGS --disable-overlay"
+     fi
+  - |
+     if [ -n "$DISABLE_CDROM" ]; then
+       ARGS="$ARGS --disable-cdrom"
+     fi
+  - |
+     if [ -n "$ENABLE_GLES" ]; then
+       ARGS="$ARGS --enable-opengles"
+     fi
+  - |
+     if [ -n "$ENABLE_GLES3" ]; then
+       ARGS="$ARGS --enable-opengles3"
+     fi
  - ./configure $ARGS
  - |
     if [ -n "$C89_BUILD" ]; then
@@ -101,7 +142,7 @@ addons:
      - qtdeclarative5-dev
    sources:
      - ubuntu-toolchain-r-test
-      - llvm-toolchain-trusty-6.0
+      - llvm-toolchain-xenial
  coverity_scan:
    project:
      name: "RetroArch"
@@ -23,7 +23,6 @@
      "ios": "c",
      "list": "c",
      "input_driver.h": "c",
-      "video_driver.h": "c",
      "menu_driver.h": "c",
      "file_path.h": "c",
      "unordered_map": "c",
@@ -54,7 +53,6 @@
      "verbosity.h": "c",
      "retroarch.h": "c",
      "menu_animation.h": "c",
-      "audio_driver.h": "c",
      "netplay.h": "c",
      "scaler.h": "c",
      "deque": "c",
@@ -71,4 +69,4 @@
      "badges.h": "c"
   },
   "C_Cpp.dimInactiveRegions": false,
-}
+}
@@ -5,12 +5,13 @@ acknowledge the following contributors:
 1ch (L0sted)
 Aaahh Ahh (Aaahh)
 Aaron Oneal (aarononeal)
+Adam Londero (alondero)
 Adam Mechtley (amechtley)
-Adolfo Ketzer (reztek)
 AdrianoML
 ajefr
 Alberto Simon (asimonf)
 Alcaro
+Aleksey Samoilov (Sunderland93)
 Alessandro Mangone (Vektor) (zevektor)
 Alex Eckhart (alex34567)
 Alex Folland (AlexFolland)
@@ -27,14 +28,16 @@ Andrés (fr500)
 Anthony J. Bentley (bentley)
 Antonio Jose Ramos Marquez (psxdev)
 AridRayne
+ArnaudFaucher
 Arto Vainiolehto (arakerlu)
-asako (asakous)
 Ash (QuarkTheAwesome)
 Ashura (CoalaJoe)
 Autechre64
 Avton1
+ayssia
 barbudreadmon
 bearoso
+benutzer193
 blackgur
 Boris Timofeev (btimofeev)
 bparker06
@@ -47,24 +50,26 @@ Casey Borders (CaseyB)
 ceb33
 celerizer
 Chris Merrett (chrisfu)
+Christian Murphy (grimpunch)
 chu (9chu)
 CidVonHighwind
 clienthax
+cold-brewed
+CompCom
 Conn O'Griofa (psyke83)
+CozmoP
 cpsw
 Cray Elliott (MP2E)
 Cristian Sandu (crazyquark)
 ctult
-cubtekki
 cucholix
 cudencuden
 cxd4
 dalter
 Dan Weiss (Dwedit)
 danieljg
-Daniil Zhilin (GeneralFailer)
+Daniil Zhilin (LaserMoai)
 dankcushions
-Danny Glover (DannyGlover)
 Dave (freakdave)
 Dave Leaver (danzel)
 David Demelier (markand)
@@ -79,14 +84,18 @@ Diego Viola (diegoviola)
 Diogo Barros (BlueKore)
 DogParty
 dor3k
+driver1998
 Dudu Akiva (duduke)
 duganchen
+dukemiller
 duskgao
 ekipan
-ensra
+Emmanuel Martin (daliaetnano)
+endrift
 erbridge
 esoptron
 Ethan Lee (flibitijibibo)
+Exvat
 Ezio-PS
 Fabio (Oibaf66)
 Fabio Ritrovato (Sephiroth87)
@@ -94,8 +103,9 @@ Fayne Aldan (FayneAldan)
 FIX94
 Flame Sage (chris062689)
 flyinghead
-Francisco José García García (frangarcj)
 Francisco Javier Trujillo Mata (fjtrujy)
+Francisco José García García (frangarcj)
+Gabriel (Ghabry)
 GameDragon2k
 Garrett Brown (garbear)
 gblues
@@ -103,6 +113,7 @@ Geoffrey Plitt (GeoffreyPlitt)
 Glenn Hevey (hevey)
 Googer
 gouchi
+grant2258
 Gregor Richards (GregorR)
 Gui Andrade (archshift)
 Gustavo Maciel Dias Vieira (gmdvieira)
@@ -113,17 +124,23 @@ Hans-Kristian Arntzen (Themaister)
 Henri Gomez (hgomez)
 Henri Gomez (hgomez-sonarsource)
 Higor Eurípedes (heuripedes)
+Hisman Yosika (dnjstlr555)
 hizzlekizzle
-Hugo B. (777sha)
+Hugo B. (hug0b)
+Hugo Hromic (hhromic)
 hunterk
+hyarsan
 Hyllian
 i30817
 iAmGhost
 Jack (jakcron)
+Jacob (cubtekki)
 James Le Cuirot (chewi)
 James Sexton (Bezier89)
+Jamiras
 Jan Holthuis (Holzhaus)
 Jay McCarthy (jeapostrophe)
+jdgleaver
 Jean-André Santoni (kivutar)
 Jean-Paul Mari (djipi)
 Jean-Sébastien Guay (Skylark13)
@@ -136,6 +153,7 @@ Jon Maddox (maddox)
 Jonathan Relf (jonathanrelf)
 Joohan Lee (losernator)
 Jools Wills (joolswills)
+Jose Lage Miguez (Joselagem)
 Joseph Carter (iKarith)
 Joseph Conan Montgomery (Grotke)
 Josh Palmer (ShiftyAxel)
@@ -143,12 +161,14 @@ JuanVCS
 Justin Jacobs (dorkster)
 Justin Weiss (justinweiss)
 Ken Rossato (rossato)
-Krzysztof Haładyn (krzys_h)
+krzys_h (krzys-h)
 kurumushi
 kwyxz
 l3iggs
+lambolighting
 lasers
 Lawrence Kesteloot (lkesteloot)
+lifajucejo
 liffy (lifning)
 Lionel Flandrin (simias)
 littleguy77
@@ -158,19 +178,26 @@ Lothar Serra Mari (lotharsm)
 Lubosz Sarnecki (lubosz)
 lucianposton
 lxerandrew
+m4xw
 Mahyar Koshkouei (deltabeard)
+Manuel Alfayate Corchete (vanfanel)
 Marcelo Munhoz Pélos (mpelos)
 markwkidd
 Maschell
 Mat M. (lioncash)
+Mats A. (Datamats)
 Matt Sephton (gingerbeardman)
+Matthew Wang (asakous)
+Max K. (langerhans)
 Maxime Gauduin (alucryd)
 mcrisostomo
 meancoot
 meepingsnesroms
 meleu
 Michael K. (kuxii2016)
+Michael Lelli (ToadKing)
 Michał Durak (micechal)
+mickski56
 Mico Chopitea (micochops)
 miguelpinheiro
 Mike Swanson (chungy)
@@ -179,17 +206,22 @@ misson20000
 Monroe88
 mprobinson
 MrHuu
+MrJs (mrjschulte)
 muzuiget
 mwtremblay
+myfreeweb
 Nathan S. (natinusala)
+NathanStrong-Tripwire
 nattycleopatra
+nayslayer
 netux79
 nfnty
+nia (ensra)
 Nicolas Adenis-Lamarre (nadenislamarre)
 Nicolas Guillaumin (nguillaumin)
 Nicolas Lopez Fernandez (pyroesp)
-Nikita Vakhrushev (JesterIOS)
-Nikola Kocic (nikola-kocic)
+Nikita Vakhrushev (SwooodGa)
+Nikola Kocić (nikola-kocic)
 Niouby
 nosh01
 not6 (r-type)
@@ -203,13 +235,17 @@ orbea
 OV2
 pamapa
 Paolo Bonzini (bonzini)
-Paul McCarty (a-shark)
+Paul McCarty (notabeatle)
 Pedro Ribeiro (pedrib)
 pinumbernumber
 pponso1
 Ramiro Morales (ramiro)
+Raphaël Zumer (rzumer)
 retro-wertz
+retrotails
+reztek
 Richard Howell (rmaz)
+rlnilsen
 Rob Loach (RobLoach)
 Romain Gay (vikbez)
 Romain Graillot (notnotme)
@@ -224,6 +260,7 @@ Saggi Mizrahi (ficoos)
 SAKUJ0
 Sam Pagenkopf (44100hertz)
 Sam Stenvall (Jalle19)
+Samuel P. (p-sam)
 Scheiker
 Sebastien Ronsse (sronsse)
 Sergi Granell (xerpi)
@@ -232,26 +269,28 @@ sergio-br2 (sergiobenrocha2)
 Seth Kingsley (sethk)
 Shane Mouton (ismouton)
 Shizeeg Unadequatov (shizeeg)
-Skarsnik
 slotek
 sparklewind
 spec-chum
 Stefan (gizmo98)
 stefan-gr
+stellarporter
 Steven M. Vascellaro (stevoisiak)
 Stuart Carnie (stuartcarnie)
 Sunguk Lee (d3m3vilurr)
 Supernature2k
 Sven (RetroSven)
+Swingflip
 Swizzy
+Sylvain Colinet (Skarsnik)
 Tatsuya79
 Terry Lewis (terry-au)
-The Last Cabra (vanfanel)
 thedax
 theheroGAC
+TheMrIron2
 TheOfficialFloW
 thiolliere
-Toad King (ToadKing)
+Thomas Lorblanchès (Zlika)
 Tobias Jakobi (tobiasjakobi)
 Tomáš Kelemen (ToKe79)
 Torsten Paul (t-paul)
@@ -262,15 +301,21 @@ URBANsUNITED
 vgmoose
 Vicky C Lau (vickychenglau)
 Vladimir Panteleev (CyberShadow)
+Vladimir Serbinenko (phcoder)
 Víctor "IlDucci" (IlDucci)
+waitingmoon
 Wang Vincent (susemm)
 webgeek1234
+Weedy Weed Smoker (WeedyWeedSmoker)
+WerWolv
+Wiimpathy
 Wiktor Strzębała (wiktorek140)
 xhp-creations
-Yarsan Hoessain (hyarsan)
+yesfish (huwpascoe)
 Yongwoon Cho (ssangkong)
 yoshisuga
 zeromus
 zlice
 Zoran Vuckovic (casdevel)
+Ömercan Kömür (fpscan)
 )";
@@ -1,6 +1,6 @@
 HAVE_FILE_LOGGER=1
-HAVE_CC_RESAMPLER=1
-NEED_CXX_LINKER=0
+NEED_CXX_LINKER?=0
+NEED_GOLD_LINKER?=0
 MISSING_DECLS   =0

 ifneq ($(C90_BUILD),)
@@ -25,6 +25,10 @@ DEFINES += -DGLOBAL_CONFIG_DIR='"$(GLOBAL_CONFIG_DIR)"'

 OBJDIR_BASE := obj-unix

+ifeq ($(NEED_GOLD_LINKER), 1)
+   LDFLAGS += -fuse-ld=gold
+endif
+
 ifeq ($(DEBUG), 1)
   OBJDIR := $(OBJDIR_BASE)/debug
   CFLAGS ?= -O0 -g
@@ -186,10 +190,14 @@ ifeq ($(MAKECMDGOALS),clean)
 config.mk:
 else
 -include $(RARCH_OBJ:.o=.d)
+ifeq ($(HAVE_CONFIG_MK),)
 config.mk: configure qb/*
 	@echo "config.mk is outdated or non-existing. Run ./configure again."
 	@exit 1
 endif
+endif
+
+SYMBOL_MAP := -Wl,-Map=output.map

 retroarch: $(RARCH_OBJ)
 	@$(if $(Q), $(shell echo echo LD $@),)
@@ -68,7 +68,6 @@ retroarch:

 	@echo "*********************************************************************"
 	@echo "*** Classic ARM7 Cortex A7 build and packages built successfully! ***"
-	@echo "****************** Winner, Winner, Chicken Dinner! ******************"
 	@echo "*********************************************************************"
 clean:
 	rm -rf obj-unix
@@ -51,7 +51,7 @@ DEFINES :=
 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_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA
 	#DEFINES += -DHAVE_NETWORKING -DHAVE_CHEEVOS -DRC_DISABLE_LUA -DHAVE_SOCKET_LEGACY -DHAVE_THREADS
 	#-DHAVE_SSL -DHAVE_BUILTINMBEDTLS -DMBEDTLS_SSL_DEBUG_ALL
 	#ssl is currently incompatible with griffin due to use of the "static" flag on repeating functions that will conflict when included in one file
@@ -133,10 +133,10 @@ endif

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

 CFLAGS += -DRARCH_INTERNAL -DRARCH_CONSOLE
 CFLAGS += -DHAVE_FILTERS_BUILTIN $(DEFINES)
@@ -83,7 +83,7 @@ else
   CFLAGS	+= -O3
 endif

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

 #CFLAGS += -DRARCH_INTERNAL
 CFLAGS += -DRARCH_CONSOLE -DIS_SALAMANDER
@@ -7,9 +7,12 @@ 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_FILTERS_BUILTIN

 HAVE_OVERLAY = 1
+HAVE_GLSL = 1
+HAVE_AUDIOMIXER = 1
+HAVE_VIDEO_LAYOUT = 0
 HAVE_CC_RESAMPLER = 1
 HAVE_EGL    = 1
 HAVE_OPENGLES = 1
@@ -22,28 +25,25 @@ HAVE_RGUI = 1
 HAVE_SDL = 0
 HAVE_SDL2 = 0
 HAVE_ZLIB = 1
-WANT_ZLIB = 1
 HAVE_SHADERPIPELINE = 1
 HAVE_STATIC_VIDEO_FILTERS = 1
 HAVE_STATIC_AUDIO_FILTERS = 1
-MEMORY = 536870912
 HAVE_STB_FONT = 1

+MEMORY = 536870912
+
 PRECISE_F32 = 1

 OBJDIR := obj-emscripten

-ifneq ($(NATIVE_ZLIB),)
-   WANT_ZLIB = 0
-endif
-
 #if you compile with SDL2 flag add this Emscripten flag "-s USE_SDL=2" to LDFLAGS:

 LIBS    := -s USE_ZLIB=1
-LDFLAGS := -L. --no-heap-copy -s USE_ZLIB=1 -s TOTAL_MEMORY=$(MEMORY) -s NO_EXIT_RUNTIME=0 -s FULL_ES2=1 -s BINARYEN_TRAP_MODE=\"clamp\" \
+LDFLAGS := -L. --no-heap-copy -s USE_ZLIB=1 -s TOTAL_MEMORY=$(MEMORY) -s NO_EXIT_RUNTIME=0 -s FULL_ES2=1 \
           -s EXPORTED_FUNCTIONS="['_main', '_malloc', '_cmd_savefiles', '_cmd_save_state', '_cmd_load_state', '_cmd_take_screenshot']" \
           --js-library emscripten/library_rwebaudio.js \
-           --js-library emscripten/library_rwebcam.js
+           --js-library emscripten/library_rwebcam.js \
+           --js-library emscripten/library_errno_codes.js
 ifneq ($(PTHREAD), 0)
   LDFLAGS += -s USE_PTHREADS=$(PTHREAD) -s PTHREAD_POOL_SIZE=2
 endif
@@ -59,7 +59,7 @@ endif

 include Makefile.common

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

 ifneq ($(V), 1)
@@ -33,13 +33,13 @@ endif
 ifeq ($(platform),)
   platform = unix

-   ifeq ($(shell uname -a),)
+   ifeq ($(shell uname -s),)
      platform = win
-   else ifneq ($(findstring MINGW,$(shell uname -a)),)
+   else ifneq ($(findstring MINGW,$(shell uname -s)),)
      platform = win
-   else ifneq ($(findstring Darwin,$(shell uname -a)),)
+   else ifneq ($(findstring Darwin,$(shell uname -s)),)
      platform = osx
-   else ifneq ($(findstring win,$(shell uname -a)),)
+   else ifneq ($(findstring win,$(shell uname -s)),)
      platform = win
   endif
 endif
@@ -47,12 +47,12 @@ endif
 # system platform
 system_platform = unix

-ifeq ($(shell uname -a),)
+ifeq ($(shell uname -s),)
   EXE_EXT = .exe
   system_platform = win
-else ifneq ($(findstring Darwin,$(shell uname -a)),)
+else ifneq ($(findstring Darwin,$(shell uname -s)),)
   system_platform = osx
-else ifneq ($(findstring MINGW,$(shell uname -a)),)
+else ifneq ($(findstring MINGW,$(shell uname -s)),)
   system_platform = win
 endif

@@ -77,9 +77,13 @@ endif

 ifneq (,$(findstring msvc,$(platform)))
   LIBS               := $(WHOLE_START) $(WHOLE_END)
+else
+ifneq (,$(findstring unix,$(platform)))
+   LIBS               := $(WHOLE_START) $(WHOLE_END)
 else
   LIBS               := $(WHOLE_START) -lretro_$(platform) $(WHOLE_END)
 endif
+endif

 libogc_platform    :=

@@ -113,7 +117,7 @@ else ifeq ($(libogc_platform), 1)
   EXT_TARGET := $(TARGET_NAME)_$(platform).dol
   EXT_INTER_TARGET := $(TARGET_NAME)_$(platform).elf

-   INCLUDE += -I. -I$(DEVKITPRO)/libogc/include -Ideps/libz -Iwii/libogc/include
+   INCLUDE += -I. -I$(DEVKITPRO)/libogc/include -Iwii/libogc/include

   ifeq ($(EXTERNAL_LIBOGC), 1)
      CFLAGS   += -DEXTERNAL_LIBOGC
@@ -180,6 +184,7 @@ else ifeq ($(libogc_platform), 1)

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

+	HAVE_AUDIOMIXER			 := 1
   HAVE_RUNAHEAD            := 1
   HAVE_FILTERS_BUILTIN     := 1
   HAVE_THREADS             := 1
@@ -189,13 +194,14 @@ else ifeq ($(libogc_platform), 1)
   HAVE_RTGA                := 1
   HAVE_IBXM                := 1
   HAVE_OVERLAY             := 1
+   HAVE_VIDEO_LAYOUT        := 0
   HAVE_ZLIB                := 1
-   WANT_ZLIB                := 1
   HAVE_7ZIP                := 1
   RARCH_CONSOLE             = 1

   ifeq ($(platform), wii)
-      #HAVE_LANGEXTRA           := 1
+		HAVE_AUDIOMIXER			 := 1
+      #HAVE_LANGEXTRA          := 1
      HAVE_WIIUSB_HID          := 1
      HAVE_RARCH_EXEC          := 1
      HAVE_RSOUND              := 1
@@ -267,9 +273,7 @@ else ifeq ($(platform), vita)
   EXT_TARGET := $(TARGET_NAME)_$(platform).velf
   EXT_INTER_TARGET := $(TARGET_NAME)_$(platform).elf
   MACHDEP := -DVITA
-   WANT_ZLIB                := 1
   INCLUDE += -Ideps/libvita2d/include
-   INCLUDE += -Ideps/libz
   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\
@@ -306,6 +310,7 @@ else ifeq ($(platform), vita)
   HAVE_VITA2D              := 1
   HAVE_NETWORKING          := 1
   HAVE_OVERLAY             := 1
+   HAVE_VIDEO_LAYOUT        := 0
   HAVE_MATERIALUI          := 1
   HAVE_XMB                 := 1
   HAVE_STB_FONT            := 1
@@ -318,12 +323,12 @@ else ifeq ($(platform), windows_msvc6_x86)
   HAVE_RBMP                := 1
   HAVE_RTGA                := 1
   HAVE_ZLIB                := 1
-   WANT_ZLIB                := 1
   HAVE_7ZIP                := 1
   HAVE_NETWORKING          := 0
   HAVE_NETWORK_CMD         := 1
-	HAVE_NETPLAYDISCOVERY    := 1
+   HAVE_NETPLAYDISCOVERY    := 1
   HAVE_OVERLAY             := 1
+   HAVE_VIDEO_LAYOUT        := 0
   HAVE_MATERIALUI          := 1
   HAVE_XMB                 := 1
   HAVE_STB_FONT            := 1
@@ -355,17 +360,18 @@ else ifeq ($(platform), windows_msvc6_x86)
   export INCLUDE := $(INCLUDE);$(INETSDK)\Include;libretro-common\include;libretro-common\include\compat\msvc;gfx\include;deps;deps\stb
   export LIB := $(LIB);$(INETSDK)\Lib
 else ifeq ($(platform), windows_msvc2003_x86)
+   HAVE_GDI                 := 1
   HAVE_RPNG                := 1
   HAVE_RJPEG               := 1
   HAVE_RBMP                := 1
   HAVE_RTGA                := 1
   HAVE_ZLIB                := 1
-   WANT_ZLIB                := 1
   HAVE_7ZIP                := 1
   HAVE_NETWORKING          := 1
   HAVE_NETWORK_CMD         := 1
-	HAVE_NETPLAYDISCOVERY    := 1
+   HAVE_NETPLAYDISCOVERY    := 1
   HAVE_OVERLAY             := 1
+   HAVE_VIDEO_LAYOUT        := 0
   HAVE_MATERIALUI          := 1
   HAVE_XMB                 := 1
   HAVE_STB_FONT            := 1
@@ -402,17 +408,18 @@ else ifeq ($(platform), windows_msvc2003_x86)
      export LIB := $(LIB);$(INETSDK)\Lib
   endif
 else ifeq ($(platform), windows_msvc2005_x86)
+   HAVE_GDI                 := 1
   HAVE_RPNG                := 1
   HAVE_RJPEG               := 1
   HAVE_RBMP                := 1
   HAVE_RTGA                := 1
   HAVE_ZLIB                := 1
-   WANT_ZLIB                := 1
   HAVE_7ZIP                := 1
   HAVE_NETWORKING          := 1
   HAVE_NETWORK_CMD         := 1
-	HAVE_NETPLAYDISCOVERY    := 1
+   HAVE_NETPLAYDISCOVERY    := 1
   HAVE_OVERLAY             := 1
+   HAVE_VIDEO_LAYOUT        := 0
   HAVE_MATERIALUI          := 1
   HAVE_XMB                 := 1
   HAVE_STB_FONT            := 1
@@ -450,17 +457,19 @@ else ifeq ($(platform), windows_msvc2005_x86)
      export LIB := $(LIB);$(INETSDK)\Lib
   endif
 else ifneq (,$(findstring windows_msvc2010,$(platform)))
+   HAVE_GDI                 := 1
+   HAVE_AUDIOMIXER          := 1
   HAVE_RPNG                := 1
   HAVE_RJPEG               := 1
   HAVE_RBMP                := 1
   HAVE_RTGA                := 1
   HAVE_ZLIB                := 1
-   WANT_ZLIB                := 1
   HAVE_7ZIP                := 1
   HAVE_NETWORKING          := 1
   HAVE_NETWORK_CMD         := 1
-	HAVE_NETPLAYDISCOVERY    := 1
+   HAVE_NETPLAYDISCOVERY    := 1
   HAVE_OVERLAY             := 1
+   HAVE_VIDEO_LAYOUT        := 0
   HAVE_MATERIALUI          := 1
   HAVE_XMB                 := 1
   HAVE_STB_FONT            := 1
@@ -472,6 +481,7 @@ else ifneq (,$(findstring windows_msvc2010,$(platform)))
   HAVE_DYLIB               := 1
   HAVE_DYNAMIC             := 1
   HAVE_GRIFFIN_CPP         := 1
+   HAVE_RUNAHEAD            := 1
   HAVE_DIRECTX             ?= 1

   EXT_TARGET := $(TARGET_NAME).exe
@@ -481,8 +491,8 @@ 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
-   LDFLAGS += shell32.lib user32.lib gdi32.lib comdlg32.lib winmm.lib ole32.lib iphlpapi.lib
+   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 -DHAVE_CDROM
+   LDFLAGS += shell32.lib user32.lib gdi32.lib comdlg32.lib winmm.lib ole32.lib iphlpapi.lib msimg32.lib

   PlatformSuffix = $(subst windows_msvc2010_,,$(platform))

@@ -521,17 +531,19 @@ else ifneq (,$(findstring windows_msvc2010,$(platform)))
      export LIB := $(LIB);$(WindowsSdkDir)\$(PlatLib)
   endif
 else ifneq (,$(findstring windows_msvc2012,$(platform)))
+   HAVE_GDI                 := 1
+   HAVE_AUDIOMIXER          := 1
   HAVE_RPNG                := 1
   HAVE_RJPEG               := 1
   HAVE_RBMP                := 1
   HAVE_RTGA                := 1
   HAVE_ZLIB                := 1
-   WANT_ZLIB                := 1
   HAVE_7ZIP                := 1
   HAVE_NETWORKING          := 1
   HAVE_NETWORK_CMD         := 1
-	HAVE_NETPLAYDISCOVERY    := 1
+   HAVE_NETPLAYDISCOVERY    := 1
   HAVE_OVERLAY             := 1
+   HAVE_VIDEO_LAYOUT        := 0
   HAVE_MATERIALUI          := 1
   HAVE_XMB                 := 1
   HAVE_STB_FONT            := 1
@@ -543,6 +555,7 @@ else ifneq (,$(findstring windows_msvc2012,$(platform)))
   HAVE_DYLIB               := 1
   HAVE_DYNAMIC             := 1
   HAVE_GRIFFIN_CPP         := 1
+   HAVE_RUNAHEAD            := 1
   HAVE_DIRECTX             ?= 1

   EXT_TARGET := $(TARGET_NAME).exe
@@ -552,7 +565,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__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 -DHAVE_CDROM
   LDFLAGS += shell32.lib user32.lib gdi32.lib comdlg32.lib winmm.lib ole32.lib iphlpapi.lib

   PlatformSuffix = $(subst windows_msvc2012_,,$(platform))
@@ -596,17 +609,19 @@ else ifneq (,$(findstring windows_msvc2012,$(platform)))
      export LIB := $(LIB);$(WindowsSdkDir)\$(PlatLib)
   endif
 else ifneq (,$(findstring windows_msvc2013,$(platform)))
+   HAVE_GDI                 := 1
+   HAVE_AUDIOMIXER          := 1
   HAVE_RPNG                := 1
   HAVE_RJPEG               := 1
   HAVE_RBMP                := 1
   HAVE_RTGA                := 1
   HAVE_ZLIB                := 1
-   WANT_ZLIB                := 1
   HAVE_7ZIP                := 1
   HAVE_NETWORKING          := 1
   HAVE_NETWORK_CMD         := 1
-	HAVE_NETPLAYDISCOVERY    := 1
+   HAVE_NETPLAYDISCOVERY    := 1
   HAVE_OVERLAY             := 1
+   HAVE_VIDEO_LAYOUT        := 0
   HAVE_MATERIALUI          := 1
   HAVE_XMB                 := 1
   HAVE_STB_FONT            := 1
@@ -618,6 +633,7 @@ else ifneq (,$(findstring windows_msvc2013,$(platform)))
   HAVE_DYLIB               := 1
   HAVE_DYNAMIC             := 1
   HAVE_GRIFFIN_CPP         := 1
+   HAVE_RUNAHEAD            := 1
   HAVE_DIRECTX             ?= 1

   EXT_TARGET := $(TARGET_NAME).exe
@@ -627,7 +643,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__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 -DHAVE_CDROM
   LDFLAGS += shell32.lib user32.lib gdi32.lib comdlg32.lib winmm.lib ole32.lib iphlpapi.lib

   PlatformSuffix = $(subst windows_msvc2013_,,$(platform))
@@ -671,17 +687,19 @@ else ifneq (,$(findstring windows_msvc2013,$(platform)))
      export LIB := $(LIB);$(WindowsSdkDir)\$(PlatLib)
   endif
 else ifneq (,$(findstring windows_msvc2015,$(platform)))
+   HAVE_GDI                 := 1
+   HAVE_AUDIOMIXER          := 1
   HAVE_RPNG                := 1
   HAVE_RJPEG               := 1
   HAVE_RBMP                := 1
   HAVE_RTGA                := 1
   HAVE_ZLIB                := 1
-   WANT_ZLIB                := 1
   HAVE_7ZIP                := 1
   HAVE_NETWORKING          := 1
   HAVE_NETWORK_CMD         := 1
-	HAVE_NETPLAYDISCOVERY    := 1
+   HAVE_NETPLAYDISCOVERY    := 1
   HAVE_OVERLAY             := 1
+   HAVE_VIDEO_LAYOUT        := 0
   HAVE_MATERIALUI          := 1
   HAVE_XMB                 := 1
   HAVE_STB_FONT            := 1
@@ -693,6 +711,7 @@ else ifneq (,$(findstring windows_msvc2015,$(platform)))
   HAVE_DYLIB               := 1
   HAVE_DYNAMIC             := 1
   HAVE_GRIFFIN_CPP         := 1
+   HAVE_RUNAHEAD            := 1
   HAVE_DIRECTX             ?= 1

   EXT_TARGET := $(TARGET_NAME).exe
@@ -701,8 +720,9 @@ else ifneq (,$(findstring windows_msvc2015,$(platform)))
   CXX = cl.exe
   LD = link.exe

+   PLATCFLAGS += -utf-8
   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__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 -DHAVE_CDROM
   LDFLAGS += shell32.lib user32.lib gdi32.lib comdlg32.lib winmm.lib ole32.lib iphlpapi.lib

   PlatformSuffix = $(subst windows_msvc2015_,,$(platform))
@@ -760,10 +780,41 @@ else ifneq (,$(findstring windows_msvc2015,$(platform)))
      export INCLUDE := $(INCLUDE);libretro-common\include;libretro-common\include\compat\msvc;gfx\include;deps;deps\stb
      export LIB := $(LIB)
   endif
+else ifneq (,$(findstring unix,$(platform)))
+   HAVE_AUDIOMIXER          := 1
+   HAVE_RPNG                := 1
+   HAVE_RJPEG               := 1
+   HAVE_RBMP                := 1
+   HAVE_RTGA                := 1
+   HAVE_ZLIB                := 1
+   HAVE_7ZIP                := 1
+   HAVE_NETWORKING          := 1
+   HAVE_NETWORK_CMD         := 1
+   HAVE_NETPLAYDISCOVERY    := 1
+   HAVE_OVERLAY             := 1
+   HAVE_VIDEO_LAYOUT        := 0
+   HAVE_MATERIALUI          := 1
+   HAVE_XMB                 := 1
+   HAVE_STB_FONT            := 1
+   HAVE_THREADS             := 1
+   HAVE_LIBRETRODB          := 1
+   HAVE_COMMAND             := 1
+   HAVE_STDIN_CMD           := 1
+   HAVE_CMD                 := 1
+   HAVE_DYLIB               := 1
+   HAVE_DYNAMIC             := 1
+   HAVE_GRIFFIN_CPP         := 1
+   WANT_GLSLANG							:= 1
+
+   PLATCFLAGS += -DHAVE_EASTEREGG -D__MMX__ -D__SSE__ -DHAVE_OPENGL -DHAVE_OPENGL1 -DHAVE_GLSL -DHAVE_SHADERPIPELINE -DHAVE_OZONE -DHAVE_CC_RESAMPLER -DHAVE_CHEEVOS -DRC_DISABLE_LUA -DHAVE_FBO -DHAVE_GL_SYNC -DHAVE_SLANG -DHAVE_GLSLANG -DHAVE_IMAGEVIEWER -DHAVE_LANGEXTRA -DHAVE_RUNAHEAD -DHAVE_MENU_WIDGETS -DHAVE_SPIRV_CROSS -DHAVE_STB_FONT -DHAVE_UPDATE_ASSETS -DHAVE_VULKAN -DHAVE_XMB -DRARCH_INTERNAL -DWANT_GLSLANG -DHAVE_X11 -DHAVE_XCB -DHAVE_UDEV -DHAVE_PULSE
+   EXT_TARGET := $(TARGET_NAME)
+   EXT_INTER_TARGET := $(TARGET_NAME)
+   INCLUDE += -Ilibretro-common/include -Igfx/include -Ideps -Ideps/stb -Ideps/rcheevos/include -Ideps/SPIRV-Cross -Ideps/glslang -I.
+   LIBS += -ldl -lm -lpthread -lGL -ludev -lpulse -lX11 -lX11-xcb -lXxf86vm
 endif

 ifneq (,$(findstring msvc,$(platform)))
-   CFLAGS += -W2 $(MACHDEP) $(PLATCFLAGS)
+   CFLAGS += -W3 $(MACHDEP) $(PLATCFLAGS)
 else
   CFLAGS += -Wall -std=gnu99 $(MACHDEP) $(PLATCFLAGS) $(INCLUDE)
   INCLUDE += -I./libretro-common/include \
@@ -828,10 +879,7 @@ endif

 ifeq ($(HAVE_ZLIB), 1)
   CFLAGS      += -DHAVE_ZLIB
-endif
-
-ifeq ($(WANT_ZLIB), 1)
-   CFLAGS      += -DWANT_ZLIB
+   CFLAGS      += -I./libretro-common/include/compat/zlib
 endif

 ifeq ($(HAVE_RPNG), 1)
@@ -858,10 +906,18 @@ ifeq ($(HAVE_7ZIP), 1)
   CFLAGS      += -DHAVE_7ZIP
 endif

+ifeq ($(HAVE_AUDIOMIXER), 1)
+   CFLAGS      += -DHAVE_AUDIOMIXER
+endif
+
 ifeq ($(HAVE_OVERLAY), 1)
   CFLAGS      += -DHAVE_OVERLAY
 endif

+ifeq ($(HAVE_VIDEO_LAYOUT), 1)
+   CFLAGS      += -DHAVE_VIDEO_LAYOUT
+endif
+
 ifeq ($(HAVE_NETWORKING), 1)
   CFLAGS      += -DHAVE_NETWORKING
 endif
@@ -21,6 +21,7 @@ OBJ :=

 DEFINES := -D__SWITCH__=1 -U__linux__ -U__linux -DGLM_FORCE_PURE=1 -DRARCH_CONSOLE -DRARCH_INTERNAL -DGLOBAL_CONFIG_DIR='"/switch"' -DHAVE_STB_VORBIS

+HAVE_AUDIOMIXER = 1
 HAVE_CC_RESAMPLER = 1
 HAVE_MENU_COMMON = 1
 HAVE_RTGA = 1
@@ -59,6 +60,8 @@ ifeq ($(HAVE_OPENGL), 1)
  HAVE_XMB = 1
  HAVE_OZONE = 1
  HAVE_OVERLAY = 1
+  HAVE_VIDEO_LAYOUT = 0
+  HAVE_GLSL = 1
 else
  HAVE_RGUI = 1
  HAVE_MATERIALUI = 0
@@ -111,7 +114,7 @@ APP_ICON := pkg/libnx/retroarch.jpg
 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)
+          $(ARCH) $(DEFINES) $(INCLUDE_DIRS) -I$(LIBNX)/include -I$(PORTLIBS)/include/ -include $(LIBNX)/include/switch.h #$(shell $(PORTLIBS)/bin/freetype-config --cflags)

 CFLAGS += $(INCLUDE) -DSWITCH=1 -DHAVE_LIBNX=1 -DNXLINK=1 -DHAVE_SHADERPIPELINE -DHAVE_UPDATE_ASSETS -DHAVE_STB_FONT #-DHAVE_FREETYPE

@@ -124,6 +127,9 @@ 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)

+# add things from Makefile.common
+CFLAGS += $(DEF_FLAGS)
+
 LIBS	:= -lswresample -lavformat -lavcodec -lavutil -lswscale -lstdc++ -lbz2 -lpng -lz -lnx -lm

 ifeq ($(HAVE_OPENGL), 1)
@@ -11,6 +11,7 @@ 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)

+HAVE_AUDIOMIXER          := 1
 HAVE_D3DX                := 1
 HAVE_D3D8                := 0
 HAVE_D3D9                := 1
@@ -30,7 +31,6 @@ HAVE_WINMM               := 1

 HAVE_RPNG                := 1
 HAVE_ZLIB                := 1
-WANT_ZLIB                := 1
 HAVE_MENU                := 1
 HAVE_RGUI                := 1
 HAVE_XMB                 := 1
@@ -54,11 +54,26 @@ HAVE_7ZIP                := 1
 HAVE_NETWORKING          := 1
 HAVE_NETWORK_CMD         := 1
 HAVE_OVERLAY             := 1
+HAVE_VIDEO_LAYOUT        := 0
 HAVE_LANGEXTRA           := 1
 HAVE_CHEEVOS             := 1
 HAVE_SHADERPIPELINE      := 1
 HAVE_IMAGEVIEWER         := 1

+ifeq ($(HAVE_D3D8), 1)
+   D3D8_LIBS := -ld3d8
+   ifeq ($(HAVE_D3DX), 1)
+      D3DX8_LIBS := -ld3dx8
+   endif
+endif
+
+ifeq ($(HAVE_D3D9), 1)
+   D3D9_LIBS := -ld3d9
+   ifeq ($(HAVE_D3DX), 1)
+      D3DX9_LIBS := -ld3dx9
+   endif
+endif
+
 include Makefile.common
 INCLUDE_DIRS := $(patsubst  -isystem%,-I%,$(INCLUDE_DIRS))
 CFLAGS       := $(filter-out  -Wno-unknown-pragmas,$(DEF_FLAGS))
@@ -122,7 +137,7 @@ endif
 FLAGS  += -nologo -MP
 FLAGS  += -Gm- -Zc:inline -fp:precise -Zc:forScope -GR- -Gd -Oi -volatile:iso
 #FLAGS  += -Zc:wchar_t -Zp16 -Z7
-#FLAGS += -utf-8
+FLAGS += -utf-8
 #FLAGS += -source-charset:utf-8

 CXXFLAGS += $(CFLAGS) -TP -EHsc
@@ -15,7 +15,7 @@ LDFLAGS = -L$(PNDSDK)/usr/lib -Wl,-rpath,$(PNDSDK)/usr/lib

 LIBS = -lGLESv2 -lEGL -ldl -lm -lpthread -lrt -lasound
 DEFINES = -std=gnu99 -DHAVE_THREADS -DHAVE_GETOPT_LONG=1 -DHAVE_GRIFFIN -DRARCH_INTERNAL
-DEFINES += -D__ARM_ARCH_6__ -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DHAVE_GLSL -DHAVE_DYNAMIC -DHAVE_RPNG -DHAVE_RJPEG -DWANT_ZLIB -DHAVE_OVERLAY -DHAVE_ALSA -DHAVE_ZLIB -D__linux__
+DEFINES += -D__ARM_ARCH_6__ -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DHAVE_GLSL -DHAVE_DYNAMIC -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_OVERLAY -DHAVE_VIDEO_LAYOUT -DHAVE_ALSA -DHAVE_ZLIB -D__linux__
 DEFINES += $(INCDIRS)
 DEFINES += -D__OPENPANDORA__ -DPANDORA
 DEFINES += -marm -march=armv7-a -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp -ftree-vectorize
@@ -17,7 +17,7 @@ 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
+	DEFINES += -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DHAVE_CC_RESAMPLER
 	ifeq ($(DEBUG), 1)
 		DEFINES += -DHAVE_NETLOGGER
 	endif
@@ -31,9 +31,11 @@ else
 	HAVE_RTGA		:= 1
 	HAVE_ZLIB		:= 1
 	HAVE_OVERLAY		:= 1
+	HAVE_VIDEO_LAYOUT := 0
 	HAVE_7ZIP		:= 1
 	HAVE_EGL 		:= 1
 	HAVE_MENU_WIDGETS := 1
+	HAVE_GLSL      := 1
 	HAVE_OPENGLES  		:= 1
 	HAVE_NETWORKING		:= 0
 	HAVE_SOCKET_LEGACY	:= 0
@@ -58,11 +60,6 @@ else
 	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)),)
@@ -82,7 +79,7 @@ STRIP   := $(PREFIX)strip
 NM      := $(PREFIX)nm
 LD      := $(CXX)

-INCDIRS := -I. -Ideps/libz -Ideps/7zip -Ilibretro-common/include -Ideps/stb
+INCDIRS := -I. -Ideps/7zip -Ilibretro-common/include -Ideps/stb -Ilibretro-common/include/compat/zlib
 LIBDIRS := -L.

 ARCHFLAGS := -m64 -DORBIS
@@ -31,18 +31,18 @@ ifeq ($(MUTE_WARNINGS), 1)
 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
+INCDIR += -Ips2 -Ips2/include -Ilibretro-common/include -Ideps -Ideps/stb -Ideps/7zip
+INCDIR += -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 += -DPS2 -DUSE_IOP_CTYPE_MACRO -D_MIPS_ARCH_R5900 -DHAVE_ZLIB -DHAVE_NO_BUILTINZLIB -DHAVE_RPNG -DHAVE_RJPEG
 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 += -lretro_ps2 -lgskit -ldmakit -lgskit_toolkit -laudsrv -lmf -lpadx -lmtap -lmc -lhdd -lsdl -lfileXio -lz
 LIBS += -lcdvdfs -lpatches -lpoweroff


@@ -36,10 +36,10 @@ 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
+			 -Ilibretro-common/include \
+			 -Ilibretro-common/include/compat/zlib

 # system platform
 system_platform = unix
@@ -69,7 +69,8 @@ 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_VIDEO_LAYOUT
+DEFINES += -DHAVE_MENU -DHAVE_MENU_WIDGETS -DHAVE_RGUI -DHAVE_XMB -DHAVE_OZONE -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
@@ -93,9 +94,6 @@ endif
 ifeq ($(HAVE_FREETYPE), 1)
 DEFINES			+= -DHAVE_FREETYPE
 FONT_LIBS		:= -lfontFT_stub -lfreetype_stub
-else
-#DEFINES			+= -DHAVE_LIBDBGFONT
-#FONT_LIBS		:= -ldbgfont
 endif

 ifeq ($(CELL_BUILD_TOOLS), SNC)
@@ -118,7 +116,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 -D__CELLOS_LV2__ -DHAVE_NETWORKING=1 -DHAVE_SOCKET_LEGACY=1 -DHAVE_MOUSE -DHAVE_GRIFFIN=1 -DHAVE_MULTIMAN=1 -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) -DHAVE_FILTERS_BUILTIN -DHAVE_CHEEVOS -DRC_DISABLE_LUA

 #DEFINES += -DHAVE_IMAGEVIEWER

@@ -85,9 +85,6 @@ endif
 ifeq ($(HAVE_FREETYPE), 1)
 DEFINES			+= -DHAVE_FREETYPE
 FONT_LIBS		:= -lfontFT_stub -lfreetype_stub
-else
-DEFINES			+= -DHAVE_LIBDBGFONT
-FONT_LIBS		:= -ldbgfont
 endif

 ifeq ($(CELL_BUILD_TOOLS), SNC)
@@ -110,7 +107,8 @@ 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_OVERLAY -DHAVE_HEADSET -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 -DWANT_ZLIB -D__CELLOS_LV2__ -DHAVE_NETWORKING=1 -DHAVE_SOCKET_LEGACY=1 -DHAVE_MOUSE -DHAVE_GRIFFIN=1 -DHAVE_MULTIMAN=0 -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) -DHAVE_STB_VORBIS
+#DEFINES += -DHAVE_VIDEO_LAYOUT
+DEFINES += -DHAVE_THREADS -DRARCH_CONSOLE -DHAVE_OPENGL -DHAVE_OVERLAY -DHAVE_HEADSET -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 -D__CELLOS_LV2__ -DHAVE_NETWORKING=1 -DHAVE_SOCKET_LEGACY=1 -DHAVE_MOUSE -DHAVE_GRIFFIN=1 -DHAVE_MULTIMAN=0 -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) -DHAVE_STB_VORBIS

 ifeq ($(DEBUG), 1)
   PPU_OPTIMIZE_LV	:= -O0 -g
@@ -24,7 +24,7 @@ endif

 STRIP			= $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-strip.exe

-INCFLAGS    = -I. -Idefines -Ilibretro-common/include -Ideps/libz
+INCFLAGS    = -I. -Idefines -Ilibretro-common/include -Ilibretro-common/include/compat/zlib
 DEFINES     = -D__CELLOS_LV2__ -DIS_SALAMANDER -DRARCH_CONSOLE -DHAVE_SYSUTILS -DHAVE_SYSMODULES -DHAVE_RARCH_EXEC

 ifeq ($(DEX_BUILD), 1)
@@ -17,7 +17,7 @@ ELF_TARGET := retroarch_psl1ght.elf
 EBOOT_PATH		= pkg/ps3/USRDIR/EBOOT.BIN
 CORE_PATH		= pkg/ps3/USRDIR/cores/CORE.SELF

-INCLUDE := -I. -I$(PS3DEV)/ppu/include -Ideps/libz -Ips3/gcmgl/include/export -Ips3/include -Ideps -Ideps/stb
+INCLUDE := -I. -I$(PS3DEV)/ppu/include -Ips3/gcmgl/include/export -Ips3/include -Ideps -Ideps/stb -Ilibretro-common/include/compat/zlib
 LIBDIRS := -L$(PS3DEV)/ppu/lib -L$(PS3DEV)/portlibs/ppu/lib -L.

 MACHDEP := -D__CELLOS_LV2__ -D__PSL1GHT__
@@ -89,7 +89,10 @@ ifeq ($(HAVE_FILE_LOGGER), 1)
 CFLAGS		+= -DHAVE_FILE_LOGGER
 endif

-SHARED_FLAGS := -DRARCH_CONSOLE -DHAVE_OPENGL -DHAVE_OVERLAY -DHAVE_HEADSET -DHAVE_OPENGLES -DHAVE_OPENGLES1 -DHAVE_PSGL -DHAVE_CG -DHAVE_CG_RUNTIME_COMPILER -DHAVE_GCMGL -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_MOUSE  -DHAVE_ZLIB -DHAVE_RPNG -DWANT_ZLIB   -DHAVE_GRIFFIN=1 -DHAVE_NETWORKING=1 -DHAVE_SOCKET_LEGACY=1 -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) -Wno-char-subscripts -DHAVE_CC_RESAMPLER
+SHARED_FLAGS :=
+
+#SHARED_FLAGS += -DHAVE_VIDEO_LAYOUT
+SHARED_FLAGS += -DRARCH_CONSOLE -DHAVE_OPENGL -DHAVE_OVERLAY -DHAVE_HEADSET -DHAVE_OPENGLES -DHAVE_OPENGLES1 -DHAVE_PSGL -DHAVE_CG -DHAVE_CG_RUNTIME_COMPILER -DHAVE_GCMGL -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_MOUSE  -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_GRIFFIN=1 -DHAVE_NETWORKING=1 -DHAVE_SOCKET_LEGACY=1 -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) -Wno-char-subscripts -DHAVE_CC_RESAMPLER
 CFLAGS += -std=gnu99 $(SHARED_FLAGS)
 CXXFLAGS += $(SHARED_FLAGS)

@@ -21,11 +21,11 @@ ifeq ($(WHOLE_ARCHIVE_LINK), 1)
   WHOLE_END := -Wl,--no-whole-archive
 endif

-INCDIR = deps deps/stb deps/libz deps/7zip deps/pthreads deps/pthreads/platform/psp deps/pthreads/platform/helper libretro-common/include
+INCDIR = deps deps/stb deps/7zip deps/pthreads deps/pthreads/platform/psp deps/pthreads/platform/helper libretro-common/include libretro-common/include/compat/zlib
 CFLAGS = $(OPTIMIZE_LV) -G0 -std=gnu99 -ffast-math -fsingle-precision-constant
 ASFLAGS = $(CFLAGS)

-RARCH_DEFINES = -DPSP -D_MIPS_ARCH_ALLEGREX -DHAVE_LANGEXTRA -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DWANT_ZLIB -DHAVE_GRIFFIN=1 -DRARCH_INTERNAL -DRARCH_CONSOLE -DHAVE_MENU -DHAVE_RGUI -DHAVE_FILTERS_BUILTIN -DHAVE_7ZIP -DHAVE_CC_RESAMPLER
+RARCH_DEFINES = -DPSP -D_MIPS_ARCH_ALLEGREX -DHAVE_LANGEXTRA -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_GRIFFIN=1 -DRARCH_INTERNAL -DRARCH_CONSOLE -DHAVE_MENU -DHAVE_RGUI -DHAVE_FILTERS_BUILTIN -DHAVE_7ZIP -DHAVE_CC_RESAMPLER

 LIBDIR =
 LDFLAGS =
@@ -11,9 +11,10 @@ DEFINES := -DSWITCH=1 -U__linux__ -U__linux -DRARCH_INTERNAL -DHAVE_DYNAMIC
 ifeq ($(GRIFFIN_BUILD), 1)
 	OBJ += griffin/griffin.o
 	DEFINES += -DHAVE_GRIFFIN=1 -DHAVE_NEON -DHAVE_MATERIALUI -DHAVE_LIBRETRODB -DHAVE_CC_RESAMPLER
-	DEFINES += -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DWANT_ZLIB
+	DEFINES += -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA
 	DEFINES += -DHAVE_RUNAHEAD -DHAVE_DYNAMIC
 else
+	HAVE_AUDIOMIXER = 1
 	HAVE_CC_RESAMPLER = 1
 	HAVE_MENU_COMMON = 1
 	HAVE_RTGA = 1
@@ -46,7 +47,7 @@ endif

 include $(LIBTRANSISTOR_HOME)/libtransistor.mk

-INCDIRS := -I. -Ideps -Ideps/libz -Ilibretro-common/include -Ideps/stb -I$(LIBTRANSISTOR_HOME)/build/sdl2_install/include/SDL2/
+INCDIRS := -I. -Ideps -Ilibretro-common/include -Ilibretro-common/include/compat/zlib -Ideps/stb -I$(LIBTRANSISTOR_HOME)/build/sdl2_install/include/SDL2/
 LIBDIRS := -L.

 TARGETS := $(TARGET).nro
@@ -12,15 +12,17 @@ PC_DEVELOPMENT_UDP_PORT	   =
 OBJ :=

 DEFINES :=
+INCDIRS :=

 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 -DHAVE_CC_RESAMPLER -DHAVE_UPDATE_ASSETS
 	ifeq ($(DEBUG), 1)
 		DEFINES += -DHAVE_NETLOGGER
 	endif
+	INCDIRS += -I. -Ideps/7zip -Ilibretro-common/include -Ilibretro-common/include/compat/zlib -Ideps/stb
 else

 	HAVE_NEON		:= 1
@@ -38,6 +40,7 @@ else
 	HAVE_MENU		:= 1
 	HAVE_MENU_COMMON	:= 1
 	HAVE_OVERLAY		:= 1
+	HAVE_VIDEO_LAYOUT := 0
 	HAVE_MATERIALUI		:= 1
 	HAVE_XMB		:= 1
 	HAVE_RGUI		:= 1
@@ -46,6 +49,7 @@ else
 	HAVE_LIBRETRODB		:= 1
 	HAVE_CC_RESAMPLER	:= 1
 	HAVE_CHEEVOS		:= 1
+	HAVE_RUNAHEAD		:= 1
 	RARCH_CONSOLE		:= 1
 	HAVE_STATIC_VIDEO_FILTERS = 1
 	HAVE_STATIC_AUDIO_FILTERS = 1
@@ -58,11 +62,7 @@ else
 	CFLAGS += $(DEF_FLAGS)
 	BLACKLIST :=
 	OBJ := $(filter-out $(BLACKLIST),$(OBJ))
-
-	OBJ += input/drivers/psp_input.o
-	OBJ += input/drivers_joypad/psp_joypad.o
-	OBJ += audio/drivers/psp_audio.o
-	OBJ += frontend/drivers/platform_psp.o
+	INCDIRS += $(INCLUDE_DIRS)
 endif

 ifeq ($(strip $(VITASDK)),)
@@ -82,7 +82,6 @@ STRIP   := $(PREFIX)strip
 NM      := $(PREFIX)nm
 LD      := $(CXX)

-INCDIRS := -I. -Ideps/libz -Ideps/7zip -Ilibretro-common/include -Ideps/stb
 LIBDIRS := -L.

 ARCHFLAGS := -march=armv7-a -mfpu=neon -mfloat-abi=hard -DVITA
@@ -30,7 +30,7 @@ ELF2DOL = $(DEVKITPPC)/bin/elf2dol$(EXE_EXT)
 DOL_TARGET := retroarch-salamander_wii.dol
 ELF_TARGET := retroarch-salamander_wii.elf

-INCLUDE := -I. -Ilibretro-common/include -Ideps/libz
+INCLUDE := -I. -Ilibretro-common/include -Ilibretro-common/include/compat/zlib
 ifeq ($(EXTERNAL_LIBOGC), 1)
 INCLUDE += -I$(DEVKITPRO)/libogc/include
 LIBDIRS := -L$(DEVKITPRO)/libogc/lib/wii -L.
@@ -1,4 +1,4 @@
-TARGET		    := retroarch_wiiu
+TARGET := retroarch_wiiu

 BUILD_HBL_ELF              = 1
 BUILD_RPX                  = 1
@@ -10,7 +10,7 @@ WIIU_HID                   = 1
 HAVE_RUNAHEAD              = 1
 WIIU_LOG_RPX               = 0
 BUILD_DIR                  = objs/wiiu
-PC_DEVELOPMENT_TCP_PORT	   ?=
+PC_DEVELOPMENT_TCP_PORT    ?=

 ifeq ($(SALAMANDER_BUILD),1)
   BUILD_DIR := $(BUILD_DIR)-salamander
@@ -27,7 +27,13 @@ ifneq ($(V), 1)
   Q := @
 endif

+DEFINES :=
 OBJ :=
+INCDIRS :=
+
+#-----------------------------
+# Features and object files
+
 OBJ += wiiu/main.o
 OBJ += wiiu/system/memory.o
 OBJ += wiiu/system/atomic.o
@@ -37,23 +43,9 @@ OBJ += wiiu/fs/sd_fat_devoptab.o
 OBJ += wiiu/fs/fs_utils.o
 OBJ += wiiu/hbl.o

-DEFINES :=
-
-ifeq ($(WIIU_LOG_RPX),1)
-   defines += -DWIIU_LOG_RPX
-endif
-
-ifeq ($(WIIU_HID),1)
-   DEFINES += -DWIIU_HID
-   OBJ += input/drivers_joypad/wiiu/hidpad_driver.o
-   OBJ += input/drivers_hid/wiiu_hid.o
-   OBJ += input/connect/joypad_connection.o \
-          input/common/hid/hid_device_driver.o \
-          input/common/hid/device_wiiu_gca.o \
-          input/common/hid/device_ds3.o \
-          input/common/hid/device_ds4.o \
-          input/common/hid/device_null.o
-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

 ifeq ($(SALAMANDER_BUILD),1)
   DEFINES += -DRARCH_CONSOLE -DIS_SALAMANDER
@@ -77,6 +69,8 @@ ifeq ($(SALAMANDER_BUILD),1)
   OBJ += libretro-common/hash/rhash.o
   OBJ += file_path_str.o
   OBJ += verbosity.o
+
+# $(SALAMANDER_BUILD),0
 else
   DEFINES += -DRARCH_INTERNAL
   DEFINES += -DHAVE_KEYMAPPER
@@ -86,7 +80,7 @@ else
   DEFINES += -DHAVE_SHADERPIPELINE

 ifeq ($(HAVE_RUNAHEAD),1)
-	DEFINES += -DHAVE_RUNAHEAD
+   DEFINES += -DHAVE_RUNAHEAD
 endif

   OBJ += wiiu/shader_utils.o
@@ -99,73 +93,139 @@ endif
   OBJ += gfx/drivers/gx2_shaders/snow.o
   OBJ += gfx/drivers/gx2_shaders/snow_simple.o
   OBJ += gfx/drivers/gx2_shaders/snowflake.o
-   OBJ += gfx/drivers_shader/slang_preprocess.o
-   OBJ += gfx/drivers_shader/glslang_util.o

   ifeq ($(GRIFFIN_BUILD), 1)
-   	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 += -DWANT_IFADDRS
-   #	DEFINES += -DHAVE_FREETYPE
-   	DEFINES += -DHAVE_XMB -DHAVE_MATERIALUI
+      OBJ += griffin/griffin.o
+
+      INCDIRS += -Ilibretro-common/include/compat/zlib
+      # for stb, libfat, iosuhax
+      INCDIRS += -Ideps -Ideps/libfat/include -Ideps/libiosuhax
+      # pad_functions uses wiiu/input.h
+      INCDIRS += -Iinput/include
+      INCDIRS += -Ideps/SPIRV-Cross
+
+      DEFINES += -DHAVE_AUDIOMIXER
+      DEFINES += -DHAVE_GRIFFIN=1 -DHAVE_MENU -DHAVE_RGUI -DHAVE_LIBRETRODB
+      DEFINES += -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DHAVE_CC_RESAMPLER
+      DEFINES += -DHAVE_SPIRV_CROSS -DHAVE_SLANG
+      DEFINES += -DHAVE_STB_FONT -DHAVE_STB_VORBIS -DHAVE_LANGEXTRA -DHAVE_LIBRETRODB -DHAVE_NETWORKING -DHAVE_NETPLAYDISCOVERY
+      #DEFINES += -DWANT_IFADDRS
+      #DEFINES += -DHAVE_FREETYPE
+      DEFINES += -DHAVE_XMB -DHAVE_MATERIALUI
+      DEFINES += -DHAVE_HID
+      DEFINES += -DWANT_LIBFAT -DHAVE_LIBFAT -DWANT_IOSUHAX -DHAVE_IOSUHAX
+      DEFINES += -DSPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS
+
+   # $(GRIFFIN_BUILD),0
   else
-   	HAVE_MENU_COMMON = 1
-   	HAVE_RTGA = 1
-   	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_MATERIALUI = 1
-   	HAVE_XMB = 1
-   	HAVE_STB_FONT = 1
-   #	HAVE_FREETYPE = 1
-   	HAVE_LANGEXTRA = 1
-   	HAVE_LIBRETRODB = 1
-   	HAVE_NETWORKING = 1
-		HAVE_NETPLAYDISCOVERY = 1
-   	HAVE_CHEEVOS = 1
-   #	WANT_IFADDRS = 1
-   	HAVE_OVERLAY = 1
-   	HAVE_STATIC_VIDEO_FILTERS = 1
-   	HAVE_STATIC_AUDIO_FILTERS = 1
-   	WANT_LIBFAT = 1
-   	WANT_IOSUHAX = 1
+      HAVE_AUDIOMIXER = 1
+      HAVE_MENU_COMMON = 1
+      HAVE_RTGA = 1
+      HAVE_RPNG = 1
+      HAVE_RJPEG = 1
+      HAVE_RBMP = 1
+      HAVE_MENU = 1
+      HAVE_RGUI = 1
+      HAVE_7ZIP = 1
+      HAVE_ZLIB = 1
+      HAVE_BUILTINZLIB = 0
+      HAVE_LIBRETRODB = 1
+      HAVE_MATERIALUI = 1
+      HAVE_XMB = 1
+      HAVE_STB_FONT = 1
+      #HAVE_FREETYPE = 1
+      HAVE_LANGEXTRA = 1
+      HAVE_LIBRETRODB = 1
+      HAVE_NETWORKING = 1
+      HAVE_NETPLAYDISCOVERY = 1
+      HAVE_CHEEVOS = 1
+      #WANT_IFADDRS = 1
+      HAVE_OVERLAY = 1
+      HAVE_SPIRV_CROSS = 1
+      HAVE_SLANG = 1
+      HAVE_VIDEO_LAYOUT = 0
+      HAVE_STATIC_VIDEO_FILTERS = 1
+      HAVE_STATIC_AUDIO_FILTERS = 1
+      WANT_LIBFAT = 1
+      WANT_IOSUHAX = 1

-   	include Makefile.common
-
-   	OBJ += gfx/drivers/gx2_gfx.o
-   	OBJ += gfx/drivers_font/wiiu_font.o
-   	OBJ += menu/drivers_display/menu_display_wiiu.o
-   	OBJ += input/drivers/wiiu_input.o
-   	OBJ += input/drivers_joypad/wiiu_joypad.o
-        OBJ += input/drivers_joypad/wiiu/wpad_driver.o
-        OBJ += input/drivers_joypad/wiiu/kpad_driver.o
-        OBJ += input/drivers_joypad/wiiu/pad_functions.o
-
-   	OBJ += audio/drivers/wiiu_audio.o
-   	OBJ += frontend/drivers/platform_wiiu.o
+      include Makefile.common
+      DEFINES += $(DEF_FLAGS)
+      INCDIRS += $(INCLUDE_DIRS)
   endif
 endif

 OBJ := $(addprefix $(BUILD_DIR)/,$(OBJ))

-#todo: remove -DWIIU and use the built-in macros instead (HW_WUP or __wiiu__).
-DEFINES += -DWIIU -DMSB_FIRST -D__WUT__
-#DEFINES += -D_GNU_SOURCE
+#-----------------------------
+# Compile flags
+
+DEFINES += -DWIIU -DMSB_FIRST -D__WUT__ -DHW_WUP -D__wiiu__
 DEFINES += -DHAVE_MAIN
 DEFINES += -DRARCH_CONSOLE

+ifeq ($(WIIU_LOG_RPX),1)
+   DEFINES += -DWIIU_LOG_RPX
+endif
+
 ifneq ($(PC_DEVELOPMENT_TCP_PORT),)
   DEFINES += -DPC_DEVELOPMENT_TCP_PORT=$(PC_DEVELOPMENT_TCP_PORT)
 endif

+INCDIRS += -I.
+INCDIRS += -Ilibretro-common/include
+INCDIRS += -Iwiiu
+INCDIRS += -Iwiiu/include
+
+CFLAGS  := -mcpu=750 -meabi -mhard-float
+CFLAGS  += -ffast-math -Werror=implicit-function-declaration
+CFLAGS  += -ffunction-sections -fdata-sections
+#CFLAGS += -fomit-frame-pointer -mword-relocations
+#CFLAGS += -Wall
+
+ifeq ($(DEBUG), 1)
+   CFLAGS += -O0 -g
+else
+   CFLAGS += -O3
+endif
+
+ASFLAGS := $(CFLAGS) -mregnames
+
+#-----------------------------
+# Linking/library flags
+
+LIBDIRS := -L.
+LDFLAGS := $(CFLAGS)
+
+ifeq ($(WHOLE_ARCHIVE_LINK), 1)
+   WHOLE_START := -Wl,--whole-archive
+   WHOLE_END := -Wl,--no-whole-archive
+endif
+
+LIBS := $(WHOLE_START) -lretro_wiiu $(WHOLE_END) -lm
+
+# Use portlibs zlib if deps/ isn't being used
+ifeq ($(HAVE_ZLIB),1)
+ifeq ($(HAVE_BUILTINZLIB),0)
+   INCDIRS += -I$(DEVKITPRO)/portlibs/ppc/include
+   LIBDIRS += -L$(DEVKITPRO)/portlibs/ppc/lib
+   # Bonus: libpng for cores that need it
+   LIBS += -lpng -lz
+endif
+endif
+
+LDFLAGS += -Wl,--gc-sections
+
+RPX_LDFLAGS      := -pie -fPIE
+RPX_LDFLAGS      += -z common-page-size=64 -z max-page-size=64
+RPX_LDFLAGS      += -T wiiu/link_rpl.ld
+RPX_LDFLAGS      += -nostartfiles
+
+HBL_ELF_LDFLAGS  := -T wiiu/link_elf.ld
+
+#-----------------------------
+# Compiler setup
+
 ifeq ($(strip $(DEVKITPPC)),)
 $(error "Please set DEVKITPPC in your environment. export DEVKITPPC=<path to>devkitPPC")
 endif
@@ -173,7 +233,7 @@ ifeq ($(strip $(DEVKITPRO)),)
 $(error "Please set DEVKITPRO in your environment. export DEVKITPRO=<path to>devkitPRO")
 endif

-export PATH	  := $(PATH):$(DEVKITPPC)/bin
+export PATH   := $(PATH):$(DEVKITPPC)/bin

 PREFIX := powerpc-eabi-

@@ -194,63 +254,8 @@ else
   ELF2RPL   := $(ELF2RPL).exe
 endif

-INCDIRS := -I.
-INCDIRS += -Ideps
-INCDIRS += -Ideps/stb
-INCDIRS += -Ideps/libz
-INCDIRS += -Ideps/7zip
-INCDIRS += -Ilibretro-common/include
-INCDIRS += -Iinput/include
-INCDIRS += -Iwiiu
-INCDIRS += -Iwiiu/include
-INCDIRS += -I$(DEVKITPRO)/portlibs/ppc/include
-LIBDIRS := -L. -L$(DEVKITPRO)/portlibs/ppc/lib
-
-CFLAGS  := -mwup -mcpu=750 -meabi -mhard-float
-LDFLAGS :=
-
-ifeq ($(DEBUG), 1)
-   CFLAGS += -O0 -g
-else
-   CFLAGS += -O3
-endif
-
-LDFLAGS := $(CFLAGS)
-
-ASFLAGS := $(CFLAGS) -mregnames
-
-CFLAGS +=  -ffast-math -Werror=implicit-function-declaration
-#CFLAGS += -fomit-frame-pointer -mword-relocations
-#CFLAGS	+= -Wall
-
-ifeq ($(WHOLE_ARCHIVE_LINK), 1)
-   WHOLE_START := -Wl,--whole-archive
-   WHOLE_END := -Wl,--no-whole-archive
-endif
-
-CXXFLAGS = $(CFLAGS) -fno-rtti -fno-exceptions
-
-LDFLAGS  += -Wl,--gc-sections
-
-LIBS	:= $(WHOLE_START) -lretro_wiiu $(WHOLE_END) -lm -lpng -lz
-
-ifneq ($(WANT_LIBFAT), 1)
-LIBS += -lfat
-endif
-
-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
-
-RPX_LDFLAGS      := -pie -fPIE
-RPX_LDFLAGS      += -z common-page-size=64 -z max-page-size=64
-RPX_LDFLAGS      += -T wiiu/link_rpl.ld
-RPX_LDFLAGS      += -nostartfiles
-
-HBL_ELF_LDFLAGS  := -T wiiu/link_elf.ld
+#-----------------------------
+# Targets and build rules

 TARGETS :=
 ifeq ($(BUILD_RPX), 1)
@@ -314,10 +319,11 @@ $(BUILD_DIR)/$(TARGET).rpx: $(BUILD_DIR)/$(TARGET).rpx.elf $(ELF2RPL) .$(TARGET)
 	$(Q)-$(ELF2RPL) $< $@

 clean:
-	rm -f $(OBJ) $(RPX_OBJ) $(HBL_ELF_OBJ) $(TARGET).elf $(TARGET).rpx.elf $(TARGET).rpx
-	rm -f $(BUILD_DIR)/$(TARGET).elf $(BUILD_DIR)/$(TARGET).rpx.elf $(BUILD_DIR)/$(TARGET).rpx
-	rm -f .$(TARGET).elf.last .$(TARGET).rpx.elf.last .$(TARGET).rpx.last
-	rm -f $(OBJ:.o=.depend) $(RPX_OBJ:.o=.depend) $(HBL_ELF_OBJ:.o=.depend)
+	@$(if $(Q), echo $@,)
+	$(Q)rm -f $(OBJ) $(RPX_OBJ) $(HBL_ELF_OBJ) $(TARGET).elf $(TARGET).rpx.elf $(TARGET).rpx
+	$(Q)rm -f $(BUILD_DIR)/$(TARGET).elf $(BUILD_DIR)/$(TARGET).rpx.elf $(BUILD_DIR)/$(TARGET).rpx
+	$(Q)rm -f .$(TARGET).elf.last .$(TARGET).rpx.elf.last .$(TARGET).rpx.last
+	$(Q)rm -f $(OBJ:.o=.depend) $(RPX_OBJ:.o=.depend) $(HBL_ELF_OBJ:.o=.depend)

 .PHONY: clean all
 .PRECIOUS: %.depend %.last
@@ -1,5 +1,6 @@
 TARGET = retroarch.exe

+HAVE_AUDIOMIXER = 1
 HAVE_DINPUT = 1
 HAVE_XAUDIO = 1
 HAVE_DSOUND = 1
@@ -33,7 +34,6 @@ HAVE_FFMPEG   := 0

 HAVE_CG       := 1
 HAVE_ZLIB     := 1
-WANT_ZLIB     := 1
 HAVE_CC_RESAMPLER := 1

 ifeq ($(HAVE_CG), 1)
@@ -56,6 +56,20 @@ SDL2_LIBS        := -lSDL2
 SDL2_CFLAGS      := -ISDL2 -DHAVE_SDL2
 endif

+ifeq ($(HAVE_D3D8), 1)
+D3D8_LIBS        := -ld3d8
+ifeq ($(HAVE_D3DX), 1)
+D3DX8_LIBS       := -ld3dx8
+endif
+endif
+
+ifeq ($(HAVE_D3D9), 1)
+D3D9_LIBS        := -ld3d9
+ifeq ($(HAVE_D3DX), 1)
+D3DX9_LIBS       := -ld3dx9
+endif
+endif
+
 ifeq ($(HAVE_RSOUND), 1)
 RSOUND_CFLAGS    := -DHAVE_RSOUND
 RSOUND_LIBS      := -lrsound
@@ -80,7 +94,9 @@ OBJDIR           := obj-w32
 OS               := Win32
 OBJ              :=
 LIBS             := -lm
-DEFINES          := -I. -Ilibretro-common/include -DRARCH_INTERNAL -DHAVE_OVERLAY
+DEFINES			  :=
+DEFINES          += -I. -Ilibretro-common/include -Ilibretro-common/include/compat/zlib -DRARCH_INTERNAL -DHAVE_OVERLAY
+#DEFINES			  += -DHAVE_VIDEO_LAYOUT
 LDFLAGS          := -L. -static-libgcc

 include Makefile.common
@@ -1,319 +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_DRIVER__H
-#define __AUDIO_DRIVER__H
-
-#include <stdint.h>
-#include <stddef.h>
-#include <sys/types.h>
-
-#include <boolean.h>
-#include <retro_common_api.h>
-
-#include <audio/audio_mixer.h>
-
-#include "audio_defines.h"
-
-RETRO_BEGIN_DECLS
-
-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;
-   char *name;
-   size_t bufsize;
-} audio_mixer_stream_t;
-
-typedef struct audio_mixer_stream_params
-{
-   float volume;
-   enum audio_mixer_slot_selection_type slot_selection_type;
-   unsigned slot_selection_idx;
-   enum audio_mixer_stream_type  stream_type;
-   enum audio_mixer_type  type;
-   enum audio_mixer_state state;
-   void *buf;
-   char *basename;
-   size_t bufsize;
-   audio_mixer_stop_cb_t cb;
-} audio_mixer_stream_params_t;
-
-typedef struct audio_driver
-{
-   /* Creates and initializes handle to audio driver.
-    *
-    * Returns: audio driver handle on success, otherwise NULL.
-    **/
-   void *(*init)(const char *device, unsigned rate,
-         unsigned latency, unsigned block_frames, unsigned *new_rate);
-
-   /*
-    * @data         : Pointer to audio data handle.
-    * @buf          : Audio buffer data.
-    * @size         : Size of audio buffer.
-    *
-    * Write samples to audio driver.
-    *
-    * Write data in buffer to audio driver.
-    * A frame here is defined as one combined sample of left and right
-    * channels. (I.e. 44.1kHz, 16-bit stereo has 88.2k samples/s, and
-    * 44.1k frames/s.)
-    *
-    * Samples are interleaved in format LRLRLRLRLR ...
-    * If the driver returns true in use_float(), a floating point
-    * format will be used, with range [-1.0, 1.0].
-    * If not, signed 16-bit samples in native byte ordering will be used.
-    *
-    * This function returns the number of frames successfully written.
-    * If an error occurs, -1 should be returned.
-    * Note that non-blocking behavior that cannot write at this time
-    * should return 0 as returning -1 will terminate the driver.
-    *
-    * Unless said otherwise with set_nonblock_state(), all writes
-    * are blocking, and it should block till it has written all frames.
-    */
-   ssize_t (*write)(void *data, const void *buf, size_t size);
-
-   /* Temporarily pauses the audio driver. */
-   bool (*stop)(void *data);
-
-   /* Resumes audio driver from the paused state. */
-   bool (*start)(void *data, bool is_shutdown);
-
-   /* Is the audio driver currently running? */
-   bool (*alive)(void *data);
-
-   /* Should we care about blocking in audio thread? Fast forwarding.
-    *
-    * If state is true, nonblocking operation is assumed.
-    * This is typically used for fast-forwarding. If driver cannot
-    * implement nonblocking writes, this can be disregarded, but should
-    * log a message to stderr.
-    * */
-   void (*set_nonblock_state)(void *data, bool toggle);
-
-   /* Stops and frees driver data. */
-   void (*free)(void *data);
-
-   /* Defines if driver will take standard floating point samples,
-    * or int16_t samples.
-    *
-    * If true is returned, the audio driver is capable of using
-    * floating point data. This will likely increase performance as the
-    * resampler unit uses floating point. The sample range is
-    * [-1.0, 1.0].
-    * */
-   bool (*use_float)(void *data);
-
-   /* Human-readable identifier. */
-   const char *ident;
-
-   /* Optional. Get audio device list (allocates, caller has to free this) */
-   void *(*device_list_new)(void *data);
-
-   /* Optional. Frees audio device list */
-   void (*device_list_free)(void *data, void *data2);
-
-   /* Optional. */
-   size_t (*write_avail)(void *data);
-
-   size_t (*buffer_size)(void *data);
-} audio_driver_t;
-
-void audio_driver_destroy_data(void);
-
-void audio_driver_suspend(void);
-
-bool audio_driver_is_suspended(void);
-
-void audio_driver_resume(void);
-
-void audio_driver_set_active(void);
-
-bool audio_driver_is_active(void);
-
-void audio_driver_destroy(void);
-
-void audio_driver_deinit_resampler(void);
-
-bool audio_driver_free_devices_list(void);
-
-bool audio_driver_new_devices_list(void);
-
-bool audio_driver_enable_callback(void);
-
-bool audio_driver_disable_callback(void);
-
-/**
- * audio_driver_find_handle:
- * @index              : index of driver to get handle to.
- *
- * Returns: handle to audio driver at index. Can be NULL
- * if nothing found.
- **/
-const void *audio_driver_find_handle(int index);
-
-/**
- * audio_driver_find_ident:
- * @index              : index of driver to get handle to.
- *
- * Returns: Human-readable identifier of audio driver at index. Can be NULL
- * if nothing found.
- **/
-const char *audio_driver_find_ident(int index);
-
-void audio_driver_set_nonblocking_state(bool enable);
-
-/**
- * config_get_audio_driver_options:
- *
- * Get an enumerated list of all audio driver names, separated by '|'.
- *
- * Returns: string listing of all audio driver names, separated by '|'.
- **/
-const char* config_get_audio_driver_options(void);
-
-void audio_driver_sample(int16_t left, int16_t right);
-
-size_t audio_driver_sample_batch(const int16_t *data, size_t frames);
-
-void audio_driver_sample_rewind(int16_t left, int16_t right);
-
-size_t audio_driver_sample_batch_rewind(const int16_t *data, size_t frames);
-
-bool audio_driver_mixer_extension_supported(const char *ext);
-
-void audio_driver_dsp_filter_free(void);
-
-void audio_driver_dsp_filter_init(const char *device);
-
-void audio_driver_set_buffer_size(size_t bufsize);
-
-bool audio_driver_get_devices_list(void **ptr);
-
-void audio_driver_setup_rewind(void);
-
-void audio_driver_monitor_adjust_system_rates(void);
-
-bool audio_driver_set_callback(const void *data);
-
-bool audio_driver_callback(void);
-
-bool audio_driver_has_callback(void);
-
-/* Sets audio monitor rate to new value. */
-void audio_driver_monitor_set_rate(void);
-
-bool audio_driver_find_driver(void);
-
-bool audio_driver_toggle_mute(void);
-
-bool audio_driver_start(bool is_shutdown);
-
-bool audio_driver_stop(void);
-
-void audio_driver_unset_callback(void);
-
-void audio_driver_frame_is_reverse(void);
-
-void audio_set_float(enum audio_action action, float val);
-
-void audio_set_bool(enum audio_action action, bool val);
-
-void audio_unset_bool(enum audio_action action, bool val);
-
-float *audio_get_float_ptr(enum audio_action action);
-
-bool *audio_get_bool_ptr(enum audio_action action);
-
-bool audio_driver_deinit(void);
-
-bool audio_driver_init(void);
-
-void audio_driver_menu_sample(void);
-
-audio_mixer_stream_t *audio_driver_mixer_get_stream(unsigned i);
-
-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);
-
-void audio_driver_mixer_stop_stream(unsigned i);
-
-float audio_driver_mixer_get_stream_volume(unsigned i);
-
-void audio_driver_mixer_set_stream_volume(unsigned i, float vol);
-
-void audio_driver_mixer_remove_stream(unsigned i);
-
-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;
-extern audio_driver_t audio_tinyalsa;
-extern audio_driver_t audio_roar;
-extern audio_driver_t audio_openal;
-extern audio_driver_t audio_opensl;
-extern audio_driver_t audio_jack;
-extern audio_driver_t audio_sdl;
-extern audio_driver_t audio_xa;
-extern audio_driver_t audio_pulse;
-extern audio_driver_t audio_dsound;
-extern audio_driver_t audio_wasapi;
-extern audio_driver_t audio_coreaudio;
-extern audio_driver_t audio_coreaudio3;
-extern audio_driver_t audio_xenon360;
-extern audio_driver_t audio_ps3;
-extern audio_driver_t audio_gx;
-extern audio_driver_t audio_ax;
-extern audio_driver_t audio_psp;
-extern audio_driver_t audio_ps2;
-extern audio_driver_t audio_ctr_csnd;
-extern audio_driver_t audio_ctr_dsp;
-extern audio_driver_t audio_switch;
-extern audio_driver_t audio_switch_thread;
-extern audio_driver_t audio_rwebaudio;
-extern audio_driver_t audio_null;
-
-RETRO_END_DECLS
-
-#endif
@@ -55,8 +55,8 @@ static void audio_thread_loop(void *data)
   if (!thr)
      return;

-   RARCH_LOG("[Audio Thread]: Initializing audio driver.\n");
-   thr->driver_data   = thr->driver->init(thr->device, thr->out_rate, thr->latency,
+   thr->driver_data   = thr->driver->init(
+         thr->device, thr->out_rate, thr->latency,
         thr->block_frames, thr->new_rate);
   slock_lock(thr->lock);
   thr->inited        = thr->driver_data ? 1 : -1;
@@ -75,8 +75,6 @@ static void audio_thread_loop(void *data)
      scond_wait(thr->cond, thr->lock);
   slock_unlock(thr->lock);

-   RARCH_LOG("[Audio Thread]: Starting audio.\n");
-
   for (;;)
   {
      slock_lock(thr->lock);
@@ -94,7 +92,8 @@ static void audio_thread_loop(void *data)
         thr->driver->stop(thr->driver_data);
         while (thr->stopped)
         {
-            /* If we stop right after start, we might not be able to properly ack.
+            /* If we stop right after start, 
+             * we might not be able to properly ack.
             * Signal in the loop instead. */
            thr->stopped_ack = true;
            scond_signal(thr->cond);
@@ -108,7 +107,6 @@ static void audio_thread_loop(void *data)
      audio_driver_callback();
   }

-   RARCH_LOG("[Audio Thread]: Tearing down driver.\n");
   thr->driver->free(thr->driver_data);
 }

@@ -300,8 +298,8 @@ bool audio_init_thread(const audio_driver_t **out_driver,
   if (!(thr->lock     = slock_new()))
      goto error;

-   thr->alive = true;
-   thr->stopped = true;
+   thr->alive          = true;
+   thr->stopped        = true;

   if (!(thr->thread   = sthread_create(audio_thread_loop, thr)))
      goto error;
@@ -19,7 +19,7 @@

 #include <boolean.h>

-#include "audio_driver.h"
+#include "../retroarch.h"

 /**
 * audio_init_thread:
@@ -0,0 +1,136 @@
+/*  RetroArch - A frontend for libretro.
+ *  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 <stdlib.h>
+
+#include <encodings/utf.h>
+#include <lists/string_list.h>
+
+#include "mmdevice_common.h"
+#include "mmdevice_common_inline.h"
+
+void *mmdevice_list_new(void *u)
+{
+   HRESULT hr;
+   UINT i;
+   PROPVARIANT prop_var;
+   union string_list_elem_attr attr;
+   IMMDeviceEnumerator *enumerator = NULL;
+   IMMDeviceCollection *collection = NULL;
+   UINT dev_count                  = 0;
+   IMMDevice *device               = NULL;
+   LPWSTR dev_id_wstr              = NULL;
+   IPropertyStore *prop_store      = NULL;
+   bool br                         = false;
+   bool prop_var_init              = false;
+   char *dev_id_str                = NULL;
+   char *dev_name_str              = NULL;
+   struct string_list *sl          = string_list_new();
+
+   if (!sl)
+      return NULL;
+
+   attr.i = 0;
+#ifdef __cplusplus
+   hr = CoCreateInstance(CLSID_MMDeviceEnumerator, NULL, CLSCTX_ALL,
+         IID_IMMDeviceEnumerator, (void **)&enumerator);
+#else
+   hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, CLSCTX_ALL,
+         &IID_IMMDeviceEnumerator, (void **)&enumerator);
+#endif
+   if (FAILED(hr))
+      goto error;
+
+   hr = _IMMDeviceEnumerator_EnumAudioEndpoints(enumerator,
+         eRender, DEVICE_STATE_ACTIVE, &collection);
+   if (FAILED(hr))
+      goto error;
+
+   hr = _IMMDeviceCollection_GetCount(collection, &dev_count);
+   if (FAILED(hr))
+      goto error;
+
+   for (i = 0; i < dev_count; ++i)
+   {
+      hr = _IMMDeviceCollection_Item(collection, i, &device);
+      if (FAILED(hr))
+         goto error;
+
+      hr = _IMMDevice_GetId(device, &dev_id_wstr);
+      if (FAILED(hr))
+         goto error;
+
+      if (!(dev_id_str = utf16_to_utf8_string_alloc(dev_id_wstr)))
+         goto error;
+
+      hr = _IMMDevice_OpenPropertyStore(device, STGM_READ, &prop_store);
+      if (FAILED(hr))
+         goto error;
+
+      PropVariantInit(&prop_var);
+      prop_var_init = true;
+      hr            = _IPropertyStore_GetValue(
+            prop_store, PKEY_Device_FriendlyName,
+            &prop_var);
+      if (FAILED(hr))
+         goto error;
+
+      if (!(dev_name_str = utf16_to_utf8_string_alloc(prop_var.pwszVal)))
+         goto error;
+
+      br = string_list_append(sl, dev_name_str, attr);
+      if (!br)
+         goto error;
+      if (dev_id_str)
+         sl->elems[sl->size-1].userdata = dev_id_str;
+
+      PropVariantClear(&prop_var);
+      prop_var_init = false;
+      if (dev_id_wstr)
+         CoTaskMemFree(dev_id_wstr);
+      if (dev_name_str)
+         free(dev_name_str);
+      dev_name_str = NULL;
+      dev_id_wstr  = NULL;
+      IFACE_RELEASE(prop_store);
+      IFACE_RELEASE(device);
+   }
+
+   IFACE_RELEASE(collection);
+   IFACE_RELEASE(enumerator);
+
+   return sl;
+
+error:
+   if (dev_id_str)
+      free(dev_id_str);
+   if (dev_name_str)
+      free(dev_name_str);
+   dev_id_str   = NULL;
+   dev_name_str = NULL;
+   if (prop_var_init)
+      PropVariantClear(&prop_var);
+   IFACE_RELEASE(prop_store);
+   if (dev_id_wstr)
+      CoTaskMemFree(dev_id_wstr);
+   dev_id_wstr = NULL;
+   IFACE_RELEASE(device);
+   IFACE_RELEASE(collection);
+   IFACE_RELEASE(enumerator);
+   if (sl)
+      string_list_free(sl);
+
+   return NULL;
+}
@@ -1,29 +1,27 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2015-2017 - Andre Leiradella
- *
- *  RetroArch is free software: you can redistribute it and/or modify it under the terms
- *  of the GNU General Public License as published by the Free Software Found-
- *  ation, either version 3 of the License, or (at your option) any later version.
- *
- *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- *  PURPOSE.  See the GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along with RetroArch.
- *  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __RARCH_HTTPSERVR_H
-#define __RARCH_HTTPSERVR_H
-
-#include <retro_common_api.h>
-
-RETRO_BEGIN_DECLS
-
-int  httpserver_init(unsigned port);
-
-void httpserver_destroy(void);
-
-RETRO_END_DECLS
-
-#endif /* __RARCH_HTTPSERVR_H */
+/*  RetroArch - A frontend for libretro.
+ *  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 _MMDEVICE_COMMON_H
+#define _MMDEVICE_COMMON_H
+
+#include <stdlib.h>
+
+RETRO_BEGIN_DECLS
+
+void *mmdevice_list_new(void *u);
+
+RETRO_END_DECLS
+
+#endif
@@ -0,0 +1,114 @@
+/*  RetroArch - A frontend for libretro.
+ *  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 _MMDEVICE_COMMON_INLINE_H
+#define _MMDEVICE_COMMON_INLINE_H
+
+#include <stdlib.h>
+
+#ifdef _WIN32_WINNT
+#undef _WIN32_WINNT
+#endif
+#define _WIN32_WINNT 0x0600
+#define WIN32_LEAN_AND_MEAN
+
+#include <windows.h>
+#include <winerror.h>
+#include <propidl.h>
+#include <initguid.h>
+#include <mmdeviceapi.h>
+#include <mmreg.h>
+#include <audioclient.h>
+
+#include <retro_common_api.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
+
+DEFINE_PROPERTYKEY(PKEY_Device_FriendlyName, 0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0x20, 0x67, 0xd1, 0x46, 0xa8, 0x50, 0xe0, 14); /* DEVPROP_TYPE_STRING */
+
+#ifdef __cplusplus
+#define _IMMDeviceCollection_Item(This,nDevice,ppdevice) (This)->Item(nDevice,ppdevice)
+#define _IAudioClient_Start(This)	( (This)->Start() )
+#define _IAudioClient_Stop(This)	( (This)->Stop() )
+#define _IAudioClient_GetCurrentPadding(This,pNumPaddingFrames)	\
+    ( (This)->GetCurrentPadding(pNumPaddingFrames) )
+#define _IAudioRenderClient_GetBuffer(This,NumFramesRequested,ppData)	\
+    ( (This)->GetBuffer(NumFramesRequested,ppData) )
+#define _IAudioRenderClient_ReleaseBuffer(This,NumFramesWritten,dwFlags)	\
+    ( (This)->ReleaseBuffer(NumFramesWritten,dwFlags) )
+#define _IAudioClient_GetService(This,riid,ppv) ( (This)->GetService(riid,ppv) )
+#define _IAudioClient_SetEventHandle(This,eventHandle)	( (This)->SetEventHandle(eventHandle) )
+#define _IAudioClient_GetBufferSize(This,pNumBufferFrames) ( (This)->GetBufferSize(pNumBufferFrames) )
+#define _IAudioClient_GetStreamLatency(This,phnsLatency)	( (This)->GetStreamLatency(phnsLatency) )
+#define _IAudioClient_GetDevicePeriod(This,phnsDefaultDevicePeriod,phnsMinimumDevicePeriod)	( (This)->GetDevicePeriod(phnsDefaultDevicePeriod,phnsMinimumDevicePeriod) )
+#define _IMMDevice_Activate(This,iid,dwClsCtx,pActivationParams,ppv) ((This)->Activate(iid,(dwClsCtx),pActivationParams,ppv))
+#define _IMMDeviceEnumerator_EnumAudioEndpoints(This,dataFlow,dwStateMask,ppDevices) (This)->EnumAudioEndpoints(dataFlow,dwStateMask,ppDevices)
+#define _IMMDeviceEnumerator_GetDefaultAudioEndpoint(This,dataFlow,role,ppEndpoint) (This)->GetDefaultAudioEndpoint(dataFlow,role,ppEndpoint)
+#define _IMMDevice_OpenPropertyStore(This,stgmAccess,ppProperties) (This)->OpenPropertyStore(stgmAccess,ppProperties)
+#define _IMMDevice_GetId(This,ppstrId) ((This)->GetId(ppstrId))
+#define _IPropertyStore_GetValue(This,key,pv) ( (This)->GetValue(key,pv) )
+#define _IMMDeviceCollection_GetCount(This,cProps) ( (This)->GetCount(cProps) )
+#else
+#define _IMMDeviceCollection_Item(This,nDevice,ppdevice) (This)->lpVtbl->Item(This,nDevice,ppdevice)
+#define _IAudioClient_Start(This)	( (This)->lpVtbl -> Start(This) )
+#define _IAudioClient_Stop(This)	( (This)->lpVtbl -> Stop(This) )
+#define _IAudioClient_GetCurrentPadding(This,pNumPaddingFrames)	\
+    ( (This)->lpVtbl -> GetCurrentPadding(This,pNumPaddingFrames) )
+#define _IAudioRenderClient_GetBuffer(This,NumFramesRequested,ppData)	\
+    ( (This)->lpVtbl -> GetBuffer(This,NumFramesRequested,ppData) )
+#define _IAudioRenderClient_ReleaseBuffer(This,NumFramesWritten,dwFlags)	\
+    ( (This)->lpVtbl -> ReleaseBuffer(This,NumFramesWritten,dwFlags) )
+#define _IAudioClient_GetService(This,riid,ppv)	( (This)->lpVtbl -> GetService(This,&(riid),ppv) )
+#define _IAudioClient_SetEventHandle(This,eventHandle)	( (This)->lpVtbl -> SetEventHandle(This,eventHandle) )
+#define _IAudioClient_GetBufferSize(This,pNumBufferFrames) ( (This)->lpVtbl -> GetBufferSize(This,pNumBufferFrames) )
+#define _IAudioClient_GetStreamLatency(This,phnsLatency)	( (This)->lpVtbl -> GetStreamLatency(This,phnsLatency) )
+#define _IAudioClient_GetDevicePeriod(This,phnsDefaultDevicePeriod,phnsMinimumDevicePeriod)	( (This)->lpVtbl -> GetDevicePeriod(This,phnsDefaultDevicePeriod,phnsMinimumDevicePeriod) )
+#define _IMMDevice_Activate(This,iid,dwClsCtx,pActivationParams,ppv) ((This)->lpVtbl->Activate(This,&(iid),dwClsCtx,pActivationParams,ppv))
+#define _IMMDeviceEnumerator_EnumAudioEndpoints(This,dataFlow,dwStateMask,ppDevices) (This)->lpVtbl->EnumAudioEndpoints(This,dataFlow,dwStateMask,ppDevices)
+#define _IMMDeviceEnumerator_GetDefaultAudioEndpoint(This,dataFlow,role,ppEndpoint) (This)->lpVtbl->GetDefaultAudioEndpoint(This,dataFlow,role,ppEndpoint)
+#define _IMMDevice_OpenPropertyStore(This,stgmAccess,ppProperties) (This)->lpVtbl->OpenPropertyStore(This,stgmAccess,ppProperties)
+#define _IMMDevice_GetId(This,ppstrId) (This)->lpVtbl->GetId(This,ppstrId)
+#define _IPropertyStore_GetValue(This,key,pv) ( (This)->lpVtbl -> GetValue(This,&(key),pv) )
+#define _IMMDeviceCollection_GetCount(This,cProps) ( (This)->lpVtbl -> GetCount(This,cProps) )
+#endif
+
+#ifdef __cplusplus
+#ifndef IFACE_RELEASE
+#define IFACE_RELEASE(iface) \
+      if (iface) \
+      { \
+         iface->Release(); \
+         iface = NULL; \
+      }
+#endif
+#else
+#ifndef IFACE_RELEASE
+#define IFACE_RELEASE(iface) \
+      if (iface) \
+      { \
+         iface->lpVtbl->Release(iface);\
+         iface = NULL; \
+      }
+#endif
+#endif
+
+#endif
@@ -21,7 +21,7 @@

 #include <alsa/asoundlib.h>

-#include "../audio_driver.h"
+#include "../../retroarch.h"
 #include "../../verbosity.h"

 typedef struct alsa
@@ -19,7 +19,7 @@
 #include <sys/asoundlib.h>
 #include <retro_math.h>

-#include "../audio_driver.h"
+#include "../../retroarch.h"

 #define MAX_FRAG_SIZE 3072
 #define DEFAULT_RATE 48000
@@ -41,7 +41,7 @@ typedef struct alsa
   bool is_paused;
   unsigned buf_size;
   unsigned buf_count;
-} alsa_t;
+} alsa_qsa_t;

 typedef long snd_pcm_sframes_t;

@@ -53,7 +53,7 @@ static void *alsa_qsa_init(const char *device,
   snd_pcm_channel_info_t pi;
   snd_pcm_channel_params_t params = {0};
   snd_pcm_channel_setup_t setup   = {0};
-   alsa_t *alsa                    = (alsa_t*)calloc(1, sizeof(alsa_t));
+   alsa_qsa_t *alsa                = (alsa_qsa_t*)calloc(1, sizeof(alsa_qsa_t));
   if (!alsa)
      return NULL;

@@ -165,8 +165,8 @@ error:
 static int check_pcm_status(void *data, int channel_type)
 {
   snd_pcm_channel_status_t status;
-   alsa_t *alsa = (alsa_t*)data;
-   int ret      = EOK;
+   alsa_qsa_t *alsa = (alsa_qsa_t*)data;
+   int ret          = EOK;

   memset(&status, 0, sizeof (status));
   status.channel = channel_type;
@@ -221,7 +221,7 @@ static int check_pcm_status(void *data, int channel_type)

 static ssize_t alsa_qsa_write(void *data, const void *buf, size_t size)
 {
-   alsa_t              *alsa = (alsa_t*)data;
+   alsa_qsa_t          *alsa = (alsa_qsa_t*)data;
   snd_pcm_sframes_t written = 0;

   while (size)
@@ -268,7 +268,7 @@ static ssize_t alsa_qsa_write(void *data, const void *buf, size_t size)

 static bool alsa_qsa_stop(void *data)
 {
-   alsa_t *alsa = (alsa_t*)data;
+   alsa_qsa_t *alsa = (alsa_qsa_t*)data;

   if (alsa->can_pause && !alsa->is_paused)
   {
@@ -284,7 +284,7 @@ static bool alsa_qsa_stop(void *data)

 static bool alsa_qsa_alive(void *data)
 {
-   alsa_t *alsa = (alsa_t*)data;
+   alsa_qsa_t *alsa = (alsa_qsa_t*)data;
   if (alsa)
      return !alsa->is_paused;
   return false;
@@ -292,7 +292,7 @@ static bool alsa_qsa_alive(void *data)

 static bool alsa_qsa_start(void *data, bool is_shutdown)
 {
-   alsa_t *alsa = (alsa_t*)data;
+   alsa_qsa_t *alsa = (alsa_qsa_t*)data;

   if (alsa->can_pause && alsa->is_paused)
   {
@@ -313,7 +313,7 @@ static bool alsa_qsa_start(void *data, bool is_shutdown)

 static void alsa_qsa_set_nonblock_state(void *data, bool state)
 {
-   alsa_t *alsa = (alsa_t*)data;
+   alsa_qsa_t *alsa = (alsa_qsa_t*)data;

   int err;

@@ -329,13 +329,13 @@ static void alsa_qsa_set_nonblock_state(void *data, bool state)

 static bool alsa_qsa_use_float(void *data)
 {
-   alsa_t *alsa = (alsa_t*)data;
+   alsa_qsa_t *alsa = (alsa_qsa_t*)data;
   return alsa->has_float;
 }

 static void alsa_qsa_free(void *data)
 {
-   alsa_t *alsa = (alsa_t*)data;
+   alsa_qsa_t *alsa = (alsa_qsa_t*)data;

   if (alsa)
   {
@@ -352,7 +352,7 @@ static void alsa_qsa_free(void *data)

 static size_t alsa_qsa_write_avail(void *data)
 {
-   alsa_t *alsa = (alsa_t*)data;
+   alsa_qsa_t *alsa = (alsa_qsa_t*)data;
   size_t avail = (alsa->buf_count -
         (int)alsa->buffered_blocks - 1) * alsa->buf_size +
      (alsa->buf_size - (int)alsa->buffer_ptr);
@@ -361,7 +361,7 @@ static size_t alsa_qsa_write_avail(void *data)

 static size_t alsa_qsa_buffer_size(void *data)
 {
-   alsa_t *alsa = (alsa_t*)data;
+   alsa_qsa_t *alsa = (alsa_qsa_t*)data;
   return alsa->buf_size * alsa->buf_count;
 }

@@ -24,7 +24,7 @@
 #include <queues/fifo_queue.h>
 #include <string/stdstring.h>

-#include "../audio_driver.h"
+#include "../../retroarch.h"
 #include "../../verbosity.h"

 #define TRY_ALSA(x) if (x < 0) \
@@ -345,7 +345,7 @@ static size_t alsa_thread_buffer_size(void *data)
   return alsa->buffer_size;
 }

-static void *alsa_device_list_new(void *data)
+static void *alsa_thread_device_list_new(void *data)
 {
   void **hints, **n;
   union string_list_elem_attr attr;
@@ -393,7 +393,7 @@ error:
   return NULL;
 }

-static void alsa_device_list_free(void *data, void *array_list_data)
+static void alsa_thread_device_list_free(void *data, void *array_list_data)
 {
   struct string_list *s = (struct string_list*)array_list_data;

@@ -413,8 +413,8 @@ audio_driver_t audio_alsathread = {
   alsa_thread_free,
   alsa_thread_use_float,
   "alsathread",
-   alsa_device_list_new,
-   alsa_device_list_free,
+   alsa_thread_device_list_new,
+   alsa_thread_device_list_free,
   alsa_thread_write_avail,
   alsa_thread_buffer_size,
 };
@@ -27,7 +27,7 @@
 #include "config.h"
 #endif

-#include "../audio_driver.h"
+#include "../../retroarch.h"
 #include "../../verbosity.h"

 #define DEFAULT_DEV "/dev/audio"
@@ -47,6 +47,8 @@ static void *audioio_init(const char *device, unsigned rate, unsigned latency,

 #ifdef AUMODE_PLAY_ALL
   info.mode = AUMODE_PLAY_ALL;
+#elif defined(AUMODE_PLAY)
+   info.mode = AUMODE_PLAY;
 #endif
   info.play.sample_rate = rate;
   info.play.channels = 2;
@@ -104,8 +106,10 @@ static bool audioio_stop(void *data)
   struct audio_info info;
   int *fd = (int*)data;

+#ifdef AUDIO_FLUSH
   if (ioctl(*fd, AUDIO_FLUSH, NULL) < 0)
      return false;
+#endif

   if (ioctl(*fd, AUDIO_GETINFO, &info) < 0)
      return false;
@@ -120,8 +124,10 @@ static bool audioio_start(void *data, bool is_shutdown)
   struct audio_info info;
   int *fd = (int*)data;

+#ifdef AUDIO_FLUSH
   if (ioctl(*fd, AUDIO_FLUSH, NULL) < 0)
      return false;
+#endif

   if (ioctl(*fd, AUDIO_GETINFO, &info) < 0)
      return false;
@@ -159,7 +165,9 @@ static void audioio_free(void *data)
 {
   int *fd = (int*)data;

+#ifdef AUDIO_FLUSH
   (void)ioctl(*fd, AUDIO_FLUSH, NULL);
+#endif

   close(*fd);
   free(fd);
@@ -31,7 +31,7 @@
 #include <retro_endianness.h>
 #include <string/stdstring.h>

-#include "../audio_driver.h"
+#include "../../retroarch.h"
 #include "../../verbosity.h"

 typedef struct coreaudio
@@ -22,7 +22,7 @@
 #include <stdlib.h>
 #include <memory.h>

-#include "../audio_driver.h"
+#include "../../retroarch.h"

 #pragma mark - ringbuffer

@@ -19,7 +19,7 @@
 #include <retro_miscellaneous.h>
 #include <retro_timers.h>

-#include "../audio_driver.h"
+#include "../../retroarch.h"

 typedef struct
 {
@@ -17,7 +17,7 @@
 #include <string.h>
 #include <malloc.h>

-#include "../audio_driver.h"
+#include "../../retroarch.h"
 #include "../../ctr/ctr_debug.h"

 typedef struct
@@ -35,9 +35,11 @@
 #ifdef HAVE_THREADS
 #include <rthreads/rthreads.h>
 #endif
+#include <lists/string_list.h>
 #include <queues/fifo_queue.h>
+#include <string/stdstring.h>

-#include "../audio_driver.h"
+#include "../../retroarch.h"
 #include "../../verbosity.h"

 #ifdef _XBOX
@@ -73,17 +75,15 @@ typedef struct dsound
   volatile bool thread_alive;
 } dsound_t;

+/* Forward declarations */
+static void *dsound_list_new(void *u);
+
 static INLINE unsigned write_avail(unsigned read_ptr,
      unsigned write_ptr, unsigned buffer_size)
 {
   return (read_ptr + buffer_size - write_ptr) % buffer_size;
 }

-static INLINE void get_positions(dsound_t *ds, DWORD *read_ptr, DWORD *write_ptr)
-{
-   IDirectSoundBuffer_GetCurrentPosition(ds->dsb, read_ptr, write_ptr);
-}
-
 #define CHUNK_SIZE 256

 struct audio_lock
@@ -97,51 +97,44 @@ struct audio_lock
 static INLINE bool grab_region(dsound_t *ds, uint32_t write_ptr,
      struct audio_lock *region)
 {
-   const char *err = NULL;
   HRESULT     res = IDirectSoundBuffer_Lock(ds->dsb, write_ptr, CHUNK_SIZE,
         &region->chunk1, &region->size1, &region->chunk2, &region->size2, 0);

   if (res == DSERR_BUFFERLOST)
   {
-      res = IDirectSoundBuffer_Restore(ds->dsb);
-      if (res != DS_OK)
+      if ((res = IDirectSoundBuffer_Restore(ds->dsb)) != DS_OK)
         return false;
-
-      res = IDirectSoundBuffer_Lock(ds->dsb, write_ptr, CHUNK_SIZE,
-            &region->chunk1, &region->size1, &region->chunk2, &region->size2, 0);
-      if (res != DS_OK)
+      if ((res = IDirectSoundBuffer_Lock(ds->dsb, write_ptr, CHUNK_SIZE,
+                  &region->chunk1, &region->size1, &region->chunk2, &region->size2, 0)) != DS_OK)
         return false;
   }

+   if (res == DS_OK)
+      return true;
+
+#ifdef DEBUG
   switch (res)
   {
      case DSERR_BUFFERLOST:
-         err = "DSERR_BUFFERLOST";
+         RARCH_WARN("[DirectSound error]: %s\n", "DSERR_BUFFERLOST");
         break;
      case DSERR_INVALIDCALL:
-         err = "DSERR_INVALIDCALL";
+         RARCH_WARN("[DirectSound error]: %s\n", "DSERR_INVALIDCALL");
         break;
      case DSERR_INVALIDPARAM:
-         err = "DSERR_INVALIDPARAM";
+         RARCH_WARN("[DirectSound error]: %s\n", "DSERR_INVALIDPARAM");
         break;
      case DSERR_PRIOLEVELNEEDED:
-         err = "DSERR_PRIOLEVELNEEDED";
+         RARCH_WARN("[DirectSound error]: %s\n", "DSERR_PRIOLEVELNEEDED");
         break;
-
      default:
-         return true;
+         break;
   }
+#endif

-   RARCH_WARN("[DirectSound error]: %s\n", err);
   return false;
 }

-static INLINE void release_region(dsound_t *ds, const struct audio_lock *region)
-{
-   IDirectSoundBuffer_Unlock(ds->dsb, region->chunk1,
-         region->size1, region->chunk2, region->size2);
-}
-
 #ifdef HAVE_THREADS
 static void dsound_thread(void *data)
 #else
@@ -153,15 +146,16 @@ static DWORD CALLBACK dsound_thread(PVOID data)

   SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_TIME_CRITICAL);

-   get_positions(ds, NULL, &write_ptr);
+   IDirectSoundBuffer_GetCurrentPosition(ds->dsb, NULL, &write_ptr);
   write_ptr = (write_ptr + ds->buffer_size / 2) % ds->buffer_size;

   while (ds->thread_alive)
   {
+      bool is_pull = false;
      struct audio_lock region;
      DWORD read_ptr, avail, fifo_avail;
-      get_positions(ds, &read_ptr, NULL);

+      IDirectSoundBuffer_GetCurrentPosition(ds->dsb, &read_ptr, NULL);
      avail = write_avail(read_ptr, write_ptr, ds->buffer_size);

      EnterCriticalSection(&ds->crit);
@@ -192,12 +186,8 @@ static DWORD CALLBACK dsound_thread(PVOID data)
      {
         /* Got space to write, but nothing in FIFO (underrun),
          * fill block with silence. */
-
         memset(region.chunk1, 0, region.size1);
         memset(region.chunk2, 0, region.size2);
-
-         release_region(ds, &region);
-         write_ptr = (write_ptr + region.size1 + region.size2) % ds->buffer_size;
      }
      else
      {
@@ -210,11 +200,16 @@ static DWORD CALLBACK dsound_thread(PVOID data)
            fifo_read(ds->buffer, region.chunk2, region.size2);
         LeaveCriticalSection(&ds->crit);

-         release_region(ds, &region);
-         write_ptr = (write_ptr + region.size1 + region.size2) % ds->buffer_size;
-
-         SetEvent(ds->event);
+         is_pull = true;
      }
+
+      IDirectSoundBuffer_Unlock(ds->dsb, region.chunk1,
+            region.size1, region.chunk2, region.size2);
+      write_ptr = (write_ptr + region.size1 + region.size2) 
+         % ds->buffer_size;
+
+      if (is_pull)
+         SetEvent(ds->event);
   }

   ExitThread(0);
@@ -308,52 +303,86 @@ static void dsound_free(void *data)
   free(ds);
 }

-struct dsound_dev
-{
-   unsigned device;
-   unsigned total_count;
-   LPGUID guid;
-};
-
 static BOOL CALLBACK enumerate_cb(LPGUID guid, LPCSTR desc, LPCSTR module, LPVOID context)
 {
-   struct dsound_dev *dev = (struct dsound_dev*)context;
+   union string_list_elem_attr attr;
+   struct string_list *list = (struct string_list*)context;

-   RARCH_LOG("\t%u: %s\n", dev->total_count, desc);
+   attr.i = 0;
+
+   string_list_append(list, desc, attr);
+
+   if (guid)
+   {
+      unsigned i;
+      LPGUID guid_copy = (LPGUID)malloc(sizeof(GUID) * 1);
+      guid_copy->Data1 = guid->Data1;
+      guid_copy->Data2 = guid->Data2;
+      guid_copy->Data3 = guid->Data3;
+      for (i = 0; i < 8; i++)
+         guid_copy->Data4[i] = guid->Data4[i];
+
+      list->elems[list->size-1].userdata = guid_copy;
+   }

-   if (dev->device == dev->total_count)
-      dev->guid = guid;
-   dev->total_count++;
   return TRUE;
 }

-static void *dsound_init(const char *device, unsigned rate, unsigned latency,
+static void *dsound_init(const char *dev, unsigned rate, unsigned latency,
      unsigned block_frames,
      unsigned *new_rate)
 {
-   WAVEFORMATEX wfx      = {0};
-   DSBUFFERDESC bufdesc  = {0};
-   struct dsound_dev dev = {0};
-   dsound_t          *ds = (dsound_t*)calloc(1, sizeof(*ds));
+   LPGUID selected_device   = NULL;
+   WAVEFORMATEX wfx         = {0};
+   DSBUFFERDESC bufdesc     = {0};
+   int32_t idx_found        = -1;
+   struct string_list *list = (struct string_list*)dsound_list_new(NULL);
+   dsound_t          *ds    = (dsound_t*)calloc(1, sizeof(*ds));

   if (!ds)
      goto error;

   InitializeCriticalSection(&ds->crit);

-   if (device)
-      dev.device = strtoul(device, NULL, 0);
+   if (dev)
+   {
+       /* Search for device name first */
+      if (list && list->elems)
+      {
+         if (list->elems)
+         {
+            unsigned i;
+            for (i = 0; i < list->size; i++)
+            {
+               if (string_is_equal(dev, list->elems[i].data))
+               {
+                  idx_found       = i;
+                  selected_device = (LPGUID)list->elems[idx_found].userdata;
+                  break;
+               }
+            }
+            /* Index was not found yet based on name string,
+             * just assume id is a one-character number index. */

-   RARCH_LOG("DirectSound devices:\n");
-#ifndef _XBOX
-#ifdef UNICODE
-   DirectSoundEnumerate((LPDSENUMCALLBACKW)enumerate_cb, &dev);
-#else
-   DirectSoundEnumerate((LPDSENUMCALLBACKA)enumerate_cb, &dev);
-#endif
-#endif
+            if (idx_found == -1 && isdigit(dev[0]))
+            {
+               idx_found = strtoul(dev, NULL, 0);
+               RARCH_LOG("[DirectSound]: Fallback, device index is a single number index instead: %d.\n", idx_found);

-   if (DirectSoundCreate(dev.guid, &ds->ds, NULL) != DS_OK)
+               if (idx_found != -1)
+               {
+                  if (idx_found < (int32_t)list->size)
+                  {
+                     RARCH_LOG("[DirectSound]: Corresponding name: %s\n", list->elems[idx_found].data);
+                     selected_device = (LPGUID)list->elems[idx_found].userdata;
+                  }
+               }
+            }
+         }
+      }
+   }
+
+   if (DirectSoundCreate(selected_device, &ds->ds, NULL) != DS_OK)
      goto error;

 #ifndef _XBOX
@@ -407,10 +436,13 @@ static void *dsound_init(const char *device, unsigned rate, unsigned latency,
   if (!dsound_start_thread(ds))
      goto error;

+   string_list_free(list);
   return ds;

 error:
   RARCH_ERR("[DirectSound] Error occurred in init.\n");
+   if (list)
+      string_list_free(list);
   dsound_free(ds);
   return NULL;
 }
@@ -512,6 +544,32 @@ static bool dsound_use_float(void *data)
   return false;
 }

+static void *dsound_list_new(void *u)
+{
+   struct string_list *sl          = string_list_new();
+
+   if (!sl)
+      return NULL;
+
+#ifndef _XBOX
+#ifdef UNICODE
+   DirectSoundEnumerate((LPDSENUMCALLBACKW)enumerate_cb, sl);
+#else
+   DirectSoundEnumerate((LPDSENUMCALLBACKA)enumerate_cb, sl);
+#endif
+#endif
+
+   return sl;
+}
+
+static void dsound_device_list_free(void *u, void *slp)
+{
+   struct string_list *sl = (struct string_list*)slp;
+
+   if (sl)
+      string_list_free(sl);
+}
+
 audio_driver_t audio_dsound = {
   dsound_init,
   dsound_write,
@@ -522,8 +580,8 @@ audio_driver_t audio_dsound = {
   dsound_free,
   dsound_use_float,
   "dsound",
-   NULL,
-   NULL,
+   dsound_list_new,
+   dsound_device_list_free,
   dsound_write_avail,
   dsound_buffer_size,
 };
@@ -27,7 +27,7 @@
 #include <boolean.h>
 #include <retro_inline.h>

-#include "../audio_driver.h"
+#include "../../retroarch.h"
 #include "../../defines/gx_defines.h"

 typedef struct
@@ -25,7 +25,7 @@
 #include <boolean.h>
 #include <rthreads/rthreads.h>

-#include "../audio_driver.h"
+#include "../../retroarch.h"
 #include "../../configuration.h"
 #include "../../verbosity.h"

@@ -14,7 +14,7 @@
 *  If not, see <http://www.gnu.org/licenses/>.
 */

-#include "../audio_driver.h"
+#include "../../retroarch.h"
 #include "../../verbosity.h"

 static void *null_audio_init(const char *device, unsigned rate, unsigned latency,
@@ -33,7 +33,7 @@
 #include <retro_miscellaneous.h>
 #include <retro_timers.h>

-#include "../audio_driver.h"
+#include "../../retroarch.h"
 #include "../../verbosity.h"

 #define BUFSIZE 1024
@@ -21,7 +21,7 @@

 #include <rthreads/rthreads.h>

-#include "../audio_driver.h"
+#include "../../retroarch.h"

 /* Helper macros, COM-style. */
 #define SLObjectItf_Realize(a, ...) ((*(a))->Realize(a, __VA_ARGS__))
@@ -152,7 +152,7 @@ static void *sl_init(const char *device, unsigned rate, unsigned latency,

   fmt_pcm.formatType     = SL_DATAFORMAT_PCM;
   fmt_pcm.numChannels    = 2;
-   fmt_pcm.samplesPerSec  = rate * 1000; // Samplerate is in milli-Hz.
+   fmt_pcm.samplesPerSec  = rate * 1000; /* Samplerate is in milli-Hz. */
   fmt_pcm.bitsPerSample  = 16;
   fmt_pcm.containerSize  = 16;
   fmt_pcm.channelMask    = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
@@ -33,7 +33,7 @@
 #include "config.h"
 #endif

-#include "../audio_driver.h"
+#include "../../retroarch.h"
 #include "../../verbosity.h"

 #ifdef HAVE_OSS_BSD
@@ -21,7 +21,7 @@
 #include <kernel.h>
 #include <audsrv.h>

-#include "../audio_driver.h"
+#include "../../retroarch.h"

 #define AUDIO_BUFFER 128 * 1024
 #define AUDIO_CHANNELS 2
@@ -45,7 +45,8 @@ static void audioConfigure(ps2_audio_t *ps2, unsigned rate)

   err = audsrv_set_format(&format);

-   if (err){
+   if (err)
+   {
      printf("set format returned %d\n", err);
      printf("audsrv returned error string: %s\n", audsrv_get_error_string());
   }
@@ -71,7 +72,7 @@ static void *ps2_audio_init(const char *device,
 static void ps2_audio_free(void *data)
 {
   ps2_audio_t* ps2 = (ps2_audio_t*)data;
-   if(!ps2)
+   if (!ps2)
      return;

   ps2->running = false;
@@ -123,9 +124,7 @@ static bool ps2_audio_start(void *data, bool is_shutdown)
   bool       start = true;

   if (ps2)
-   {
      ps2->running = true;
-   }

   return start;
 }
@@ -148,9 +147,7 @@ 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;
 }
@@ -19,7 +19,7 @@

 #include <queues/fifo_queue.h>

-#include "../audio_driver.h"
+#include "../../retroarch.h"

 #include "../../defines/ps3_defines.h"

@@ -40,7 +40,7 @@
 #define SceUID uint32_t
 #endif

-#include "../audio_driver.h"
+#include "../../retroarch.h"

 typedef struct psp_audio
 {
@@ -23,7 +23,7 @@
 #include <retro_miscellaneous.h>
 #include <retro_endianness.h>

-#include "../audio_driver.h"
+#include "../../retroarch.h"
 #include "../../verbosity.h"

 typedef struct
@@ -23,7 +23,7 @@

 #include <boolean.h>

-#include "../audio_driver.h"
+#include "../../retroarch.h"
 #include "../../verbosity.h"

 typedef struct
@@ -21,7 +21,7 @@
 #include <queues/fifo_queue.h>
 #include <rthreads/rthreads.h>

-#include "../audio_driver.h"
+#include "../../retroarch.h"
 #include "rsound.h"

 typedef struct rsd
@@ -106,7 +106,7 @@ enum rsd_format
   RSD_S32_NE = 0x1000,
   RSD_U32_LE = 0x2000,
   RSD_U32_BE = 0x4000,
-   RSD_U32_NE = 0x8000,
+   RSD_U32_NE = 0x8000
 };

 /* Defines operations that can be used with rsd_set_param() */
@@ -18,7 +18,7 @@
 #include <unistd.h>
 #include <boolean.h>

-#include "../audio_driver.h"
+#include "../../retroarch.h"

 /* forward declarations */
 unsigned RWebAudioSampleRate(void);
@@ -14,20 +14,20 @@
 *  If not, see <http://www.gnu.org/licenses/>.
 */

+#include <stdint.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+
 #include <boolean.h>
 #include <rthreads/rthreads.h>
 #include <queues/fifo_queue.h>
 #include <retro_inline.h>
 #include <retro_math.h>

-#include "../audio_driver.h"
+#include "../../retroarch.h"
 #include "../../verbosity.h"

-#include <stdint.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-
 #include "SDL.h"
 #include "SDL_audio.h"

@@ -20,7 +20,7 @@
 #include <stdint.h>

 #include "switch_audio_compat.h"
-#include "../audio_driver.h"
+#include "../../retroarch.h"
 #include "../../verbosity.h"

 #ifdef HAVE_LIBNX
@@ -0,0 +1,361 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2019      - misson20000
+ *  Copyright (C) 2019      - m4xw
+ *  Copyright (C) 2019      - lifajucejo
+ *  Copyright (C) 2019      - p-sam
+ *
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <malloc.h>
+#include <stdint.h>
+
+#include <switch.h>
+
+#include "../../retroarch.h"
+#include "../../verbosity.h"
+
+#define BUFFER_COUNT 5
+
+static const int sample_rate           = 48000;
+static const int num_channels          = 2;
+static const uint8_t sink_channels[]   = { 0, 1 };
+
+static const AudioRendererConfig audio_renderer_config =
+{
+   .output_rate     = AudioRendererOutputRate_48kHz,
+   .num_voices      = 24,
+   .num_effects     = 0,
+   .num_sinks       = 1,
+   .num_mix_objs    = 1,
+   .num_mix_buffers = 2,
+};
+
+typedef struct {
+   AudioDriver drv;
+   void* mempool;
+   AudioDriverWaveBuf wavebufs[BUFFER_COUNT];
+   AudioDriverWaveBuf* current_wavebuf;
+   void* current_pool_ptr;
+   size_t current_size;
+   size_t buffer_size;
+   size_t samples;
+   Mutex update_lock;
+   bool nonblocking;
+} libnx_audren_t;
+
+static void *libnx_audren_audio_init(const char *device, unsigned rate, unsigned latency,
+      unsigned block_frames,
+      unsigned *new_rate)
+{
+   unsigned i, j;
+   libnx_audren_t *aud;
+   Result rc;
+   int mpid;
+   size_t mempool_size;
+   unsigned real_latency;
+
+   RARCH_LOG("[Audio]: Using libnx_audren driver\n");
+
+   aud = (libnx_audren_t*)calloc(1, sizeof(libnx_audren_t));
+
+   if (!aud)
+   {
+      RARCH_ERR("[Audio]: struct alloc failed\n");
+      goto fail;
+   }
+
+   real_latency = MAX(5, latency);
+   RARCH_LOG("[Audio]: real_latency is %u\n", real_latency);
+
+   aud->nonblocking = !block_frames;
+   aud->buffer_size = (real_latency * sample_rate / 1000);
+   aud->samples = (aud->buffer_size / num_channels / sizeof(int16_t));
+   aud->current_size = 0;
+   *new_rate = sample_rate;
+
+   mempool_size = (aud->buffer_size * BUFFER_COUNT + (AUDREN_MEMPOOL_ALIGNMENT-1)) &~ (AUDREN_MEMPOOL_ALIGNMENT-1);
+   aud->mempool = memalign(AUDREN_MEMPOOL_ALIGNMENT, mempool_size);
+   if (!aud->mempool)
+   {
+      RARCH_ERR("[Audio]: mempool alloc failed\n");
+      goto fail;
+   }
+
+   rc = audrenInitialize(&audio_renderer_config);
+   if(R_FAILED(rc))
+   {
+      RARCH_ERR("[Audio]: audrenInitialize: %x\n", rc);
+      goto fail;
+   }
+
+   rc = audrvCreate(&aud->drv, &audio_renderer_config, num_channels);
+   if(R_FAILED(rc))
+   {
+      RARCH_ERR("[Audio]: audrvCreate: %x\n", rc);
+      goto fail_init;
+   }
+
+   for(i = 0; i < BUFFER_COUNT; i++)
+   {
+      aud->wavebufs[i].data_raw = aud->mempool;
+      aud->wavebufs[i].size = mempool_size;
+      aud->wavebufs[i].start_sample_offset = i * aud->samples;
+      aud->wavebufs[i].end_sample_offset = aud->wavebufs[i].start_sample_offset + aud->samples;
+   }
+
+   aud->current_wavebuf = NULL;
+
+   mpid = audrvMemPoolAdd(&aud->drv, aud->mempool, mempool_size);
+   audrvMemPoolAttach(&aud->drv, mpid);
+
+   audrvDeviceSinkAdd(&aud->drv, AUDREN_DEFAULT_DEVICE_NAME, num_channels, sink_channels);
+
+   rc = audrenStartAudioRenderer();
+   if(R_FAILED(rc))
+   {
+      RARCH_ERR("[Audio]: audrenStartAudioRenderer: %x\n", rc);
+   }
+
+   audrvVoiceInit(&aud->drv, 0, num_channels, PcmFormat_Int16, sample_rate);
+   audrvVoiceSetDestinationMix(&aud->drv, 0, AUDREN_FINAL_MIX_ID);
+   for(i = 0; i < num_channels; i++)
+   {
+      for(j = 0; j < num_channels; j++)
+      {
+         audrvVoiceSetMixFactor(&aud->drv, 0, i == j ? 1.0f : 0.0f, i, j);
+      }
+   }
+
+   mutexInit(&aud->update_lock);
+   *new_rate = sample_rate;
+
+   return aud;
+
+fail_init:
+   audrenExit();
+
+fail:
+   if (aud)
+   {
+      if (aud->mempool)
+      {
+         free(aud->mempool);
+      }
+
+      free(aud);
+   }
+
+   return NULL;
+}
+
+static size_t libnx_audren_audio_buffer_size(void *data)
+{
+   libnx_audren_t *aud = (libnx_audren_t*)data;
+
+   if (!aud)
+      return 0;
+
+   return aud->buffer_size;
+}
+
+static ssize_t libnx_audren_audio_get_free_wavebuf_idx(libnx_audren_t* aud)
+{
+   unsigned i;
+
+   for (i = 0; i < BUFFER_COUNT; i++)
+   {
+      if (aud->wavebufs[i].state == AudioDriverWaveBufState_Free
+         || aud->wavebufs[i].state == AudioDriverWaveBufState_Done)
+      {
+         return i;
+      }
+   }
+
+   return -1;
+}
+
+static size_t libnx_audren_audio_append(libnx_audren_t* aud, const void *buf, size_t size)
+{
+   ssize_t free_idx = -1;
+
+   if(!aud->current_wavebuf)
+   {
+      free_idx = libnx_audren_audio_get_free_wavebuf_idx(aud);
+      if(free_idx == -1)
+         return 0;
+
+      aud->current_wavebuf = &aud->wavebufs[free_idx];
+      aud->current_pool_ptr = aud->mempool + (free_idx * aud->buffer_size);
+      aud->current_size = 0;
+   }
+
+   if(size > aud->buffer_size - aud->current_size)
+   {
+      size = aud->buffer_size - aud->current_size;
+   }
+
+   void *dstbuf = aud->current_pool_ptr + aud->current_size;
+   memcpy(dstbuf, buf, size);
+   armDCacheFlush(dstbuf, size);
+
+   aud->current_size += size;
+
+   if(aud->current_size == aud->buffer_size)
+   {
+      audrvVoiceAddWaveBuf(&aud->drv, 0, aud->current_wavebuf);
+
+      mutexLock(&aud->update_lock);
+      audrvUpdate(&aud->drv);
+      mutexUnlock(&aud->update_lock);
+
+      if (!audrvVoiceIsPlaying(&aud->drv, 0))
+      {
+         audrvVoiceStart(&aud->drv, 0);
+      }
+
+      aud->current_wavebuf = NULL;
+   }
+
+   return size;
+}
+
+static ssize_t libnx_audren_audio_write(void *data, const void *buf, size_t size)
+{
+   libnx_audren_t *aud = (libnx_audren_t*)data;
+   size_t written = 0;
+
+   if (!aud)
+      return -1;
+
+   while(written < size)
+   {
+      written += libnx_audren_audio_append(aud, buf + written, size - written);
+      if(written != size)
+      {
+         if(aud->nonblocking)
+         {
+            break;
+         }
+         else
+         {
+            mutexLock(&aud->update_lock);
+            audrvUpdate(&aud->drv);
+            mutexUnlock(&aud->update_lock);
+            audrenWaitFrame();
+         }
+      }
+   }
+
+   return written;
+}
+
+static bool libnx_audren_audio_stop(void *data)
+{
+   libnx_audren_t *aud = (libnx_audren_t*)data;
+
+   if (!aud)
+      return false;
+
+   audrvVoiceStop(&aud->drv, 0);
+
+   return true;
+}
+
+static bool libnx_audren_audio_start(void *data, bool is_shutdown)
+{
+   (void)is_shutdown;
+   libnx_audren_t *aud = (libnx_audren_t*)data;
+
+   if (!aud)
+      return false;
+
+   audrvVoiceStart(&aud->drv, 0);
+
+   return true;
+}
+
+static bool libnx_audren_audio_alive(void *data)
+{
+   libnx_audren_t *aud = (libnx_audren_t*)data;
+
+   if (!aud)
+      return false;
+
+   return true;
+}
+
+static void libnx_audren_audio_free(void *data)
+{
+   libnx_audren_t *aud = (libnx_audren_t*)data;
+
+   if (!aud)
+      return;
+
+   audrvVoiceStop(&aud->drv, 0);
+   audrvClose(&aud->drv);
+   audrenExit();
+
+   if (aud->mempool)
+   {
+      free(aud->mempool);
+   }
+
+   free(aud);
+}
+
+static bool libnx_audren_audio_use_float(void *data)
+{
+   (void)data;
+   return false; /* force S16 */
+}
+
+static size_t libnx_audren_audio_write_avail(void *data)
+{
+   libnx_audren_t *aud = (libnx_audren_t*)data;
+   size_t avail;
+
+   if (!aud || !aud->current_wavebuf)
+      return 0;
+
+   avail = aud->buffer_size - aud->current_size;
+
+   return avail;
+}
+
+static void libnx_audren_audio_set_nonblock_state(void *data, bool state)
+{
+   libnx_audren_t *aud = (libnx_audren_t*)data;
+
+   if (!aud)
+      return;
+
+   aud->nonblocking = state;
+}
+
+audio_driver_t audio_switch_libnx_audren = {
+   libnx_audren_audio_init,
+   libnx_audren_audio_write,
+   libnx_audren_audio_stop,
+   libnx_audren_audio_start,
+   libnx_audren_audio_alive,
+   libnx_audren_audio_set_nonblock_state,
+   libnx_audren_audio_free,
+   libnx_audren_audio_use_float,
+   "switch_audren",
+   NULL, /* device_list_new */
+   NULL, /* device_list_free */
+   libnx_audren_audio_write_avail,
+   libnx_audren_audio_buffer_size,
+};
@@ -0,0 +1,439 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2019      - p-sam
+ *
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <malloc.h>
+#include <stdint.h>
+
+#include <switch.h>
+
+#include <queues/fifo_queue.h>
+#include "../../retroarch.h"
+#include "../../verbosity.h"
+#include "../../tasks/tasks_internal.h"
+
+#define BUFFER_COUNT 5
+
+static const int sample_rate           = 48000;
+static const int num_channels          = 2;
+static const uint8_t sink_channels[]   = { 0, 1 };
+static const size_t thread_stack_size  = 1024 * 8;
+static const int thread_preferred_cpu  = 2;
+
+static const AudioRendererConfig audio_renderer_config =
+{
+   .output_rate     = AudioRendererOutputRate_48kHz,
+   .num_voices      = 24,
+   .num_effects     = 0,
+   .num_sinks       = 1,
+   .num_mix_objs    = 1,
+   .num_mix_buffers = 2,
+};
+
+typedef struct {
+   AudioDriver drv;
+   void* mempool;
+   AudioDriverWaveBuf wavebufs[BUFFER_COUNT];
+   size_t buffer_size;
+   size_t samples;
+   bool nonblocking;
+
+   fifo_buffer_t* fifo;
+   Mutex fifo_lock;
+   CondVar fifo_condvar;
+   Mutex fifo_condlock;
+   Thread thread;
+
+   volatile bool running;
+   volatile bool paused;
+} libnx_audren_thread_t;
+
+static void thread_job(void* data)
+{
+   libnx_audren_thread_t *aud = (libnx_audren_thread_t*)data;
+   size_t available = 0;
+   size_t current_size = 0;
+   size_t written_tmp = 0;
+   AudioDriverWaveBuf* current_wavebuf = NULL;
+   void* current_pool_ptr = NULL;
+   void* dstbuf = NULL;
+   unsigned i;
+
+   if (!aud)
+      return;
+
+   while(aud->running)
+   {
+      if(!current_wavebuf)
+      {
+         for (i = 0; i < BUFFER_COUNT; i++)
+         {
+            if (aud->wavebufs[i].state == AudioDriverWaveBufState_Free
+               || aud->wavebufs[i].state == AudioDriverWaveBufState_Done)
+            {
+               current_wavebuf = &aud->wavebufs[i];
+               current_pool_ptr = aud->mempool + (i * aud->buffer_size);
+               current_size = 0;
+               break;
+            }
+         }
+      }
+
+      if(current_wavebuf)
+      {
+         mutexLock(&aud->fifo_lock);
+         available = aud->paused ? 0 : fifo_read_avail(aud->fifo);
+         written_tmp = MIN(available, aud->buffer_size - current_size);
+         dstbuf = current_pool_ptr + current_size;
+         if(written_tmp > 0)
+         {
+            fifo_read(aud->fifo, dstbuf, written_tmp);
+         }
+         mutexUnlock(&aud->fifo_lock);
+
+         if(written_tmp > 0)
+         {
+            condvarWakeAll(&aud->fifo_condvar);
+
+            current_size += written_tmp;
+            armDCacheFlush(dstbuf, written_tmp);
+         }
+
+         if(current_size == aud->buffer_size)
+         {
+            audrvVoiceAddWaveBuf(&aud->drv, 0, current_wavebuf);
+
+            audrvUpdate(&aud->drv);
+            if (!audrvVoiceIsPlaying(&aud->drv, 0))
+            {
+               audrvVoiceStart(&aud->drv, 0);
+            }
+
+            current_wavebuf = NULL;
+         }
+
+         svcSleepThread(1000UL);
+      }
+      else
+      {
+         audrvUpdate(&aud->drv);
+         audrenWaitFrame();
+      }
+   }
+}
+
+static void *libnx_audren_thread_audio_init(const char *device, unsigned rate, unsigned latency,
+      unsigned block_frames,
+      unsigned *new_rate)
+{
+   unsigned i, j;
+   libnx_audren_thread_t *aud;
+   Result rc;
+   int mpid;
+   size_t mempool_size;
+   unsigned real_latency;
+   uint32_t thread_priority;
+
+   RARCH_LOG("[Audio]: Using libnx_audren_thread driver\n");
+
+   aud = (libnx_audren_thread_t*)calloc(1, sizeof(libnx_audren_thread_t));
+
+   if (!aud)
+   {
+      RARCH_ERR("[Audio]: struct alloc failed\n");
+      goto fail;
+   }
+
+   real_latency = MAX(latency, 5);
+   RARCH_LOG("[Audio]: real_latency is %u\n", real_latency);
+
+   aud->running = true;
+   aud->paused = false;
+   aud->nonblocking = !block_frames;
+   aud->buffer_size = (real_latency * sample_rate / 1000);
+   aud->samples = (aud->buffer_size / num_channels / sizeof(int16_t));
+
+   mempool_size = (aud->buffer_size * BUFFER_COUNT + (AUDREN_MEMPOOL_ALIGNMENT-1)) &~ (AUDREN_MEMPOOL_ALIGNMENT-1);
+   aud->mempool = memalign(AUDREN_MEMPOOL_ALIGNMENT, mempool_size);
+   if (!aud->mempool)
+   {
+      RARCH_ERR("[Audio]: mempool alloc failed\n");
+      goto fail;
+   }
+
+   rc = audrenInitialize(&audio_renderer_config);
+   if(R_FAILED(rc))
+   {
+      RARCH_ERR("[Audio]: audrenInitialize: %x\n", rc);
+      goto fail;
+   }
+
+   rc = audrvCreate(&aud->drv, &audio_renderer_config, num_channels);
+   if(R_FAILED(rc))
+   {
+      RARCH_ERR("[Audio]: audrvCreate: %x\n", rc);
+      goto fail_init;
+   }
+
+   for(i = 0; i < BUFFER_COUNT; i++)
+   {
+      aud->wavebufs[i].data_raw = aud->mempool;
+      aud->wavebufs[i].size = mempool_size;
+      aud->wavebufs[i].start_sample_offset = i * aud->samples;
+      aud->wavebufs[i].end_sample_offset = aud->wavebufs[i].start_sample_offset + aud->samples;
+   }
+
+   mpid = audrvMemPoolAdd(&aud->drv, aud->mempool, mempool_size);
+   audrvMemPoolAttach(&aud->drv, mpid);
+
+   audrvDeviceSinkAdd(&aud->drv, AUDREN_DEFAULT_DEVICE_NAME, num_channels, sink_channels);
+
+   rc = audrenStartAudioRenderer();
+   if(R_FAILED(rc))
+   {
+      RARCH_ERR("[Audio]: audrenStartAudioRenderer: %x\n", rc);
+   }
+
+   audrvVoiceInit(&aud->drv, 0, num_channels, PcmFormat_Int16, sample_rate);
+   audrvVoiceSetDestinationMix(&aud->drv, 0, AUDREN_FINAL_MIX_ID);
+   for(i = 0; i < num_channels; i++)
+   {
+      for(j = 0; j < num_channels; j++)
+      {
+         audrvVoiceSetMixFactor(&aud->drv, 0, i == j ? 1.0f : 0.0f, i, j);
+      }
+   }
+
+   aud->fifo = fifo_new(aud->buffer_size);
+   if (!aud->fifo)
+   {
+      RARCH_ERR("[Audio]: fifo alloc failed\n");
+      goto fail_drv;
+   }
+
+   mutexInit(&aud->fifo_lock);
+   condvarInit(&aud->fifo_condvar);
+   mutexInit(&aud->fifo_condlock);
+
+   svcGetThreadPriority(&thread_priority, CUR_THREAD_HANDLE);
+   rc = threadCreate(&aud->thread, &thread_job, (void*)aud, thread_stack_size, thread_priority - 1, thread_preferred_cpu);
+   if(R_FAILED(rc))
+   {
+      RARCH_ERR("[Audio]: threadCreate: %x\n", rc);
+      goto fail_drv;
+   }
+
+   rc = threadStart(&aud->thread);
+   if(R_FAILED(rc))
+   {
+      RARCH_ERR("[Audio]: threadStart: %x\n", rc);
+      threadClose(&aud->thread);
+      goto fail_drv;
+   }
+
+   *new_rate = sample_rate;
+
+   return aud;
+
+fail_drv:
+   audrvClose(&aud->drv);
+
+fail_init:
+   audrenExit();
+
+fail:
+   if (aud)
+   {
+      if (aud->mempool)
+      {
+         free(aud->mempool);
+      }
+
+      free(aud);
+   }
+
+   return NULL;
+}
+
+static size_t libnx_audren_thread_audio_buffer_size(void *data)
+{
+   libnx_audren_thread_t *aud = (libnx_audren_thread_t*)data;
+
+   if (!aud)
+      return 0;
+
+   return aud->buffer_size;
+}
+
+static ssize_t libnx_audren_thread_audio_write(void *data, const void *buf, size_t size)
+{
+   libnx_audren_thread_t *aud = (libnx_audren_thread_t*)data;
+   size_t available, written, written_tmp;
+
+   if (!aud || !aud->running)
+      return -1;
+
+   if(aud->paused)
+      return 0;
+
+   if(aud->nonblocking)
+   {
+      mutexLock(&aud->fifo_lock);
+      available = fifo_write_avail(aud->fifo);
+      written = MIN(available, size);
+      if(written > 0)
+      {
+         fifo_write(aud->fifo, buf, written);
+      }
+      mutexUnlock(&aud->fifo_lock);
+   }
+   else
+   {
+      written = 0;
+      while (written < size && aud->running)
+      {
+         mutexLock(&aud->fifo_lock);
+         available = fifo_write_avail(aud->fifo);
+         if(available)
+         {
+            written_tmp = MIN(size - written, available);
+            fifo_write(aud->fifo, (const char*)buf + written, written_tmp);
+            mutexUnlock(&aud->fifo_lock);
+            written += written_tmp;
+         }
+         else
+         {
+            mutexUnlock(&aud->fifo_lock);
+            mutexLock(&aud->fifo_condlock);
+            condvarWait(&aud->fifo_condvar, &aud->fifo_condlock);
+            mutexUnlock(&aud->fifo_condlock);
+         }
+      }
+   }
+
+   return written;
+}
+
+static bool libnx_audren_thread_audio_stop(void *data)
+{
+   libnx_audren_thread_t *aud = (libnx_audren_thread_t*)data;
+
+   if (!aud)
+      return false;
+
+   aud->paused = true;
+
+   return true;
+}
+
+static bool libnx_audren_thread_audio_start(void *data, bool is_shutdown)
+{
+   (void)is_shutdown;
+   libnx_audren_thread_t *aud = (libnx_audren_thread_t*)data;
+
+   if (!aud)
+      return false;
+
+   aud->paused = false;
+
+   return true;
+}
+
+static bool libnx_audren_thread_audio_alive(void *data)
+{
+   libnx_audren_thread_t *aud = (libnx_audren_thread_t*)data;
+
+   if (!aud)
+      return false;
+
+   return true;
+}
+
+static void libnx_audren_thread_audio_free(void *data)
+{
+   libnx_audren_thread_t *aud = (libnx_audren_thread_t*)data;
+
+   if (!aud)
+      return;
+
+   aud->running = false;
+   mutexUnlock(&aud->fifo_lock);
+   threadWaitForExit(&aud->thread);
+   threadClose(&aud->thread);
+   audrvVoiceStop(&aud->drv, 0);
+   audrvClose(&aud->drv);
+   audrenExit();
+
+   if (aud->mempool)
+   {
+      free(aud->mempool);
+   }
+
+   if (aud->fifo)
+   {
+      fifo_clear(aud->fifo);
+      fifo_free(aud->fifo);
+   }
+
+   free(aud);
+}
+
+static bool libnx_audren_thread_audio_use_float(void *data)
+{
+   (void)data;
+   return false; /* force S16 */
+}
+
+static size_t libnx_audren_thread_audio_write_avail(void *data)
+{
+   libnx_audren_thread_t *aud = (libnx_audren_thread_t*)data;
+   size_t available;
+
+   if (!aud)
+      return 0;
+
+   mutexLock(&aud->fifo_lock);
+   available = fifo_write_avail(aud->fifo);
+   mutexUnlock(&aud->fifo_lock);
+
+   return available;
+}
+
+static void libnx_audren_thread_audio_set_nonblock_state(void *data, bool state)
+{
+   libnx_audren_thread_t *aud = (libnx_audren_thread_t*)data;
+
+   if (!aud)
+      return;
+
+   aud->nonblocking = state;
+}
+
+audio_driver_t audio_switch_libnx_audren_thread = {
+   libnx_audren_thread_audio_init,
+   libnx_audren_thread_audio_write,
+   libnx_audren_thread_audio_stop,
+   libnx_audren_thread_audio_start,
+   libnx_audren_thread_audio_alive,
+   libnx_audren_thread_audio_set_nonblock_state,
+   libnx_audren_thread_audio_free,
+   libnx_audren_thread_audio_use_float,
+   "switch_audren_thread",
+   NULL, /* device_list_new */
+   NULL, /* device_list_free */
+   libnx_audren_thread_audio_write_avail,
+   libnx_audren_thread_audio_buffer_size,
+};
@@ -28,7 +28,7 @@
 #endif

 #include <queues/fifo_queue.h>
-#include "../audio_driver.h"
+#include "../../retroarch.h"
 #include "../../verbosity.h"

 #include "../../tasks/tasks_internal.h"
@@ -64,7 +64,7 @@
 #include <retro_inline.h>
 #include <retro_endianness.h>

-#include "../audio_driver.h"
+#include "../../retroarch.h"
 #include "../../verbosity.h"

 /* Implementation tinyalsa pcm */
@@ -174,17 +174,17 @@
 #define SNDRV_PCM_IOCTL_LINK		_IOW('A', 0x60, int)
 #define SNDRV_PCM_IOCTL_UNLINK		_IO('A', 0x61)

-#define	SNDRV_PCM_ACCESS_MMAP_INTERLEAVED	(( snd_pcm_access_t) 0) /* interleaved mmap */
-#define	SNDRV_PCM_ACCESS_MMAP_NONINTERLEAVED	(( snd_pcm_access_t) 1) /* noninterleaved mmap */
-#define	SNDRV_PCM_ACCESS_MMAP_COMPLEX		(( snd_pcm_access_t) 2) /* complex mmap */
-#define	SNDRV_PCM_ACCESS_RW_INTERLEAVED		(( snd_pcm_access_t) 3) /* readi/writei */
-#define	SNDRV_PCM_ACCESS_RW_NONINTERLEAVED	(( snd_pcm_access_t) 4) /* readn/writen */
+#define	SNDRV_PCM_ACCESS_MMAP_INTERLEAVED	(( tinyalsa_snd_pcm_access_t) 0) /* interleaved mmap */
+#define	SNDRV_PCM_ACCESS_MMAP_NONINTERLEAVED	(( tinyalsa_snd_pcm_access_t) 1) /* noninterleaved mmap */
+#define	SNDRV_PCM_ACCESS_MMAP_COMPLEX		(( tinyalsa_snd_pcm_access_t) 2) /* complex mmap */
+#define	SNDRV_PCM_ACCESS_RW_INTERLEAVED		(( tinyalsa_snd_pcm_access_t) 3) /* readi/writei */
+#define	SNDRV_PCM_ACCESS_RW_NONINTERLEAVED	(( tinyalsa_snd_pcm_access_t) 4) /* readn/writen */
 #define	SNDRV_PCM_ACCESS_LAST		SNDRV_PCM_ACCESS_RW_NONINTERLEAVED

-#define	SNDRV_PCM_SUBFORMAT_STD		(( snd_pcm_subformat_t) 0)
+#define	SNDRV_PCM_SUBFORMAT_STD		(( tinyalsa_snd_pcm_subformat_t) 0)
 #define	SNDRV_PCM_SUBFORMAT_LAST	SNDRV_PCM_SUBFORMAT_STD

-#define	SNDRV_PCM_SUBFORMAT_STD		(( snd_pcm_subformat_t) 0)
+#define	SNDRV_PCM_SUBFORMAT_STD		(( tinyalsa_snd_pcm_subformat_t) 0)
 #define	SNDRV_PCM_SUBFORMAT_LAST	SNDRV_PCM_SUBFORMAT_STD
 #define SNDRV_PCM_INFO_MMAP		0x00000001	/* hardware supports mmap */
 #define SNDRV_PCM_INFO_MMAP_VALID	0x00000002	/* period data are valid during transfer */
@@ -203,15 +203,15 @@
 #define SNDRV_PCM_INFO_NO_PERIOD_WAKEUP	0x00800000	/* period wakeup can be disabled */
 #define SNDRV_PCM_INFO_HAS_WALL_CLOCK   0x01000000      /* has audio wall clock for audio/system time sync */
 #define SNDRV_PCM_INFO_FIFO_IN_FRAMES	0x80000000	/* internal kernel flag - FIFO size is in frames */
-#define	SNDRV_PCM_STATE_OPEN		(( snd_pcm_state_t) 0) /* stream is open */
-#define	SNDRV_PCM_STATE_SETUP		(( snd_pcm_state_t) 1) /* stream has a setup */
-#define	SNDRV_PCM_STATE_PREPARED	(( snd_pcm_state_t) 2) /* stream is ready to start */
-#define	SNDRV_PCM_STATE_RUNNING		(( snd_pcm_state_t) 3) /* stream is running */
-#define	SNDRV_PCM_STATE_XRUN		(( snd_pcm_state_t) 4) /* stream reached an xrun */
-#define	SNDRV_PCM_STATE_DRAINING	(( snd_pcm_state_t) 5) /* stream is draining */
-#define	SNDRV_PCM_STATE_PAUSED		(( snd_pcm_state_t) 6) /* stream is paused */
-#define	SNDRV_PCM_STATE_SUSPENDED	(( snd_pcm_state_t) 7) /* hardware is suspended */
-#define	SNDRV_PCM_STATE_DISCONNECTED	(( snd_pcm_state_t) 8) /* hardware is disconnected */
+#define	SNDRV_PCM_STATE_OPEN		(( tinyalsa_snd_pcm_state_t) 0) /* stream is open */
+#define	SNDRV_PCM_STATE_SETUP		(( tinyalsa_snd_pcm_state_t) 1) /* stream has a setup */
+#define	SNDRV_PCM_STATE_PREPARED	(( tinyalsa_snd_pcm_state_t) 2) /* stream is ready to start */
+#define	SNDRV_PCM_STATE_RUNNING		(( tinyalsa_snd_pcm_state_t) 3) /* stream is running */
+#define	SNDRV_PCM_STATE_XRUN		(( tinyalsa_snd_pcm_state_t) 4) /* stream reached an xrun */
+#define	SNDRV_PCM_STATE_DRAINING	(( tinyalsa_snd_pcm_state_t) 5) /* stream is draining */
+#define	SNDRV_PCM_STATE_PAUSED		(( tinyalsa_snd_pcm_state_t) 6) /* stream is paused */
+#define	SNDRV_PCM_STATE_SUSPENDED	(( tinyalsa_snd_pcm_state_t) 7) /* hardware is suspended */
+#define	SNDRV_PCM_STATE_DISCONNECTED	(( tinyalsa_snd_pcm_state_t) 8) /* hardware is disconnected */
 #define	SNDRV_PCM_STATE_LAST		SNDRV_PCM_STATE_DISCONNECTED

 #define	SNDRV_PCM_HW_PARAM_ACCESS	         0	/* Access type */
@@ -237,53 +237,53 @@
 #define SNDRV_PCM_HW_PARAMS_EXPORT_BUFFER	   (1<<1)	/* export buffer */
 #define SNDRV_PCM_HW_PARAMS_NO_PERIOD_WAKEUP	(1<<2)	/* disable period wakeups */

-#define	SNDRV_PCM_FORMAT_S8	(( snd_pcm_format_t) 0)
-#define	SNDRV_PCM_FORMAT_U8	(( snd_pcm_format_t) 1)
-#define	SNDRV_PCM_FORMAT_S16_LE	(( snd_pcm_format_t) 2)
-#define	SNDRV_PCM_FORMAT_S16_BE	(( snd_pcm_format_t) 3)
-#define	SNDRV_PCM_FORMAT_U16_LE	(( snd_pcm_format_t) 4)
-#define	SNDRV_PCM_FORMAT_U16_BE	(( snd_pcm_format_t) 5)
-#define	SNDRV_PCM_FORMAT_S24_LE	(( snd_pcm_format_t) 6) /* low three bytes */
-#define	SNDRV_PCM_FORMAT_S24_BE	(( snd_pcm_format_t) 7) /* low three bytes */
-#define	SNDRV_PCM_FORMAT_U24_LE	(( snd_pcm_format_t) 8) /* low three bytes */
-#define	SNDRV_PCM_FORMAT_U24_BE	(( snd_pcm_format_t) 9) /* low three bytes */
-#define	SNDRV_PCM_FORMAT_S32_LE	(( snd_pcm_format_t) 10)
-#define	SNDRV_PCM_FORMAT_S32_BE	(( snd_pcm_format_t) 11)
-#define	SNDRV_PCM_FORMAT_U32_LE	(( snd_pcm_format_t) 12)
-#define	SNDRV_PCM_FORMAT_U32_BE	(( snd_pcm_format_t) 13)
-#define	SNDRV_PCM_FORMAT_FLOAT_LE	(( snd_pcm_format_t) 14) /* 4-byte float, IEEE-754 32-bit, range -1.0 to 1.0 */
-#define	SNDRV_PCM_FORMAT_FLOAT_BE	(( snd_pcm_format_t) 15) /* 4-byte float, IEEE-754 32-bit, range -1.0 to 1.0 */
-#define	SNDRV_PCM_FORMAT_FLOAT64_LE	(( snd_pcm_format_t) 16) /* 8-byte float, IEEE-754 64-bit, range -1.0 to 1.0 */
-#define	SNDRV_PCM_FORMAT_FLOAT64_BE	(( snd_pcm_format_t) 17) /* 8-byte float, IEEE-754 64-bit, range -1.0 to 1.0 */
-#define	SNDRV_PCM_FORMAT_IEC958_SUBFRAME_LE (( snd_pcm_format_t) 18) /* IEC-958 subframe, Little Endian */
-#define	SNDRV_PCM_FORMAT_IEC958_SUBFRAME_BE (( snd_pcm_format_t) 19) /* IEC-958 subframe, Big Endian */
-#define	SNDRV_PCM_FORMAT_MU_LAW		(( snd_pcm_format_t) 20)
-#define	SNDRV_PCM_FORMAT_A_LAW		(( snd_pcm_format_t) 21)
-#define	SNDRV_PCM_FORMAT_IMA_ADPCM	(( snd_pcm_format_t) 22)
-#define	SNDRV_PCM_FORMAT_MPEG		(( snd_pcm_format_t) 23)
-#define	SNDRV_PCM_FORMAT_GSM		(( snd_pcm_format_t) 24)
-#define	SNDRV_PCM_FORMAT_SPECIAL	(( snd_pcm_format_t) 31)
-#define	SNDRV_PCM_FORMAT_S24_3LE	(( snd_pcm_format_t) 32)	/* in three bytes */
-#define	SNDRV_PCM_FORMAT_S24_3BE	(( snd_pcm_format_t) 33)	/* in three bytes */
-#define	SNDRV_PCM_FORMAT_U24_3LE	(( snd_pcm_format_t) 34)	/* in three bytes */
-#define	SNDRV_PCM_FORMAT_U24_3BE	(( snd_pcm_format_t) 35)	/* in three bytes */
-#define	SNDRV_PCM_FORMAT_S20_3LE	(( snd_pcm_format_t) 36)	/* in three bytes */
-#define	SNDRV_PCM_FORMAT_S20_3BE	(( snd_pcm_format_t) 37)	/* in three bytes */
-#define	SNDRV_PCM_FORMAT_U20_3LE	(( snd_pcm_format_t) 38)	/* in three bytes */
-#define	SNDRV_PCM_FORMAT_U20_3BE	(( snd_pcm_format_t) 39)	/* in three bytes */
-#define	SNDRV_PCM_FORMAT_S18_3LE	(( snd_pcm_format_t) 40)	/* in three bytes */
-#define	SNDRV_PCM_FORMAT_S18_3BE	(( snd_pcm_format_t) 41)	/* in three bytes */
-#define	SNDRV_PCM_FORMAT_U18_3LE	(( snd_pcm_format_t) 42)	/* in three bytes */
-#define	SNDRV_PCM_FORMAT_U18_3BE	(( snd_pcm_format_t) 43)	/* in three bytes */
-#define	SNDRV_PCM_FORMAT_G723_24	(( snd_pcm_format_t) 44) /* 8 samples in 3 bytes */
-#define	SNDRV_PCM_FORMAT_G723_24_1B	(( snd_pcm_format_t) 45) /* 1 sample in 1 byte */
-#define	SNDRV_PCM_FORMAT_G723_40	(( snd_pcm_format_t) 46) /* 8 Samples in 5 bytes */
-#define	SNDRV_PCM_FORMAT_G723_40_1B	(( snd_pcm_format_t) 47) /* 1 sample in 1 byte */
-#define	SNDRV_PCM_FORMAT_DSD_U8		(( snd_pcm_format_t) 48) /* DSD, 1-byte samples DSD (x8) */
-#define	SNDRV_PCM_FORMAT_DSD_U16_LE	(( snd_pcm_format_t) 49) /* DSD, 2-byte samples DSD (x16), little endian */
-#define	SNDRV_PCM_FORMAT_DSD_U32_LE	(( snd_pcm_format_t) 50) /* DSD, 4-byte samples DSD (x32), little endian */
-#define	SNDRV_PCM_FORMAT_DSD_U16_BE	(( snd_pcm_format_t) 51) /* DSD, 2-byte samples DSD (x16), big endian */
-#define	SNDRV_PCM_FORMAT_DSD_U32_BE	(( snd_pcm_format_t) 52) /* DSD, 4-byte samples DSD (x32), big endian */
+#define	SNDRV_PCM_FORMAT_S8	(( tinyalsa_snd_pcm_format_t) 0)
+#define	SNDRV_PCM_FORMAT_U8	(( tinyalsa_snd_pcm_format_t) 1)
+#define	SNDRV_PCM_FORMAT_S16_LE	(( tinyalsa_snd_pcm_format_t) 2)
+#define	SNDRV_PCM_FORMAT_S16_BE	(( tinyalsa_snd_pcm_format_t) 3)
+#define	SNDRV_PCM_FORMAT_U16_LE	(( tinyalsa_snd_pcm_format_t) 4)
+#define	SNDRV_PCM_FORMAT_U16_BE	(( tinyalsa_snd_pcm_format_t) 5)
+#define	SNDRV_PCM_FORMAT_S24_LE	(( tinyalsa_snd_pcm_format_t) 6) /* low three bytes */
+#define	SNDRV_PCM_FORMAT_S24_BE	(( tinyalsa_snd_pcm_format_t) 7) /* low three bytes */
+#define	SNDRV_PCM_FORMAT_U24_LE	(( tinyalsa_snd_pcm_format_t) 8) /* low three bytes */
+#define	SNDRV_PCM_FORMAT_U24_BE	(( tinyalsa_snd_pcm_format_t) 9) /* low three bytes */
+#define	SNDRV_PCM_FORMAT_S32_LE	(( tinyalsa_snd_pcm_format_t) 10)
+#define	SNDRV_PCM_FORMAT_S32_BE	(( tinyalsa_snd_pcm_format_t) 11)
+#define	SNDRV_PCM_FORMAT_U32_LE	(( tinyalsa_snd_pcm_format_t) 12)
+#define	SNDRV_PCM_FORMAT_U32_BE	(( tinyalsa_snd_pcm_format_t) 13)
+#define	SNDRV_PCM_FORMAT_FLOAT_LE	(( tinyalsa_snd_pcm_format_t) 14) /* 4-byte float, IEEE-754 32-bit, range -1.0 to 1.0 */
+#define	SNDRV_PCM_FORMAT_FLOAT_BE	(( tinyalsa_snd_pcm_format_t) 15) /* 4-byte float, IEEE-754 32-bit, range -1.0 to 1.0 */
+#define	SNDRV_PCM_FORMAT_FLOAT64_LE	(( tinyalsa_snd_pcm_format_t) 16) /* 8-byte float, IEEE-754 64-bit, range -1.0 to 1.0 */
+#define	SNDRV_PCM_FORMAT_FLOAT64_BE	(( tinyalsa_snd_pcm_format_t) 17) /* 8-byte float, IEEE-754 64-bit, range -1.0 to 1.0 */
+#define	SNDRV_PCM_FORMAT_IEC958_SUBFRAME_LE (( tinyalsa_snd_pcm_format_t) 18) /* IEC-958 subframe, Little Endian */
+#define	SNDRV_PCM_FORMAT_IEC958_SUBFRAME_BE (( tinyalsa_snd_pcm_format_t) 19) /* IEC-958 subframe, Big Endian */
+#define	SNDRV_PCM_FORMAT_MU_LAW		(( tinyalsa_snd_pcm_format_t) 20)
+#define	SNDRV_PCM_FORMAT_A_LAW		(( tinyalsa_snd_pcm_format_t) 21)
+#define	SNDRV_PCM_FORMAT_IMA_ADPCM	(( tinyalsa_snd_pcm_format_t) 22)
+#define	SNDRV_PCM_FORMAT_MPEG		(( tinyalsa_snd_pcm_format_t) 23)
+#define	SNDRV_PCM_FORMAT_GSM		(( tinyalsa_snd_pcm_format_t) 24)
+#define	SNDRV_PCM_FORMAT_SPECIAL	(( tinyalsa_snd_pcm_format_t) 31)
+#define	SNDRV_PCM_FORMAT_S24_3LE	(( tinyalsa_snd_pcm_format_t) 32)	/* in three bytes */
+#define	SNDRV_PCM_FORMAT_S24_3BE	(( tinyalsa_snd_pcm_format_t) 33)	/* in three bytes */
+#define	SNDRV_PCM_FORMAT_U24_3LE	(( tinyalsa_snd_pcm_format_t) 34)	/* in three bytes */
+#define	SNDRV_PCM_FORMAT_U24_3BE	(( tinyalsa_snd_pcm_format_t) 35)	/* in three bytes */
+#define	SNDRV_PCM_FORMAT_S20_3LE	(( tinyalsa_snd_pcm_format_t) 36)	/* in three bytes */
+#define	SNDRV_PCM_FORMAT_S20_3BE	(( tinyalsa_snd_pcm_format_t) 37)	/* in three bytes */
+#define	SNDRV_PCM_FORMAT_U20_3LE	(( tinyalsa_snd_pcm_format_t) 38)	/* in three bytes */
+#define	SNDRV_PCM_FORMAT_U20_3BE	(( tinyalsa_snd_pcm_format_t) 39)	/* in three bytes */
+#define	SNDRV_PCM_FORMAT_S18_3LE	(( tinyalsa_snd_pcm_format_t) 40)	/* in three bytes */
+#define	SNDRV_PCM_FORMAT_S18_3BE	(( tinyalsa_snd_pcm_format_t) 41)	/* in three bytes */
+#define	SNDRV_PCM_FORMAT_U18_3LE	(( tinyalsa_snd_pcm_format_t) 42)	/* in three bytes */
+#define	SNDRV_PCM_FORMAT_U18_3BE	(( tinyalsa_snd_pcm_format_t) 43)	/* in three bytes */
+#define	SNDRV_PCM_FORMAT_G723_24	(( tinyalsa_snd_pcm_format_t) 44) /* 8 samples in 3 bytes */
+#define	SNDRV_PCM_FORMAT_G723_24_1B	(( tinyalsa_snd_pcm_format_t) 45) /* 1 sample in 1 byte */
+#define	SNDRV_PCM_FORMAT_G723_40	(( tinyalsa_snd_pcm_format_t) 46) /* 8 Samples in 5 bytes */
+#define	SNDRV_PCM_FORMAT_G723_40_1B	(( tinyalsa_snd_pcm_format_t) 47) /* 1 sample in 1 byte */
+#define	SNDRV_PCM_FORMAT_DSD_U8		(( tinyalsa_snd_pcm_format_t) 48) /* DSD, 1-byte samples DSD (x8) */
+#define	SNDRV_PCM_FORMAT_DSD_U16_LE	(( tinyalsa_snd_pcm_format_t) 49) /* DSD, 2-byte samples DSD (x16), little endian */
+#define	SNDRV_PCM_FORMAT_DSD_U32_LE	(( tinyalsa_snd_pcm_format_t) 50) /* DSD, 4-byte samples DSD (x32), little endian */
+#define	SNDRV_PCM_FORMAT_DSD_U16_BE	(( tinyalsa_snd_pcm_format_t) 51) /* DSD, 2-byte samples DSD (x16), big endian */
+#define	SNDRV_PCM_FORMAT_DSD_U32_BE	(( tinyalsa_snd_pcm_format_t) 52) /* DSD, 4-byte samples DSD (x32), big endian */
 #define	SNDRV_PCM_FORMAT_LAST		SNDRV_PCM_FORMAT_DSD_U32_BE

 #define SNDRV_MASK_MAX	               256
@@ -427,10 +427,10 @@ enum
 typedef unsigned long snd_pcm_uframes_t;
 typedef signed long snd_pcm_sframes_t;
 typedef int snd_pcm_hw_param_t;
-typedef int __bitwise snd_pcm_access_t;
-typedef int __bitwise snd_pcm_subformat_t;
-typedef int __bitwise snd_pcm_state_t;
-typedef int __bitwise snd_pcm_format_t;
+typedef int __bitwise tinyalsa_snd_pcm_access_t;
+typedef int __bitwise tinyalsa_snd_pcm_subformat_t;
+typedef int __bitwise tinyalsa_snd_pcm_state_t;
+typedef int __bitwise tinyalsa_snd_pcm_format_t;

 /** A bit mask of 256 bits (32 bytes) that describes some hardware parameters of a PCM */
 struct pcm_mask
@@ -448,11 +448,11 @@ union snd_pcm_sync_id

 struct snd_pcm_mmap_status
 {
-	snd_pcm_state_t state;		/* RO: state - SNDRV_PCM_STATE_XXXX */
+	tinyalsa_snd_pcm_state_t state;		/* RO: state - SNDRV_PCM_STATE_XXXX */
 	int pad1;			/* Needed for 64 bit alignment */
 	snd_pcm_uframes_t hw_ptr;	/* RO: hw ptr (0...boundary-1) */
 	struct timespec tstamp;		/* Timestamp */
-	snd_pcm_state_t suspended_state; /* RO: suspended stream state */
+	tinyalsa_snd_pcm_state_t suspended_state; /* RO: suspended stream state */
 	struct timespec audio_tstamp;	/* from sample counter or wall clock */
 };

@@ -591,7 +591,7 @@ struct snd_xfern

 struct snd_pcm_status
 {
-   snd_pcm_state_t state;		/* stream state */
+   tinyalsa_snd_pcm_state_t state;		/* stream state */
   struct timespec trigger_tstamp;	/* time when stream was started/stopped/paused */
   struct timespec tstamp;		/* reference timestamp */
   snd_pcm_uframes_t appl_ptr;	/* appl ptr */
@@ -600,7 +600,7 @@ struct snd_pcm_status
   snd_pcm_uframes_t avail;	/* number of frames available */
   snd_pcm_uframes_t avail_max;	/* max frames available on hw since last status */
   snd_pcm_uframes_t overrange;	/* count of ADC (capture) overrange detections from last status */
-   snd_pcm_state_t suspended_state; /* suspended stream state */
+   tinyalsa_snd_pcm_state_t suspended_state; /* suspended stream state */
   __u32 reserved_alignment;	/* must be filled with zero */
   struct timespec audio_tstamp;	/* from sample counter or wall clock */
   unsigned char reserved[56-sizeof(struct timespec)]; /* must be filled with zero */
@@ -2257,7 +2257,7 @@ static void * tinyalsa_init(const char *devicestr, unsigned rate,
   RARCH_LOG("[TINYALSA]: Can pause: %s.\n", tinyalsa->can_pause ? "yes" : "no");
   RARCH_LOG("[TINYALSA]: Audio rate: %uHz.\n", config.rate);
   RARCH_LOG("[TINYALSA]: Buffer size: %u frames.\n", buffer_size);
-   RARCH_LOG("[TINYALSA]: Buffer size: %u bytes.\n", tinyalsa->buffer_size);
+   RARCH_LOG("[TINYALSA]: Buffer size: %u bytes.\n", (unsigned int)tinyalsa->buffer_size);
   RARCH_LOG("[TINYALSA]: Frame  size: %u bytes.\n", tinyalsa->frame_bits / 8);
   RARCH_LOG("[TINYALSA]: Latency: %ums.\n", buffer_size * 1000 / (rate * 4));

@@ -15,135 +15,17 @@

 #include <stdlib.h>

-#ifdef _WIN32_WINNT
-#undef _WIN32_WINNT
-#endif
-#define _WIN32_WINNT 0x0600
-#define WIN32_LEAN_AND_MEAN
-
-#include <windows.h>
-#include <winerror.h>
-#include <propidl.h>
-#include <initguid.h>
-#include <mmdeviceapi.h>
-#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>
+#include <string/stdstring.h>

-#include "../audio_driver.h"
+#include "../common/mmdevice_common.h"
+#include "../common/mmdevice_common_inline.h"
+
+#include "../../retroarch.h"
 #include "../../verbosity.h"
 #include "../../configuration.h"

-DEFINE_PROPERTYKEY(PKEY_Device_FriendlyName, 0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0x20, 0x67, 0xd1, 0x46, 0xa8, 0x50, 0xe0, 14); /* DEVPROP_TYPE_STRING */
-
-#ifdef __cplusplus
-#define _IMMDeviceCollection_Item(This,nDevice,ppdevice) (This)->Item(nDevice,ppdevice)
-#define _IAudioClient_Start(This)	( (This)->Start() )
-#define _IAudioClient_Stop(This)	( (This)->Stop() )
-#define _IAudioClient_GetCurrentPadding(This,pNumPaddingFrames)	\
-    ( (This)->GetCurrentPadding(pNumPaddingFrames) )
-#define _IAudioRenderClient_GetBuffer(This,NumFramesRequested,ppData)	\
-    ( (This)->GetBuffer(NumFramesRequested,ppData) )
-#define _IAudioRenderClient_ReleaseBuffer(This,NumFramesWritten,dwFlags)	\
-    ( (This)->ReleaseBuffer(NumFramesWritten,dwFlags) )
-#define _IAudioClient_GetService(This,riid,ppv) ( (This)->GetService(riid,ppv) )
-#define _IAudioClient_SetEventHandle(This,eventHandle)	( (This)->SetEventHandle(eventHandle) )
-#define _IAudioClient_GetBufferSize(This,pNumBufferFrames) ( (This)->GetBufferSize(pNumBufferFrames) )
-#define _IAudioClient_GetStreamLatency(This,phnsLatency)	( (This)->GetStreamLatency(phnsLatency) )
-#define _IAudioClient_GetDevicePeriod(This,phnsDefaultDevicePeriod,phnsMinimumDevicePeriod)	( (This)->GetDevicePeriod(phnsDefaultDevicePeriod,phnsMinimumDevicePeriod) )
-#define _IMMDevice_Activate(This,iid,dwClsCtx,pActivationParams,ppv) ((This)->Activate(iid,(dwClsCtx),pActivationParams,ppv))
-#define _IMMDeviceEnumerator_EnumAudioEndpoints(This,dataFlow,dwStateMask,ppDevices) (This)->EnumAudioEndpoints(dataFlow,dwStateMask,ppDevices)
-#define _IMMDeviceEnumerator_GetDefaultAudioEndpoint(This,dataFlow,role,ppEndpoint) (This)->GetDefaultAudioEndpoint(dataFlow,role,ppEndpoint)
-#define _IMMDevice_OpenPropertyStore(This,stgmAccess,ppProperties) (This)->OpenPropertyStore(stgmAccess,ppProperties)
-#define _IMMDevice_GetId(This,ppstrId) ((This)->GetId(ppstrId))
-#define _IPropertyStore_GetValue(This,key,pv) ( (This)->GetValue(key,pv) )
-#define _IMMDeviceCollection_GetCount(This,cProps) ( (This)->GetCount(cProps) )
-#else
-#define _IMMDeviceCollection_Item(This,nDevice,ppdevice) (This)->lpVtbl->Item(This,nDevice,ppdevice)
-#define _IAudioClient_Start(This)	( (This)->lpVtbl -> Start(This) )
-#define _IAudioClient_Stop(This)	( (This)->lpVtbl -> Stop(This) )
-#define _IAudioClient_GetCurrentPadding(This,pNumPaddingFrames)	\
-    ( (This)->lpVtbl -> GetCurrentPadding(This,pNumPaddingFrames) )
-#define _IAudioRenderClient_GetBuffer(This,NumFramesRequested,ppData)	\
-    ( (This)->lpVtbl -> GetBuffer(This,NumFramesRequested,ppData) )
-#define _IAudioRenderClient_ReleaseBuffer(This,NumFramesWritten,dwFlags)	\
-    ( (This)->lpVtbl -> ReleaseBuffer(This,NumFramesWritten,dwFlags) )
-#define _IAudioClient_GetService(This,riid,ppv)	( (This)->lpVtbl -> GetService(This,&(riid),ppv) )
-#define _IAudioClient_SetEventHandle(This,eventHandle)	( (This)->lpVtbl -> SetEventHandle(This,eventHandle) )
-#define _IAudioClient_GetBufferSize(This,pNumBufferFrames) ( (This)->lpVtbl -> GetBufferSize(This,pNumBufferFrames) )
-#define _IAudioClient_GetStreamLatency(This,phnsLatency)	( (This)->lpVtbl -> GetStreamLatency(This,phnsLatency) )
-#define _IAudioClient_GetDevicePeriod(This,phnsDefaultDevicePeriod,phnsMinimumDevicePeriod)	( (This)->lpVtbl -> GetDevicePeriod(This,phnsDefaultDevicePeriod,phnsMinimumDevicePeriod) )
-#define _IMMDevice_Activate(This,iid,dwClsCtx,pActivationParams,ppv) ((This)->lpVtbl->Activate(This,&(iid),dwClsCtx,pActivationParams,ppv))
-#define _IMMDeviceEnumerator_EnumAudioEndpoints(This,dataFlow,dwStateMask,ppDevices) (This)->lpVtbl->EnumAudioEndpoints(This,dataFlow,dwStateMask,ppDevices)
-#define _IMMDeviceEnumerator_GetDefaultAudioEndpoint(This,dataFlow,role,ppEndpoint) (This)->lpVtbl->GetDefaultAudioEndpoint(This,dataFlow,role,ppEndpoint)
-#define _IMMDevice_OpenPropertyStore(This,stgmAccess,ppProperties) (This)->lpVtbl->OpenPropertyStore(This,stgmAccess,ppProperties)
-#define _IMMDevice_GetId(This,ppstrId) (This)->lpVtbl->GetId(This,ppstrId)
-#define _IPropertyStore_GetValue(This,key,pv) ( (This)->lpVtbl -> GetValue(This,&(key),pv) )
-#define _IMMDeviceCollection_GetCount(This,cProps) ( (This)->lpVtbl -> GetCount(This,cProps) )
-#endif
-
-#define WASAPI_WARN(bool_exp, err_str, warn_exp) \
-      if (!(bool_exp)) { \
-         RARCH_WARN("[WASAPI]: %s.\n", err_str); \
-         warn_exp; }
-
-#define WASAPI_CHECK(bool_exp, err_str, err_exp) \
-      if (!(bool_exp)) { \
-         RARCH_ERR("[WASAPI]: %s.\n", err_str); \
-         err_exp; }
-
-#define WASAPI_HR_CHECK(hr, fun_str, err_exp) \
-      if (FAILED(hr)) { \
-         RARCH_ERR("[WASAPI]: %s failed with error 0x%.8X.\n", fun_str, hr); \
-         err_exp; }
-
-#define WASAPI_HR_WARN(hr, fun_str, warn_exp) \
-      if (FAILED(hr)) { \
-         RARCH_WARN("[WASAPI]: %s failed with error 0x%.8X.\n", fun_str, hr); \
-         warn_exp; }
-
-#define WASAPI_SR_CHECK(bool_exp, fun_str, err_exp) \
-      if (!(bool_exp)) { \
-         RARCH_ERR("[WASAPI]: %s failed with error %d.\n", fun_str, GetLastError()); \
-         err_exp; }
-
-#ifdef __cplusplus
-#define WASAPI_RELEASE(iface) \
-      if(iface) \
-      { \
-         iface->Release(); \
-         iface = NULL; \
-      }
-#else
-#define WASAPI_RELEASE(iface) \
-      if(iface) \
-      { \
-         iface->lpVtbl->Release(iface);\
-         iface = NULL; \
-      }
-#endif
-
-#define WASAPI_FREE(ptr)\
-      if(ptr) {\
-         free(ptr);\
-         ptr = NULL; }\
-
-#define WASAPI_CO_FREE(ptr)\
-      if(ptr) {\
-         CoTaskMemFree(ptr);\
-         ptr = NULL; }\
-
 typedef struct
 {
   bool exclusive;
@@ -158,38 +40,6 @@ typedef struct
   fifo_buffer_t      *buffer; /* NULL in unbuffered shared mode */
 } wasapi_t;

-static bool wasapi_check_device_id(IMMDevice *device, const char *id)
-{
-   HRESULT hr;
-   bool result   = false;
-   LPWSTR dev_id = NULL, dev_cmp_id = NULL;
-   int id_length = MultiByteToWideChar(CP_ACP, 0, id, -1, NULL, 0);
-
-   WASAPI_SR_CHECK(id_length > 0, "MultiByteToWideChar", goto error);
-
-   dev_cmp_id = (LPWSTR)malloc(id_length * sizeof(WCHAR));
-   WASAPI_CHECK(dev_cmp_id, "Out of memory", goto error);
-
-   id_length = MultiByteToWideChar(CP_ACP, 0, id, -1, dev_cmp_id, id_length);
-   WASAPI_SR_CHECK(id_length > 0, "MultiByteToWideChar", goto error);
-
-   hr = _IMMDevice_GetId(device, &dev_id);
-   WASAPI_HR_CHECK(hr, "IMMDevice::GetId", goto error);
-
-   result = lstrcmpW(dev_cmp_id, dev_id) == 0 ? true : false;
-
-   WASAPI_CO_FREE(dev_id);
-   WASAPI_FREE(dev_cmp_id);
-
-   return result;
-
-error:
-   WASAPI_CO_FREE(dev_id);
-   WASAPI_FREE(dev_cmp_id);
-
-   return false;
-}
-
 static IMMDevice *wasapi_init_device(const char *id)
 {
   HRESULT hr;
@@ -214,48 +64,85 @@ static IMMDevice *wasapi_init_device(const char *id)
   hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, CLSCTX_ALL,
         &IID_IMMDeviceEnumerator, (void **)&enumerator);
 #endif
-   WASAPI_HR_CHECK(hr, "CoCreateInstance", goto error);
+   if (FAILED(hr))
+      goto error;

   if (id)
   {
+      int32_t idx_found        = -1;
+      struct string_list *list = (struct string_list*)mmdevice_list_new(NULL);
+
+      /* Search for device name first */
+      if (list)
+      {
+         if (list->elems)
+         {
+            unsigned i;
+            for (i = 0; i < list->size; i++)
+            {
+               RARCH_LOG("[WASAPI]: %d : %s\n", i, list->elems[i].data);
+               if (string_is_equal(id, list->elems[i].data))
+               {
+                  idx_found = i;
+                  break;
+               }
+            }
+            /* Index was not found yet based on name string,
+             * just assume id is a one-character number index. */
+
+            if (idx_found == -1 && isdigit(id[0]))
+            {
+               idx_found = strtoul(id, NULL, 0);
+               RARCH_LOG("[WASAPI]: Fallback, device index is a single number index instead: %d.\n", idx_found);
+
+            }
+         }
+         string_list_free(list);
+      }
+
+      if (idx_found == -1)
+         idx_found = 0;
+
      hr = _IMMDeviceEnumerator_EnumAudioEndpoints(enumerator,
            eRender, DEVICE_STATE_ACTIVE, &collection);
-      WASAPI_HR_CHECK(hr, "IMMDeviceEnumerator::EnumAudioEndpoints",
-            goto error);
+      if (FAILED(hr))
+         goto error;

      hr = _IMMDeviceCollection_GetCount(collection, &dev_count);
-      WASAPI_HR_CHECK(hr, "IMMDeviceCollection::GetCount", goto error);
+      if (FAILED(hr))
+         goto error;

      for (i = 0; i < dev_count; ++i)
      {
         hr = _IMMDeviceCollection_Item(collection, i, &device);
-         WASAPI_HR_CHECK(hr, "IMMDeviceCollection::Item", continue);
+         if (FAILED(hr))
+            goto error;

-         if (wasapi_check_device_id(device, id))
+         if (i == idx_found)
            break;

-         WASAPI_RELEASE(device);
+         IFACE_RELEASE(device);
      }
   }
   else
   {
      hr = _IMMDeviceEnumerator_GetDefaultAudioEndpoint(
            enumerator, eRender, eConsole, &device);
-      WASAPI_HR_CHECK(hr, "IMMDeviceEnumerator::GetDefaultAudioEndpoint",
-            goto error);
+      if (FAILED(hr))
+         goto error;
   }

   if (!device)
      goto error;

-   WASAPI_RELEASE(collection);
-   WASAPI_RELEASE(enumerator);
+   IFACE_RELEASE(collection);
+   IFACE_RELEASE(enumerator);

   return device;

 error:
-   WASAPI_RELEASE(collection);
-   WASAPI_RELEASE(enumerator);
+   IFACE_RELEASE(collection);
+   IFACE_RELEASE(enumerator);

   if (id)
   {
@@ -271,7 +158,7 @@ error:

 static unsigned wasapi_pref_rate(unsigned i)
 {
-   const unsigned r[] = { 48000, 44100, 96000, 192000 };
+   const unsigned r[] = { 48000, 44100, 96000, 192000, 32000 };

   if (i >= sizeof(r) / sizeof(unsigned))
      return 0;
@@ -317,7 +204,8 @@ static IAudioClient *wasapi_init_client_sh(IMMDevice *device,
   HRESULT hr           = _IMMDevice_Activate(device,
         IID_IAudioClient,
         CLSCTX_ALL, NULL, (void**)&client);
-   WASAPI_HR_CHECK(hr, "IMMDevice::Activate", return NULL);
+   if (FAILED(hr))
+      return NULL;

   /* once for float, once for pcm (requested first) */
   for (i = 0; i < 2; ++i)
@@ -346,11 +234,12 @@ static IAudioClient *wasapi_init_client_sh(IMMDevice *device,
         if (hr == AUDCLNT_E_ALREADY_INITIALIZED)
         {
            HRESULT hr;
-            WASAPI_RELEASE(client);
+            IFACE_RELEASE(client);
            hr           = _IMMDevice_Activate(device,
                  IID_IAudioClient,
                  CLSCTX_ALL, NULL, (void**)&client);
-            WASAPI_HR_CHECK(hr, "IMMDevice::Activate", return NULL);
+            if (FAILED(hr))
+               return NULL;

 #ifdef __cplusplus
            hr = client->Initialize(AUDCLNT_SHAREMODE_SHARED,
@@ -375,7 +264,8 @@ static IAudioClient *wasapi_init_client_sh(IMMDevice *device,
      }
   }

-   WASAPI_HR_CHECK(hr, "IAudioClient::Initialize", goto error);
+   if (FAILED(hr))
+      goto error;

   *float_fmt = float_fmt_res;
   *rate      = rate_res;
@@ -383,7 +273,7 @@ static IAudioClient *wasapi_init_client_sh(IMMDevice *device,
   return client;

 error:
-   WASAPI_RELEASE(client);
+   IFACE_RELEASE(client);

   return NULL;
 }
@@ -402,10 +292,12 @@ static IAudioClient *wasapi_init_client_ex(IMMDevice *device,
   HRESULT hr                     = _IMMDevice_Activate(device,
         IID_IAudioClient,
         CLSCTX_ALL, NULL, (void**)&client);
-   WASAPI_HR_CHECK(hr, "IMMDevice::Activate", return NULL);
+   if (FAILED(hr))
+      return NULL;

   hr = _IAudioClient_GetDevicePeriod(client, NULL, &minimum_period);
-   WASAPI_HR_CHECK(hr, "IAudioClient::GetDevicePeriod", goto error);
+   if (FAILED(hr))
+      goto error;

   /* buffer_duration is in 100ns units */
   buffer_duration = latency * 10000.0;
@@ -438,13 +330,15 @@ static IAudioClient *wasapi_init_client_ex(IMMDevice *device,
         if (hr == AUDCLNT_E_BUFFER_SIZE_NOT_ALIGNED)
         {
            hr = _IAudioClient_GetBufferSize(client, &buffer_length);
-            WASAPI_HR_CHECK(hr, "IAudioClient::GetBufferSize", goto error);
+            if (FAILED(hr))
+               goto error;

-            WASAPI_RELEASE(client);
+            IFACE_RELEASE(client);
            hr                     = _IMMDevice_Activate(device,
                  IID_IAudioClient,
                  CLSCTX_ALL, NULL, (void**)&client);
-            WASAPI_HR_CHECK(hr, "IMMDevice::Activate", return NULL);
+            if (FAILED(hr))
+               return NULL;

            buffer_duration = 10000.0 * 1000.0 / rate_res * buffer_length + 0.5;
 #ifdef __cplusplus
@@ -459,11 +353,12 @@ static IAudioClient *wasapi_init_client_ex(IMMDevice *device,
         }
         if (hr == AUDCLNT_E_ALREADY_INITIALIZED)
         {
-            WASAPI_RELEASE(client);
+            IFACE_RELEASE(client);
            hr                     = _IMMDevice_Activate(device,
                  IID_IAudioClient,
                  CLSCTX_ALL, NULL, (void**)&client);
-            WASAPI_HR_CHECK(hr, "IMMDevice::Activate", return NULL);
+            if (FAILED(hr))
+               return NULL;

 #ifdef __cplusplus
            hr = client->Initialize(AUDCLNT_SHAREMODE_EXCLUSIVE,
@@ -477,11 +372,11 @@ static IAudioClient *wasapi_init_client_ex(IMMDevice *device,
         }
         if (hr != AUDCLNT_E_UNSUPPORTED_FORMAT)
         {
-            WASAPI_WARN(hr != AUDCLNT_E_DEVICE_IN_USE,
-                  "Device already in use", goto error);
+            if (hr == AUDCLNT_E_DEVICE_IN_USE)
+               goto error;

-            WASAPI_WARN(hr != AUDCLNT_E_EXCLUSIVE_MODE_NOT_ALLOWED,
-                  "Exclusive mode disabled", goto error);
+            if (hr == AUDCLNT_E_EXCLUSIVE_MODE_NOT_ALLOWED)
+               goto error;

            i = 2; /* break from outer loop too */
            break;
@@ -494,7 +389,8 @@ static IAudioClient *wasapi_init_client_ex(IMMDevice *device,
      }
   }

-   WASAPI_HR_CHECK(hr, "IAudioClient::Initialize", goto error);
+   if (FAILED(hr))
+      goto error;

   *float_fmt = float_fmt_res;
   *rate      = rate_res;
@@ -502,7 +398,7 @@ static IAudioClient *wasapi_init_client_ex(IMMDevice *device,
   return client;

 error:
-   WASAPI_RELEASE(client);
+   IFACE_RELEASE(client);

   return NULL;
 }
@@ -538,7 +434,8 @@ static IAudioClient *wasapi_init_client(IMMDevice *device, bool *exclusive,
      }
   }

-   WASAPI_CHECK(client, "Failed to initialize client", return NULL);
+   if (!client)
+      return NULL;

   /* next calls are allowed to fail (we losing info only) */

@@ -596,11 +493,12 @@ static void *wasapi_init(const char *dev_id, unsigned rate, unsigned latency,
   bool float_format         = settings->bools.audio_wasapi_float_format;
   int sh_buffer_length      = settings->ints.audio_wasapi_sh_buffer_length;
   wasapi_t *w               = (wasapi_t*)calloc(1, sizeof(wasapi_t));
+
+   if (!w)
+      return NULL;
+
   w->exclusive              = settings->bools.audio_wasapi_exclusive_mode;
-
-   WASAPI_CHECK(w, "Out of memory", return NULL);
-
-   w->device = wasapi_init_device(dev_id);
+   w->device                 = wasapi_init_device(dev_id);
   if (!w->device && dev_id)
      w->device = wasapi_init_device(NULL);
   if (!w->device)
@@ -612,14 +510,17 @@ static void *wasapi_init(const char *dev_id, unsigned rate, unsigned latency,
      goto error;

   hr = _IAudioClient_GetBufferSize(w->client, &frame_count);
-   WASAPI_HR_CHECK(hr, "IAudioClient::GetBufferSize", goto error);
+   if (FAILED(hr))
+      goto error;

-   w->frame_size = float_format ? 8 : 4;
+   w->frame_size         = float_format ? 8 : 4;
   w->engine_buffer_size = frame_count * w->frame_size;
+
   if (w->exclusive)
   {
      w->buffer = fifo_new(w->engine_buffer_size);
-      WASAPI_CHECK(w->buffer, "Out of memory", goto error);
+      if (!w->buffer)
+         goto error;

      RARCH_LOG("[WASAPI]: Intermediate buffer length is %u frames (%.1fms).\n",
            frame_count, (double)frame_count * 1000.0 / rate);
@@ -629,13 +530,15 @@ static void *wasapi_init(const char *dev_id, unsigned rate, unsigned latency,
      if (sh_buffer_length < 0)
      {
         hr = _IAudioClient_GetDevicePeriod(w->client, &dev_period, NULL);
-         WASAPI_HR_CHECK(hr, "IAudioClient::GetDevicePeriod", goto error);
+         if (FAILED(hr))
+            goto error;

         sh_buffer_length = dev_period * rate / 10000000;
      }

      w->buffer = fifo_new(sh_buffer_length * w->frame_size);
-      WASAPI_CHECK(w->buffer, "Out of memory", goto error);
+      if (!w->buffer)
+         goto error;

      RARCH_LOG("[WASAPI]: Intermediate buffer length is %u frames (%.1fms).\n",
            sh_buffer_length, (double)sh_buffer_length * 1000.0 / rate);
@@ -646,34 +549,40 @@ static void *wasapi_init(const char *dev_id, unsigned rate, unsigned latency,
   }

   w->write_event = CreateEventA(NULL, FALSE, FALSE, NULL);
-   WASAPI_SR_CHECK(w->write_event, "CreateEventA", goto error);
+   if (!w->write_event)
+      goto error;

   hr = _IAudioClient_SetEventHandle(w->client, w->write_event);
-   WASAPI_HR_CHECK(hr, "IAudioClient::SetEventHandle", goto error);
+   if (FAILED(hr))
+      goto error;

   hr = _IAudioClient_GetService(w->client,
         IID_IAudioRenderClient, (void**)&w->renderer);
-   WASAPI_HR_CHECK(hr, "IAudioClient::GetService", goto error);
+   if (FAILED(hr))
+      goto error;

   hr = _IAudioRenderClient_GetBuffer(w->renderer, frame_count, &dest);
-   WASAPI_HR_CHECK(hr, "IAudioRenderClient::GetBuffer", goto error);
+   if (FAILED(hr))
+      goto error;

   hr = _IAudioRenderClient_ReleaseBuffer(
         w->renderer, frame_count,
         AUDCLNT_BUFFERFLAGS_SILENT);
-   WASAPI_HR_CHECK(hr, "IAudioRenderClient::ReleaseBuffer", goto error);
+   if (FAILED(hr))
+      goto error;

   hr = _IAudioClient_Start(w->client);
-   WASAPI_HR_CHECK(hr, "IAudioClient::Start", goto error);
-   w->running = true;
+   if (FAILED(hr))
+      goto error;
+   w->running  = true;
   w->blocking = settings->bools.audio_sync;

   return w;

 error:
-   WASAPI_RELEASE(w->renderer);
-   WASAPI_RELEASE(w->client);
-   WASAPI_RELEASE(w->device);
+   IFACE_RELEASE(w->renderer);
+   IFACE_RELEASE(w->client);
+   IFACE_RELEASE(w->device);
   if (w->write_event)
      CloseHandle(w->write_event);
   if (w->buffer)
@@ -689,13 +598,15 @@ static bool wasapi_flush(wasapi_t * w, const void * data, size_t size)
   UINT32 frame_count = size / w->frame_size;
   HRESULT hr         = _IAudioRenderClient_GetBuffer(
         w->renderer, frame_count, &dest);
-   WASAPI_HR_CHECK(hr, "IAudioRenderClient::GetBuffer", return false)
+   if (FAILED(hr))
+      return false;

   memcpy(dest, data, size);
   hr = _IAudioRenderClient_ReleaseBuffer(
         w->renderer, frame_count,
         0);
-   WASAPI_HR_CHECK(hr, "IAudioRenderClient::ReleaseBuffer", return false);
+   if (FAILED(hr))
+      return false;

   return true;
 }
@@ -706,13 +617,15 @@ static bool wasapi_flush_buffer(wasapi_t * w, size_t size)
   UINT32 frame_count = size / w->frame_size;
   HRESULT hr         = _IAudioRenderClient_GetBuffer(
         w->renderer, frame_count, &dest);
-   WASAPI_HR_CHECK(hr, "IAudioRenderClient::GetBuffer", return false)
+   if (FAILED(hr))
+      return false;

   fifo_read(w->buffer, dest, size);
   hr = _IAudioRenderClient_ReleaseBuffer(
         w->renderer, frame_count,
         0);
-   WASAPI_HR_CHECK(hr, "IAudioRenderClient::ReleaseBuffer", return false);
+   if (FAILED(hr))
+      return false;

   return true;
 }
@@ -735,20 +648,20 @@ static ssize_t wasapi_write_sh(wasapi_t *w, const void * data, size_t size)
         if (w->blocking)
         {
            ir = WaitForSingleObject(w->write_event, INFINITE);
-            WASAPI_SR_CHECK(ir == WAIT_OBJECT_0, "WaitForSingleObject", return -1);
+            if (!(ir == WAIT_OBJECT_0))
+               return -1;
         }

         hr = _IAudioClient_GetCurrentPadding(w->client, &padding);
-         WASAPI_HR_CHECK(hr, "IAudioClient::GetCurrentPadding", return -1);
+         if (FAILED(hr))
+            return -1;

         read_avail  = fifo_read_avail(w->buffer);
         write_avail = w->engine_buffer_size - padding * w->frame_size;
         written     = read_avail < write_avail ? read_avail : write_avail;
         if (written)
-         {
            if (!wasapi_flush_buffer(w, written))
               return -1;
-         }
      }

      write_avail = fifo_write_avail(w->buffer);
@@ -761,11 +674,13 @@ static ssize_t wasapi_write_sh(wasapi_t *w, const void * data, size_t size)
      if (w->blocking)
      {
         ir = WaitForSingleObject(w->write_event, INFINITE);
-         WASAPI_SR_CHECK(ir == WAIT_OBJECT_0, "WaitForSingleObject", return -1);
+         if (!(ir == WAIT_OBJECT_0))
+            return -1;
      }

      hr = _IAudioClient_GetCurrentPadding(w->client, &padding);
-      WASAPI_HR_CHECK(hr, "IAudioClient::GetCurrentPadding", return -1);
+      if (FAILED(hr))
+         return -1;

      write_avail = w->engine_buffer_size - padding * w->frame_size;
      if (!write_avail)
@@ -773,10 +688,8 @@ static ssize_t wasapi_write_sh(wasapi_t *w, const void * data, size_t size)

      written = size < write_avail ? size : write_avail;
      if (written)
-      {
         if (!wasapi_flush(w, data, written))
            return -1;
-      }
   }

   return written;
@@ -784,20 +697,19 @@ static ssize_t wasapi_write_sh(wasapi_t *w, const void * data, size_t size)

 static ssize_t wasapi_write_ex(wasapi_t *w, const void * data, size_t size)
 {
-   ssize_t writen     = 0;
+   ssize_t written    = 0;
   size_t write_avail = fifo_write_avail(w->buffer);

   if (!write_avail)
   {
      DWORD ir = WaitForSingleObject(
            w->write_event, w->blocking ? INFINITE : 0);
-      if (ir != WAIT_OBJECT_0 && w->blocking)
-      {
-         RARCH_ERR("[WASAPI]: WaitForSingleObject failed with error %d.\n", GetLastError());
-         return -1;
-      }
      if (ir != WAIT_OBJECT_0)
+      {
+         if (w->blocking)
+            return -1;
         return 0;
+      }

      if (!wasapi_flush_buffer(w, w->engine_buffer_size))
         return -1;
@@ -805,10 +717,10 @@ static ssize_t wasapi_write_ex(wasapi_t *w, const void * data, size_t size)
      write_avail = w->engine_buffer_size;
   }

-   writen = size < write_avail ? size : write_avail;
-   fifo_write(w->buffer, data, writen);
+   written = size < write_avail ? size : write_avail;
+   fifo_write(w->buffer, data, written);

-   return writen;
+   return written;
 }

 static ssize_t wasapi_write(void *wh, const void *data, size_t size)
@@ -841,7 +753,8 @@ static bool wasapi_stop(void *wh)
 {
   wasapi_t *w = (wasapi_t*)wh;
   HRESULT  hr = _IAudioClient_Stop(w->client);
-   WASAPI_HR_CHECK(hr, "IAudioClient::Stop", return !w->running);
+   if (FAILED(hr))
+      return !w->running;

   w->running = false;

@@ -856,7 +769,8 @@ static bool wasapi_start(void *wh, bool u)
   if (hr == AUDCLNT_E_NOT_STOPPED)
      return true;

-   WASAPI_HR_CHECK(hr, "IAudioClient::Start", return w->running);
+   if (FAILED(hr))
+      return w->running;

   w->running = true;

@@ -885,11 +799,11 @@ static void wasapi_free(void *wh)
   wasapi_t *w        = (wasapi_t*)wh;
   HANDLE write_event = w->write_event;

-   WASAPI_RELEASE(w->renderer);
+   IFACE_RELEASE(w->renderer);
   if (w->client)
      _IAudioClient_Stop(w->client);
-   WASAPI_RELEASE(w->client);
-   WASAPI_RELEASE(w->device);
+   IFACE_RELEASE(w->client);
+   IFACE_RELEASE(w->device);
   if (w->buffer)
      fifo_free(w->buffer);
   free(w);
@@ -901,7 +815,8 @@ static void wasapi_free(void *wh)
   }

   /* If event isn't signaled log and leak */
-   WASAPI_CHECK(ir == WAIT_OBJECT_0, "Memory leak in wasapi_free", return);
+   if (!(ir == WAIT_OBJECT_0))
+      return;

   CloseHandle(write_event);
 }
@@ -913,125 +828,12 @@ static bool wasapi_use_float(void *wh)
   return w->frame_size == 8;
 }

-static void *wasapi_device_list_new(void *u)
-{
-   HRESULT hr;
-   UINT i;
-   PROPVARIANT prop_var;
-   int ir;
-   union string_list_elem_attr attr;
-   IMMDeviceEnumerator *enumerator = NULL;
-   IMMDeviceCollection *collection = NULL;
-   UINT dev_count                  = 0;
-   IMMDevice *device               = NULL;
-   LPWSTR dev_id_wstr              = NULL;
-   IPropertyStore *prop_store      = NULL;
-   bool prop_var_init              = false;
-   bool br                         = false;
-   char *dev_id_str                = NULL;
-   char *dev_name_str              = NULL;
-   struct string_list *sl          = string_list_new();
-
-   WASAPI_CHECK(sl, "string_list_new failed", return NULL);
-
-   attr.i = 0;
-#ifdef __cplusplus
-   hr = CoCreateInstance(CLSID_MMDeviceEnumerator, NULL, CLSCTX_ALL,
-         IID_IMMDeviceEnumerator, (void **)&enumerator);
-#else
-   hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, CLSCTX_ALL,
-         &IID_IMMDeviceEnumerator, (void **)&enumerator);
-#endif
-   WASAPI_HR_CHECK(hr, "CoCreateInstance", goto error);
-
-   hr = _IMMDeviceEnumerator_EnumAudioEndpoints(enumerator,
-         eRender, DEVICE_STATE_ACTIVE, &collection);
-   WASAPI_HR_CHECK(hr, "IMMDeviceEnumerator::EnumAudioEndpoints", goto error);
-
-   hr = _IMMDeviceCollection_GetCount(collection, &dev_count);
-   WASAPI_HR_CHECK(hr, "IMMDeviceCollection::GetCount", goto error);
-
-   for (i = 0; i < dev_count; ++i)
-   {
-      hr = _IMMDeviceCollection_Item(collection, i, &device);
-      WASAPI_HR_CHECK(hr, "IMMDeviceCollection::Item", goto error);
-
-      hr = _IMMDevice_GetId(device, &dev_id_wstr);
-      WASAPI_HR_CHECK(hr, "IMMDevice::GetId", goto error);
-
-      ir = WideCharToMultiByte(CP_ACP, 0, dev_id_wstr, -1,
-            NULL, 0, NULL, NULL);
-      WASAPI_SR_CHECK(ir, "WideCharToMultiByte", goto error);
-
-      dev_id_str = (char *)malloc(ir);
-      WASAPI_CHECK(dev_id_str, "Out of memory", goto error);
-
-      ir = WideCharToMultiByte(CP_ACP, 0, dev_id_wstr, -1,
-            dev_id_str, ir, NULL, NULL);
-      WASAPI_SR_CHECK(ir, "WideCharToMultiByte", goto error);
-
-      hr = _IMMDevice_OpenPropertyStore(device, STGM_READ, &prop_store);
-      WASAPI_HR_CHECK(hr, "IMMDevice::OpenPropertyStore", goto error);
-
-      PropVariantInit(&prop_var);
-      prop_var_init = true;
-      hr = _IPropertyStore_GetValue(prop_store, PKEY_Device_FriendlyName,
-            &prop_var);
-      WASAPI_HR_CHECK(hr, "IPropertyStore::GetValue", goto error);
-
-      ir = WideCharToMultiByte(CP_ACP, 0, prop_var.pwszVal, -1,
-            NULL, 0, NULL, NULL);
-      WASAPI_SR_CHECK(ir, "WideCharToMultiByte", goto error);
-
-      dev_name_str = (char *)malloc(ir);
-      WASAPI_CHECK(dev_name_str, "Out of memory", goto error);
-
-      ir = WideCharToMultiByte(CP_ACP, 0, prop_var.pwszVal, -1,
-            dev_name_str, ir, NULL, NULL);
-      WASAPI_SR_CHECK(ir, "WideCharToMultiByte", goto error);
-
-      RARCH_LOG("[WASAPI]: %s %s\n", dev_name_str, dev_id_str);
-
-      br = string_list_append(sl, dev_id_str, attr);
-      WASAPI_CHECK(br, "string_list_append failed", goto error);
-
-      PropVariantClear(&prop_var);
-      prop_var_init = false;
-      WASAPI_CO_FREE(dev_id_wstr);
-      WASAPI_FREE(dev_id_str);
-      WASAPI_FREE(dev_name_str);
-      WASAPI_RELEASE(prop_store);
-      WASAPI_RELEASE(device);
-   }
-
-   WASAPI_RELEASE(collection);
-   WASAPI_RELEASE(enumerator);
-
-   return sl;
-
-error:
-   WASAPI_FREE(dev_id_str);
-   WASAPI_FREE(dev_name_str);
-   if (prop_var_init)
-      PropVariantClear(&prop_var);
-   WASAPI_RELEASE(prop_store);
-   WASAPI_CO_FREE(dev_id_wstr);
-   WASAPI_RELEASE(device);
-   WASAPI_RELEASE(collection);
-   WASAPI_RELEASE(enumerator);
-   if (sl)
-      string_list_free(sl);
-
-   RARCH_ERR("[WASAPI]: Device enumeration failed.\n");
-
-   return NULL;
-}
-
 static void wasapi_device_list_free(void *u, void *slp)
 {
   struct string_list *sl = (struct string_list*)slp;

-   string_list_free(sl);
+   if (sl)
+      string_list_free(sl);
 }

 static size_t wasapi_write_avail(void *wh)
@@ -1044,7 +846,8 @@ static size_t wasapi_write_avail(void *wh)
      return fifo_write_avail(w->buffer);

   hr = _IAudioClient_GetCurrentPadding(w->client, &padding);
-   WASAPI_HR_CHECK(hr, "IAudioClient::GetCurrentPadding", return 0);
+   if (FAILED(hr))
+      return 0;

   return w->engine_buffer_size - padding * w->frame_size;
 }
@@ -1069,7 +872,7 @@ audio_driver_t audio_wasapi = {
   wasapi_free,
   wasapi_use_float,
   "wasapi",
-   wasapi_device_list_new,
+   mmdevice_list_new,
   wasapi_device_list_free,
   wasapi_write_avail,
   wasapi_buffer_size
@@ -21,10 +21,10 @@
 #include <wiiu/os.h>
 #include <wiiu/ax.h>

-#include "wiiu/wiiu_dbg.h"
-#include "wiiu/system/memory.h"
+#include "../../wiiu/wiiu_dbg.h"
+#include "../../wiiu/system/memory.h"

-#include "audio/audio_driver.h"
+#include "../../retroarch.h"

 typedef struct
 {
@@ -28,6 +28,9 @@

 #include <compat/msvc.h>
 #include <retro_miscellaneous.h>
+#include <string/stdstring.h>
+#include <encodings/utf.h>
+#include <lists/string_list.h>

 #if defined(_MSC_VER) && (_WIN32_WINNT <= _WIN32_WINNT_WIN2K)
 /* needed for CoInitializeEx */
@@ -36,7 +39,11 @@

 #include "xaudio.h"

-#include "../audio_driver.h"
+#if (_WIN32_WINNT >= 0x0602 /*_WIN32_WINNT_WIN8*/)
+#include "../common/mmdevice_common.h"
+#endif
+
+#include "../../retroarch.h"
 #include "../../verbosity.h"

 typedef struct xaudio2 xaudio2_t;
@@ -59,6 +66,9 @@ typedef struct
   size_t bufsize;
 } xa_t;

+/* Forward declarations */
+static void *xa_list_new(void *u);
+
 #if defined(__cplusplus) && !defined(CINTERFACE)
 struct xaudio2 : public IXAudio2VoiceCallback
 #else
@@ -126,29 +136,6 @@ const struct IXAudio2VoiceCallbackVtbl voice_vtable = {
 };
 #endif

-#if 0
-static void xaudio2_enumerate_devices(xaudio2_t *xa)
-{
-   uint32_t dev_count = 0;
-   unsigned i = 0;
-
-   (void)xa;
-   (void)i;
-   (void)dev_count;
-#ifndef _XBOX
-   IXAudio2_GetDeviceCount(xa->pXAudio2, &dev_count);
-   fprintf(stderr, "XAudio2 devices:\n");
-
-   for (i = 0; i < dev_count; i++)
-   {
-      XAUDIO2_DEVICE_DETAILS dev_detail;
-      IXAudio2_GetDeviceDetails(xa->pXAudio2, i, &dev_detail);
-      fwprintf(stderr, L"\t%u: %s\n", i, dev_detail.DisplayName);
-   }
-#endif
-}
-#endif
-
 static void xaudio2_set_wavefmt(WAVEFORMATEX *wfx,
      unsigned channels, unsigned samplerate)
 {
@@ -197,20 +184,22 @@ static void xaudio2_free(xaudio2_t *handle)
 }

 static xaudio2_t *xaudio2_new(unsigned samplerate, unsigned channels,
-      size_t size, unsigned device)
+      size_t size, const char *device)
 {
-   xaudio2_t *handle = NULL;
-   WAVEFORMATEX wfx  = {0};
-
+   int32_t idx_found        = -1;
+   WAVEFORMATEX wfx         = {0};
+   struct string_list *list = NULL;
 #if defined(__cplusplus) && !defined(CINTERFACE)
-   handle = new xaudio2;
+   xaudio2_t *handle        = new xaudio2;
 #else
-   handle = (xaudio2_t*)calloc(1, sizeof(*handle));
+   xaudio2_t *handle        = (xaudio2_t*)calloc(1, sizeof(*handle));
 #endif

   if (!handle)
      goto error;

+   list                     = (struct string_list*)xa_list_new(NULL);
+
 #if !defined(__cplusplus) || defined(CINTERFACE)
   handle->lpVtbl = &voice_vtable;
 #endif
@@ -218,11 +207,56 @@ static xaudio2_t *xaudio2_new(unsigned samplerate, unsigned channels,
   if (FAILED(XAudio2Create(&handle->pXAudio2, 0, XAUDIO2_DEFAULT_PROCESSOR)))
      goto error;

+   if (device)
+   {
+      /* Search for device name first */
+      if (list && list->elems)
+      {
+         if (list->elems)
+         {
+            unsigned i;
+            for (i = 0; i < list->size; i++)
+            {
+               if (string_is_equal(device, list->elems[i].data))
+               {
+                  idx_found       = i;
+                  break;
+               }
+            }
+            /* Index was not found yet based on name string,
+             * just assume id is a one-character number index. */
+
+            if (idx_found == -1)
+            {
+               if (isdigit(device[0]))
+               {
+                  RARCH_LOG("[XAudio2]: Fallback, device index is a single number index instead: %d.\n", idx_found);
+                  idx_found = strtoul(device, NULL, 0);
+               }
+            }
+         }
+      }
+   }
+
+   if (idx_found == -1)
+      idx_found = 0;
+
 #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;
+   {
+      wchar_t *temp = NULL;
+      if (device)
+         temp = utf8_to_utf16_string_alloc((const char*)list->elems[idx_found].userdata);
+
+      if (FAILED(IXAudio2_CreateMasteringVoice(handle->pXAudio2, &handle->pMasterVoice, channels, samplerate, 0, (LPCWSTR)(uintptr_t)temp, NULL, AudioCategory_GameEffects)))
+      {
+         free(temp);
+         goto error;
+      }
+      if (temp)
+         free(temp);
+   }
 #else
-   if (FAILED(IXAudio2_CreateMasteringVoice(handle->pXAudio2, &handle->pMasterVoice, channels, samplerate, 0, device, NULL)))
+   if (FAILED(IXAudio2_CreateMasteringVoice(handle->pXAudio2, &handle->pMasterVoice, channels, samplerate, 0, idx_found, NULL)))
      goto error;
 #endif

@@ -247,16 +281,65 @@ static xaudio2_t *xaudio2_new(unsigned samplerate, unsigned channels,
               XAUDIO2_COMMIT_NOW)))
      goto error;

+   if (list)
+      string_list_free(list);
   return handle;

 error:
+   if (list)
+      string_list_free(list);
   xaudio2_free(handle);
   return NULL;
 }

-static size_t xaudio2_write(xaudio2_t *handle, const uint8_t *buffer, size_t bytes_)
+static void *xa_init(const char *device, unsigned rate, unsigned latency,
+      unsigned block_frames,
+      unsigned *new_rate)
 {
-   unsigned bytes        = bytes_;
+   size_t bufsize;
+   xa_t *xa              = (xa_t*)calloc(1, sizeof(*xa));
+   if (!xa)
+      return NULL;
+
+   if (latency < 8)
+      latency = 8; /* Do not allow shenanigans. */
+
+   bufsize = latency * rate / 1000;
+
+   RARCH_LOG("[XAudio2]: Requesting %u ms latency, using %d ms latency.\n",
+         latency, (int)bufsize * 1000 / rate);
+
+   xa->bufsize = bufsize * 2 * sizeof(float);
+
+   xa->xa = xaudio2_new(rate, 2, xa->bufsize, device);
+   if (!xa->xa)
+   {
+      RARCH_ERR("Failed to init XAudio2.\n");
+      free(xa);
+      return NULL;
+   }
+
+   return xa;
+}
+
+static ssize_t xa_write(void *data, const void *buf, size_t size)
+{
+   unsigned bytes;
+   xa_t *xa              = (xa_t*)data;
+   xaudio2_t *handle     = xa->xa;
+   const uint8_t *buffer = (const uint8_t*)buf;
+
+   if (xa->nonblock)
+   {
+      size_t avail = XAUDIO2_WRITE_AVAILABLE(xa->xa);
+
+      if (avail == 0)
+         return 0;
+      if (avail < size)
+         size = avail;
+   }
+
+   bytes = size;

   while (bytes)
   {
@@ -289,7 +372,11 @@ static size_t xaudio2_write(xaudio2_t *handle, const uint8_t *buffer, size_t byt

         if (FAILED(IXAudio2SourceVoice_SubmitSourceBuffer(
                     handle->pSourceVoice, &xa2buffer, NULL)))
+         {
+            if (size > 0)
+               return -1;
            return 0;
+         }

         InterlockedIncrement((LONG volatile*)&handle->buffers);
         handle->bufptr       = 0;
@@ -297,62 +384,7 @@ static size_t xaudio2_write(xaudio2_t *handle, const uint8_t *buffer, size_t byt
      }
   }

-   return bytes_;
-}
-
-static void *xa_init(const char *device, unsigned rate, unsigned latency,
-      unsigned block_frames,
-      unsigned *new_rate)
-{
-   size_t bufsize;
-   unsigned device_index = 0;
-   xa_t *xa              = (xa_t*)calloc(1, sizeof(*xa));
-   if (!xa)
-      return NULL;
-
-   if (latency < 8)
-      latency = 8; /* Do not allow shenanigans. */
-
-   bufsize = latency * rate / 1000;
-
-   RARCH_LOG("[XAudio2]: Requesting %u ms latency, using %d ms latency.\n",
-         latency, (int)bufsize * 1000 / rate);
-
-   xa->bufsize = bufsize * 2 * sizeof(float);
-
-   if (device)
-      device_index = strtoul(device, NULL, 0);
-
-   xa->xa = xaudio2_new(rate, 2, xa->bufsize, device_index);
-   if (!xa->xa)
-   {
-      RARCH_ERR("Failed to init XAudio2.\n");
-      free(xa);
-      return NULL;
-   }
-
-   return xa;
-}
-
-static ssize_t xa_write(void *data, const void *buf, size_t size)
-{
-   size_t ret;
-   xa_t *xa = (xa_t*)data;
-
-   if (xa->nonblock)
-   {
-      size_t avail = XAUDIO2_WRITE_AVAILABLE(xa->xa);
-
-      if (avail == 0)
-         return 0;
-      if (avail < size)
-         size = avail;
-   }
-
-   ret = xaudio2_write(xa->xa, (const uint8_t*)buf, size);
-   if (ret == 0 && size > 0)
-      return -1;
-   return ret;
+   return size;
 }

 static bool xa_stop(void *data)
@@ -414,6 +446,58 @@ static size_t xa_buffer_size(void *data)
   return xa->bufsize;
 }

+static void xa_device_list_free(void *u, void *slp)
+{
+   struct string_list *sl = (struct string_list*)slp;
+
+   if (sl)
+      string_list_free(sl);
+}
+
+static void *xa_list_new(void *u)
+{
+#if defined(_XBOX) || !(_WIN32_WINNT >= 0x0602 /*_WIN32_WINNT_WIN8*/)
+   unsigned i;
+   union string_list_elem_attr attr;
+   uint32_t dev_count              = 0;
+   IXAudio2 *ixa2                  = NULL;
+   struct string_list *sl          = string_list_new();
+
+   if (!sl)
+      return NULL;
+
+   attr.i = 0;
+
+   if (FAILED(XAudio2Create(&ixa2, 0, XAUDIO2_DEFAULT_PROCESSOR)))
+      return NULL;
+
+   IXAudio2_GetDeviceCount(ixa2, &dev_count);
+
+   for (i = 0; i < dev_count; i++)
+   {
+      XAUDIO2_DEVICE_DETAILS dev_detail;
+      if (IXAudio2_GetDeviceDetails(ixa2, i, &dev_detail) == S_OK)
+      {
+         char *str = utf16_to_utf8_string_alloc(dev_detail.DisplayName);
+
+         if (str)
+         {
+            string_list_append(sl, str, attr);
+            free(str);
+         }
+      }
+   }
+
+   IXAudio2_Release(ixa2);
+
+   return sl;
+#elif defined(__WINRT__)
+   return NULL;
+#else
+   return mmdevice_list_new(u);
+#endif
+}
+
 audio_driver_t audio_xa = {
   xa_init,
   xa_write,
@@ -424,8 +508,8 @@ audio_driver_t audio_xa = {
   xa_free,
   xa_use_float,
   "xaudio",
-   NULL,
-   NULL,
+   xa_list_new,
+   xa_device_list_free,
   xa_write_avail,
   xa_buffer_size,
 };
@@ -314,6 +314,8 @@ DECLARE_INTERFACE_(IXAudio2, IUnknown)
 #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_GetDeviceCount(handle, puCount) (handle)->GetDeviceCount(puCount)
+#define IXAudio2_GetDeviceDetails(handle, Index,pDeviceDetails) (handle)->GetDeviceDetails(Index, pDeviceDetails)
 #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
@@ -21,7 +21,7 @@

 #include <retro_inline.h>

-#include "../audio_driver.h"
+#include "../../retroarch.h"

 #define SOUND_FREQUENCY 48000
 #define MAX_BUFFER 2048
@@ -1,237 +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 <string.h>
-
-#ifdef HAVE_CONFIG_H
-#include "../config.h"
-#endif
-
-#include "camera_driver.h"
-
-#include "../configuration.h"
-#include "../driver.h"
-#include "../retroarch.h"
-#include "../list_special.h"
-#include "../verbosity.h"
-
-static const camera_driver_t *camera_drivers[] = {
-#ifdef HAVE_V4L2
-   &camera_v4l2,
-#endif
-#ifdef EMSCRIPTEN
-   &camera_rwebcam,
-#endif
-#ifdef ANDROID
-   &camera_android,
-#endif
-   &camera_null,
-   NULL,
-};
-
-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;
-
-/**
- * camera_driver_find_handle:
- * @idx                : index of driver to get handle to.
- *
- * Returns: handle to camera driver at index. Can be NULL
- * if nothing found.
- **/
-const void *camera_driver_find_handle(int idx)
-{
-   const void *drv = camera_drivers[idx];
-   if (!drv)
-      return NULL;
-   return drv;
-}
-
-/**
- * camera_driver_find_ident:
- * @idx                : index of driver to get handle to.
- *
- * Returns: Human-readable identifier of camera driver at index. Can be NULL
- * if nothing found.
- **/
-const char *camera_driver_find_ident(int idx)
-{
-   const camera_driver_t *drv = camera_drivers[idx];
-   if (!drv)
-      return NULL;
-   return drv->ident;
-}
-
-/**
- * config_get_camera_driver_options:
- *
- * Get an enumerated list of all camera driver names,
- * separated by '|'.
- *
- * Returns: string listing of all camera driver names,
- * separated by '|'.
- **/
-const char* config_get_camera_driver_options(void)
-{
-   return char_list_new_special(STRING_LIST_CAMERA_DRIVERS, NULL);
-}
-
-void driver_camera_stop(void)
-{
-   camera_driver_ctl(RARCH_CAMERA_CTL_START, NULL);
-}
-
-bool driver_camera_start(void)
-{
-   return camera_driver_ctl(RARCH_CAMERA_CTL_START, NULL);
-}
-
-void camera_driver_poll(void)
-{
-   if (!camera_cb.caps)
-      return;
-   if (!camera_driver || !camera_driver->poll || !camera_data)
-      return;
-   camera_driver->poll(camera_data,
-         camera_cb.frame_raw_framebuffer,
-         camera_cb.frame_opengl_texture);
-}
-
-bool camera_driver_ctl(enum rarch_camera_ctl_state state, void *data)
-{
-   settings_t        *settings = config_get_ptr();
-
-   switch (state)
-   {
-      case RARCH_CAMERA_CTL_DESTROY:
-         camera_driver_active   = false;
-         camera_driver          = NULL;
-         camera_data            = NULL;
-         break;
-      case RARCH_CAMERA_CTL_SET_ACTIVE:
-         camera_driver_active = true;
-         break;
-      case RARCH_CAMERA_CTL_FIND_DRIVER:
-         {
-            int i;
-            driver_ctx_info_t drv;
-
-            drv.label = "camera_driver";
-            drv.s     = settings->arrays.camera_driver;
-
-            driver_ctl(RARCH_DRIVER_CTL_FIND_INDEX, &drv);
-
-            i         = (int)drv.len;
-
-            if (i >= 0)
-               camera_driver = (const camera_driver_t*)camera_driver_find_handle(i);
-            else
-            {
-               if (verbosity_is_enabled())
-               {
-                  unsigned d;
-                  RARCH_ERR("Couldn't find any camera driver named \"%s\"\n",
-                        settings->arrays.camera_driver);
-                  RARCH_LOG_OUTPUT("Available camera drivers are:\n");
-                  for (d = 0; camera_driver_find_handle(d); d++)
-                     RARCH_LOG_OUTPUT("\t%s\n", camera_driver_find_ident(d));
-
-                  RARCH_WARN("Going to default to first camera driver...\n");
-               }
-
-               camera_driver = (const camera_driver_t*)camera_driver_find_handle(0);
-
-               if (!camera_driver)
-                  retroarch_fail(1, "find_camera_driver()");
-            }
-         }
-         break;
-      case RARCH_CAMERA_CTL_UNSET_ACTIVE:
-         camera_driver_active = false;
-         break;
-      case RARCH_CAMERA_CTL_IS_ACTIVE:
-        return camera_driver_active;
-      case RARCH_CAMERA_CTL_DEINIT:
-        if (camera_data && camera_driver)
-        {
-           if (camera_cb.deinitialized)
-              camera_cb.deinitialized();
-
-           if (camera_driver->free)
-              camera_driver->free(camera_data);
-        }
-
-        camera_data = NULL;
-        break;
-      case RARCH_CAMERA_CTL_STOP:
-        if (     camera_driver
-              && camera_driver->stop
-              && camera_data)
-           camera_driver->stop(camera_data);
-        break;
-      case RARCH_CAMERA_CTL_START:
-        if (camera_driver && camera_data && camera_driver->start)
-        {
-           if (settings->bools.camera_allow)
-              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);
-        }
-        break;
-      case RARCH_CAMERA_CTL_SET_CB:
-        {
-           struct retro_camera_callback *cb =
-              (struct retro_camera_callback*)data;
-           camera_cb          = *cb;
-        }
-        break;
-      case RARCH_CAMERA_CTL_INIT:
-        /* Resource leaks will follow if camera is initialized twice. */
-        if (camera_data)
-           return false;
-
-        camera_driver_ctl(RARCH_CAMERA_CTL_FIND_DRIVER, NULL);
-
-        if (!camera_driver)
-           return false;
-
-        camera_data = camera_driver->init(
-              *settings->arrays.camera_device ? settings->arrays.camera_device : NULL,
-              camera_cb.caps,
-              settings->uints.camera_width ?
-              settings->uints.camera_width : camera_cb.width,
-              settings->uints.camera_height ?
-              settings->uints.camera_height : camera_cb.height);
-
-        if (!camera_data)
-        {
-           RARCH_ERR("Failed to initialize camera driver. Will continue without camera.\n");
-           camera_driver_ctl(RARCH_CAMERA_CTL_UNSET_ACTIVE, NULL);
-        }
-
-        if (camera_cb.initialized)
-           camera_cb.initialized();
-        break;
-      default:
-         break;
-   }
-
-   return true;
-}
@@ -1,110 +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 __CAMERA_DRIVER__H
-#define __CAMERA_DRIVER__H
-
-#include <stdint.h>
-
-#include <boolean.h>
-#include <retro_common_api.h>
-#include <libretro.h>
-
-RETRO_BEGIN_DECLS
-
-enum rarch_camera_ctl_state
-{
-   RARCH_CAMERA_CTL_NONE = 0,
-   RARCH_CAMERA_CTL_DESTROY,
-   RARCH_CAMERA_CTL_DEINIT,
-   RARCH_CAMERA_CTL_SET_ACTIVE,
-   RARCH_CAMERA_CTL_UNSET_ACTIVE,
-   RARCH_CAMERA_CTL_IS_ACTIVE,
-   RARCH_CAMERA_CTL_FIND_DRIVER,
-   RARCH_CAMERA_CTL_SET_CB,
-   RARCH_CAMERA_CTL_STOP,
-   RARCH_CAMERA_CTL_START,
-   RARCH_CAMERA_CTL_INIT
-};
-
-typedef struct camera_driver
-{
-   /* FIXME: params for initialization - queries for resolution,
-    * framerate, color format which might or might not be honored. */
-   void *(*init)(const char *device, uint64_t buffer_types,
-         unsigned width, unsigned height);
-
-   void (*free)(void *data);
-
-   bool (*start)(void *data);
-   void (*stop)(void *data);
-
-   /* Polls the camera driver.
-    * Will call the appropriate callback if a new frame is ready.
-    * Returns true if a new frame was handled. */
-   bool (*poll)(void *data,
-         retro_camera_frame_raw_framebuffer_t frame_raw_cb,
-         retro_camera_frame_opengl_texture_t frame_gl_cb);
-
-   const char *ident;
-} camera_driver_t;
-
-extern camera_driver_t camera_v4l2;
-extern camera_driver_t camera_android;
-extern camera_driver_t camera_rwebcam;
-extern camera_driver_t camera_avfoundation;
-extern camera_driver_t camera_null;
-
-/**
- * config_get_camera_driver_options:
- *
- * Get an enumerated list of all camera driver names,
- * separated by '|'.
- *
- * Returns: string listing of all camera driver names,
- * separated by '|'.
- **/
-const char* config_get_camera_driver_options(void);
-
-/**
- * camera_driver_find_handle:
- * @index              : index of driver to get handle to.
- *
- * Returns: handle to camera driver at index. Can be NULL
- * if nothing found.
- **/
-const void *camera_driver_find_handle(int index);
-
-/**
- * camera_driver_find_ident:
- * @index              : index of driver to get handle to.
- *
- * Returns: Human-readable identifier of camera driver at index. Can be NULL
- * if nothing found.
- **/
-const char *camera_driver_find_ident(int index);
-
-void driver_camera_stop(void);
-
-bool driver_camera_start(void);
-
-void camera_driver_poll(void);
-
-bool camera_driver_ctl(enum rarch_camera_ctl_state state, void *data);
-
-RETRO_END_DECLS
-
-#endif
@@ -17,7 +17,7 @@

 #include <glsym/glsym.h>

-#include "../camera_driver.h"
+#include "../../retroarch.h"

 typedef struct android_camera
 {
@@ -14,7 +14,7 @@
 *  If not, see <http://www.gnu.org/licenses/>.
 */

-#include "../camera_driver.h"
+#include "../../retroarch.h"

 static void *nullcamera_init(const char *device, uint64_t caps,
      unsigned width, unsigned height)
@@ -18,7 +18,7 @@

 #include <boolean.h>

-#include "../camera_driver.h"
+#include "../../retroarch.h"

 /* forward declarations */
 void *RWebCamInit(uint64_t caps, unsigned width, unsigned height);
@@ -45,7 +45,7 @@

 #include <compat/strl.h>

-#include "../camera_driver.h"
+#include "../../retroarch.h"
 #include "../../verbosity.h"

 struct buffer
@@ -1,6 +1,20 @@
+/*  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/>.
+ */
+
 #include <file/file_path.h>
 #include <string/stdstring.h>
-#include <streams/file_stream.h>

 #ifdef HAVE_MENU
 #include "../menu/menu_driver.h"
@@ -17,7 +31,7 @@ badges_ctx_t badges_ctx;

 bool badge_exists(const char* filepath)
 {
-  return filestream_exists(filepath);
+  return path_is_valid(filepath);
 }

 void set_badge_menu_texture(badges_ctx_t * badges, int i)
@@ -44,7 +44,7 @@
 #include <rthreads/rthreads.h>
 #endif

-#include "../cheevos/badges.h" /* RCHEEVOS TODO: fix path */
+#include "badges.h"
 #include "cheevos.h"
 #include "fixup.h"
 #include "parser.h"
@@ -503,13 +503,18 @@ static void rcheevos_award(rcheevos_cheevo_t* cheevo, int mode)
      cheevo->active &= ~RCHEEVOS_ACTIVE_SOFTCORE;

   /* Show the OSD message. */
-#if defined(HAVE_MENU) && defined(HAVE_MENU_WIDGETS)
-   if (!menu_widgets_push_achievement(cheevo->info->title, cheevo->info->badge))
-#endif
   {
-      snprintf(buffer, sizeof(buffer), "Achievement Unlocked: %s", cheevo->info->title);
-      runloop_msg_queue_push(buffer, 0, 2 * 60, false, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
-      runloop_msg_queue_push(cheevo->info->description, 0, 3 * 60, false, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
+#if defined(HAVE_MENU) && defined(HAVE_MENU_WIDGETS)
+      bool widgets_ready = menu_widgets_ready();
+      if (widgets_ready)
+         menu_widgets_push_achievement(cheevo->info->title, cheevo->info->badge);
+      else
+#endif
+      {
+         snprintf(buffer, sizeof(buffer), "Achievement Unlocked: %s", cheevo->info->title);
+         runloop_msg_queue_push(buffer, 0, 2 * 60, false, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
+         runloop_msg_queue_push(cheevo->info->description, 0, 3 * 60, false, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
+      }
   }

   /* Start the award task. */
@@ -529,8 +534,9 @@ static void rcheevos_award(rcheevos_cheevo_t* cheevo, int mode)
      cheevo->info->id);
      shotname[sizeof(shotname) - 1] = '\0';

-      if (take_screenshot(shotname, true,
-            video_driver_cached_frame_has_valid_framebuffer(), false, true))
+      if (take_screenshot(settings->paths.directory_screenshot,
+               shotname, true,
+               video_driver_cached_frame_has_valid_framebuffer(), false, true))
         CHEEVOS_LOG(RCHEEVOS_TAG "got a screenshot for cheevo %u\n", cheevo->info->id);
      else
         CHEEVOS_LOG(RCHEEVOS_TAG "failed to get screenshot for cheevo %u\n", cheevo->info->id);
@@ -952,7 +958,9 @@ bool rcheevos_unload(void)
      rcheevos_locals.lboards    = NULL;

      rcheevos_loaded            = false;
+      rcheevos_hardcore_active   = false;
      rcheevos_hardcore_paused   = false;
+      rcheevos_state_loaded_flag = false;
   }

   return true;
@@ -1487,7 +1495,7 @@ found:

      /* Checks for the existence of a headered Lynx file.
         Unheadered files fall back to RCHEEVOS_GENERIC_MD5. */
-      if (coro->len <= lynx_header_len ||
+      if (coro->len <= (unsigned)lynx_header_len ||
        memcmp("LYNX", (void *)coro->data, 5) != 0)
      {
         coro->gameid = 0;
@@ -1768,7 +1776,10 @@ found:
                              coro->json, coro->k))
                        CHEEVOS_ERR(RCHEEVOS_TAG "error writing badge %s\n", coro->badge_fullpath);
                     else
+                     {
                        CHEEVOS_FREE(coro->json);
+                        coro->json = NULL;
+                     }
                  }
               }
            }
@@ -467,7 +467,7 @@ static int rcheevos_read_number(void* userdata,
   }
   else if (ud->is_console_id)
   {
-      ud->patchdata->console_id = strtol(number, NULL, 10);
+      ud->patchdata->console_id = (unsigned)strtol(number, NULL, 10);
      ud->is_console_id         = 0;
   }

@@ -1,74 +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 <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);
-
-#if defined(HAVE_MENU) || defined(HAVE_MENU_WIDGETS)
-   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_OLD_BADGE_H
-#define __RARCH_CHEEVOS_OLD_BADGE_H
-
-#include "../menu/menu_driver.h"
-
-#include <retro_common_api.h>
-
-RETRO_BEGIN_DECLS
-
-#define CHEEVOS_BADGE_LIMIT 256
-
-typedef struct
-{
-  bool badge_locked[CHEEVOS_BADGE_LIMIT];
-  const char * badge_id_list[CHEEVOS_BADGE_LIMIT];
-  menu_texture_item menu_texture_list[CHEEVOS_BADGE_LIMIT];
-} badges_ctx_t;
-
-bool badge_exists(const char* filepath);
-void set_badge_menu_texture(badges_ctx_t * badges, int i);
-extern void set_badge_info (badges_ctx_t *badge_struct, int id, const char *badge_id, bool active);
-extern menu_texture_item get_badge_texture(int id);
-
-extern badges_ctx_t badges_ctx;
-static badges_ctx_t new_badges_ctx;
-
-RETRO_END_DECLS
-
-#endif
@@ -1,165 +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_OLD_H
-#define __RARCH_CHEEVOS_OLD_H
-
-#include <stdint.h>
-#include <stdlib.h>
-
-#include <boolean.h>
-
-#include <retro_common_api.h>
-
-RETRO_BEGIN_DECLS
-
-/*****************************************************************************
-Setup - mainly for debugging
-*****************************************************************************/
-
-/* Define this macro to get extra-verbose log for cheevos. */
-#define CHEEVOS_VERBOSE
-
-/*****************************************************************************
-End of setup
-*****************************************************************************/
-
-#define CHEEVOS_TAG "[CHEEVOS]: "
-
-#ifdef CHEEVOS_VERBOSE
-
-#define CHEEVOS_LOG RARCH_LOG
-#define CHEEVOS_ERR RARCH_ERR
-
-#else
-
-void cheevos_log(const char *fmt, ...);
-
-#define CHEEVOS_LOG cheevos_log
-#define CHEEVOS_ERR cheevos_log
-
-#endif
-
-typedef struct cheevos_ctx_desc
-{
-   unsigned idx;
-   char *s;
-   size_t len;
-} cheevos_ctx_desc_t;
-
-typedef enum
-{
-   CHEEVOS_CONSOLE_NONE = 0,
-   /* Don't change those, the values match the console IDs
-    * at retroachievements.org. */
-   CHEEVOS_CONSOLE_MEGA_DRIVE      = 1,
-   CHEEVOS_CONSOLE_NINTENDO_64     = 2,
-   CHEEVOS_CONSOLE_SUPER_NINTENDO  = 3,
-   CHEEVOS_CONSOLE_GAMEBOY         = 4,
-   CHEEVOS_CONSOLE_GAMEBOY_ADVANCE = 5,
-   CHEEVOS_CONSOLE_GAMEBOY_COLOR   = 6,
-   CHEEVOS_CONSOLE_NINTENDO        = 7,
-   CHEEVOS_CONSOLE_PC_ENGINE       = 8,
-   CHEEVOS_CONSOLE_SEGA_CD         = 9,
-   CHEEVOS_CONSOLE_SEGA_32X        = 10,
-   CHEEVOS_CONSOLE_MASTER_SYSTEM   = 11,
-   CHEEVOS_CONSOLE_PLAYSTATION     = 12,
-   CHEEVOS_CONSOLE_ATARI_LYNX      = 13,
-   CHEEVOS_CONSOLE_NEOGEO_POCKET   = 14,
-   CHEEVOS_CONSOLE_GAME_GEAR       = 15,
-   CHEEVOS_CONSOLE_GAMECUBE        = 16,
-   CHEEVOS_CONSOLE_ATARI_JAGUAR    = 17,
-   CHEEVOS_CONSOLE_NINTENDO_DS     = 18,
-   CHEEVOS_CONSOLE_WII             = 19,
-   CHEEVOS_CONSOLE_WII_U           = 20,
-   CHEEVOS_CONSOLE_PLAYSTATION_2   = 21,
-   CHEEVOS_CONSOLE_XBOX            = 22,
-   CHEEVOS_CONSOLE_SKYNET          = 23,
-   CHEEVOS_CONSOLE_XBOX_ONE        = 24,
-   CHEEVOS_CONSOLE_ATARI_2600      = 25,
-   CHEEVOS_CONSOLE_MS_DOS          = 26,
-   CHEEVOS_CONSOLE_ARCADE          = 27,
-   CHEEVOS_CONSOLE_VIRTUAL_BOY     = 28,
-   CHEEVOS_CONSOLE_MSX             = 29,
-   CHEEVOS_CONSOLE_COMMODORE_64    = 30,
-   CHEEVOS_CONSOLE_ZX81            = 31,
-   CHEEVOS_CONSOLE_ATARI_7800      = 51
-} cheevos_console_t;
-
-enum
-{
-   CHEEVOS_DIRTY_TITLE       = 1 << 0,
-   CHEEVOS_DIRTY_DESC        = 1 << 1,
-   CHEEVOS_DIRTY_POINTS      = 1 << 2,
-   CHEEVOS_DIRTY_AUTHOR      = 1 << 3,
-   CHEEVOS_DIRTY_ID          = 1 << 4,
-   CHEEVOS_DIRTY_BADGE       = 1 << 5,
-   CHEEVOS_DIRTY_CONDITIONS  = 1 << 6,
-   CHEEVOS_DIRTY_VOTES       = 1 << 7,
-   CHEEVOS_DIRTY_DESCRIPTION = 1 << 8,
-
-   CHEEVOS_DIRTY_ALL         = (1 << 9) - 1
-};
-
-enum
-{
-   CHEEVOS_ACTIVE_SOFTCORE = 1 << 0,
-   CHEEVOS_ACTIVE_HARDCORE = 1 << 1
-};
-
-enum
-{
-   CHEEVOS_FORMAT_FRAMES = 0,
-   CHEEVOS_FORMAT_SECS,
-   CHEEVOS_FORMAT_MILLIS,
-   CHEEVOS_FORMAT_SCORE,
-   CHEEVOS_FORMAT_VALUE,
-   CHEEVOS_FORMAT_OTHER
-};
-
-bool cheevos_load(const void *data);
-
-void cheevos_reset_game(void);
-
-void cheevos_populate_menu(void *data);
-
-bool cheevos_get_description(cheevos_ctx_desc_t *desc);
-
-bool cheevos_apply_cheats(bool *data_bool);
-
-bool cheevos_unload(void);
-
-bool cheevos_toggle_hardcore_mode(void);
-
-void cheevos_test(void);
-
-bool cheevos_set_cheats(void);
-
-void cheevos_set_support_cheevos(bool state);
-
-bool cheevos_get_support_cheevos(void);
-
-cheevos_console_t cheevos_get_console(void);
-
-extern bool cheevos_loaded;
-extern bool cheevos_hardcore_active;
-extern bool cheevos_hardcore_paused;
-extern bool cheevos_state_loaded_flag;
-extern int cheats_are_enabled;
-extern int cheats_were_enabled;
-
-RETRO_END_DECLS
-
-#endif /* __RARCH_CHEEVOS_H */
@@ -1,189 +0,0 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2015-2017 - Andre Leiradella
- *
- *  RetroArch is free software: you can redistribute it and/or modify it under the terms
- *  of the GNU General Public License as published by the Free Software Found-
- *  ation, either version 3 of the License, or (at your option) any later version.
- *
- *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- *  PURPOSE.  See the GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along with RetroArch.
- *  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "cond.h"
-#include "var.h"
-
-#include "../retroarch.h"
-#include "../verbosity.h"
-
-/*****************************************************************************
-Parsing
-*****************************************************************************/
-
-static cheevos_cond_op_t cheevos_cond_parse_operator(const char** memaddr)
-{
-   const char *str = *memaddr;
-   cheevos_cond_op_t op;
-
-   if (*str == '=' && str[1] == '=')
-   {
-      op = CHEEVOS_COND_OP_EQUALS;
-      str += 2;
-   }
-   else if (*str == '=')
-   {
-      op = CHEEVOS_COND_OP_EQUALS;
-      str++;
-   }
-   else if (*str == '!' && str[1] == '=')
-   {
-      op = CHEEVOS_COND_OP_NOT_EQUAL_TO;
-      str += 2;
-   }
-   else if (*str == '<' && str[1] == '=')
-   {
-      op = CHEEVOS_COND_OP_LESS_THAN_OR_EQUAL;
-      str += 2;
-   }
-   else if (*str == '<')
-   {
-      op = CHEEVOS_COND_OP_LESS_THAN;
-      str++;
-   }
-   else if (*str == '>' && str[1] == '=')
-   {
-      op = CHEEVOS_COND_OP_GREATER_THAN_OR_EQUAL;
-      str += 2;
-   }
-   else if (*str == '>')
-   {
-      op = CHEEVOS_COND_OP_GREATER_THAN;
-      str++;
-   }
-   else
-   {
-      CHEEVOS_ERR(CHEEVOS_TAG "unknown operator %c\n.", *str);
-      op = CHEEVOS_COND_OP_EQUALS;
-   }
-
-   *memaddr = str;
-   return op;
-}
-
-void cheevos_cond_parse(cheevos_cond_t* cond, const char** memaddr)
-{
-   const char* str = *memaddr;
-   cond->type = CHEEVOS_COND_TYPE_STANDARD;
-
-   if (*str != 0 && str[1] == ':')
-   {
-      int skip = 2;
-
-      switch (*str)
-      {
-      case 'R':
-         cond->type = CHEEVOS_COND_TYPE_RESET_IF;
-         break;
-      case 'P':
-         cond->type = CHEEVOS_COND_TYPE_PAUSE_IF;
-         break;
-      case 'A':
-         cond->type = CHEEVOS_COND_TYPE_ADD_SOURCE;
-         break;
-      case 'B':
-         cond->type = CHEEVOS_COND_TYPE_SUB_SOURCE;
-         break;
-      case 'C':
-         cond->type = CHEEVOS_COND_TYPE_ADD_HITS;
-         break;
-      default:
-         skip = 0;
-         break;
-      }
-
-      str += skip;
-   }
-
-   cheevos_var_parse(&cond->source, &str);
-   cond->op = cheevos_cond_parse_operator(&str);
-   cheevos_var_parse(&cond->target, &str);
-   cond->curr_hits = 0;
-
-   if (*str == '(' || *str == '.')
-   {
-      char* end;
-      cond->req_hits = (unsigned)strtol(str + 1, &end, 10);
-      str = end + (*end == ')' || *end == '.');
-   }
-   else
-      cond->req_hits = 0;
-
-   *memaddr = str;
-}
-
-unsigned cheevos_cond_count_in_set(const char* memaddr, unsigned which)
-{
-   cheevos_cond_t dummy;
-   unsigned index = 0;
-   unsigned count = 0;
-
-   for (;;)
-   {
-      for (;;)
-      {
-         cheevos_cond_parse(&dummy, &memaddr);
-
-         if (index == which)
-            count++;
-
-         if (*memaddr != '_')
-            break;
-
-         memaddr++;
-      }
-
-      index++;
-
-      if (*memaddr != 'S')
-         break;
-
-      memaddr++;
-   }
-
-   return count;
-}
-
-void cheevos_cond_parse_in_set(cheevos_cond_t* cond, const char* memaddr, unsigned which)
-{
-   cheevos_cond_t dummy;
-   unsigned index = 0;
-
-   for (;;)
-   {
-      for (;;)
-      {
-         if (index == which)
-         {
-            cheevos_cond_parse(cond, &memaddr);
-            cond++;
-         }
-         else
-            cheevos_cond_parse(&dummy, &memaddr);
-
-         if (*memaddr != '_')
-            break;
-
-         memaddr++;
-      }
-
-      index++;
-
-      if (*memaddr != 'S')
-         break;
-
-      memaddr++;
-   }
-}
@@ -1,63 +0,0 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2015-2017 - Andre Leiradella
- *
- *  RetroArch is free software: you can redistribute it and/or modify it under the terms
- *  of the GNU General Public License as published by the Free Software Found-
- *  ation, either version 3 of the License, or (at your option) any later version.
- *
- *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- *  PURPOSE.  See the GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along with RetroArch.
- *  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __RARCH_CHEEVOS_COND_H
-#define __RARCH_CHEEVOS_COND_H
-
-#include "var.h"
-
-#include <retro_common_api.h>
-
-RETRO_BEGIN_DECLS
-
-typedef enum
-{
-   CHEEVOS_COND_TYPE_STANDARD,
-   CHEEVOS_COND_TYPE_PAUSE_IF,
-   CHEEVOS_COND_TYPE_RESET_IF,
-   CHEEVOS_COND_TYPE_ADD_SOURCE,
-   CHEEVOS_COND_TYPE_SUB_SOURCE,
-   CHEEVOS_COND_TYPE_ADD_HITS
-} cheevos_cond_type_t;
-
-typedef enum
-{
-   CHEEVOS_COND_OP_EQUALS,
-   CHEEVOS_COND_OP_LESS_THAN,
-   CHEEVOS_COND_OP_LESS_THAN_OR_EQUAL,
-   CHEEVOS_COND_OP_GREATER_THAN,
-   CHEEVOS_COND_OP_GREATER_THAN_OR_EQUAL,
-   CHEEVOS_COND_OP_NOT_EQUAL_TO
-} cheevos_cond_op_t;
-
-typedef struct
-{
-   cheevos_cond_type_t type;
-   unsigned            req_hits;
-   unsigned            curr_hits;
-   char                pause;
-
-   cheevos_var_t       source;
-   cheevos_cond_op_t   op;
-   cheevos_var_t       target;
-} cheevos_cond_t;
-
-void     cheevos_cond_parse(cheevos_cond_t* cond, const char** memaddr);
-unsigned cheevos_cond_count_in_set(const char* memaddr, unsigned which);
-void     cheevos_cond_parse_in_set(cheevos_cond_t* cond, const char* memaddr, unsigned which);
-
-RETRO_END_DECLS
-
-#endif /* __RARCH_CHEEVOS_COND_H */
@@ -1,75 +0,0 @@
-#ifndef CORO_H
-#define CORO_H
-
-/*
-Released under the CC0: https://creativecommons.org/publicdomain/zero/1.0/
-*/
-
-/* Use at the beginning of the coroutine, you must have declared a variable coro_t* coro */
-#define CORO_ENTER() \
-  { \
-  CORO_again: ; \
-  switch ( coro->step ) { \
-  case CORO_BEGIN: ;
-
-/* Use to define labels which are targets to GOTO and GOSUB */
-#define CORO_SUB( x ) \
-  case x: ;
-
-/* Use at the end of the coroutine */
-#define CORO_LEAVE() \
-  } } \
-  do { return 0; } while ( 0 )
-
-/* Go to the x label */
-#define CORO_GOTO( x ) \
-  do { \
-    coro->step = ( x ); \
-    goto CORO_again; \
-  } while ( 0 )
-
-/* Go to a subroutine, execution continues until the subroutine returns via RET */
-#define CORO_GOSUB( x ) \
-  do { \
-    coro->stack[ coro->sp++ ] = __LINE__; \
-    coro->step = ( x ); \
-    goto CORO_again; \
-    case __LINE__: ; \
-  } while ( 0 )
-
-/* Returns from a subroutine */
-#define CORO_RET() \
-  do { \
-    coro->step = coro->stack[ --coro->sp ]; \
-    goto CORO_again; \
-  } while ( 0 )
-
-/* Yields to the caller, execution continues from this point when the coroutine is resumed */
-#define CORO_YIELD() \
-  do { \
-    coro->step = __LINE__; \
-    return 1; \
-    case __LINE__: ; \
-  } while ( 0 )
-
-/* The coroutine entry point, never use 0 as a label */
-#define CORO_BEGIN 0
-
-/* Sets up the coroutine */
-#define CORO_SETUP() \
-  do { \
-    coro->step = CORO_BEGIN; \
-    coro->sp   = 0; \
-  } while ( 0 )
-
-#define CORO_STOP() \
-  do { \
-    return 0; \
-  } while ( 0 )
-
-/* Add this macro to your coro_t structure containing the variables for the coroutine */
-#define CORO_FIELDS \
-  int step, sp; \
-  int stack[ 8 ];
-
-#endif /* CORO_H */
@@ -1,422 +0,0 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2015-2017 - Andre Leiradella
- *
- *  RetroArch is free software: you can redistribute it and/or modify it under the terms
- *  of the GNU General Public License as published by the Free Software Found-
- *  ation, either version 3 of the License, or (at your option) any later version.
- *
- *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- *  PURPOSE.  See the GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along with RetroArch.
- *  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <ctype.h>
-#include <stdint.h>
-
-#include <libretro.h>
-
-#include "var.h"
-
-#include "../retroarch.h"
-#include "../core.h"
-#include "../verbosity.h"
-
-/*****************************************************************************
-Parsing
-*****************************************************************************/
-
-static cheevos_var_size_t cheevos_var_parse_prefix(const char** memaddr)
-{
-   /* Careful not to use ABCDEF here, this denotes part of an actual variable! */
-   const char* str = *memaddr;
-   cheevos_var_size_t size;
-
-   switch (toupper((unsigned char)*str++))
-   {
-      case 'M':
-         size = CHEEVOS_VAR_SIZE_BIT_0;
-         break;
-      case 'N':
-         size = CHEEVOS_VAR_SIZE_BIT_1;
-         break;
-      case 'O':
-         size = CHEEVOS_VAR_SIZE_BIT_2;
-         break;
-      case 'P':
-         size = CHEEVOS_VAR_SIZE_BIT_3;
-         break;
-      case 'Q':
-         size = CHEEVOS_VAR_SIZE_BIT_4;
-         break;
-      case 'R':
-         size = CHEEVOS_VAR_SIZE_BIT_5;
-         break;
-      case 'S':
-         size = CHEEVOS_VAR_SIZE_BIT_6;
-         break;
-      case 'T':
-         size = CHEEVOS_VAR_SIZE_BIT_7;
-         break;
-      case 'L':
-         size = CHEEVOS_VAR_SIZE_NIBBLE_LOWER;
-         break;
-      case 'U':
-         size = CHEEVOS_VAR_SIZE_NIBBLE_UPPER;
-         break;
-      case 'H':
-         size = CHEEVOS_VAR_SIZE_EIGHT_BITS;
-         break;
-      case 'X':
-         size = CHEEVOS_VAR_SIZE_THIRTYTWO_BITS;
-         break;
-      default:
-         str--;
-         /* fall through */
-      case ' ':
-         size = CHEEVOS_VAR_SIZE_SIXTEEN_BITS;
-         break;
-   }
-
-   *memaddr = str;
-   return size;
-}
-
-static size_t cheevos_var_reduce(size_t addr, size_t mask)
-{
-   while (mask)
-   {
-      size_t tmp = (mask - 1) & ~mask;
-      addr = (addr & tmp) | ((addr >> 1) & ~tmp);
-      mask = (mask & (mask - 1)) >> 1;
-   }
-
-   return addr;
-}
-
-static size_t cheevos_var_highest_bit(size_t n)
-{
-   n |= n >>  1;
-   n |= n >>  2;
-   n |= n >>  4;
-   n |= n >>  8;
-   n |= n >> 16;
-
-   return n ^ (n >> 1);
-}
-
-void cheevos_var_parse(cheevos_var_t* var, const char** memaddr)
-{
-   char *end       = NULL;
-   const char *str = *memaddr;
-   unsigned base   = 16;
-
-   var->is_bcd = false;
-
-   if (toupper((unsigned char)*str) == 'D' && str[1] == '0' && toupper((unsigned char)str[2]) == 'X')
-   {
-      /* d0x + 4 hex digits */
-      str += 3;
-      var->type = CHEEVOS_VAR_TYPE_DELTA_MEM;
-   }
-   else if (toupper((unsigned char)*str) == 'B' && str[1] == '0' && toupper((unsigned char)str[2]) == 'X')
-   {
-      /* b0x (binary-coded decimal) */
-      str += 3;
-      var->is_bcd = true;
-      var->type = CHEEVOS_VAR_TYPE_ADDRESS;
-   }
-   else if (*str == '0' && toupper((unsigned char)str[1]) == 'X')
-   {
-      /* 0x + 4 hex digits */
-      str += 2;
-      var->type = CHEEVOS_VAR_TYPE_ADDRESS;
-   }
-   else
-   {
-      var->type = CHEEVOS_VAR_TYPE_VALUE_COMP;
-
-      if (toupper((unsigned char)*str) == 'H')
-         str++;
-      else
-      {
-         if (toupper((unsigned char)*str) == 'V')
-            str++;
-
-         base = 10;
-      }
-   }
-
-   if (var->type != CHEEVOS_VAR_TYPE_VALUE_COMP)
-   {
-      var->size = cheevos_var_parse_prefix(&str);
-   }
-
-   var->value = (unsigned)strtol(str, &end, base);
-   *memaddr   = end;
-}
-
-void cheevos_var_patch_addr(cheevos_var_t* var, cheevos_console_t console)
-{
-   rarch_system_info_t *system = runloop_get_system_info();
-
-   var->bank_id = -1;
-
-   if (console == CHEEVOS_CONSOLE_NINTENDO)
-   {
-      if (var->value >= 0x0800 && var->value < 0x2000)
-      {
-         CHEEVOS_LOG(CHEEVOS_TAG "NES memory address in mirrorred RAM %X, adjusted to %X\n", var->value, var->value & 0x07ff);
-         var->value &= 0x07ff;
-      }
-   }
-   else if (console == CHEEVOS_CONSOLE_GAMEBOY_COLOR)
-   {
-      if (var->value >= 0xe000 && var->value <= 0xfdff)
-      {
-         CHEEVOS_LOG(CHEEVOS_TAG "GBC memory address in echo RAM %X, adjusted to %X\n", var->value, var->value - 0x2000);
-         var->value -= 0x2000;
-      }
-   }
-
-   if (system->mmaps.num_descriptors != 0)
-   {
-      const rarch_memory_descriptor_t *desc = NULL;
-      const rarch_memory_descriptor_t *end  = NULL;
-
-      /* Patch the address to correctly map it to the mmaps */
-      if (console == CHEEVOS_CONSOLE_GAMEBOY_ADVANCE)
-      {
-         if (var->value < 0x8000) /* Internal RAM */
-         {
-            CHEEVOS_LOG(CHEEVOS_TAG "GBA memory address %X adjusted to %X\n", var->value, var->value + 0x3000000);
-            var->value += 0x3000000;
-         }
-         else /* Work RAM */
-         {
-            CHEEVOS_LOG(CHEEVOS_TAG "GBA memory address %X adjusted to %X\n", var->value, var->value + 0x2000000 - 0x8000);
-            var->value += 0x2000000 - 0x8000;
-         }
-      }
-      else if (console == CHEEVOS_CONSOLE_PC_ENGINE)
-      {
-         CHEEVOS_LOG(CHEEVOS_TAG "PCE memory address %X adjusted to %X\n", var->value, var->value + 0x1f0000);
-         var->value += 0x1f0000;
-      }
-      else if (console == CHEEVOS_CONSOLE_SUPER_NINTENDO)
-      {
-         if (var->value < 0x020000) /* Work RAM */
-         {
-            CHEEVOS_LOG(CHEEVOS_TAG "SNES memory address %X adjusted to %X\n", var->value, var->value + 0x7e0000);
-            var->value += 0x7e0000;
-         }
-         else /* Save RAM */
-         {
-            CHEEVOS_LOG(CHEEVOS_TAG "SNES memory address %X adjusted to %X\n", var->value, var->value + 0x006000 - 0x020000);
-            var->value += 0x006000 - 0x020000;
-         }
-      }
-
-      desc = system->mmaps.descriptors;
-      end  = desc + system->mmaps.num_descriptors;
-
-      for (; desc < end; desc++)
-      {
-         if (((desc->core.start ^ var->value) & desc->core.select) == 0)
-         {
-            unsigned addr = var->value;
-            var->bank_id  = (int)(desc - system->mmaps.descriptors);
-            var->value    = (unsigned)cheevos_var_reduce(
-               (addr - desc->core.start) & desc->disconnect_mask,
-               desc->core.disconnect);
-
-            if (var->value >= desc->core.len)
-               var->value -= cheevos_var_highest_bit(var->value);
-
-            var->value += desc->core.offset;
-
-            CHEEVOS_LOG(CHEEVOS_TAG "address %X set to descriptor %d at offset %X\n", addr, var->bank_id + 1, var->value);
-            break;
-         }
-      }
-   }
-   else
-   {
-      unsigned i;
-
-      for (i = 0; i < 4; i++)
-      {
-         retro_ctx_memory_info_t meminfo;
-
-         switch (i)
-         {
-            case 0:
-               meminfo.id = RETRO_MEMORY_SYSTEM_RAM;
-               break;
-            case 1:
-               meminfo.id = RETRO_MEMORY_SAVE_RAM;
-               break;
-            case 2:
-               meminfo.id = RETRO_MEMORY_VIDEO_RAM;
-               break;
-            case 3:
-               meminfo.id = RETRO_MEMORY_RTC;
-               break;
-         }
-
-         core_get_memory(&meminfo);
-
-         if (var->value < meminfo.size)
-         {
-            var->bank_id = i;
-            break;
-         }
-
-         /* HACK subtract the correct amount of bytes to reach the save RAM */
-         if (i == 0 && console == CHEEVOS_CONSOLE_NINTENDO)
-            var->value -= 0x6000;
-         else
-            var->value -= meminfo.size;
-      }
-   }
-}
-
-/*****************************************************************************
-Testing
-*****************************************************************************/
-
-uint8_t* cheevos_var_get_memory(const cheevos_var_t* var)
-{
-   rarch_system_info_t *system = NULL;
-   uint8_t             *memory = NULL;
-   size_t               length = 0;
-
-   if (var->bank_id < 0)
-      return NULL;
-
-   system = runloop_get_system_info();
-
-   if (system->mmaps.num_descriptors != 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};
-
-      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: %d\n", var->bank_id);
-            break;
-      }
-
-      core_get_memory(&meminfo);
-
-      memory = (uint8_t*)meminfo.data;
-      length = meminfo.size;
-   }
-
-   if (memory == NULL || var->value >= length)
-      return NULL;
-
-   return memory + var->value;
-}
-
-unsigned cheevos_var_get_value(cheevos_var_t* var)
-{
-   const uint8_t* memory = NULL;
-   unsigned value        = 0;
-
-   switch (var->type)
-   {
-      case CHEEVOS_VAR_TYPE_VALUE_COMP:
-         value = var->value;
-         break;
-
-      case CHEEVOS_VAR_TYPE_ADDRESS:
-      case CHEEVOS_VAR_TYPE_DELTA_MEM:
-         memory = cheevos_var_get_memory(var);
-
-         if (memory)
-         {
-            value = memory[0];
-
-            switch (var->size)
-            {
-               case CHEEVOS_VAR_SIZE_BIT_0:
-                  value &= 1;
-                  break;
-               case CHEEVOS_VAR_SIZE_BIT_1:
-                  value = (value >> 1) & 1;
-                  break;
-               case CHEEVOS_VAR_SIZE_BIT_2:
-                  value = (value >> 2) & 1;
-                  break;
-               case CHEEVOS_VAR_SIZE_BIT_3:
-                  value = (value >> 3) & 1;
-                  break;
-               case CHEEVOS_VAR_SIZE_BIT_4:
-                  value = (value >> 4) & 1;
-                  break;
-               case CHEEVOS_VAR_SIZE_BIT_5:
-                  value = (value >> 5) & 1;
-                  break;
-               case CHEEVOS_VAR_SIZE_BIT_6:
-                  value = (value >> 6) & 1;
-                  break;
-               case CHEEVOS_VAR_SIZE_BIT_7:
-                  value = (value >> 7) & 1;
-                  break;
-               case CHEEVOS_VAR_SIZE_NIBBLE_LOWER:
-                  value &= 0x0f;
-                  break;
-               case CHEEVOS_VAR_SIZE_NIBBLE_UPPER:
-                  value = (value >> 4) & 0x0f;
-                  break;
-               case CHEEVOS_VAR_SIZE_EIGHT_BITS:
-                  break;
-               case CHEEVOS_VAR_SIZE_SIXTEEN_BITS:
-                  value |= memory[1] << 8;
-                  break;
-               case CHEEVOS_VAR_SIZE_THIRTYTWO_BITS:
-                  value |= memory[1] << 8;
-                  value |= memory[2] << 16;
-                  value |= memory[3] << 24;
-                  break;
-            }
-         }
-
-         if (var->type == CHEEVOS_VAR_TYPE_DELTA_MEM)
-         {
-            unsigned previous = var->previous;
-            var->previous     = value;
-            value = previous;
-         }
-
-         break;
-
-      case CHEEVOS_VAR_TYPE_DYNAMIC_VAR:
-         /* We shouldn't get here... */
-         break;
-   }
-
-   if(var->is_bcd)
-      return (((value >> 4) & 0xf) * 10) + (value & 0xf);
-   return value;
-}
@@ -1,78 +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_VAR_H
-#define __RARCH_CHEEVOS_VAR_H
-
-#include <stdint.h>
-
-#include "cheevos.h"
-
-#include <retro_common_api.h>
-
-RETRO_BEGIN_DECLS
-
-typedef enum
-{
-   CHEEVOS_VAR_SIZE_BIT_0 = 0,
-   CHEEVOS_VAR_SIZE_BIT_1,
-   CHEEVOS_VAR_SIZE_BIT_2,
-   CHEEVOS_VAR_SIZE_BIT_3,
-   CHEEVOS_VAR_SIZE_BIT_4,
-   CHEEVOS_VAR_SIZE_BIT_5,
-   CHEEVOS_VAR_SIZE_BIT_6,
-   CHEEVOS_VAR_SIZE_BIT_7,
-   CHEEVOS_VAR_SIZE_NIBBLE_LOWER,
-   CHEEVOS_VAR_SIZE_NIBBLE_UPPER,
-   /* Byte, */
-   CHEEVOS_VAR_SIZE_EIGHT_BITS, /* =Byte, */
-   CHEEVOS_VAR_SIZE_SIXTEEN_BITS,
-   CHEEVOS_VAR_SIZE_THIRTYTWO_BITS
-} cheevos_var_size_t;
-
-typedef enum
-{
-   /* compare to the value of a live address in RAM */
-   CHEEVOS_VAR_TYPE_ADDRESS = 0,
-
-   /* a number. assume 32 bit */
-   CHEEVOS_VAR_TYPE_VALUE_COMP,
-
-   /* the value last known at this address. */
-   CHEEVOS_VAR_TYPE_DELTA_MEM,
-
-   /* a custom user-set variable */
-   CHEEVOS_VAR_TYPE_DYNAMIC_VAR
-} cheevos_var_type_t;
-
-typedef struct
-{
-   cheevos_var_size_t size;
-   cheevos_var_type_t type;
-   int                bank_id;
-   bool               is_bcd;
-   unsigned           value;
-   unsigned           previous;
-} cheevos_var_t;
-
-void cheevos_var_parse(cheevos_var_t* var, const char** memaddr);
-void cheevos_var_patch_addr(cheevos_var_t* var, cheevos_console_t console);
-
-uint8_t* cheevos_var_get_memory(const cheevos_var_t* var);
-unsigned cheevos_var_get_value(cheevos_var_t* var);
-
-RETRO_END_DECLS
-
-#endif /* __RARCH_CHEEVOS_VAR_H */
@@ -72,11 +72,8 @@ enum event_command
   CMD_EVENT_REWIND_INIT,
   /* Toggles rewind. */
   CMD_EVENT_REWIND_TOGGLE,
-   /* Deinitializes autosave. */
-   CMD_EVENT_AUTOSAVE_DEINIT,
   /* Initializes autosave. */
   CMD_EVENT_AUTOSAVE_INIT,
-   CMD_EVENT_AUTOSAVE_STATE,
   /* Stops audio. */
   CMD_EVENT_AUDIO_STOP,
   /* Starts audio. */
@@ -101,10 +98,6 @@ enum event_command
   CMD_EVENT_OVERLAY_NEXT,
   /* Deinitializes overlay. */
   CMD_EVENT_DSP_FILTER_INIT,
-   /* Deinitializes graphics filter. */
-   CMD_EVENT_DSP_FILTER_DEINIT,
-   /* Deinitializes GPU recoring. */
-   CMD_EVENT_GPU_RECORD_DEINIT,
   /* Initializes recording system. */
   CMD_EVENT_RECORD_INIT,
   /* Deinitializes recording system. */
@@ -121,19 +114,12 @@ enum event_command
   CMD_EVENT_CORE_DEINIT,
   /* Initializes core. */
   CMD_EVENT_CORE_INIT,
-   /* Set audio blocking state. */
-   CMD_EVENT_AUDIO_SET_BLOCKING_STATE,
-   /* Set audio nonblocking state. */
-   CMD_EVENT_AUDIO_SET_NONBLOCKING_STATE,
   /* Apply video state changes. */
   CMD_EVENT_VIDEO_APPLY_STATE_CHANGES,
   /* Set video blocking state. */
   CMD_EVENT_VIDEO_SET_BLOCKING_STATE,
-   /* Set video nonblocking state. */
-   CMD_EVENT_VIDEO_SET_NONBLOCKING_STATE,
   /* Sets current aspect ratio index. */
   CMD_EVENT_VIDEO_SET_ASPECT_RATIO,
-   CMD_EVENT_RESET_CONTEXT,
   /* Restarts RetroArch. */
   CMD_EVENT_RESTART_RETROARCH,
   /* Shutdown the OS */
@@ -152,7 +138,6 @@ enum event_command
   CMD_EVENT_UNPAUSE,
   /* 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,
@@ -166,20 +151,8 @@ enum event_command
   CMD_EVENT_SHADERS_APPLY_CHANGES,
   /* A new shader preset has been loaded */
   CMD_EVENT_SHADER_PRESET_LOADED,
-   /* Initializes shader directory. */
-   CMD_EVENT_SHADER_DIR_INIT,
-   /* Deinitializes shader directory. */
-   CMD_EVENT_SHADER_DIR_DEINIT,
-   /* Initializes controllers. */
-   CMD_EVENT_CONTROLLERS_INIT,
-   /* Initializes cheats. */
-   CMD_EVENT_CHEATS_INIT,
-   /* Deinitializes cheats. */
-   CMD_EVENT_CHEATS_DEINIT,
   /* Apply cheats. */
   CMD_EVENT_CHEATS_APPLY,
-   /* Deinitializes network system. */
-   CMD_EVENT_NETWORK_DEINIT,
   /* Initializes network system. */
   CMD_EVENT_NETWORK_INIT,
   /* Initializes netplay system with a string or no host specified. */
@@ -196,22 +169,6 @@ enum event_command
   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. */
-   CMD_EVENT_BSV_MOVIE_DEINIT,
-   /* Initializes command interface. */
-   CMD_EVENT_COMMAND_INIT,
-   /* Deinitialize command interface. */
-   CMD_EVENT_COMMAND_DEINIT,
-   /* Initializes remote gamepad interface. */
-   CMD_EVENT_REMOTE_INIT,
-   /* Deinitializes remote gamepad interface. */
-   CMD_EVENT_REMOTE_DEINIT,
-   /* Initializes keyboard to gamepad mapper interface. */
-   CMD_EVENT_MAPPER_INIT,
-   /* Deinitializes keyboard to gamepad mapper interface. */
-   CMD_EVENT_MAPPER_DEINIT,
   /* Reinitializes audio driver. */
   CMD_EVENT_AUDIO_REINIT,
   /* Resizes windowed scale. Will reinitialize video driver. */
@@ -235,39 +192,27 @@ enum event_command
   CMD_EVENT_UI_COMPANION_TOGGLE,
   /* Toggles fullscreen mode. */
   CMD_EVENT_FULLSCREEN_TOGGLE,
-   CMD_EVENT_PERFCNT_REPORT_FRONTEND_LOG,
   CMD_EVENT_VOLUME_UP,
   CMD_EVENT_VOLUME_DOWN,
   CMD_EVENT_MIXER_VOLUME_UP,
   CMD_EVENT_MIXER_VOLUME_DOWN,
-   CMD_EVENT_DISABLE_OVERRIDES,
-   CMD_EVENT_RESTORE_REMAPS,
-   CMD_EVENT_RESTORE_DEFAULT_SHADER_PRESET,
   CMD_EVENT_DISCORD_INIT,
-   CMD_EVENT_DISCORD_DEINIT,
-   CMD_EVENT_DISCORD_UPDATE
+   CMD_EVENT_DISCORD_UPDATE,
+   CMD_EVENT_OSK_TOGGLE,
+   CMD_EVENT_RECORDING_TOGGLE,
+   CMD_EVENT_STREAMING_TOGGLE,
+   CMD_EVENT_AI_SERVICE_TOGGLE,
+   CMD_EVENT_BSV_RECORDING_TOGGLE,
+   CMD_EVENT_SHADER_NEXT,
+   CMD_EVENT_SHADER_PREV,
+   CMD_EVENT_CHEAT_INDEX_PLUS,
+   CMD_EVENT_CHEAT_INDEX_MINUS,
+   CMD_EVENT_CHEAT_TOGGLE,
+   CMD_EVENT_AI_SERVICE_CALL
 };

 bool command_set_shader(const char *arg);

-bool command_network_send(const char *cmd_);
-
-bool command_network_new(
-      command_t *handle,
-      bool stdin_enable,
-      bool network_enable,
-      uint16_t port);
-
-command_t *command_new(void);
-
-bool command_poll(command_t *handle);
-
-bool command_get(command_handle_t *handle);
-
-bool command_set(command_handle_t *handle);
-
-bool command_free(command_t *handle);
-
 /**
 * command_event:
 * @cmd                  : Command index.
@@ -22,214 +22,217 @@

 /* User 1 */
 static const struct retro_keybind retro_keybinds_1[] = {
-    /*     | RetroPad button              | enum                                             | keyboard key  | m-btn | js btn   | js axis | */
+    /*     | RetroPad button              | enum                                                   | keyboard key    | m-btn | js btn   | js axis | */
 #ifdef __QNX__
-   { true, RETRO_DEVICE_ID_JOYPAD_B,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_B,              RETROK_k,       NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_Y,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_Y,              RETROK_i,       NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_SELECT, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_SELECT,         RETROK_v,       NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_START,  MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_START,          RETROK_b,       NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_UP,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_UP,             RETROK_e,       NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_DOWN,   MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_DOWN,           RETROK_s,       NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_LEFT,   MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_LEFT,           RETROK_w,       NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_RIGHT,  MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_RIGHT,          RETROK_d,       NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_A,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_A,              RETROK_l,       NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_X,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_X,              RETROK_o,       NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_L,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L,              RETROK_f,       NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_R,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R,              RETROK_j,       NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_L2,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L2,             RETROK_r,       NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_R2,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R2,             RETROK_u,       NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_L3,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L3,             RETROK_g,       NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_R3,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R3,             RETROK_h,       NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_B,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_B,                    RETROK_k,         NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RETRO_DEVICE_ID_JOYPAD_Y,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_Y,                    RETROK_i,         NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RETRO_DEVICE_ID_JOYPAD_SELECT, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_SELECT,               RETROK_v,         NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RETRO_DEVICE_ID_JOYPAD_START,  MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_START,                RETROK_b,         NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RETRO_DEVICE_ID_JOYPAD_UP,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_UP,                   RETROK_e,         NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RETRO_DEVICE_ID_JOYPAD_DOWN,   MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_DOWN,                 RETROK_s,         NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RETRO_DEVICE_ID_JOYPAD_LEFT,   MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_LEFT,                 RETROK_w,         NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RETRO_DEVICE_ID_JOYPAD_RIGHT,  MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_RIGHT,                RETROK_d,         NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RETRO_DEVICE_ID_JOYPAD_A,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_A,                    RETROK_l,         NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RETRO_DEVICE_ID_JOYPAD_X,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_X,                    RETROK_o,         NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RETRO_DEVICE_ID_JOYPAD_L,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L,                    RETROK_f,         NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RETRO_DEVICE_ID_JOYPAD_R,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R,                    RETROK_j,         NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RETRO_DEVICE_ID_JOYPAD_L2,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L2,                   RETROK_r,         NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RETRO_DEVICE_ID_JOYPAD_R2,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R2,                   RETROK_u,         NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RETRO_DEVICE_ID_JOYPAD_L3,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L3,                   RETROK_g,         NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RETRO_DEVICE_ID_JOYPAD_R3,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R3,                   RETROK_h,         NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },

-   { true, RARCH_ANALOG_LEFT_X_PLUS,      MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_X_PLUS,    RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_ANALOG_LEFT_X_MINUS,     MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_X_MINUS,   RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_ANALOG_LEFT_Y_PLUS,      MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_Y_PLUS,    RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_ANALOG_LEFT_Y_MINUS,     MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_Y_MINUS,   RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_ANALOG_RIGHT_X_PLUS,     MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_X_PLUS,   RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_ANALOG_RIGHT_X_MINUS,    MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_X_MINUS,  RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_ANALOG_RIGHT_Y_PLUS,     MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_Y_PLUS,   RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_ANALOG_RIGHT_Y_MINUS,    MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_Y_MINUS,  RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_ANALOG_LEFT_X_PLUS,      MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_X_PLUS,          RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_ANALOG_LEFT_X_MINUS,     MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_X_MINUS,         RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_ANALOG_LEFT_Y_PLUS,      MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_Y_PLUS,          RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_ANALOG_LEFT_Y_MINUS,     MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_Y_MINUS,         RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_ANALOG_RIGHT_X_PLUS,     MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_X_PLUS,         RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_ANALOG_RIGHT_X_MINUS,    MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_X_MINUS,        RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_ANALOG_RIGHT_Y_PLUS,     MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_Y_PLUS,         RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_ANALOG_RIGHT_Y_MINUS,    MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_Y_MINUS,        RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },

-   { true, RARCH_LIGHTGUN_TRIGGER,        MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_TRIGGER,      RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_LIGHTGUN_RELOAD,         MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_RELOAD,       RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_LIGHTGUN_AUX_A,          MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_AUX_A,        RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_LIGHTGUN_AUX_B,          MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_AUX_B,        RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_LIGHTGUN_AUX_C,          MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_AUX_C,        RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_LIGHTGUN_START,          MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_START,        RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_LIGHTGUN_SELECT,         MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_SELECT,       RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_LIGHTGUN_DPAD_UP,        MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_DPAD_UP,      RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_LIGHTGUN_DPAD_DOWN,      MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_DPAD_DOWN,    RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_LIGHTGUN_DPAD_LEFT,      MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_DPAD_LEFT,    RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_LIGHTGUN_DPAD_RIGHT,     MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_DPAD_RIGHT,   RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_LIGHTGUN_TRIGGER,        MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_TRIGGER,            RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_LIGHTGUN_RELOAD,         MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_RELOAD,             RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_LIGHTGUN_AUX_A,          MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_AUX_A,              RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_LIGHTGUN_AUX_B,          MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_AUX_B,              RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_LIGHTGUN_AUX_C,          MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_AUX_C,              RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_LIGHTGUN_START,          MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_START,              RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_LIGHTGUN_SELECT,         MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_SELECT,             RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_LIGHTGUN_DPAD_UP,        MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_DPAD_UP,            RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_LIGHTGUN_DPAD_DOWN,      MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_DPAD_DOWN,          RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_LIGHTGUN_DPAD_LEFT,      MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_DPAD_LEFT,          RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_LIGHTGUN_DPAD_RIGHT,     MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_DPAD_RIGHT,         RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },

-   { true, RARCH_TURBO_ENABLE,             MENU_ENUM_LABEL_VALUE_INPUT_TURBO_ENABLE,              RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_TURBO_ENABLE,            MENU_ENUM_LABEL_VALUE_INPUT_TURBO_ENABLE,                RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },

-   { true, RARCH_FAST_FORWARD_KEY,         MENU_ENUM_LABEL_VALUE_INPUT_META_FAST_FORWARD_KEY,     RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_FAST_FORWARD_HOLD_KEY,    MENU_ENUM_LABEL_VALUE_INPUT_META_FAST_FORWARD_HOLD_KEY,RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_SLOWMOTION_KEY,           MENU_ENUM_LABEL_VALUE_INPUT_META_SLOWMOTION_KEY,       RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_SLOWMOTION_HOLD_KEY,      MENU_ENUM_LABEL_VALUE_INPUT_META_SLOWMOTION_HOLD_KEY,  RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_LOAD_STATE_KEY,           MENU_ENUM_LABEL_VALUE_INPUT_META_LOAD_STATE_KEY,       RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_SAVE_STATE_KEY,           MENU_ENUM_LABEL_VALUE_INPUT_META_SAVE_STATE_KEY,       RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_FULLSCREEN_TOGGLE_KEY,    MENU_ENUM_LABEL_VALUE_INPUT_META_FULLSCREEN_TOGGLE_KEY,RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_QUIT_KEY,                 MENU_ENUM_LABEL_VALUE_INPUT_META_QUIT_KEY,             RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_STATE_SLOT_PLUS,          MENU_ENUM_LABEL_VALUE_INPUT_META_STATE_SLOT_PLUS,      RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_STATE_SLOT_MINUS,         MENU_ENUM_LABEL_VALUE_INPUT_META_STATE_SLOT_MINUS,     RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_REWIND,                   MENU_ENUM_LABEL_VALUE_INPUT_META_REWIND,               RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_BSV_RECORD_TOGGLE,        MENU_ENUM_LABEL_VALUE_INPUT_META_BSV_RECORD_TOGGLE,    RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_PAUSE_TOGGLE,             MENU_ENUM_LABEL_VALUE_INPUT_META_PAUSE_TOGGLE,         RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_FRAMEADVANCE,             MENU_ENUM_LABEL_VALUE_INPUT_META_FRAMEADVANCE,         RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_RESET,                    MENU_ENUM_LABEL_VALUE_INPUT_META_RESET,                RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_SHADER_NEXT,              MENU_ENUM_LABEL_VALUE_INPUT_META_SHADER_NEXT,          RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_SHADER_PREV,              MENU_ENUM_LABEL_VALUE_INPUT_META_SHADER_PREV,          RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_CHEAT_INDEX_PLUS,         MENU_ENUM_LABEL_VALUE_INPUT_META_CHEAT_INDEX_PLUS,     RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_CHEAT_INDEX_MINUS,        MENU_ENUM_LABEL_VALUE_INPUT_META_CHEAT_INDEX_MINUS,    RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_CHEAT_TOGGLE,             MENU_ENUM_LABEL_VALUE_INPUT_META_CHEAT_TOGGLE,         RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { 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 },
-   { true, RARCH_VOLUME_DOWN,              MENU_ENUM_LABEL_VALUE_INPUT_META_VOLUME_DOWN,          RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_OVERLAY_NEXT,             MENU_ENUM_LABEL_VALUE_INPUT_META_OVERLAY_NEXT,         RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_DISK_EJECT_TOGGLE,        MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_EJECT_TOGGLE,    RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_DISK_NEXT,                MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_NEXT,            RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_DISK_PREV,                MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_PREV,            RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_GRAB_MOUSE_TOGGLE,        MENU_ENUM_LABEL_VALUE_INPUT_META_GRAB_MOUSE_TOGGLE,    RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { 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 },
+   { true, RARCH_FAST_FORWARD_KEY,        MENU_ENUM_LABEL_VALUE_INPUT_META_FAST_FORWARD_KEY,       RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_FAST_FORWARD_HOLD_KEY,   MENU_ENUM_LABEL_VALUE_INPUT_META_FAST_FORWARD_HOLD_KEY,  RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_SLOWMOTION_KEY,          MENU_ENUM_LABEL_VALUE_INPUT_META_SLOWMOTION_KEY,         RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_SLOWMOTION_HOLD_KEY,     MENU_ENUM_LABEL_VALUE_INPUT_META_SLOWMOTION_HOLD_KEY,    RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_LOAD_STATE_KEY,          MENU_ENUM_LABEL_VALUE_INPUT_META_LOAD_STATE_KEY,         RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_SAVE_STATE_KEY,          MENU_ENUM_LABEL_VALUE_INPUT_META_SAVE_STATE_KEY,         RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_FULLSCREEN_TOGGLE_KEY,   MENU_ENUM_LABEL_VALUE_INPUT_META_FULLSCREEN_TOGGLE_KEY,  RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_QUIT_KEY,                MENU_ENUM_LABEL_VALUE_INPUT_META_QUIT_KEY,               RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_STATE_SLOT_PLUS,         MENU_ENUM_LABEL_VALUE_INPUT_META_STATE_SLOT_PLUS,        RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_STATE_SLOT_MINUS,        MENU_ENUM_LABEL_VALUE_INPUT_META_STATE_SLOT_MINUS,       RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_REWIND,                  MENU_ENUM_LABEL_VALUE_INPUT_META_REWIND,                 RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_BSV_RECORD_TOGGLE,       MENU_ENUM_LABEL_VALUE_INPUT_META_BSV_RECORD_TOGGLE,      RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_PAUSE_TOGGLE,            MENU_ENUM_LABEL_VALUE_INPUT_META_PAUSE_TOGGLE,           RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_FRAMEADVANCE,            MENU_ENUM_LABEL_VALUE_INPUT_META_FRAMEADVANCE,           RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_RESET,                   MENU_ENUM_LABEL_VALUE_INPUT_META_RESET,                  RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_SHADER_NEXT,             MENU_ENUM_LABEL_VALUE_INPUT_META_SHADER_NEXT,            RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_SHADER_PREV,             MENU_ENUM_LABEL_VALUE_INPUT_META_SHADER_PREV,            RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_CHEAT_INDEX_PLUS,        MENU_ENUM_LABEL_VALUE_INPUT_META_CHEAT_INDEX_PLUS,       RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_CHEAT_INDEX_MINUS,       MENU_ENUM_LABEL_VALUE_INPUT_META_CHEAT_INDEX_MINUS,      RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_CHEAT_TOGGLE,            MENU_ENUM_LABEL_VALUE_INPUT_META_CHEAT_TOGGLE,           RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_SCREENSHOT,              MENU_ENUM_LABEL_VALUE_INPUT_META_SCREENSHOT,             RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_MUTE,                    MENU_ENUM_LABEL_VALUE_INPUT_META_MUTE,                   RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_OSK,                     MENU_ENUM_LABEL_VALUE_INPUT_META_OSK,                    RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_FPS_TOGGLE,              MENU_ENUM_LABEL_VALUE_INPUT_META_FPS_TOGGLE,             RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_SEND_DEBUG_INFO,         MENU_ENUM_LABEL_VALUE_INPUT_META_SEND_DEBUG_INFO,        RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_NETPLAY_HOST_TOGGLE,     MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_HOST_TOGGLE,    RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_NETPLAY_GAME_WATCH,      MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_GAME_WATCH,     RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_ENABLE_HOTKEY,           MENU_ENUM_LABEL_VALUE_INPUT_META_ENABLE_HOTKEY,          RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_VOLUME_UP,               MENU_ENUM_LABEL_VALUE_INPUT_META_VOLUME_UP,              RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_VOLUME_DOWN,             MENU_ENUM_LABEL_VALUE_INPUT_META_VOLUME_DOWN,            RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_OVERLAY_NEXT,            MENU_ENUM_LABEL_VALUE_INPUT_META_OVERLAY_NEXT,           RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_DISK_EJECT_TOGGLE,       MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_EJECT_TOGGLE,      RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_DISK_NEXT,               MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_NEXT,              RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_DISK_PREV,               MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_PREV,              RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_GRAB_MOUSE_TOGGLE,       MENU_ENUM_LABEL_VALUE_INPUT_META_GRAB_MOUSE_TOGGLE,      RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_GAME_FOCUS_TOGGLE,       MENU_ENUM_LABEL_VALUE_INPUT_META_GAME_FOCUS_TOGGLE,      RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_UI_COMPANION_TOGGLE,     MENU_ENUM_LABEL_VALUE_INPUT_META_UI_COMPANION_TOGGLE,    RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_MENU_TOGGLE,             MENU_ENUM_LABEL_VALUE_INPUT_META_MENU_TOGGLE,            RETROK_SPACE,     NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_RECORDING_TOGGLE,        MENU_ENUM_LABEL_VALUE_INPUT_META_RECORDING_TOGGLE,       RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_STREAMING_TOGGLE,        MENU_ENUM_LABEL_VALUE_INPUT_META_STREAMING_TOGGLE,       RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_AI_SERVICE,              MENU_ENUM_LABEL_VALUE_INPUT_META_AI_SERVICE,             RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
 #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 },
-   { true, RETRO_DEVICE_ID_JOYPAD_SELECT, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_SELECT,         RETROK_RSHIFT,  NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_START,  MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_START,          RETROK_RETURN,  NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_UP,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_UP,             RETROK_UP,      NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_DOWN,   MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_DOWN,           RETROK_DOWN,    NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_LEFT,   MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_LEFT,           RETROK_LEFT,    NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_RIGHT,  MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_RIGHT,          RETROK_RIGHT,   NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_A,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_A,              RETROK_x,       NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_X,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_X,              RETROK_s,       NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_L,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L,              RETROK_q,       NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_R,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R,              RETROK_w,       NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_L2,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L2,             RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_R2,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R2,             RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_L3,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L3,             RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_R3,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R3,             RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_B,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_B,                    RETROK_z,         NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RETRO_DEVICE_ID_JOYPAD_Y,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_Y,                    RETROK_a,         NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RETRO_DEVICE_ID_JOYPAD_SELECT, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_SELECT,               RETROK_RSHIFT,    NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RETRO_DEVICE_ID_JOYPAD_START,  MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_START,                RETROK_RETURN,    NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RETRO_DEVICE_ID_JOYPAD_UP,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_UP,                   RETROK_UP,        NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RETRO_DEVICE_ID_JOYPAD_DOWN,   MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_DOWN,                 RETROK_DOWN,      NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RETRO_DEVICE_ID_JOYPAD_LEFT,   MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_LEFT,                 RETROK_LEFT,      NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RETRO_DEVICE_ID_JOYPAD_RIGHT,  MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_RIGHT,                RETROK_RIGHT,     NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RETRO_DEVICE_ID_JOYPAD_A,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_A,                    RETROK_x,         NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RETRO_DEVICE_ID_JOYPAD_X,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_X,                    RETROK_s,         NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RETRO_DEVICE_ID_JOYPAD_L,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L,                    RETROK_q,         NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RETRO_DEVICE_ID_JOYPAD_R,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R,                    RETROK_w,         NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RETRO_DEVICE_ID_JOYPAD_L2,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L2,                   RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RETRO_DEVICE_ID_JOYPAD_R2,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R2,                   RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RETRO_DEVICE_ID_JOYPAD_L3,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L3,                   RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RETRO_DEVICE_ID_JOYPAD_R3,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R3,                   RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },

-   { true, RARCH_ANALOG_LEFT_X_PLUS,      MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_X_PLUS,    RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_ANALOG_LEFT_X_MINUS,     MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_X_MINUS,   RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_ANALOG_LEFT_Y_PLUS,      MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_Y_PLUS,    RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_ANALOG_LEFT_Y_MINUS,     MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_Y_MINUS,   RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_ANALOG_RIGHT_X_PLUS,     MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_X_PLUS,   RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_ANALOG_RIGHT_X_MINUS,    MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_X_MINUS,  RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_ANALOG_RIGHT_Y_PLUS,     MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_Y_PLUS,   RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_ANALOG_RIGHT_Y_MINUS,    MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_Y_MINUS,  RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_ANALOG_LEFT_X_PLUS,      MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_X_PLUS,          RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_ANALOG_LEFT_X_MINUS,     MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_X_MINUS,         RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_ANALOG_LEFT_Y_PLUS,      MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_Y_PLUS,          RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_ANALOG_LEFT_Y_MINUS,     MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_Y_MINUS,         RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_ANALOG_RIGHT_X_PLUS,     MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_X_PLUS,         RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_ANALOG_RIGHT_X_MINUS,    MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_X_MINUS,        RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_ANALOG_RIGHT_Y_PLUS,     MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_Y_PLUS,         RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_ANALOG_RIGHT_Y_MINUS,    MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_Y_MINUS,        RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },

-   { true, RARCH_LIGHTGUN_TRIGGER,        MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_TRIGGER,      RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_LIGHTGUN_RELOAD,         MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_RELOAD,       RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_LIGHTGUN_AUX_A,          MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_AUX_A,        RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_LIGHTGUN_AUX_B,          MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_AUX_B,        RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_LIGHTGUN_AUX_C,          MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_AUX_C,        RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_LIGHTGUN_START,          MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_START,        RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_LIGHTGUN_SELECT,         MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_SELECT,       RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_LIGHTGUN_DPAD_UP,        MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_DPAD_UP,      RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_LIGHTGUN_DPAD_DOWN,      MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_DPAD_DOWN,    RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_LIGHTGUN_DPAD_LEFT,      MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_DPAD_LEFT,    RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_LIGHTGUN_DPAD_RIGHT,     MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_DPAD_RIGHT,   RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_LIGHTGUN_TRIGGER,        MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_TRIGGER,            RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_LIGHTGUN_RELOAD,         MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_RELOAD,             RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_LIGHTGUN_AUX_A,          MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_AUX_A,              RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_LIGHTGUN_AUX_B,          MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_AUX_B,              RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_LIGHTGUN_AUX_C,          MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_AUX_C,              RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_LIGHTGUN_START,          MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_START,              RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_LIGHTGUN_SELECT,         MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_SELECT,             RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_LIGHTGUN_DPAD_UP,        MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_DPAD_UP,            RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_LIGHTGUN_DPAD_DOWN,      MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_DPAD_DOWN,          RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_LIGHTGUN_DPAD_LEFT,      MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_DPAD_LEFT,          RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_LIGHTGUN_DPAD_RIGHT,     MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_DPAD_RIGHT,         RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },

-   { true, RARCH_TURBO_ENABLE,             MENU_ENUM_LABEL_VALUE_INPUT_TURBO_ENABLE,         RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_TURBO_ENABLE,             MENU_ENUM_LABEL_VALUE_INPUT_TURBO_ENABLE,               RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+
+   { true, RARCH_FAST_FORWARD_KEY,         MENU_ENUM_LABEL_VALUE_INPUT_META_FAST_FORWARD_KEY,      RETROK_SPACE,     NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_FAST_FORWARD_HOLD_KEY,    MENU_ENUM_LABEL_VALUE_INPUT_META_FAST_FORWARD_HOLD_KEY, RETROK_l,         NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_SLOWMOTION_KEY,           MENU_ENUM_LABEL_VALUE_INPUT_META_SLOWMOTION_KEY,        RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_SLOWMOTION_HOLD_KEY,      MENU_ENUM_LABEL_VALUE_INPUT_META_SLOWMOTION_KEY,        RETROK_e,         NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_LOAD_STATE_KEY,           MENU_ENUM_LABEL_VALUE_INPUT_META_LOAD_STATE_KEY,        RETROK_F4,        NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_SAVE_STATE_KEY,           MENU_ENUM_LABEL_VALUE_INPUT_META_SAVE_STATE_KEY,        RETROK_F2,        NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_FULLSCREEN_TOGGLE_KEY,    MENU_ENUM_LABEL_VALUE_INPUT_META_FULLSCREEN_TOGGLE_KEY, RETROK_f,         NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_QUIT_KEY,                 MENU_ENUM_LABEL_VALUE_INPUT_META_QUIT_KEY,              RETROK_ESCAPE,    NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_STATE_SLOT_PLUS,          MENU_ENUM_LABEL_VALUE_INPUT_META_STATE_SLOT_PLUS,       RETROK_F7,        NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_STATE_SLOT_MINUS,         MENU_ENUM_LABEL_VALUE_INPUT_META_STATE_SLOT_MINUS,      RETROK_F6,        NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_REWIND,                   MENU_ENUM_LABEL_VALUE_INPUT_META_REWIND,                RETROK_r,         NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_BSV_RECORD_TOGGLE,        MENU_ENUM_LABEL_VALUE_INPUT_META_BSV_RECORD_TOGGLE,     RETROK_o,         NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_PAUSE_TOGGLE,             MENU_ENUM_LABEL_VALUE_INPUT_META_PAUSE_TOGGLE,          RETROK_p,         NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_FRAMEADVANCE,             MENU_ENUM_LABEL_VALUE_INPUT_META_FRAMEADVANCE,          RETROK_k,         NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_RESET,                    MENU_ENUM_LABEL_VALUE_INPUT_META_RESET,                 RETROK_h,         NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_SHADER_NEXT,              MENU_ENUM_LABEL_VALUE_INPUT_META_SHADER_NEXT,           RETROK_m,         NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_SHADER_PREV,              MENU_ENUM_LABEL_VALUE_INPUT_META_SHADER_PREV,           RETROK_n,         NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_CHEAT_INDEX_PLUS,         MENU_ENUM_LABEL_VALUE_INPUT_META_CHEAT_INDEX_PLUS,      RETROK_y,         NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_CHEAT_INDEX_MINUS,        MENU_ENUM_LABEL_VALUE_INPUT_META_CHEAT_INDEX_MINUS,     RETROK_t,         NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_CHEAT_TOGGLE,             MENU_ENUM_LABEL_VALUE_INPUT_META_CHEAT_TOGGLE,          RETROK_u,         NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_SCREENSHOT,               MENU_ENUM_LABEL_VALUE_INPUT_META_SCREENSHOT,            RETROK_F8,        NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_MUTE,                     MENU_ENUM_LABEL_VALUE_INPUT_META_MUTE,                  RETROK_F9,        NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_OSK,                      MENU_ENUM_LABEL_VALUE_INPUT_META_OSK,                   RETROK_F12,       NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_FPS_TOGGLE,               MENU_ENUM_LABEL_VALUE_INPUT_META_FPS_TOGGLE,            RETROK_F3,        NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_SEND_DEBUG_INFO,          MENU_ENUM_LABEL_VALUE_INPUT_META_SEND_DEBUG_INFO,       RETROK_F10,       NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_NETPLAY_HOST_TOGGLE,      MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_HOST_TOGGLE,   RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_NETPLAY_GAME_WATCH,       MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_GAME_WATCH,    RETROK_i,         NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_ENABLE_HOTKEY,            MENU_ENUM_LABEL_VALUE_INPUT_META_ENABLE_HOTKEY,         RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_VOLUME_UP,                MENU_ENUM_LABEL_VALUE_INPUT_META_VOLUME_UP,             RETROK_KP_PLUS,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_VOLUME_DOWN,              MENU_ENUM_LABEL_VALUE_INPUT_META_VOLUME_DOWN,           RETROK_KP_MINUS,  NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_OVERLAY_NEXT,             MENU_ENUM_LABEL_VALUE_INPUT_META_OVERLAY_NEXT,          RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_DISK_EJECT_TOGGLE,        MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_EJECT_TOGGLE,     RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_DISK_NEXT,                MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_NEXT,             RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_DISK_PREV,                MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_PREV,             RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_GRAB_MOUSE_TOGGLE,        MENU_ENUM_LABEL_VALUE_INPUT_META_GRAB_MOUSE_TOGGLE,     RETROK_F11,       NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_GAME_FOCUS_TOGGLE,        MENU_ENUM_LABEL_VALUE_INPUT_META_GAME_FOCUS_TOGGLE,     RETROK_SCROLLOCK, NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_UI_COMPANION_TOGGLE,      MENU_ENUM_LABEL_VALUE_INPUT_META_UI_COMPANION_TOGGLE,   RETROK_F5,        NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_MENU_TOGGLE,              MENU_ENUM_LABEL_VALUE_INPUT_META_MENU_TOGGLE,           RETROK_F1,        NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_RECORDING_TOGGLE,         MENU_ENUM_LABEL_VALUE_INPUT_META_RECORDING_TOGGLE,      RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_STREAMING_TOGGLE,         MENU_ENUM_LABEL_VALUE_INPUT_META_STREAMING_TOGGLE,      RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_AI_SERVICE,               MENU_ENUM_LABEL_VALUE_INPUT_META_AI_SERVICE,            RETROK_UNKNOWN,   NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },

-   { true, RARCH_FAST_FORWARD_KEY,         MENU_ENUM_LABEL_VALUE_INPUT_META_FAST_FORWARD_KEY,     RETROK_SPACE,   NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_FAST_FORWARD_HOLD_KEY,    MENU_ENUM_LABEL_VALUE_INPUT_META_FAST_FORWARD_HOLD_KEY,RETROK_l,       NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_SLOWMOTION_KEY,           MENU_ENUM_LABEL_VALUE_INPUT_META_SLOWMOTION_KEY,       RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_SLOWMOTION_HOLD_KEY,      MENU_ENUM_LABEL_VALUE_INPUT_META_SLOWMOTION_KEY,       RETROK_e,       NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_LOAD_STATE_KEY,           MENU_ENUM_LABEL_VALUE_INPUT_META_LOAD_STATE_KEY,       RETROK_F4,      NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_SAVE_STATE_KEY,           MENU_ENUM_LABEL_VALUE_INPUT_META_SAVE_STATE_KEY,       RETROK_F2,      NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_FULLSCREEN_TOGGLE_KEY,    MENU_ENUM_LABEL_VALUE_INPUT_META_FULLSCREEN_TOGGLE_KEY,RETROK_f,       NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_QUIT_KEY,                 MENU_ENUM_LABEL_VALUE_INPUT_META_QUIT_KEY,             RETROK_ESCAPE,  NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_STATE_SLOT_PLUS,          MENU_ENUM_LABEL_VALUE_INPUT_META_STATE_SLOT_PLUS,      RETROK_F7,      NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_STATE_SLOT_MINUS,         MENU_ENUM_LABEL_VALUE_INPUT_META_STATE_SLOT_MINUS,     RETROK_F6,      NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_REWIND,                   MENU_ENUM_LABEL_VALUE_INPUT_META_REWIND,               RETROK_r,       NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_BSV_RECORD_TOGGLE,        MENU_ENUM_LABEL_VALUE_INPUT_META_BSV_RECORD_TOGGLE,  RETROK_o,       NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_PAUSE_TOGGLE,             MENU_ENUM_LABEL_VALUE_INPUT_META_PAUSE_TOGGLE,         RETROK_p,       NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_FRAMEADVANCE,             MENU_ENUM_LABEL_VALUE_INPUT_META_FRAMEADVANCE,         RETROK_k,       NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_RESET,                    MENU_ENUM_LABEL_VALUE_INPUT_META_RESET,                RETROK_h,       NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_SHADER_NEXT,              MENU_ENUM_LABEL_VALUE_INPUT_META_SHADER_NEXT,          RETROK_m,       NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_SHADER_PREV,              MENU_ENUM_LABEL_VALUE_INPUT_META_SHADER_PREV,          RETROK_n,       NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_CHEAT_INDEX_PLUS,         MENU_ENUM_LABEL_VALUE_INPUT_META_CHEAT_INDEX_PLUS,     RETROK_y,       NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_CHEAT_INDEX_MINUS,        MENU_ENUM_LABEL_VALUE_INPUT_META_CHEAT_INDEX_MINUS,    RETROK_t,       NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_CHEAT_TOGGLE,             MENU_ENUM_LABEL_VALUE_INPUT_META_CHEAT_TOGGLE,         RETROK_u,       NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { 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 },
-   { true, RARCH_VOLUME_DOWN,              MENU_ENUM_LABEL_VALUE_INPUT_META_VOLUME_DOWN,          RETROK_KP_MINUS,NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_OVERLAY_NEXT,             MENU_ENUM_LABEL_VALUE_INPUT_META_OVERLAY_NEXT,         RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_DISK_EJECT_TOGGLE,        MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_EJECT_TOGGLE,    RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_DISK_NEXT,                MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_NEXT,            RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_DISK_PREV,                MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_PREV,            RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_GRAB_MOUSE_TOGGLE,        MENU_ENUM_LABEL_VALUE_INPUT_META_GRAB_MOUSE_TOGGLE,    RETROK_F11,     NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { 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
 };

 /* Users 2 to MAX_USERS */
 static const struct retro_keybind retro_keybinds_rest[] = {
-    /*     | RetroPad button              | desc                                             | keyboard key  | js btn   | js axis | */
-   { true, RETRO_DEVICE_ID_JOYPAD_B,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_B,              RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_Y,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_Y,              RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_SELECT, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_SELECT,         RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_START,  MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_START,          RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_UP,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_UP,             RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_DOWN,   MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_DOWN,           RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_LEFT,   MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_LEFT,           RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_RIGHT,  MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_RIGHT,          RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_A,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_A,              RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_X,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_X,              RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_L,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L,              RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_R,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R,              RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_L2,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L2,             RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_R2,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R2,             RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_L3,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L3,             RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_R3,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R3,             RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+    /*     | RetroPad button              | desc                                            | keyboard key  | js btn   | js axis | */
+   { true, RETRO_DEVICE_ID_JOYPAD_B,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_B,             RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RETRO_DEVICE_ID_JOYPAD_Y,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_Y,             RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RETRO_DEVICE_ID_JOYPAD_SELECT, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_SELECT,        RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RETRO_DEVICE_ID_JOYPAD_START,  MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_START,         RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RETRO_DEVICE_ID_JOYPAD_UP,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_UP,            RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RETRO_DEVICE_ID_JOYPAD_DOWN,   MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_DOWN,          RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RETRO_DEVICE_ID_JOYPAD_LEFT,   MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_LEFT,          RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RETRO_DEVICE_ID_JOYPAD_RIGHT,  MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_RIGHT,         RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RETRO_DEVICE_ID_JOYPAD_A,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_A,             RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RETRO_DEVICE_ID_JOYPAD_X,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_X,             RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RETRO_DEVICE_ID_JOYPAD_L,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L,             RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RETRO_DEVICE_ID_JOYPAD_R,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R,             RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RETRO_DEVICE_ID_JOYPAD_L2,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L2,            RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RETRO_DEVICE_ID_JOYPAD_R2,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R2,            RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RETRO_DEVICE_ID_JOYPAD_L3,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L3,            RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RETRO_DEVICE_ID_JOYPAD_R3,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R3,            RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },

-   { true, RARCH_ANALOG_LEFT_X_PLUS,      MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_X_PLUS,    RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_ANALOG_LEFT_X_MINUS,     MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_X_MINUS,   RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_ANALOG_LEFT_Y_PLUS,      MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_Y_PLUS,    RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_ANALOG_LEFT_Y_MINUS,     MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_Y_MINUS,   RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_ANALOG_RIGHT_X_PLUS,     MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_X_PLUS,   RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_ANALOG_RIGHT_X_MINUS,    MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_X_MINUS,  RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_ANALOG_RIGHT_Y_PLUS,     MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_Y_PLUS,   RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_ANALOG_RIGHT_Y_MINUS,    MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_Y_MINUS,  RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_ANALOG_LEFT_X_PLUS,      MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_X_PLUS,   RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_ANALOG_LEFT_X_MINUS,     MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_X_MINUS,  RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_ANALOG_LEFT_Y_PLUS,      MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_Y_PLUS,   RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_ANALOG_LEFT_Y_MINUS,     MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_Y_MINUS,  RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_ANALOG_RIGHT_X_PLUS,     MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_X_PLUS,  RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_ANALOG_RIGHT_X_MINUS,    MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_X_MINUS, RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_ANALOG_RIGHT_Y_PLUS,     MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_Y_PLUS,  RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_ANALOG_RIGHT_Y_MINUS,    MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_Y_MINUS, RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },

-   { true, RARCH_LIGHTGUN_TRIGGER,        MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_TRIGGER,      RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_LIGHTGUN_RELOAD,         MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_RELOAD,       RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_LIGHTGUN_AUX_A,          MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_AUX_A,        RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_LIGHTGUN_AUX_B,          MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_AUX_B,        RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_LIGHTGUN_AUX_C,          MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_AUX_C,        RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_LIGHTGUN_START,          MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_START,        RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_LIGHTGUN_SELECT,         MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_SELECT,       RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_LIGHTGUN_DPAD_UP,        MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_DPAD_UP,      RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_LIGHTGUN_DPAD_DOWN,      MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_DPAD_DOWN,    RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_LIGHTGUN_DPAD_LEFT,      MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_DPAD_LEFT,    RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_LIGHTGUN_DPAD_RIGHT,     MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_DPAD_RIGHT,   RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_LIGHTGUN_TRIGGER,        MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_TRIGGER,     RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_LIGHTGUN_RELOAD,         MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_RELOAD,      RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_LIGHTGUN_AUX_A,          MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_AUX_A,       RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_LIGHTGUN_AUX_B,          MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_AUX_B,       RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_LIGHTGUN_AUX_C,          MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_AUX_C,       RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_LIGHTGUN_START,          MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_START,       RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_LIGHTGUN_SELECT,         MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_SELECT,      RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_LIGHTGUN_DPAD_UP,        MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_DPAD_UP,     RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_LIGHTGUN_DPAD_DOWN,      MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_DPAD_DOWN,   RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_LIGHTGUN_DPAD_LEFT,      MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_DPAD_LEFT,   RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
+   { true, RARCH_LIGHTGUN_DPAD_RIGHT,     MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_DPAD_RIGHT,  RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },

-   { true, RARCH_TURBO_ENABLE,            MENU_ENUM_LABEL_VALUE_INPUT_TURBO_ENABLE,          RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_TURBO_ENABLE,            MENU_ENUM_LABEL_VALUE_INPUT_TURBO_ENABLE,         RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE, AXIS_NONE, AXIS_NONE, NULL, NULL },
 };

 #endif
@@ -9,345 +9,345 @@
 #endif

 #ifdef HAVE_OVERLAY
-static const bool _overlay_supp = true;
+#define SUPPORTS_OVERLAY true
 #else
-static const bool _overlay_supp = false;
+#define SUPPORTS_OVERLAY false
 #endif

 #ifdef HAVE_V4L2
-static const bool _v4l2_supp = true;
+#define SUPPORTS_V4L2 true
 #else
-static const bool _v4l2_supp = false;
+#define SUPPORTS_V4L2 false
 #endif

 #ifdef HAVE_COMMAND
-static const bool _command_supp = true;
+#define SUPPORTS_COMMAND true
 #else
-static const bool _command_supp = false;
+#define SUPPORTS_COMMAND false
 #endif

 #ifdef HAVE_NETWORK_CMD
-static const bool _network_command_supp = true;
+#define SUPPORTS_NETWORK_COMMAND true
 #else
-static const bool _network_command_supp = false;
+#define SUPPORTS_NETWORK_COMMAND false
 #endif

 #ifdef HAVE_NETWORKGAMEPAD
-static const bool _network_gamepad_supp = true;
+#define SUPPORTS_NETWORK_GAMEPAD true
 #else
-static const bool _network_gamepad_supp = false;
+#define SUPPORTS_NETWORK_GAMEPAD false
 #endif

 #ifdef HAVE_FILTERS_BUILTIN
-static const bool _cpu_filters = true;
+#define SUPPORTS_CPU_FILTERS true
 #else
-static const bool _cpu_filters = false;
+#define SUPPORTS_CPU_FILTERS false
 #endif

 #ifdef HAVE_LIBUSB
-static const bool _libusb_supp = true;
+#define SUPPORTS_LIBUSB true
 #else
-static const bool _libusb_supp = false;
+#define SUPPORTS_LIBUSB false
 #endif

 #ifdef HAVE_SDL
-static const bool _sdl_supp = true;
+#define SUPPORTS_SDL true
 #else
-static const bool _sdl_supp = false;
+#define SUPPORTS_SDL false
 #endif

 #ifdef HAVE_SDL2
-static const bool _sdl2_supp = true;
+#define SUPPORTS_SDL2 true
 #else
-static const bool _sdl2_supp = false;
+#define SUPPORTS_SDL2 false
 #endif

 #ifdef HAVE_THREADS
-static const bool _thread_supp = true;
+#define SUPPORTS_THREAD true
 #else
-static const bool _thread_supp = false;
+#define SUPPORTS_THREAD false
 #endif

 #ifdef HAVE_OPENGL
-static const bool _opengl_supp = true;
+#define SUPPORTS_OPENGL true
 #else
-static const bool _opengl_supp = false;
+#define SUPPORTS_OPENGL false
 #endif

 #ifdef HAVE_VULKAN
-static const bool _vulkan_supp = true;
+#define SUPPORTS_VULKAN true
 #else
-static const bool _vulkan_supp = false;
+#define SUPPORTS_VULKAN false
 #endif

 #ifdef HAVE_METAL
-static const bool _metal_supp = true;
+#define SUPPORTS_METAL true
 #else
-static const bool _metal_supp = false;
+#define SUPPORTS_METAL false
 #endif

 #if defined(HAVE_OPENGLES) || defined(HAVE_OPENGLES2) || defined(HAVE_OPENGLES3) || defined(HAVE_OPENGLES_3_1) || defined(HAVE_OPENGLES_3_2)
-static const bool _opengles_supp = true;
+#define SUPPORTS_OPENGLES true
 #else
-static const bool _opengles_supp = false;
+#define SUPPORTS_OPENGLES false
 #endif

 #ifdef HAVE_KMS
-static const bool _kms_supp = true;
+#define SUPPORTS_KMS true
 #else
-static const bool _kms_supp = false;
+#define SUPPORTS_KMS false
 #endif

 #ifdef HAVE_UDEV
-static const bool _udev_supp = true;
+#define SUPPORTS_UDEV true
 #else
-static const bool _udev_supp = false;
+#define SUPPORTS_UDEV false
 #endif

 #ifdef HAVE_VG
-static const bool _vg_supp = true;
+#define SUPPORTS_VG true
 #else
-static const bool _vg_supp = false;
+#define SUPPORTS_VG false
 #endif

 #ifdef HAVE_EGL
-static const bool _egl_supp = true;
+#define SUPPORTS_EGL true
 #else
-static const bool _egl_supp = false;
+#define SUPPORTS_EGL false
 #endif

 #ifdef HAVE_X11
-static const bool _x11_supp = true;
+#define SUPPORTS_X11 true
 #else
-static const bool _x11_supp = false;
+#define SUPPORTS_X11 false
 #endif

 #ifdef HAVE_WAYLAND
-static const bool _wayland_supp = true;
+#define SUPPORTS_WAYLAND true
 #else
-static const bool _wayland_supp = false;
+#define SUPPORTS_WAYLAND false
 #endif

 #ifdef HAVE_XVIDEO
-static const bool _xvideo_supp = true;
+#define SUPPORTS_XVIDEO true
 #else
-static const bool _xvideo_supp = false;
+#define SUPPORTS_XVIDEO false
 #endif

 #ifdef HAVE_ALSA
-static const bool _alsa_supp = true;
+#define SUPPORTS_ALSA true
 #else
-static const bool _alsa_supp = false;
+#define SUPPORTS_ALSA false
 #endif

 #ifdef HAVE_TINYALSA
-static const bool _tinyalsa_supp = true;
+#define SUPPORTS_TINYALSA true
 #else
-static const bool _tinyalsa_supp = false;
+#define SUPPORTS_TINYALSA false
 #endif

 #ifdef HAVE_COREAUDIO
-static const bool _coreaudio_supp = true;
+#define SUPPORTS_COREAUDIO true
 #else
-static const bool _coreaudio_supp = false;
+#define SUPPORTS_COREAUDIO false
 #endif

 #ifdef HAVE_COREAUDIO3
-static const bool _coreaudio3_supp = true;
+#define SUPPORTS_COREAUDIO3 true
 #else
-static const bool _coreaudio3_supp = false;
+#define SUPPORTS_COREAUDIO3 false
 #endif

 #if defined(HAVE_OSS) || defined(HAVE_OSS_BSD)
-static const bool _oss_supp = true;
+#define SUPPORTS_OSS true
 #else
-static const bool _oss_supp = false;
+#define SUPPORTS_OSS false
 #endif

 #ifdef HAVE_AL
-static const bool _al_supp = true;
+#define SUPPORTS_AL true
 #else
-static const bool _al_supp = false;
+#define SUPPORTS_AL false
 #endif

 #ifdef HAVE_SL
-static const bool _sl_supp = true;
+#define SUPPORTS_SL true
 #else
-static const bool _sl_supp = false;
+#define SUPPORTS_SL false
 #endif

 #ifdef HAVE_LIBRETRODB
-static const bool _libretrodb_supp = true;
+#define SUPPORTS_LIBRETRODB true
 #else
-static const bool _libretrodb_supp = false;
+#define SUPPORTS_LIBRETRODB false
 #endif

 #ifdef HAVE_RSOUND
-static const bool _rsound_supp = true;
+#define SUPPORTS_RSOUND true
 #else
-static const bool _rsound_supp = false;
+#define SUPPORTS_RSOUND false
 #endif

 #ifdef HAVE_ROAR
-static const bool _roar_supp = true;
+#define SUPPORTS_ROAR true
 #else
-static const bool _roar_supp = false;
+#define SUPPORTS_ROAR false
 #endif

 #ifdef HAVE_JACK
-static const bool _jack_supp = true;
+#define SUPPORTS_JACK true
 #else
-static const bool _jack_supp = false;
+#define SUPPORTS_JACK false
 #endif

 #ifdef HAVE_PULSE
-static const bool _pulse_supp = true;
+#define SUPPORTS_PULSE true
 #else
-static const bool _pulse_supp = false;
+#define SUPPORTS_PULSE false
 #endif

 #ifdef HAVE_DSOUND
-static const bool _dsound_supp = true;
+#define SUPPORTS_DSOUND true
 #else
-static const bool _dsound_supp = false;
+#define SUPPORTS_DSOUND false
 #endif

 #ifdef HAVE_WASAPI
-static const bool _wasapi_supp = true;
+#define SUPPORTS_WASAPI true
 #else
-static const bool _wasapi_supp = false;
+#define SUPPORTS_WASAPI false
 #endif

 #ifdef HAVE_XAUDIO
-static const bool _xaudio_supp = true;
+#define SUPPORTS_XAUDIO true
 #else
-static const bool _xaudio_supp = false;
+#define SUPPORTS_XAUDIO false
 #endif

 #ifdef HAVE_ZLIB
-static const bool _zlib_supp = true;
+#define SUPPORTS_ZLIB true
 #else
-static const bool _zlib_supp = false;
+#define SUPPORTS_ZLIB false
 #endif

 #ifdef HAVE_7ZIP
-static const bool _7zip_supp = true;
+#define SUPPORTS_7ZIP true
 #else
-static const bool _7zip_supp = false;
+#define SUPPORTS_7ZIP false
 #endif

 #ifdef HAVE_DYLIB
-static const bool _dylib_supp = true;
+#define SUPPORTS_DYLIB true
 #else
-static const bool _dylib_supp = false;
+#define SUPPORTS_DYLIB false
 #endif

 #ifdef HAVE_CG
-static const bool _cg_supp = true;
+#define SUPPORTS_CG true
 #else
-static const bool _cg_supp = false;
+#define SUPPORTS_CG false
 #endif

 #ifdef HAVE_GLSL
-static const bool _glsl_supp = true;
+#define SUPPORTS_GLSL true
 #else
-static const bool _glsl_supp = false;
+#define SUPPORTS_GLSL false
 #endif

 #ifdef HAVE_HLSL
-static const bool _hlsl_supp = true;
+#define SUPPORTS_HLSL true
 #else
-static const bool _hlsl_supp = false;
+#define SUPPORTS_HLSL false
 #endif

 #ifdef HAVE_SDL_IMAGE
-static const bool _sdl_image_supp = true;
+#define SUPPORTS_SDL_IMAGE true
 #else
-static const bool _sdl_image_supp = false;
+#define SUPPORTS_SDL_IMAGE false
 #endif

 #ifdef HAVE_DYNAMIC
-static const bool _dynamic_supp = true;
+#define SUPPORTS_DYNAMIC true
 #else
-static const bool _dynamic_supp = false;
+#define SUPPORTS_DYNAMIC false
 #endif

 #ifdef HAVE_FFMPEG
-static const bool _ffmpeg_supp = true;
+#define SUPPORTS_FFMPEG true
 #else
-static const bool _ffmpeg_supp = false;
+#define SUPPORTS_FFMPEG false
 #endif

 #ifdef HAVE_MPV
-static const bool _mpv_supp = true;
+#define SUPPORTS_MPV true
 #else
-static const bool _mpv_supp = false;
+#define SUPPORTS_MPV false
 #endif

 #ifdef HAVE_FREETYPE
-static const bool _freetype_supp = true;
+#define SUPPORTS_FREETYPE true
 #else
-static const bool _freetype_supp = false;
+#define SUPPORTS_FREETYPE false
 #endif

 #ifdef HAVE_STB_FONT
-static const bool _stbfont_supp = true;
+#define SUPPORTS_STBFONT true
 #else
-static const bool _stbfont_supp = false;
+#define SUPPORTS_STBFONT false
 #endif

 #ifdef HAVE_NETWORKING
-static const bool _netplay_supp = true;
+#define SUPPORTS_NETPLAY true
 #else
-static const bool _netplay_supp = false;
+#define SUPPORTS_NETPLAY false
 #endif

 #ifdef HAVE_PYTHON
-static const bool _python_supp = true;
+#define SUPPORTS_PYTHON true
 #else
-static const bool _python_supp = false;
+#define SUPPORTS_PYTHON false
 #endif

 #if defined(HAVE_COCOA) || defined(HAVE_COCOATOUCH) || defined(HAVE_COCOA_METAL)
-static const bool _cocoa_supp = true;
+#define SUPPORTS_COCOA true
 #else
-static const bool _cocoa_supp = false;
+#define SUPPORTS_COCOA false
 #endif

 #ifdef HAVE_QT
-static const bool _qt_supp = true;
+#define SUPPORTS_QT true
 #else
-static const bool _qt_supp = false;
+#define SUPPORTS_QT false
 #endif

 #ifdef HAVE_RPNG
-static const bool _rpng_supp = true;
+#define SUPPORTS_RPNG true
 #else
-static const bool _rpng_supp = false;
+#define SUPPORTS_RPNG false
 #endif

 #ifdef HAVE_RJPEG
-static const bool _rjpeg_supp = true;
+#define SUPPORTS_RJPEG true
 #else
-static const bool _rjpeg_supp = false;
+#define SUPPORTS_RJPEG false
 #endif

 #ifdef HAVE_RBMP
-static const bool _rbmp_supp = true;
+#define SUPPORTS_RBMP true
 #else
-static const bool _rbmp_supp = false;
+#define SUPPORTS_RBMP false
 #endif

 #ifdef HAVE_RTGA
-static const bool _rtga_supp = true;
+#define SUPPORTS_RTGA true
 #else
-static const bool _rtga_supp = false;
+#define SUPPORTS_RTGA false
 #endif

 #ifdef HAVE_CORETEXT
-static const bool _coretext_supp = true;
+#define SUPPORTS_CORETEXT true
 #else
-static const bool _coretext_supp = false;
+#define SUPPORTS_CORETEXT false
 #endif

 #if !defined(_WIN32) && !defined(GLOBAL_CONFIG_DIR)
@@ -106,6 +106,9 @@ typedef struct settings
      bool video_memory_show;
      bool video_msg_bgcolor_enable;
      bool video_3ds_lcd_bottom;
+#ifdef HAVE_VIDEO_LAYOUT
+      bool video_layout_enable;
+#endif

      /* Audio */
      bool audio_enable;
@@ -126,6 +129,7 @@ typedef struct settings
      bool input_overlay_enable_autopreferred;
      bool input_overlay_hide_in_menu;
      bool input_overlay_show_physical_inputs;
+      bool input_overlay_show_mouse_cursor;
      bool input_descriptor_label_show;
      bool input_descriptor_hide_unbound;
      bool input_all_users_control_menu;
@@ -135,11 +139,17 @@ typedef struct settings
      bool input_small_keyboard_enable;
      bool input_keyboard_gamepad_enable;

+      /* Frame time counter */
+      bool frame_time_counter_reset_after_fastforwarding;
+      bool frame_time_counter_reset_after_load_state;
+      bool frame_time_counter_reset_after_save_state;
+
      /* Menu */
      bool filter_by_current_core;
      bool menu_enable_widgets;
      bool menu_show_start_screen;
      bool menu_pause_libretro;
+      bool menu_savestate_resume;
      bool menu_timedate_enable;
      bool menu_battery_level_enable;
      bool menu_core_enable;
@@ -159,15 +169,22 @@ typedef struct settings
      bool menu_show_core_updater;
      bool menu_show_load_core;
      bool menu_show_load_content;
+      bool menu_show_load_disc;
+      bool menu_show_dump_disc;
      bool menu_show_information;
      bool menu_show_configurations;
      bool menu_show_help;
      bool menu_show_quit_retroarch;
+      bool menu_show_restart_retroarch;
      bool menu_show_reboot;
      bool menu_show_shutdown;
      bool menu_show_latency;
      bool menu_show_rewind;
      bool menu_show_overlays;
+      bool menu_show_legacy_thumbnail_updater;
+#ifdef HAVE_VIDEO_LAYOUT
+      bool menu_show_video_layout;
+#endif
      bool menu_materialui_icons_enable;
      bool menu_rgui_background_filler_thickness_enable;
      bool menu_rgui_border_filler_thickness_enable;
@@ -191,12 +208,37 @@ typedef struct settings
      bool menu_use_preferred_system_color_theme;
      bool menu_preferred_system_color_theme_set;
      bool menu_unified_controls;
+      bool menu_ticker_smooth;
+      bool settings_show_drivers;
+      bool settings_show_video;
+      bool settings_show_audio;
+      bool settings_show_input;
+      bool settings_show_latency;
+      bool settings_show_core;
+      bool settings_show_configuration;
+      bool settings_show_saving;
+      bool settings_show_logging;
+      bool settings_show_frame_throttle;
+      bool settings_show_recording;
+      bool settings_show_onscreen_display;
+      bool settings_show_user_interface;
+      bool settings_show_ai_service;
+      bool settings_show_power_management;
+      bool settings_show_achievements;
+      bool settings_show_network;
+      bool settings_show_playlists;
+      bool settings_show_user;
+      bool settings_show_directory;
+      bool quick_menu_show_resume_content;
+      bool quick_menu_show_restart_content;
+      bool quick_menu_show_close_content;
      bool quick_menu_show_take_screenshot;
      bool quick_menu_show_save_load_state;
      bool quick_menu_show_undo_save_load_state;
      bool quick_menu_show_add_to_favorites;
      bool quick_menu_show_start_recording;
      bool quick_menu_show_start_streaming;
+      bool quick_menu_show_set_core_association;
      bool quick_menu_show_reset_core_association;
      bool quick_menu_show_options;
      bool quick_menu_show_controls;
@@ -208,6 +250,7 @@ typedef struct settings
      bool quick_menu_show_information;
      bool quick_menu_show_recording;
      bool quick_menu_show_streaming;
+      bool quick_menu_show_download_thumbnails;
      bool kiosk_mode_enable;

      bool crt_switch_custom_refresh_enable;
@@ -224,6 +267,7 @@ typedef struct settings

      /* Network */
      bool network_buildbot_auto_extract_archive;
+      bool network_on_demand_thumbnails;

      /* UI */
      bool ui_menubar_enable;
@@ -241,7 +285,6 @@ typedef struct settings
      bool cheevos_badges_enable;
      bool cheevos_verbose_enable;
      bool cheevos_auto_screenshot;
-      bool cheevos_old_enable; /* RCHEEVOS TODO: remove line */

      /* Camera */
      bool camera_allow;
@@ -266,7 +309,6 @@ typedef struct settings
      bool set_supports_no_game_enable;
      bool auto_screenshot_filename;
      bool history_list_enable;
-      bool playlist_entry_remove;
      bool playlist_entry_rename;
      bool rewind_enable;
      bool vrr_runloop_enable;
@@ -292,6 +334,7 @@ typedef struct settings
      bool game_specific_options;
      bool auto_overrides_enable;
      bool auto_remaps_enable;
+      bool global_core_options;
      bool auto_shaders_enable;

      bool sort_savefiles_enable;
@@ -324,12 +367,14 @@ typedef struct settings
      bool vibrate_on_keypress;
      bool enable_device_vibration;
      bool ozone_collapse_sidebar;
-
+      bool ozone_truncate_playlist_name;

      bool log_to_file;
      bool log_to_file_timestamp;

      bool scan_without_core_match;
+
+      bool ai_service_enable;
   } bools;

   struct
@@ -352,6 +397,7 @@ typedef struct settings
      float menu_footer_opacity;
      float menu_header_opacity;
      float menu_ticker_speed;
+      float menu_rgui_particle_effect_speed;

      float audio_max_timing_skew;
      float audio_volume; /* dB scale. */
@@ -375,6 +421,19 @@ typedef struct settings
      int state_slot;
      int audio_wasapi_sh_buffer_length;
      int crt_switch_center_adjust;
+#ifdef HAVE_VULKAN
+      int vulkan_gpu_index;
+#endif
+#ifdef HAVE_D3D10
+      int d3d10_gpu_index;
+#endif
+#ifdef HAVE_D3D11
+      int d3d11_gpu_index;
+#endif
+#ifdef HAVE_D3D12
+      int d3d12_gpu_index;
+#endif
+      int content_favorites_size;
   } ints;

   struct
@@ -384,6 +443,8 @@ typedef struct settings
      unsigned audio_block_frames;
      unsigned audio_latency;

+      unsigned fps_update_interval;
+
      unsigned input_block_timeout;

      unsigned audio_resampler_quality;
@@ -405,6 +466,7 @@ typedef struct settings
      unsigned bundle_assets_extract_version_current;
      unsigned bundle_assets_extract_last_version;
      unsigned content_history_size;
+      unsigned frontend_log_level;
      unsigned libretro_log_level;
      unsigned rewind_granularity;
      unsigned rewind_buffer_size_step;
@@ -435,20 +497,33 @@ typedef struct settings
      unsigned video_record_scale_factor;
      unsigned video_stream_scale_factor;
      unsigned video_3ds_display_mode;
+#ifdef HAVE_VIDEO_LAYOUT
+      unsigned video_layout_selected_view;
+#endif
+#ifdef GEKKO
+      unsigned video_overscan_correction_top;
+      unsigned video_overscan_correction_bottom;
+#endif
+      unsigned video_shader_delay;

      unsigned menu_timedate_style;
      unsigned menu_thumbnails;
      unsigned menu_left_thumbnails;
+      unsigned menu_thumbnail_upscale_threshold;
      unsigned menu_rgui_thumbnail_downscaler;
      unsigned menu_rgui_thumbnail_delay;
      unsigned menu_dpi_override_value;
      unsigned menu_rgui_color_theme;
+      unsigned menu_xmb_animation_opening_main_menu;
+      unsigned menu_xmb_animation_horizontal_highlight;
+      unsigned menu_xmb_animation_move_up_down;
      unsigned menu_xmb_layout;
      unsigned menu_xmb_shader_pipeline;
      unsigned menu_xmb_scale_factor;
      unsigned menu_xmb_alpha_factor;
      unsigned menu_xmb_theme;
      unsigned menu_xmb_color_theme;
+      unsigned menu_xmb_thumbnail_scale_factor;
      unsigned menu_materialui_color_theme;
      unsigned menu_ozone_color_theme;
      unsigned menu_font_color_red;
@@ -460,6 +535,7 @@ typedef struct settings
      unsigned menu_rgui_particle_effect;
      unsigned menu_ticker_type;

+      unsigned playlist_entry_remove_enable;
      unsigned playlist_show_inline_core_name;
      unsigned playlist_sublabel_runtime_type;

@@ -496,6 +572,9 @@ typedef struct settings
      unsigned video_record_threads;

      unsigned libnx_overclock;
+      unsigned ai_service_mode;
+      unsigned ai_service_target_lang;
+      unsigned ai_service_source_lang;
   } uints;

   struct
@@ -530,8 +609,6 @@ typedef struct settings
      char audio_device[255];
      char camera_device[255];

-      char playlist_names[PATH_MAX_LENGTH];
-      char playlist_cores[PATH_MAX_LENGTH];
      char bundle_assets_src[PATH_MAX_LENGTH];
      char bundle_assets_dst[PATH_MAX_LENGTH];
      char bundle_assets_dst_subdir[PATH_MAX_LENGTH];
@@ -545,6 +622,8 @@ typedef struct settings
      char twitch_stream_key[PATH_MAX_LENGTH];

      char discord_app_id[PATH_MAX_LENGTH];
+      char translation_service_url[2048];
+      char ai_service_url[PATH_MAX_LENGTH];
   } arrays;

   struct
@@ -558,6 +637,7 @@ typedef struct settings
      char network_buildbot_url[255];
      char network_buildbot_assets_url[255];
      char browse_url[4096];
+      char path_stream_url[8192];

      char path_menu_xmb_font[PATH_MAX_LENGTH];
      char menu_content_show_settings_password[PATH_MAX_LENGTH];
@@ -565,9 +645,11 @@ typedef struct settings
      char path_cheat_database[PATH_MAX_LENGTH];
      char path_content_database[PATH_MAX_LENGTH];
      char path_overlay[PATH_MAX_LENGTH];
+#ifdef HAVE_VIDEO_LAYOUT
+      char path_video_layout[PATH_MAX_LENGTH];
+#endif
      char path_record_config[PATH_MAX_LENGTH];
      char path_stream_config[PATH_MAX_LENGTH];
-      char path_stream_url[8192];
      char path_menu_wallpaper[PATH_MAX_LENGTH];
      char path_audio_dsp_plugin[PATH_MAX_LENGTH];
      char path_softfilter_plugin[PATH_MAX_LENGTH];
@@ -579,7 +661,6 @@ typedef struct settings
      char path_content_video_history[PATH_MAX_LENGTH];
      char path_libretro_info[PATH_MAX_LENGTH];
      char path_cheat_settings[PATH_MAX_LENGTH];
-      char path_shader[PATH_MAX_LENGTH];
      char path_font[PATH_MAX_LENGTH];
      char path_rgui_theme_preset[PATH_MAX_LENGTH];

@@ -593,6 +674,9 @@ typedef struct settings
      char directory_cursor[PATH_MAX_LENGTH];
      char directory_input_remapping[PATH_MAX_LENGTH];
      char directory_overlay[PATH_MAX_LENGTH];
+#ifdef HAVE_VIDEO_LAYOUT
+      char directory_video_layout[PATH_MAX_LENGTH];
+#endif
      char directory_resampler[PATH_MAX_LENGTH];
      char directory_screenshot[PATH_MAX_LENGTH];
      char directory_system[PATH_MAX_LENGTH];
@@ -703,12 +787,12 @@ const char *config_get_midi_driver_options(void);
 const char *config_get_default_record(void);

 /**
- * config_load:
+ * config_parse_file:
 *
 * Loads a config file and reads all the values into memory.
 *
 */
-void config_load(void);
+void config_parse_file(void);

 /**
 * config_load_override:
@@ -740,17 +824,7 @@ bool config_unload_override(void);
 * Returns: false if there was an error or no action was performed.
 *
 */
-bool config_load_remap(void);
-
-/**
- * config_load_shader_preset:
- *
- * Tries to append game-specific and core-specific shader presets.
- *
- * Returns: false if there was an error or no action was performed.
- *
- */
-bool config_load_shader_preset(void);
+bool config_load_remap(const char *directory_input_remapping);

 /**
 * config_save_autoconf_profile:
@@ -785,14 +859,10 @@ bool config_save_overrides(int override_type);
 * properly. */
 bool config_replace(bool config_save_on_exit, char *path);

-bool config_init(void);
-
 bool config_overlay_enable_default(void);

 void config_set_defaults(void);

-void config_free(void);
-
 settings_t *config_get_ptr(void);

 RETRO_END_DECLS
@@ -2,14 +2,12 @@

 PACKAGE_NAME=retroarch

-cat /dev/null > config.log
-
 . qb/qb.init.sh

-. qb/qb.system.sh
-
 . qb/qb.params.sh

+. qb/qb.system.sh
+
 . qb/qb.comp.sh

 . qb/qb.libs.sh
@@ -153,10 +153,6 @@ typedef struct retro_callbacks
   retro_input_poll_t poll_cb;
 } retro_callbacks_t;

-bool core_load(unsigned poll_type_behavior);
-
-bool core_unload(void);
-
 bool core_set_default_callbacks(struct retro_callbacks *cbs);

 bool core_set_rewind_callbacks(void);
@@ -167,57 +163,27 @@ bool core_set_netplay_callbacks(void);
 bool core_unset_netplay_callbacks(void);
 #endif

-bool core_set_poll_type(unsigned *type);
+bool core_set_poll_type(unsigned type);

 /* Runs the core for one frame. */
 bool core_run(void);

-/* Runs the core for one frame, but does not trigger any input polling */
-bool core_run_no_input_polling(void);
-
-bool core_init(void);
-
-bool core_deinit(void *data);
-
-bool core_unload_game(void);
-
 bool core_reset(void);

-bool core_set_environment(retro_ctx_environ_info_t *info);
-
 bool core_serialize_size(retro_ctx_size_info_t *info);

 uint64_t core_serialization_quirks(void);

-void core_set_serialization_quirks(uint64_t quirks);
-
 bool core_serialize(retro_ctx_serialize_info_t *info);

 bool core_unserialize(retro_ctx_serialize_info_t *info);

-bool core_init_symbols(enum rarch_core_type *type);
-
 bool core_set_cheat(retro_ctx_cheat_info_t *info);

 bool core_reset_cheat(void);

-bool core_api_version(retro_ctx_api_info_t *api);
-
-/* Compare libretro core API version against API version
- * used by RetroArch.
- *
- * TODO - when libretro v2 gets added, allow for switching
- * between libretro version backend dynamically.
- */
-bool core_verify_api_version(void);
-
-bool core_get_region(retro_ctx_region_info_t *info);
-
 bool core_get_memory(retro_ctx_memory_info_t *info);

-/* Initialize system A/V information. */
-bool core_get_system_av_info(struct retro_system_av_info *av_info);
-
 /* Get system A/V information. */
 bool core_get_system_info(struct retro_system_info *system);

@@ -227,24 +193,6 @@ bool core_set_controller_port_device(retro_ctx_controller_info_t *pad);

 bool core_has_set_input_descriptor(void);

-void core_set_input_descriptors(void);
-
-void core_unset_input_descriptors(void);
-
-bool core_uninit_libretro_callbacks(void);
-
-void core_uninit_symbols(void);
-
-void core_set_input_state(retro_ctx_input_state_info_t *info);
-
-bool core_is_symbols_inited(void);
-
-bool core_is_inited(void);
-
-bool core_is_game_loaded(void);
-
-extern struct retro_callbacks retro_ctx;
-
 RETRO_END_DECLS

 #endif
@@ -1,532 +0,0 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- *  Copyright (C) 2011-2017 - Daniel De Matteis
- *  Copyright (C) 2012-2015 - Michael Lelli
- *  Copyright (C) 2016-2019 - Brad Parker
- *
- *  RetroArch is free software: you can redistribute it and/or modify it under the terms
- *  of the GNU General Public License as published by the Free Software Found-
- *  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 <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <errno.h>
-
-#include <boolean.h>
-#include <lists/string_list.h>
-#include <string/stdstring.h>
-#include <libretro.h>
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#ifdef HAVE_NETWORKING
-#include "network/netplay/netplay.h"
-#endif
-
-#include "core.h"
-#include "content.h"
-#include "dynamic.h"
-#include "msg_hash.h"
-#include "managers/state_manager.h"
-#include "verbosity.h"
-#include "gfx/video_driver.h"
-#include "audio/audio_driver.h"
-#include "tasks/tasks_internal.h"
-
-#ifdef HAVE_RUNAHEAD
-#include "runahead/copy_load_info.h"
-#include "runahead/secondary_core.h"
-#endif
-
-struct                     retro_callbacks retro_ctx;
-struct                     retro_core_t current_core;
-
-static void retro_run_null(void)
-{
-}
-
-static void retro_frame_null(const void *data, unsigned width,
-      unsigned height, size_t pitch)
-{
-}
-
-static void retro_input_poll_null(void)
-{
-}
-
-static void core_input_state_poll_maybe(void)
-{
-   if (current_core.poll_type == POLL_TYPE_NORMAL)
-      input_poll();
-}
-
-static int16_t core_input_state_poll(unsigned port,
-      unsigned device, unsigned idx, unsigned id)
-{
-   if (current_core.poll_type == POLL_TYPE_LATE)
-   {
-      if (!current_core.input_polled)
-         input_poll();
-
-      current_core.input_polled = true;
-   }
-   return input_state(port, device, idx, id);
-}
-
-void core_set_input_state(retro_ctx_input_state_info_t *info)
-{
-   current_core.retro_set_input_state(info->cb);
-}
-
-/**
- * core_init_libretro_cbs:
- * @data           : pointer to retro_callbacks object
- *
- * Initializes libretro callbacks, and binds the libretro callbacks
- * to default callback functions.
- **/
-static bool core_init_libretro_cbs(struct retro_callbacks *cbs)
-{
-   current_core.retro_set_video_refresh(video_driver_frame);
-   current_core.retro_set_audio_sample(audio_driver_sample);
-   current_core.retro_set_audio_sample_batch(audio_driver_sample_batch);
-   current_core.retro_set_input_state(core_input_state_poll);
-   current_core.retro_set_input_poll(core_input_state_poll_maybe);
-
-   core_set_default_callbacks(cbs);
-
-#ifdef HAVE_NETWORKING
-   if (!netplay_driver_ctl(RARCH_NETPLAY_CTL_IS_DATA_INITED, NULL))
-      return true;
-
-   core_set_netplay_callbacks();
-#endif
-
-   return true;
-}
-
-/**
- * core_set_default_callbacks:
- * @data           : pointer to retro_callbacks object
- *
- * Binds the libretro callbacks to default callback functions.
- **/
-bool core_set_default_callbacks(struct retro_callbacks *cbs)
-{
-   cbs->frame_cb        = video_driver_frame;
-   cbs->sample_cb       = audio_driver_sample;
-   cbs->sample_batch_cb = audio_driver_sample_batch;
-   cbs->state_cb        = core_input_state_poll;
-   cbs->poll_cb         = input_poll;
-
-   return true;
-}
-
-bool core_deinit(void *data)
-{
-   struct retro_callbacks *cbs = (struct retro_callbacks*)data;
-
-   if (!cbs)
-      return false;
-
-   cbs->frame_cb        = retro_frame_null;
-   cbs->sample_cb       = NULL;
-   cbs->sample_batch_cb = NULL;
-   cbs->state_cb        = NULL;
-   cbs->poll_cb         = retro_input_poll_null;
-
-   current_core.inited  = false;
-
-   return true;
-}
-
-bool core_uninit_libretro_callbacks(void)
-{
-   return core_deinit(&retro_ctx);
-}
-
-/**
- * core_set_rewind_callbacks:
- *
- * Sets the audio sampling callbacks based on whether or not
- * rewinding is currently activated.
- **/
-bool core_set_rewind_callbacks(void)
-{
-   if (state_manager_frame_is_reversed())
-   {
-      current_core.retro_set_audio_sample(audio_driver_sample_rewind);
-      current_core.retro_set_audio_sample_batch(audio_driver_sample_batch_rewind);
-   }
-   else
-   {
-      current_core.retro_set_audio_sample(audio_driver_sample);
-      current_core.retro_set_audio_sample_batch(audio_driver_sample_batch);
-   }
-   return true;
-}
-
-#ifdef HAVE_NETWORKING
-/**
- * core_set_netplay_callbacks:
- *
- * Set the I/O callbacks to use netplay's interceding callback system. Should
- * only be called while initializing netplay.
- **/
-bool core_set_netplay_callbacks(void)
-{
-   /* Force normal poll type for netplay. */
-   current_core.poll_type = POLL_TYPE_NORMAL;
-
-   /* And use netplay's interceding callbacks */
-   current_core.retro_set_video_refresh(video_frame_net);
-   current_core.retro_set_audio_sample(audio_sample_net);
-   current_core.retro_set_audio_sample_batch(audio_sample_batch_net);
-   current_core.retro_set_input_state(input_state_net);
-
-   return true;
-}
-
-/**
- * core_unset_netplay_callbacks
- *
- * Unset the I/O callbacks from having used netplay's interceding callback
- * system. Should only be called while uninitializing netplay.
- */
-bool core_unset_netplay_callbacks(void)
-{
-   struct retro_callbacks cbs;
-   if (!core_set_default_callbacks(&cbs))
-      return false;
-
-   current_core.retro_set_video_refresh(cbs.frame_cb);
-   current_core.retro_set_audio_sample(cbs.sample_cb);
-   current_core.retro_set_audio_sample_batch(cbs.sample_batch_cb);
-   current_core.retro_set_input_state(cbs.state_cb);
-
-   return true;
-}
-#endif
-
-bool core_set_cheat(retro_ctx_cheat_info_t *info)
-{
-   current_core.retro_cheat_set(info->index, info->enabled, info->code);
-   return true;
-}
-
-bool core_reset_cheat(void)
-{
-   current_core.retro_cheat_reset();
-   return true;
-}
-
-bool core_api_version(retro_ctx_api_info_t *api)
-{
-   if (!api)
-      return false;
-   api->version = current_core.retro_api_version();
-   return true;
-}
-
-bool core_set_poll_type(unsigned *type)
-{
-   current_core.poll_type = *type;
-   return true;
-}
-
-void core_uninit_symbols(void)
-{
-   uninit_libretro_sym(&current_core);
-   current_core.symbols_inited = false;
-}
-
-bool core_init_symbols(enum rarch_core_type *type)
-{
-   if (!type || !init_libretro_sym(*type, &current_core))
-      return false;
-
-   if (!current_core.retro_run)
-      current_core.retro_run = retro_run_null;
-   current_core.symbols_inited = true;
-   return true;
-}
-
-bool core_set_controller_port_device(retro_ctx_controller_info_t *pad)
-{
-   if (!pad)
-      return false;
-
-#ifdef HAVE_RUNAHEAD
-   remember_controller_port_device(pad->port, pad->device);
-#endif
-
-   current_core.retro_set_controller_port_device(pad->port, pad->device);
-   return true;
-}
-
-bool core_get_memory(retro_ctx_memory_info_t *info)
-{
-   if (!info)
-      return false;
-   info->size  = current_core.retro_get_memory_size(info->id);
-   info->data  = current_core.retro_get_memory_data(info->id);
-   return true;
-}
-
-bool core_load_game(retro_ctx_load_content_info_t *load_info)
-{
-   bool contentless = false;
-   bool is_inited   = false;
-
-   video_driver_set_cached_frame_ptr(NULL);
-
-#ifdef HAVE_RUNAHEAD
-   set_load_content_info(load_info);
-   clear_controller_port_map();
-#endif
-
-   content_get_status(&contentless, &is_inited);
-   set_save_state_in_background(false);
-
-   if (load_info && load_info->special)
-      current_core.game_loaded = current_core.retro_load_game_special(
-            load_info->special->id, load_info->info, load_info->content->size);
-   else if (load_info && !string_is_empty(load_info->content->elems[0].data))
-      current_core.game_loaded = current_core.retro_load_game(load_info->info);
-   else if (contentless)
-      current_core.game_loaded = current_core.retro_load_game(NULL);
-   else
-      current_core.game_loaded = false;
-
-   return current_core.game_loaded;
-}
-
-bool core_get_system_info(struct retro_system_info *system)
-{
-   if (!system)
-      return false;
-   current_core.retro_get_system_info(system);
-   return true;
-}
-
-bool core_unserialize(retro_ctx_serialize_info_t *info)
-{
-   if (!info || !current_core.retro_unserialize(info->data_const, info->size))
-      return false;
-
-#if HAVE_NETWORKING
-   netplay_driver_ctl(RARCH_NETPLAY_CTL_LOAD_SAVESTATE, info);
-#endif
-
-   return true;
-}
-
-bool core_serialize(retro_ctx_serialize_info_t *info)
-{
-   if (!info || !current_core.retro_serialize(info->data, info->size))
-      return false;
-   return true;
-}
-
-bool core_serialize_size(retro_ctx_size_info_t *info)
-{
-   if (!info)
-      return false;
-   info->size = current_core.retro_serialize_size();
-   return true;
-}
-
-uint64_t core_serialization_quirks(void)
-{
-   return current_core.serialization_quirks_v;
-}
-
-void core_set_serialization_quirks(uint64_t quirks)
-{
-   current_core.serialization_quirks_v = quirks;
-}
-
-bool core_set_environment(retro_ctx_environ_info_t *info)
-{
-   if (!info)
-      return false;
-   current_core.retro_set_environment(info->env);
-   return true;
-}
-
-bool core_get_system_av_info(struct retro_system_av_info *av_info)
-{
-   if (!av_info)
-      return false;
-   current_core.retro_get_system_av_info(av_info);
-   return true;
-}
-
-bool core_reset(void)
-{
-   video_driver_set_cached_frame_ptr(NULL);
-
-   current_core.retro_reset();
-   return true;
-}
-
-bool core_init(void)
-{
-   video_driver_set_cached_frame_ptr(NULL);
-
-   current_core.retro_init();
-   current_core.inited          = true;
-   return true;
-}
-
-bool core_unload(void)
-{
-   video_driver_set_cached_frame_ptr(NULL);
-
-   if (current_core.inited)
-      current_core.retro_deinit();
-
-   return true;
-}
-
-bool core_unload_game(void)
-{
-   video_driver_free_hw_context();
-
-   video_driver_set_cached_frame_ptr(NULL);
-
-   if (current_core.game_loaded)
-   {
-      current_core.retro_unload_game();
-      current_core.game_loaded = false;
-   }
-
-   audio_driver_stop();
-
-   return true;
-}
-
-bool core_run(void)
-{
-#ifdef HAVE_NETWORKING
-   if (!netplay_driver_ctl(RARCH_NETPLAY_CTL_PRE_FRAME, NULL))
-   {
-      /* Paused due to netplay. We must poll and display something so that a
-       * netplay peer pausing doesn't just hang. */
-      input_poll();
-      video_driver_cached_frame();
-      return true;
-   }
-#endif
-
-   switch (current_core.poll_type)
-   {
-      case POLL_TYPE_EARLY:
-         input_poll();
-         break;
-      case POLL_TYPE_LATE:
-         current_core.input_polled = false;
-         break;
-      default:
-         break;
-   }
-
-   current_core.retro_run();
-
-   if (current_core.poll_type == POLL_TYPE_LATE && !current_core.input_polled)
-      input_poll();
-
-#ifdef HAVE_NETWORKING
-   netplay_driver_ctl(RARCH_NETPLAY_CTL_POST_FRAME, NULL);
-#endif
-
-   return true;
-}
-
-bool core_run_no_input_polling(void)
-{
-   current_core.retro_run();
-   return true;
-}
-
-bool core_load(unsigned poll_type_behavior)
-{
-   current_core.poll_type = poll_type_behavior;
-
-   if (!core_verify_api_version())
-      return false;
-   if (!core_init_libretro_cbs(&retro_ctx))
-      return false;
-
-   core_get_system_av_info(video_viewport_get_system_av_info());
-
-   return true;
-}
-
-bool core_verify_api_version(void)
-{
-   unsigned api_version = current_core.retro_api_version();
-   RARCH_LOG("%s: %u\n",
-         msg_hash_to_str(MSG_VERSION_OF_LIBRETRO_API),
-         api_version);
-   RARCH_LOG("%s: %u\n",
-         msg_hash_to_str(MSG_COMPILED_AGAINST_API),
-         RETRO_API_VERSION);
-
-   if (api_version != RETRO_API_VERSION)
-   {
-      RARCH_WARN("%s\n", msg_hash_to_str(MSG_LIBRETRO_ABI_BREAK));
-      return false;
-   }
-   return true;
-}
-
-bool core_get_region(retro_ctx_region_info_t *info)
-{
-  if (!info)
-    return false;
-  info->region = current_core.retro_get_region();
-  return true;
-}
-
-bool core_has_set_input_descriptor(void)
-{
-   return current_core.has_set_input_descriptors;
-}
-
-void core_set_input_descriptors(void)
-{
-   current_core.has_set_input_descriptors = true;
-}
-
-void core_unset_input_descriptors(void)
-{
-   current_core.has_set_input_descriptors = false;
-}
-
-bool core_is_inited(void)
-{
-  return current_core.inited;
-}
-
-bool core_is_symbols_inited(void)
-{
-  return current_core.symbols_inited;
-}
-
-bool core_is_game_loaded(void)
-{
-  return current_core.game_loaded;
-}
@@ -27,6 +27,7 @@
 #include "config.h"
 #endif

+#include "retroarch.h"
 #include "verbosity.h"

 #include "core_info.h"
@@ -36,17 +37,45 @@
 #include "uwp/uwp_func.h"
 #endif

-static const char *core_info_tmp_path               = NULL;
+#ifdef HAVE_COMPRESSION
 static const struct string_list *core_info_tmp_list = NULL;
+#endif
+static const char *core_info_tmp_path               = NULL;
 static core_info_t *core_info_current               = NULL;
 static core_info_list_t *core_info_curr_list        = NULL;

+enum compare_op
+{
+   COMPARE_OP_EQUAL,
+   COMPARE_OP_NOT_EQUAL,
+   COMPARE_OP_LESS,
+   COMPARE_OP_LESS_EQUAL,
+   COMPARE_OP_GREATER,
+   COMPARE_OP_GREATER_EQUAL
+};
+
 static void core_info_list_resolve_all_extensions(
      core_info_list_t *core_info_list)
 {
   size_t i              = 0;
+   size_t all_ext_len    = 0;
+   char *all_ext         = NULL;

-   core_info_list->all_ext[0] = '\0';
+   for (i = 0; i < core_info_list->count; i++)
+   {
+      if (core_info_list->list[i].supported_extensions)
+         all_ext_len +=
+            (strlen(core_info_list->list[i].supported_extensions) + 2);
+   }
+
+   all_ext_len += STRLEN_CONST("7z|") + STRLEN_CONST("zip|");
+
+   all_ext      = (char*)calloc(1, all_ext_len);
+
+   if (!all_ext)
+      return;
+
+   core_info_list->all_ext = all_ext;

   for (i = 0; i < core_info_list->count; i++)
   {
@@ -54,15 +83,14 @@ static void core_info_list_resolve_all_extensions(
         continue;

      strlcat(core_info_list->all_ext,
-            core_info_list->list[i].supported_extensions,
-            sizeof(core_info_list->all_ext));
-      string_concat(core_info_list->all_ext, "|");
+            core_info_list->list[i].supported_extensions, all_ext_len);
+      strlcat(core_info_list->all_ext, "|", all_ext_len);
   }
 #ifdef HAVE_7ZIP
-   string_concat(core_info_list->all_ext, "7z|");
+   strlcat(core_info_list->all_ext, "7z|", all_ext_len);
 #endif
 #ifdef HAVE_ZLIB
-   string_concat(core_info_list->all_ext, "zip|");
+   strlcat(core_info_list->all_ext, "zip|", all_ext_len);
 #endif
 }

@@ -148,6 +176,7 @@ static void core_info_list_free(core_info_list_t *core_info_list)
      free(info->categories);
      free(info->databases);
      free(info->notes);
+      free(info->required_hw_api);
      string_list_free(info->supported_extensions_list);
      string_list_free(info->authors_list);
      string_list_free(info->note_list);
@@ -155,6 +184,7 @@ static void core_info_list_free(core_info_list_t *core_info_list)
      string_list_free(info->licenses_list);
      string_list_free(info->categories_list);
      string_list_free(info->databases_list);
+      string_list_free(info->required_hw_api_list);
      config_file_free((config_file_t*)info->config_data);

      for (j = 0; j < info->firmware_count; j++)
@@ -165,6 +195,7 @@ static void core_info_list_free(core_info_list_t *core_info_list)
      free(info->firmware);
   }

+   free(core_info_list->all_ext);
   free(core_info_list->list);
   free(core_info_list);
 }
@@ -209,7 +240,7 @@ static config_file_t *core_info_list_iterate(
   info_path_base = NULL;

   if (path_is_valid(info_path))
-      conf = config_file_new(info_path);
+      conf = config_file_new_from_path_to_string(info_path);
   free(info_path);

   return conf;
@@ -268,8 +299,8 @@ static core_info_list_t *core_info_list_new(const char *path,

   for (i = 0; i < contents->size; i++)
   {
-      const char *path      = contents->elems[i].data;
-      config_file_t *conf   = core_info_list_iterate(path,
+      const char *base_path = contents->elems[i].data;
+      config_file_t *conf   = core_info_list_iterate(base_path,
            path_basedir);

      if (conf)
@@ -404,6 +435,16 @@ static core_info_list_t *core_info_list_new(const char *path,
            tmp = NULL;
         }

+         if (config_get_string(conf, "required_hw_api", &tmp)
+               && !string_is_empty(tmp))
+         {
+            core_info[i].required_hw_api = strdup(tmp);
+            core_info[i].required_hw_api_list = string_split(core_info[i].required_hw_api, "|");
+
+            free(tmp);
+            tmp = NULL;
+         }
+
         if (tmp)
            free(tmp);
         tmp    = NULL;
@@ -422,8 +463,8 @@ static core_info_list_t *core_info_list_new(const char *path,
         core_info[i].config_data = conf;
      }

-      if (!string_is_empty(path))
-         core_info[i].path = strdup(path);
+      if (!string_is_empty(base_path))
+         core_info[i].path = strdup(base_path);

      if (!core_info[i].display_name)
         core_info[i].display_name =
@@ -444,7 +485,7 @@ static core_info_list_t *core_info_list_new(const char *path,
 *
 * Data in *info is invalidated when the
 * core_info_list is freed. */
-static bool core_info_list_get_info(core_info_list_t *core_info_list,
+bool core_info_list_get_info(core_info_list_t *core_info_list,
      core_info_t *out_info, const char *path)
 {
   size_t i;
@@ -468,6 +509,7 @@ static bool core_info_list_get_info(core_info_list_t *core_info_list,
   return false;
 }

+#ifdef HAVE_COMPRESSION
 static bool core_info_does_support_any_file(const core_info_t *core,
      const struct string_list *list)
 {
@@ -481,6 +523,7 @@ static bool core_info_does_support_any_file(const core_info_t *core,
         return true;
   return false;
 }
+#endif

 static bool core_info_does_support_file(
      const core_info_t *core, const char *path)
@@ -500,12 +543,14 @@ static int core_info_qsort_cmp(const void *a_, const void *b_)
 {
   const core_info_t *a = (const core_info_t*)a_;
   const core_info_t *b = (const core_info_t*)b_;
-   int support_a        =
-         core_info_does_support_any_file(a, core_info_tmp_list)
-      || core_info_does_support_file(a, core_info_tmp_path);
-   int support_b        =
-         core_info_does_support_any_file(b, core_info_tmp_list)
-      || core_info_does_support_file(b, core_info_tmp_path);
+   int support_a        = core_info_does_support_file(a, core_info_tmp_path);
+   int support_b        = core_info_does_support_file(b, core_info_tmp_path);
+#ifdef HAVE_COMPRESSION
+   support_a            = support_a ||
+      core_info_does_support_any_file(a, core_info_tmp_list);
+   support_b            = support_b ||
+      core_info_does_support_any_file(b, core_info_tmp_list);
+#endif

   if (support_a != support_b)
      return support_b - support_a;
@@ -686,8 +731,10 @@ void core_info_list_get_supported_cores(core_info_list_t *core_info_list,
      const char *path, const core_info_t **infos, size_t *num_infos)
 {
   size_t i;
-   struct string_list *list = NULL;
   size_t supported         = 0;
+#ifdef HAVE_COMPRESSION
+   struct string_list *list = NULL;
+#endif

   if (!core_info_list)
      return;
@@ -720,8 +767,10 @@ void core_info_list_get_supported_cores(core_info_list_t *core_info_list,
      break;
   }

+#ifdef HAVE_COMPRESSION
   if (list)
      string_list_free(list);
+#endif

   *infos     = core_info_list->list;
   *num_infos = supported;
@@ -830,7 +879,8 @@ error:
   return false;
 }

-bool core_info_database_supports_content_path(const char *database_path, const char *path)
+bool core_info_database_supports_content_path(
+      const char *database_path, const char *path)
 {
   char *database           = NULL;
   const char *new_path     = path_basename(database_path);
@@ -898,8 +948,8 @@ bool core_info_list_get_display_name(core_info_list_t *core_info_list,

 bool core_info_get_display_name(const char *path, char *s, size_t len)
 {
-   char       *tmp          = NULL;
-   config_file_t *conf      = config_file_new(path);
+   char       *tmp     = NULL;
+   config_file_t *conf = config_file_new_from_path_to_string(path);

   if (!conf)
      return false;
@@ -913,3 +963,356 @@ bool core_info_get_display_name(const char *path, char *s, size_t len)
   config_file_free(conf);
   return true;
 }
+
+static int core_info_qsort_func_path(const core_info_t *a,
+      const core_info_t *b)
+{
+   if (!a || !b)
+      return 0;
+
+   if (string_is_empty(a->path) || string_is_empty(b->path))
+      return 0;
+
+   return strcasecmp(a->path, b->path);
+}
+
+static int core_info_qsort_func_display_name(const core_info_t *a,
+      const core_info_t *b)
+{
+   if (!a || !b)
+      return 0;
+
+   if (string_is_empty(a->display_name) || string_is_empty(b->display_name))
+      return 0;
+
+   return strcasecmp(a->display_name, b->display_name);
+}
+
+static int core_info_qsort_func_core_name(const core_info_t *a,
+      const core_info_t *b)
+{
+   if (!a || !b)
+      return 0;
+
+   if (string_is_empty(a->core_name) || string_is_empty(b->core_name))
+      return 0;
+
+   return strcasecmp(a->core_name, b->core_name);
+}
+
+static int core_info_qsort_func_system_name(const core_info_t *a,
+      const core_info_t *b)
+{
+   if (!a || !b)
+      return 0;
+
+   if (string_is_empty(a->systemname) || string_is_empty(b->systemname))
+      return 0;
+
+   return strcasecmp(a->systemname, b->systemname);
+}
+
+void core_info_qsort(core_info_list_t *core_info_list,
+      enum core_info_list_qsort_type qsort_type)
+{
+   if (!core_info_list)
+      return;
+
+   if (core_info_list->count < 2)
+      return;
+
+   switch (qsort_type)
+   {
+      case CORE_INFO_LIST_SORT_PATH:
+         qsort(core_info_list->list,
+               core_info_list->count,
+               sizeof(core_info_t),
+               (int (*)(const void *, const void *))
+               core_info_qsort_func_path);
+         break;
+      case CORE_INFO_LIST_SORT_DISPLAY_NAME:
+         qsort(core_info_list->list,
+               core_info_list->count,
+               sizeof(core_info_t),
+               (int (*)(const void *, const void *))
+               core_info_qsort_func_display_name);
+         break;
+      case CORE_INFO_LIST_SORT_CORE_NAME:
+         qsort(core_info_list->list,
+               core_info_list->count,
+               sizeof(core_info_t),
+               (int (*)(const void *, const void *))
+               core_info_qsort_func_core_name);
+         break;
+      case CORE_INFO_LIST_SORT_SYSTEM_NAME:
+         qsort(core_info_list->list,
+               core_info_list->count,
+               sizeof(core_info_t),
+               (int (*)(const void *, const void *))
+               core_info_qsort_func_system_name);
+         break;
+      default:
+         return;
+   }
+}
+
+static bool core_info_compare_api_version(int sys_major, int sys_minor, int major, int minor, enum compare_op op)
+{
+   switch (op)
+   {
+      case COMPARE_OP_EQUAL:
+         if (sys_major == major && sys_minor == minor)
+            return true;
+         break;
+      case COMPARE_OP_NOT_EQUAL:
+         if (!(sys_major == major && sys_minor == minor))
+            return true;
+         break;
+      case COMPARE_OP_LESS:
+         if (sys_major < major || (sys_major == major && sys_minor < minor))
+            return true;
+         break;
+      case COMPARE_OP_LESS_EQUAL:
+         if (sys_major < major || (sys_major == major && sys_minor <= minor))
+            return true;
+         break;
+      case COMPARE_OP_GREATER:
+         if (sys_major > major || (sys_major == major && sys_minor > minor))
+            return true;
+         break;
+      case COMPARE_OP_GREATER_EQUAL:
+         if (sys_major > major || (sys_major == major && sys_minor >= minor))
+            return true;
+         break;
+      default:
+         break;
+   }
+
+   return false;
+}
+
+bool core_info_hw_api_supported(core_info_t *info)
+{
+#ifdef RARCH_INTERNAL
+   unsigned i;
+   enum gfx_ctx_api sys_api;
+   gfx_ctx_flags_t sys_flags       = {0};
+   const char *sys_api_version_str = video_driver_get_gpu_api_version_string();
+   int sys_api_version_major       = 0;
+   int sys_api_version_minor       = 0;
+
+   enum api_parse_state
+   {
+      STATE_API_NAME,
+      STATE_API_COMPARE_OP,
+      STATE_API_VERSION
+   };
+
+   if (!info || !info->required_hw_api_list || info->required_hw_api_list->size == 0)
+      return true;
+
+   sys_api = video_context_driver_get_api();
+   video_context_driver_get_flags(&sys_flags);
+
+   for (i = 0; i < info->required_hw_api_list->size; i++)
+   {
+      char api_str[32]           = {0};
+      char version[16]           = {0};
+      char major_str[16]         = {0};
+      char minor_str[16]         = {0};
+      const char *cur_api        = info->required_hw_api_list->elems[i].data;
+      int api_pos                = 0;
+      int major_str_pos          = 0;
+      int minor_str_pos          = 0;
+      int cur_api_len            = 0;
+      int j                      = 0;
+      int major                  = 0;
+      int minor                  = 0;
+      bool found_major           = false;
+      bool found_minor           = false;
+      enum compare_op op         = COMPARE_OP_GREATER_EQUAL;
+      enum api_parse_state state = STATE_API_NAME;
+
+      if (string_is_empty(cur_api))
+         continue;
+
+      cur_api_len = strlen(cur_api);
+
+      for (j = 0; j < cur_api_len; j++)
+      {
+         if (cur_api[j] == ' ')
+            continue;
+
+         switch (state)
+         {
+            case STATE_API_NAME:
+            {
+               if (isupper(cur_api[j]) || islower(cur_api[j]))
+                  api_str[api_pos++] = cur_api[j];
+               else
+               {
+                  j--;
+                  state = STATE_API_COMPARE_OP;
+                  break;
+               }
+
+               break;
+            }
+            case STATE_API_COMPARE_OP:
+            {
+               if (j < cur_api_len - 1 && !(cur_api[j] >= '0' && cur_api[j] <= '9'))
+               {
+                  if (cur_api[j] == '=' && cur_api[j + 1] == '=')
+                  {
+                     op = COMPARE_OP_EQUAL;
+                     j++;
+                  }
+                  else if (cur_api[j] == '=')
+                     op = COMPARE_OP_EQUAL;
+                  else if (cur_api[j] == '!' && cur_api[j + 1] == '=')
+                  {
+                     op = COMPARE_OP_NOT_EQUAL;
+                     j++;
+                  }
+                  else if (cur_api[j] == '<' && cur_api[j + 1] == '=')
+                  {
+                     op = COMPARE_OP_LESS_EQUAL;
+                     j++;
+                  }
+                  else if (cur_api[j] == '>' && cur_api[j + 1] == '=')
+                  {
+                     op = COMPARE_OP_GREATER_EQUAL;
+                     j++;
+                  }
+                  else if (cur_api[j] == '<')
+                     op = COMPARE_OP_LESS;
+                  else if (cur_api[j] == '>')
+                     op = COMPARE_OP_GREATER;
+               }
+
+               state = STATE_API_VERSION;
+
+               break;
+            }
+            case STATE_API_VERSION:
+            {
+               if (!found_minor && cur_api[j] >= '0' && cur_api[j] <= '9' && cur_api[j] != '.')
+               {
+                  found_major = true;
+
+                  if (major_str_pos < sizeof(major_str) - 1)
+                     major_str[major_str_pos++] = cur_api[j];
+               }
+               else if (found_major && found_minor && cur_api[j] >= '0' && cur_api[j] <= '9')
+               {
+                  if (minor_str_pos < sizeof(minor_str) - 1)
+                     minor_str[minor_str_pos++] = cur_api[j];
+               }
+               else if (cur_api[j] == '.')
+                  found_minor = true;
+               break;
+            }
+            default:
+               break;
+         }
+      }
+
+      sscanf(major_str, "%d", &major);
+      sscanf(minor_str, "%d", &minor);
+      snprintf(version, sizeof(version), "%d.%d", major, minor);
+#if 0
+      printf("Major: %d\n", major);
+      printf("Minor: %d\n", minor);
+      printf("API: %s\n", api_str);
+      printf("Version: %s\n", version);
+      fflush(stdout);
+#endif
+
+      if ((string_is_equal_noncase(api_str, "opengl") && sys_api == GFX_CTX_OPENGL_API) ||
+            (string_is_equal_noncase(api_str, "openglcompat") && sys_api == GFX_CTX_OPENGL_API) ||
+            (string_is_equal_noncase(api_str, "openglcompatibility") && sys_api == GFX_CTX_OPENGL_API))
+      {
+         /* system is running a core context while compat is requested */
+         if (sys_flags.flags & (1 << GFX_CTX_FLAGS_GL_CORE_CONTEXT))   
+            return false;
+
+         sscanf(sys_api_version_str, "%d.%d", &sys_api_version_major, &sys_api_version_minor);
+
+         if (core_info_compare_api_version(sys_api_version_major, sys_api_version_minor, major, minor, op))
+            return true;
+      }
+      else if (string_is_equal_noncase(api_str, "openglcore") && sys_api == GFX_CTX_OPENGL_API)
+      {
+         sscanf(sys_api_version_str, "%d.%d", &sys_api_version_major, &sys_api_version_minor);
+
+         if (core_info_compare_api_version(sys_api_version_major, sys_api_version_minor, major, minor, op))
+            return true;
+      }
+      else if (string_is_equal_noncase(api_str, "opengles") && sys_api == GFX_CTX_OPENGL_ES_API)
+      {
+         sscanf(sys_api_version_str, "OpenGL ES %d.%d", &sys_api_version_major, &sys_api_version_minor);
+
+         if (core_info_compare_api_version(sys_api_version_major, sys_api_version_minor, major, minor, op))
+            return true;
+      }
+      else if (string_is_equal_noncase(api_str, "direct3d8") && sys_api == GFX_CTX_DIRECT3D8_API)
+      {
+         sys_api_version_major = 8;
+         sys_api_version_minor = 0;
+
+         if (core_info_compare_api_version(sys_api_version_major, sys_api_version_minor, major, minor, op))
+            return true;
+      }
+      else if (string_is_equal_noncase(api_str, "direct3d9") && sys_api == GFX_CTX_DIRECT3D9_API)
+      {
+         sys_api_version_major = 9;
+         sys_api_version_minor = 0;
+
+         if (core_info_compare_api_version(sys_api_version_major, sys_api_version_minor, major, minor, op))
+            return true;
+      }
+      else if (string_is_equal_noncase(api_str, "direct3d10") && sys_api == GFX_CTX_DIRECT3D10_API)
+      {
+         sys_api_version_major = 10;
+         sys_api_version_minor = 0;
+
+         if (core_info_compare_api_version(sys_api_version_major, sys_api_version_minor, major, minor, op))
+            return true;
+      }
+      else if (string_is_equal_noncase(api_str, "direct3d11") && sys_api == GFX_CTX_DIRECT3D11_API)
+      {
+         sys_api_version_major = 11;
+         sys_api_version_minor = 0;
+
+         if (core_info_compare_api_version(sys_api_version_major, sys_api_version_minor, major, minor, op))
+            return true;
+      }
+      else if (string_is_equal_noncase(api_str, "direct3d12") && sys_api == GFX_CTX_DIRECT3D12_API)
+      {
+         sys_api_version_major = 12;
+         sys_api_version_minor = 0;
+
+         if (core_info_compare_api_version(sys_api_version_major, sys_api_version_minor, major, minor, op))
+            return true;
+      }
+      else if (string_is_equal_noncase(api_str, "vulkan") && sys_api == GFX_CTX_VULKAN_API)
+      {
+         sscanf(sys_api_version_str, "%d.%d", &sys_api_version_major, &sys_api_version_minor);
+
+         if (core_info_compare_api_version(sys_api_version_major, sys_api_version_minor, major, minor, op))
+            return true;
+      }
+      else if (string_is_equal_noncase(api_str, "metal") && sys_api == GFX_CTX_METAL_API)
+      {
+         sscanf(sys_api_version_str, "%d.%d", &sys_api_version_major, &sys_api_version_minor);
+
+         if (core_info_compare_api_version(sys_api_version_major, sys_api_version_minor, major, minor, op))
+            return true;
+      }
+   }
+
+   return false;
+#else
+   return true;
+#endif
+}