Update CHANGES.md

(Favourites) Fix 'remove entry' deleting wrong item

.github/FUNDING.yml

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

.github/ISSUE_TEMPLATE.md

@@ -2,34 +2,34 @@
 - Only RetroArch bugs should be filed here. Not core bugs or game bugs
 - This is not a forum or a help section, this is strictly developer oriented
 
-## Description
-
-[Description of the bug]
-
-### Expected behavior
-
-[What you expected to happen]
-
-### Actual behavior
-
-[What is actually happening]
-
-### Steps to reproduce the bug
-
-1. [First step]
-2. [Second step]
-3. [and so on...]
-
-### Bisect Results
+## Description
+
+[Description of the bug]
+
+### Expected behavior
+
+[What you expected to happen]
+
+### Actual behavior
+
+[What is actually happening]
+
+### Steps to reproduce the bug
+
+1. [First step]
+2. [Second step]
+3. [and so on...]
+
+### Bisect Results
+
+[Try to bisect and tell us when this started happening]
+
+### Version/Commit
+You can find this information under Information/System Information
+
+- RetroArch: [version/commit]
+
+### Environment information
 
-[Try to bisect and tell us when this started happening]
-
-### Version/Commit
-You can find this information under Information/System Information
-
-- RetroArch: [version/commit]
-
-### Environment information
-
 - OS: [The operating system you're running]
-- Compiler: [In case you are running local builds]
+- Compiler: [In case you are running local builds]

.github/PULL_REQUEST_TEMPLATE.md

@@ -4,7 +4,6 @@
 2. If you are sending several unrelated fixes or features, use a branch and a separate pull request for each
 3. If possible try squashing everything in a single commit. This is particularly beneficial in the case of feature merges since it allows easy bisecting when a problem arises
 
-
 ## Description
 
 [Description of the pull request, detail any issues you are fixing or any features you are implementing]

.gitignore

@@ -62,7 +62,6 @@ apple/RetroArch_iOS.xcodeproj/project.xcworkspace/*
 /freetype2/
 /ft2build.h
 /iconv.h
-/libxml2/
 /phoenix/
 /python/
 /rsound.h
@@ -76,6 +75,11 @@ run.sh
 convert_rumble.awk
 *~
 assets
+info
+content_image_history.lpl
+saves
+screenshots
+
 
 # Wii U
 *.depend
@@ -87,7 +91,6 @@ wiiu/wut/elf2rpl/elf2rpl
 /pkg/wiiu/rpx
 /wiiu-devel.properties
 
-
 # 3ds
 /.lst
 *.3dsx
@@ -112,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/
@@ -165,6 +172,10 @@ retroarch_switch.nacp
 retroarch_switch.nro
 retroarch_switch.nso
 
+# PS2
+ps2/irx/*.c
+ps2/libcdvd/lib/
+
 # Wayland
 gfx/common/wayland/idle-inhibit-unstable-v1.c
 gfx/common/wayland/idle-inhibit-unstable-v1.h

.gitlab-ci.yml

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

.travis.yml

@@ -1,39 +1,53 @@
 # 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
-      addons:
-        apt:
-          packages:
-            - g++-mingw-w64-i686
-            - mingw-w64-i686-dev
-      script:
-        - ./configure --disable-d3d8 --disable-d3d9 --disable-d3d10 --disable-d3d11 --disable-d3d12 --enable-builtinzlib
-        - make
+      addons: true
       env: CROSS_COMPILE=i686-w64-mingw32- CFLAGS="-D_WIN32_WINNT=0x0501"
+    - compiler: mingw-x86
+      addons: true
+      env: C89_BUILD=1 CROSS_COMPILE=i686-w64-mingw32- CFLAGS="-D_WIN32_WINNT=0x0501"
+    - compiler: mingw-x86
+      addons: true
+      env: CXX_BUILD=1 CROSS_COMPILE=i686-w64-mingw32- CFLAGS="-D_WIN32_WINNT=0x0501"
     - compiler: mingw-x64
-      addons:
-        apt:
-          packages:
-            - g++-mingw-w64-x86-64
-            - mingw-w64-x86-64-dev
-      script:
-        - ./configure --disable-d3d8 --disable-d3d9 --disable-d3d10 --disable-d3d11 --disable-d3d12 --enable-builtinzlib
-        - make
+      addons: true
       env: CROSS_COMPILE=x86_64-w64-mingw32- CFLAGS="-D_WIN32_WINNT=0x0501"
+    - compiler: mingw-x64
+      addons: true
+      env: C89_BUILD=1 CROSS_COMPILE=x86_64-w64-mingw32- CFLAGS="-D_WIN32_WINNT=0x0501"
+    - compiler: mingw-x64
+      addons: true
+      env: CXX_BUILD=1 CROSS_COMPILE=x86_64-w64-mingw32- CFLAGS="-D_WIN32_WINNT=0x0501"
     - compiler: gcc
-      # Install a more recent gcc than the default
-      before_install:
-        - sudo apt-get install -y g++-8
       env: CC=gcc-8 CXX=g++-8
+    - compiler: gcc
+      env: C89_BUILD=1 CC=gcc-8 CXX=g++-8
+    - compiler: gcc
+      env: CXX_BUILD=1 CC=gcc-8 CXX=g++-8
+    - compiler: gcc
+      env: DISABLE_MENU=1 CC=gcc-8 CXX=g++-8
+    - compiler: 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
-      # Install a more recent clang than the default
-      before_install:
-        - sudo apt-get install -y libstdc++-7-dev
-        - sudo apt-get install -y clang-6.0
       env: CC=clang-6.0 CXX=clang++-6.0
+    - 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:
@@ -49,13 +63,74 @@ 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:
+  - |
+     if [ "$CC" = gcc-8 ]; then
+       # Install a more recent gcc than the default
+       sudo apt-get install -y g++-8
+     elif [ "$CC" = clang-6.0 ]; then
+       # Install a more recent clang than the default
+       sudo apt-get install -y clang-6.0
+     elif [ "$CROSS_COMPILE" = i686-w64-mingw32- ]; then
+       sudo update-alternatives --set i686-w64-mingw32-g++ /usr/bin/i686-w64-mingw32-g++-posix
+     elif [ "$CROSS_COMPILE" = x86_64-w64-mingw32- ]; then
+       sudo update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix
+     fi
 
 script:
-  - ./configure
-  - make
+  - |
+     if [ -n "$CROSS_COMPILE" ]; then
+       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
+       make C89_BUILD=1
+     elif [ -n "$CXX_BUILD" ]; then
+       make CXX_BUILD=1
+     else
+       make
+     fi
 
 env:
   global:
+   - ARGS=""
    - MAKEFLAGS="-j2"
    - secure: "qc91ReC3OlzSh2gFaSH6TYzC2qIQvgA2AZff6J13eaH8xijAhuMzttZ0rMQJ0DWCIhPeUb0kIzVyaGoe4MwPALzpw1C1AznIWiZJ53HN+hWCOcS/af7YVPk6HPySnwqrS+Wv3AIIvIKFV2mxv21F/JbT/N+pArlRrp904Xj+KPo="
 addons:
@@ -67,7 +142,7 @@ addons:
       - qtdeclarative5-dev
     sources:
       - ubuntu-toolchain-r-test
-      - llvm-toolchain-trusty-6.0
+      - llvm-toolchain-xenial
   coverity_scan:
     project:
       name: "RetroArch"

.vscode/c_cpp_properties.json

@@ -1,131 +1,155 @@
 {
-    "configurations": [
-        {
-            "name": "Mac",
-            "includePath": [
-                "/usr/include",
-                "/usr/local/include",
-                "${workspaceRoot}",
-                "${workspaceRoot}/libretro-common/include"
+   "configurations": [
+      {
+         "name": "Mac",
+         "includePath": [
+            "/usr/include",
+            "/usr/local/include",
+            "${workspaceRoot}",
+            "${workspaceRoot}/libretro-common/include"
+         ],
+         "defines": [],
+         "intelliSenseMode": "clang-x64",
+         "browse": {
+            "path": [
+               "/usr/include",
+               "/usr/local/include",
+               "${workspaceRoot}"
             ],
-            "defines": [],
-            "intelliSenseMode": "clang-x64",
-            "browse": {
-                "path": [
-                    "/usr/include",
-                    "/usr/local/include",
-                    "${workspaceRoot}"
-                ],
-                "limitSymbolsToIncludedHeaders": true,
-                "databaseFilename": ""
-            },
-            "macFrameworkPath": [
-                "/System/Library/Frameworks",
-                "/Library/Frameworks"
-            ]
-        },
-        {
-            "name": "Linux",
-            "includePath": [
-                "/usr/include",
-                "/usr/local/include",
-                "${workspaceRoot}",
-                "${workspaceFolder}/libretro-common/include",
-                "${workspaceRoot}/libretro-common/include"
+            "limitSymbolsToIncludedHeaders": true,
+            "databaseFilename": ""
+         },
+         "macFrameworkPath": [
+            "/System/Library/Frameworks",
+            "/Library/Frameworks"
+         ]
+      },
+      {
+         "name": "Linux",
+         "includePath": [
+            "/usr/include",
+            "/usr/local/include",
+            "${workspaceRoot}",
+            "${workspaceFolder}/libretro-common/include",
+            "${workspaceRoot}/libretro-common/include"
+         ],
+         "defines": [],
+         "intelliSenseMode": "clang-x64",
+         "browse": {
+            "path": [
+               "/usr/include",
+               "/usr/local/include",
+               "${workspaceRoot}"
             ],
-            "defines": [],
-            "intelliSenseMode": "clang-x64",
-            "browse": {
-                "path": [
-                    "/usr/include",
-                    "/usr/local/include",
-                    "${workspaceRoot}"
-                ],
-                "limitSymbolsToIncludedHeaders": true,
-                "databaseFilename": ""
-            }
-        },
-        {
-            "name": "Win32",
-            "includePath": [
-                "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/um",
-                "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/ucrt",
-                "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/shared",
-                "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/winrt",
-                "${workspaceRoot}",
-                "${workspaceFolder}/libretro-common/include"
+            "limitSymbolsToIncludedHeaders": true,
+            "databaseFilename": ""
+         }
+      },
+      {
+         "name": "Win32",
+         "includePath": [
+            "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/um",
+            "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/ucrt",
+            "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/shared",
+            "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/winrt",
+            "${workspaceRoot}",
+            "${workspaceFolder}/libretro-common/include"
+         ],
+         "defines": [
+            "_DEBUG",
+            "UNICODE"
+         ],
+         "intelliSenseMode": "msvc-x64",
+         "browse": {
+            "path": [
+               "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/um",
+               "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/ucrt",
+               "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/shared",
+               "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/winrt",
+               "${workspaceRoot}"
             ],
-            "defines": [
-                "_DEBUG",
-                "UNICODE"
+            "limitSymbolsToIncludedHeaders": true,
+            "databaseFilename": ""
+         },
+         "cStandard": "c11",
+         "cppStandard": "c++17"
+      },
+      {
+         "name": "msys2-mingw32",
+         "includePath": [
+            "C:/msys64/mingw32/include",
+            "C:/msys64/mingw32/i686-w64-mingw32/include",
+            "${workspaceRoot}/libretro-common/include",
+            "${workspaceRoot}/include",
+            "${workspaceRoot}"
+         ],
+         "defines": [
+            "_DEBUG",
+            "UNICODE"
+         ],
+         "intelliSenseMode": "msvc-x64",
+         "browse": {
+            "path": [
+               "C:/msys64/mingw32/include",
+               "C:/msys64/mingw32/i686-w64-mingw32/include",
+               "${workspaceRoot}/libretro-common/include",
+               "${workspaceRoot}/include",
+               "${workspaceRoot}"
             ],
-            "intelliSenseMode": "msvc-x64",
-            "browse": {
-                "path": [
-                    "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/um",
-                    "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/ucrt",
-                    "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/shared",
-                    "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/winrt",
-                    "${workspaceRoot}"
-                ],
-                "limitSymbolsToIncludedHeaders": true,
-                "databaseFilename": ""
-            },
-            "cStandard": "c11",
-            "cppStandard": "c++17"
-        },
-        {
-            "name": "msys2-mingw32",
-            "includePath": [
-                "C:/msys64/mingw32/include",
-                "C:/msys64/mingw32/i686-w64-mingw32/include",
-                "${workspaceRoot}/libretro-common/include",
-                "${workspaceRoot}/include",
-                "${workspaceRoot}"
+            "limitSymbolsToIncludedHeaders": true,
+            "databaseFilename": ""
+         }
+      },
+      {
+         "name": "msys2-mingw64",
+         "includePath": [
+            "C:/msys64/mingw64/include",
+            "C:/msys64/mingw64/x86_64-w64-mingw32/include",
+            "${workspaceRoot}/libretro-common/include",
+            "${workspaceRoot}/include",
+            "${workspaceRoot}"
+         ],
+         "defines": [
+            "_DEBUG",
+            "UNICODE"
+         ],
+         "intelliSenseMode": "msvc-x64",
+         "browse": {
+            "path": [
+               "C:/msys64/mingw64/include",
+               "C:/msys64/mingw64/x86_64-w64-mingw32/include",
+               "${workspaceRoot}/libretro-common/include",
+               "${workspaceRoot}/include",
+               "${workspaceRoot}"
             ],
-            "defines": [
-                "_DEBUG",
-                "UNICODE"
-            ],
-            "intelliSenseMode": "msvc-x64",
-            "browse": {
-                "path": [
-                    "C:/msys64/mingw32/include",
-                    "C:/msys64/mingw32/i686-w64-mingw32/include",
-                    "${workspaceRoot}/libretro-common/include",
-                    "${workspaceRoot}/include",
-                    "${workspaceRoot}"
-                ],
-                "limitSymbolsToIncludedHeaders": true,
-                "databaseFilename": ""
-            }
-        },
-        {
-            "name": "msys2-mingw64",
-            "includePath": [
-                "C:/msys64/mingw64/include",
-                "C:/msys64/mingw64/x86_64-w64-mingw32/include",
-                "${workspaceRoot}/libretro-common/include",
-                "${workspaceRoot}/include",
-                "${workspaceRoot}"
-            ],
-            "defines": [
-                "_DEBUG",
-                "UNICODE"
-            ],
-            "intelliSenseMode": "msvc-x64",
-            "browse": {
-                "path": [
-                    "C:/msys64/mingw64/include",
-                    "C:/msys64/mingw64/x86_64-w64-mingw32/include",
-                    "${workspaceRoot}/libretro-common/include",
-                    "${workspaceRoot}/include",
-                    "${workspaceRoot}"
-                ],
-                "limitSymbolsToIncludedHeaders": true,
-                "databaseFilename": ""
-            }
-        }
-    ],
-    "version": 4
+            "limitSymbolsToIncludedHeaders": true,
+            "databaseFilename": ""
+         }
+      },
+      {
+         "name": "Switch",
+         "includePath": [
+            "/opt/devkitpro/devkitA64/aarch64-none-elf/include",
+            "/opt/devkitpro/devkitA64/lib/gcc/aarch64-none-elf/8.3.0/include",
+            "/opt/devkitpro/libnx/include",
+            "/opt/devkitpro/portlibs/switch/include",
+            "/opt/devkitpro/portlibs/switch/include/freetype2",
+            "${workspaceFolder}/**"
+         ],
+         "defines": [
+            "_DEBUG",
+            "UNICODE",
+            "_UNICODE",
+            "__aarch64__",
+            "__SWITCH__",
+            "HAVE_LIBNX"
+         ],
+         "windowsSdkVersion": "10.0.17763.0",
+         "compilerPath": "/opt/devkitpro/devkitA64/bin/aarch64-none-elf-gcc",
+         "cStandard": "c11",
+         "cppStandard": "c++11",
+         "intelliSenseMode": "gcc-x64"
+      }
+   ],
+   "version": 4
 }

.vscode/launch.json

@@ -24,7 +24,7 @@
              }
          ]
       },
-      { 
+      {
          "name": "(gdb) Attach",
          "type": "cppdbg",
          "request": "attach",

.vscode/settings.json

@@ -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",
@@ -40,9 +39,34 @@
       "ozone_theme.h": "c",
       "ozone_texture.h": "c",
       "string_list.h": "c",
-      "core_info.h": "c"
+      "core_info.h": "c",
       "thread": "c",
-      "xlocale": "c"
+      "xlocale": "c",
+      "menu_widgets.h": "c",
+      "message_queue.h": "c",
+      "task_queue.h": "c",
+      "fifo_queue.h": "c",
+      "file_list.h": "c",
+      "strl.h": "c",
+      "configuration.h": "c",
+      "ozone_display.h": "c",
+      "verbosity.h": "c",
+      "retroarch.h": "c",
+      "menu_animation.h": "c",
+      "netplay.h": "c",
+      "scaler.h": "c",
+      "deque": "c",
+      "vector": "c",
+      "xhash": "c",
+      "xiosbase": "c",
+      "xstring": "c",
+      "xtree": "c",
+      "xutility": "c",
+      "menu_input_dialog.h": "c",
+      "menu_filebrowser.h": "c",
+      "ozone_sidebar.h": "c",
+      "menu_thumbnail_path.h": "c",
+      "badges.h": "c"
    },
    "C_Cpp.dimInactiveRegions": false,
-}
+}

.vscode/tasks.json

@@ -45,7 +45,7 @@
 
          "group": {
             "kind": "build",
-            "isDefault": true 
+            "isDefault": true
          },
 
          "command": "./configure; make -j2",

10bpc-gl.diff

@@ -48,7 +48,7 @@ index b90a8e40c3..e57c4df194 100644
 +#endif
 +
  #endif
- 
+
  #if defined(HAVE_OPENGL)
 @@ -313,6 +354,43 @@ static void create_gl_context(HWND hwnd, bool *quit)
           RARCH_LOG("[WGL]: Adaptive VSync supported.\n");

AUTHORS.h

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

CONTRIBUTING.md

@@ -1,58 +1,58 @@
-# Contributing to RetroArch
-
-If you are a developer and want to contribute to the development of RetroArch, please read this.
-If you have found a bug and want to submit a minor patch or a bug report, please read this as well.
-
-# Submitting a bug report
-When submitting a bug report, make sure that the bug is local to RetroArch.
-A bug in a libretro core or something deemed to be external is likely to be closed very fast.
-If you still suspect a bug in RetroArch, make sure to test with several cores to make sure.
-
-If you have troubles building RetroArch on Linux/BSD/OSX, make sure to paste shell output of ./configure,
-as well as config.log and shell output of make. If building on Windows, just paste shell output of make.
-
-If the issue occurs during runtime, make sure to paste RetroArch's verbose log.
-If using Phoenix frontend, you can find log in (File -> Show Log) after running.
-In console, make sure to run with verbose (-v) flag.
-
-# Pull Requests
-Outside contributions are generally only accepted in the form of a pull request. The process is very simple.
-Fork RetroArch, make your changes, and issue a pull request on GitHub. This can all be done within the browser.
-The changes are reviewed, and might be merged in. If the pull request isn't acceptable at the time,
-note that it's possible to continue pushing up commits to your branch.
-
-If you want to develop a larger feature,
-we'd like to discuss this first (ideally on IRC) so that you don't risk developing something
-that won't be merged. A pull request with a proof-of-concept is fine, but please indicate so.
-
-## libretro API
-If you wish to add functionality to libretro's API, it can take some time to merge in, because changes
-to libretro API will affect other projects as well, and we highly value API/ABI stability.
-Features will only be added when deemed *necessary* for a concrete libretro core to function properly.
-Features will not be added on basis of hypothetical libretro implementations.
-
-# Coding style
-Having a consistent code style throughout the code base is highly valued.
-Please look through the code to get a feel for the coding style.
-A pull request may be asked to fix the coding style before submission.
-In other cases, a pull request may be followed up with a "style nit commit".
-
-## Non-obvious things:
-  - Code should be both ISO C99 and ISO C++ compatible. This dual requirement is for XBox360 and MSVC in general. Think of it as a C++ compatible subset of C99.
-  - Warnings are not allowed (-Wall). Make sure your code is warning-free. Note that warning sensitivity differs a bit across compiler versions.
-  - Using deprecated APIs is discouraged.
-
-# Copyright Headers and AUTHORS
-If you have contributed to a part of a source file (a chunk of code that's written by you),
-you should add yourself to the copyright header in that file.
-If you have contributed significantly
-(a feature, a contribution you can "name", e.g. "Added audio driver foo"), you should add yourself to AUTHORS file.
-We'd like your full name and email, and which features you have been part of.
-
-# IRC
-Active development happens on IRC. (#retroarch @ irc.freenode.org)
-We value discussing things in "real-time".
-
-# Commit Access
-Contributors who show a track record of making good pull requests over time will eventually get commit access to the repo.
+# Contributing to RetroArch
+
+If you are a developer and want to contribute to the development of RetroArch, please read this.
+If you have found a bug and want to submit a minor patch or a bug report, please read this as well.
+
+# Submitting a bug report
+When submitting a bug report, make sure that the bug is local to RetroArch.
+A bug in a libretro core or something deemed to be external is likely to be closed very fast.
+If you still suspect a bug in RetroArch, make sure to test with several cores to make sure.
+
+If you have troubles building RetroArch on Linux/BSD/OSX, make sure to paste shell output of ./configure,
+as well as config.log and shell output of make. If building on Windows, just paste shell output of make.
+
+If the issue occurs during runtime, make sure to paste RetroArch's verbose log.
+If using Phoenix frontend, you can find log in (File -> Show Log) after running.
+In console, make sure to run with verbose (-v) flag.
+
+# Pull Requests
+Outside contributions are generally only accepted in the form of a pull request. The process is very simple.
+Fork RetroArch, make your changes, and issue a pull request on GitHub. This can all be done within the browser.
+The changes are reviewed, and might be merged in. If the pull request isn't acceptable at the time,
+note that it's possible to continue pushing up commits to your branch.
+
+If you want to develop a larger feature,
+we'd like to discuss this first (ideally on IRC) so that you don't risk developing something
+that won't be merged. A pull request with a proof-of-concept is fine, but please indicate so.
+
+## libretro API
+If you wish to add functionality to libretro's API, it can take some time to merge in, because changes
+to libretro API will affect other projects as well, and we highly value API/ABI stability.
+Features will only be added when deemed *necessary* for a concrete libretro core to function properly.
+Features will not be added on basis of hypothetical libretro implementations.
+
+# Coding style
+Having a consistent code style throughout the code base is highly valued.
+Please look through the code to get a feel for the coding style.
+A pull request may be asked to fix the coding style before submission.
+In other cases, a pull request may be followed up with a "style nit commit".
+
+## Non-obvious things:
+  - Code should be both ISO C99 and ISO C++ compatible. This dual requirement is for XBox360 and MSVC in general. Think of it as a C++ compatible subset of C99.
+  - Warnings are not allowed (-Wall). Make sure your code is warning-free. Note that warning sensitivity differs a bit across compiler versions.
+  - Using deprecated APIs is discouraged.
+
+# Copyright Headers and AUTHORS
+If you have contributed to a part of a source file (a chunk of code that's written by you),
+you should add yourself to the copyright header in that file.
+If you have contributed significantly
+(a feature, a contribution you can "name", e.g. "Added audio driver foo"), you should add yourself to AUTHORS file.
+We'd like your full name and email, and which features you have been part of.
+
+# IRC
+Active development happens on IRC. (#retroarch @ irc.freenode.org)
+We value discussing things in "real-time".
+
+# Commit Access
+Contributors who show a track record of making good pull requests over time will eventually get commit access to the repo.
 This typically happens when the "overhead" of looking through pull requests over time becomes a burden.

Makefile

@@ -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 $@),)

Makefile.apple

@@ -19,6 +19,6 @@ $(foreach x,$(join $(addsuffix :,$(MOC_SRC)),$(MOC_HEADERS)),$(eval $x))
 
 generate: $(MOC_SRC)
 	@echo $(MOC_SRC)
-	
+
 print-%:
-	@echo '$*=$($*)'
+	@echo '$*=$($*)'

Makefile.classic_armv7_a7

@@ -1,23 +1,20 @@
 # This build was put together and is maintained by ModMyClassic.com for Libretro.
 # The purpose is to give Libretro a proper "official" build platform for classic consoles.
 # If you need any help in building for the classics or have any questions then please visit
-# https://modmyclassic.com/comp and we will help in any way possible! 
+# https://modmyclassic.com/comp and we will help in any way possible!
 
 # Building Prerequisites ##############
-# arm-linux-gnueabihf-gcc-8
-# arm-linux-gnueabihf-g++-8
-# arm-linux-gnueabihf-as
 # arm-linux-gnueabihf-strip
 # patchelf
 # bc
 
 include version.all
 
-# Classic Readme Variables ############
+# Classic Readme Variables ############
 CLASSIC_ALT_VER := $(shell echo $(RARCH_VERSION) | tr . _)
-CLASSIC_MODS_VER := Official_Retroarch_v$(CLASSIC_ALT_VER)c_COptimised
-CLASSIC_MODS_NAME := RetroArch v$(RARCH_VERSION)c \(Official Classic Optimised\)
-CLASSIC_VERSION := $(RARCH_VERSION)c \(Classic+\)
+CLASSIC_MODS_VER := Official_Retroarch_v$(CLASSIC_ALT_VER)
+CLASSIC_MODS_NAME := RetroArch v$(RARCH_VERSION) (Official Optimised)
+CLASSIC_VERSION := $(RARCH_VERSION)
 MOD_CREATOR := Libretro + ModMyClassic
 MOD_CATEGORY := RetroArch
 GIT_COMMIT := $(shell echo "`git rev-parse --short HEAD``git diff-index --quiet HEAD -- || echo '-dirty'`")
@@ -28,10 +25,6 @@ HAKCHI_GIT := https://github.com/Classicmods/RA_Platform-Hakchi
 
 # General Shared Variables ############
 TARGET := retroarch
-CC_V = arm-linux-gnueabihf-gcc-8
-CXX_V = arm-linux-gnueabihf-g++-8
-AS_V = arm-linux-gnueabihf-as
-CC_AS_V = arm-linux-gnueabihf-gcc-8
 
 # Libretro Defines ####################
 #HAVE_CLASSIC = Classic Hook, disable some features
@@ -41,15 +34,10 @@ CC_AS_V = arm-linux-gnueabihf-gcc-8
 all: $(TARGET)
 
 retroarch:
-	#Backup vanilla version files + ammend version
-	cp version.all version_BACKUP.all && cp version.dtd version_BACKUP.dtd
-	sed -i -e 's/RARCH_VERSION="[^"]*"/RARCH_VERSION="$(CLASSIC_VERSION)"/g' version.all
-	sed -i -e 's/PACKAGE_VERSION "[^"]*"/PACKAGE_VERSION "$(CLASSIC_VERSION)"/g' version.all
-	sed -i -e 's/ENTITY version "[^"]*"/ENTITY version "$(CLASSIC_VERSION)"/g' version.dtd
 	#Build the RetroArch Binary for cross platform classics (ARMv7 Cortex A7)
 	patchelf --version #Check if you have patchelf installed... (sudo apt-get install patchelf)
-	./configure --host=arm-linux-gnueabihf --enable-mali_fbdev --disable-freetype --enable-opengles --enable-udev --enable-alsa --enable-neon --enable-floathard --disable-discord
-	make CC=$(CC_V) CXX=$(CXX_V) AS=$(AS_V) CC_AS=$(CC_AS_V) LDFLAGS_SDL=-lSDL2 HAVE_CLASSIC=1 HAVE_C_A7A7=1 HAVE_HAKCHI=1 -j #Cook it
+	CFLAGS="-marm -mtune=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard" ./configure --host=arm-linux-gnueabihf --enable-mali_fbdev --disable-freetype --enable-opengles --enable-udev --enable-alsa --enable-neon --enable-floathard --disable-discord
+	make HAVE_CLASSIC=1 HAVE_C_A7A7=1 HAVE_HAKCHI=1 -j #Cook it
 	arm-linux-gnueabihf-strip -v retroarch
 	patchelf --replace-needed libSDL2-2.0.so.0 libSDL2.so retroarch #libSDL2-2.0.so.0 sym link doesn't exist on native build. Just patch the binary...
 
@@ -78,14 +66,8 @@ retroarch:
 	@echo "** BUILT CLASSIC_MODS HAKCHI - $(CLASSIC_MODS_VER) HMOD PACKAGE **"
 	rm -fr /tmp/$(HAKCHI_DIR) #clean up tmp
 
-	#COMMODORE 64 MINI BUILD (WIP)
-	
-	#Clean down dirty files
-	rm -f version.all version.dtd
-	mv version_BACKUP.all version.all && mv version_BACKUP.dtd version.dtd
 	@echo "*********************************************************************"
 	@echo "*** Classic ARM7 Cortex A7 build and packages built successfully! ***"
-	@echo "****************** Winner, Winner, Chicken Dinner! ******************"
 	@echo "*********************************************************************"
 clean:
 	rm -rf obj-unix
@@ -107,7 +89,4 @@ clean:
 	rm -f $(PNDDIR)/readme.html
 	rm -f retroarch
 	rm -f $(CLASSIC_MODS_VER).hmod
-	rm -f version.all version.dtd
-	mv -f version_BACKUP.all version.all || echo "Backup Doesn't Exist - Ignoring..."
-	mv -f version_BACKUP.dtd version.dtd || echo "Backup Doesn't Exist - Ignoring..."
-	rm -f *_BACKUP*
+

Makefile.ctr

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

Makefile.ctr.salamander

@@ -40,7 +40,7 @@ OBJ := ctr/ctr_system.o \
 		 libretro-common/hash/rhash.o \
 		 file_path_str.o \
 		 verbosity.o
-		 
+
 OBJ += ctr/exec-3dsx/exec_cia.o \
 	ctr/exec-3dsx/exec_3dsx.o \
 	ctr/exec-3dsx/mini-hb-menu/launch.o \
@@ -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

Makefile.emscripten

@@ -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
@@ -17,32 +20,30 @@ HAVE_RJPEG  = 0
 HAVE_RPNG   = 1
 HAVE_EMSCRIPTEN = 1
 HAVE_MENU = 1
+HAVE_MENU_WIDGETS = 1
 HAVE_RGUI = 1
 HAVE_SDL = 0
 HAVE_SDL2 = 0
 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
@@ -58,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)

Makefile.griffin

@@ -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    :=
 
@@ -89,6 +93,8 @@ else ifeq ($(platform), wii)
    libogc_platform    := 1
 endif
 
+HAVE_MENU_WIDGETS := 1
+
 # PS3
 ifeq ($(platform), ps3)
    #TODO
@@ -111,8 +117,8 @@ 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
       CXXFLAGS += -DEXTERNAL_LIBOGC
@@ -178,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
@@ -187,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
@@ -265,13 +273,11 @@ 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\
-           -lSceSysmodule_stub -lSceCtrl_stub -lSceTouch_stub -lSceAudio_stub -lSceFiber_stub\
+           -lSceSysmodule_stub -lSceCtrl_stub -lSceHid_stub -lSceTouch_stub -lSceAudio_stub -lSceFiber_stub\
            -lScePower_stub -lSceRtc_stub -lSceCommonDialog_stub -lScePgf_stub \
            -lSceMotion_stub -lSceAppMgr_stub -lpng -lm -lc
 
@@ -304,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
@@ -316,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
@@ -353,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
@@ -384,7 +392,7 @@ else ifeq ($(platform), windows_msvc2003_x86)
 
    PLATCFLAGS += -D_WIN32 -DWINVER=0x0400 -D_WIN32_WINNT=0x0400 -D__STDC_CONSTANT_MACROS -D_MBCS -D_VC80_UPGRADE=0x0710
    LDFLAGS += shell32.lib user32.lib gdi32.lib comdlg32.lib winmm.lib ole32.lib
-   
+
    PATH := $(shell IFS=$$'\n'; cygpath "$(VS71COMNTOOLS)../../Vc7/bin"):$(PATH)
    PATH := $(PATH):$(shell IFS=$$'\n'; cygpath "$(VS71COMNTOOLS)../IDE")
    INCLUDE := $(shell IFS=$$'\n'; cygpath -w "$(VS71COMNTOOLS)../../Vc7/include")
@@ -400,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
@@ -430,9 +439,9 @@ else ifeq ($(platform), windows_msvc2005_x86)
    CXX = cl.exe
    LD = link.exe
 
-   PLATCFLAGS += -D_WIN32 -D_WIN32_WINNT=0x0410 -D__STDC_CONSTANT_MACROS -D_MBCS -DHAVE_EASTEREGG
+   PLATCFLAGS += -D_WIN32 -D_WIN32_WINNT=0x0410 -D__STDC_CONSTANT_MACROS -D_MBCS -DHAVE_EASTEREGG -D__MMX__ -D__SSE__ -DHAVE_OPENGL -DHAVE_OPENGL1 -DHAVE_GLSL -DHAVE_SHADERPIPELINE -DHAVE_OZONE
    LDFLAGS += shell32.lib user32.lib gdi32.lib comdlg32.lib winmm.lib ole32.lib msimg32.lib
-   
+
    PATH := $(shell IFS=$$'\n'; cygpath "$(VS80COMNTOOLS)../../VC/bin"):$(PATH)
    PATH := $(PATH):$(shell IFS=$$'\n'; cygpath "$(VS80COMNTOOLS)../IDE")
    INCLUDE := $(shell IFS=$$'\n'; cygpath -w "$(VS80COMNTOOLS)../../VC/include")
@@ -448,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
@@ -470,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
@@ -479,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__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))
 
@@ -519,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
@@ -541,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
@@ -550,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__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))
@@ -594,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
@@ -616,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
@@ -625,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__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))
@@ -669,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
@@ -691,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
@@ -699,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__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))
@@ -758,15 +780,46 @@ 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 \
 				  -Ideps \
-				  -Ideps/stb 
+				  -Ideps/stb
 endif
 
 OBJ = griffin/griffin.o  $(PLATOBJS)
@@ -826,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)
@@ -856,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
@@ -973,8 +1031,8 @@ ifneq (,$(findstring msvc,$(platform)))
 	LINKOUT = -out:
 	LINK = link.exe
 else
-	OBJOUT   = -o 
-	LINKOUT  = -o 
+	OBJOUT   = -o
+	LINKOUT  = -o
 	LINK = $(CXX)
 endif
 

Makefile.libnx

@@ -17,13 +17,11 @@ DEBUG                  ?= 0
 WHOLE_ARCHIVE_LINK      = 0
 GRIFFIN_BUILD           = 0
 
-OBJ := 
+OBJ :=
 
-# For threading we need to overwrite some vars with global defines because devkitPro's includes 
-# make it hard for us. This works for the pthread wrapper
-DEFINES_THREAD := -Dpthread_t=Thread -Dpthread_mutex_t=Mutex -Dpthread_mutexattr_t='void*' -Dpthread_attr_t=int -Dpthread_cond_t=CondVar -Dpthread_condattr_t='int' -D_SYS__PTHREADTYPES_H_
-DEFINES := -D__SWITCH__=1 -U__linux__ -U__linux -DGLM_FORCE_PURE=1 -DRARCH_CONSOLE -DRARCH_INTERNAL -DGLOBAL_CONFIG_DIR='"/switch"' $(DEFINES_THREAD) -DHAVE_STB_VORBIS
+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
@@ -52,6 +50,7 @@ HAVE_SWITCH = 1
 HAVE_LIBNX = 1
 HAVE_OPENGL = 1
 HAVE_LANGEXTRA = 1
+HAVE_MENU_WIDGETS = 1
 
 ifeq ($(HAVE_OPENGL), 1)
   HAVE_EGL = 1
@@ -61,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
@@ -113,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
 
@@ -121,16 +122,15 @@ ifeq ($(strip $(HAVE_STATIC_DUMMY)),1)
   CFLAGS	+=	-DHAVE_STATIC_DUMMY=1
 endif
 
-# The following line works around an issue in newlib that produces a compilation
-# error in glm. It will be removed as soon as this issue is resolved.
-CFLAGS	+= -D_GLIBCXX_USE_C99_MATH_TR1 -D_LDBL_EQ_DBL
-
 CXXFLAGS	:= $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11
 
 ASFLAGS	:=	-g $(ARCH)
 LDFLAGS	=	-specs=$(DEVKITPRO)/libnx/switch.specs $(ARCH) -Wl,--allow-multiple-definition -Wl,-Map,$(notdir $*.map)
 
-LIBS	:= -lstdc++ -lbz2 -lpng -lz -lnx -lm
+# add things from Makefile.common
+CFLAGS += $(DEF_FLAGS)
+
+LIBS	:= -lswresample -lavformat -lavcodec -lavutil -lswscale -lstdc++ -lbz2 -lpng -lz -lnx -lm
 
 ifeq ($(HAVE_OPENGL), 1)
   LIBS := -lEGL -lglapi -ldrm_nouveau $(LIBS)

Makefile.libogc

@@ -29,7 +29,7 @@ ifneq (,$(findstring Darwin,$(UNAME_S)))
 endif
 
 #---------------------------------------------------------------------------------
-# path to tools 
+# path to tools
 #---------------------------------------------------------------------------------
 export PORTLIBS	:=	$(DEVKITPRO)/portlibs/ppc
 export PATH	:=	$(DEVKITPPC)/bin:$(PORTLIBS)/bin:$(PATH)
@@ -56,7 +56,7 @@ ISVC=$(or $(VCBUILDHELPER_COMMAND),$(MSBUILDEXTENSIONSPATH32),$(MSBUILDEXTENSION
 #---------------------------------------------------------------------------------
 %.o: %.cpp
 	$(CXX) $(CXXFLAGS) -c $< -o $@
-	
+
 #---------------------------------------------------------------------------------
 %.o: %.c
 	$(CC) $(CFLAGS) -c $< -o $@

Makefile.msvc

@@ -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
@@ -19,6 +20,8 @@ HAVE_D3D11               := 1
 HAVE_D3D12               := 1
 HAVE_CG                  := 1
 HAVE_OPENGL              := 1
+HAVE_OPENGL1             := 1
+HAVE_MENU_WIDGETS			 := 1
 HAVE_VULKAN              := 1
 HAVE_XAUDIO              := 1
 HAVE_XINPUT              := 1
@@ -28,7 +31,6 @@ HAVE_WINMM               := 1
 
 HAVE_RPNG                := 1
 HAVE_ZLIB                := 1
-WANT_ZLIB                := 1
 HAVE_MENU                := 1
 HAVE_RGUI                := 1
 HAVE_XMB                 := 1
@@ -52,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))
@@ -120,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

Makefile.openpandora

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

Makefile.orbis

@@ -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,8 +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
@@ -57,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)),)
@@ -81,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
@@ -117,12 +115,12 @@ ifeq ($(WHOLE_ARCHIVE_LINK), 1)
    WHOLE_START := -Wl,--whole-archive
    WHOLE_END := -Wl,--no-whole-archive
 endif
-CXXFLAGS := $(CFLAGS) 
+CXXFLAGS := $(CFLAGS)
 
 PS4_LIBS := -lps4link -ldebugnet -lorbisFile -lelfloader -lorbisKeyboard -lorbis2d -lpng -lz -lorbisGl -lorbisPad -lorbisAudio -lmod -lorbisFileBrowser -lorbisXbmFont -lSceNet_stub -lScePigletv2VSH_stub -lSceSystemService_stub -lSceUserService_stub -lScePad_stub -lSceAudioOut_stub -lSceIme_stub -lSceSysmodule_stub \
 	-lPs4_extension_kernel_call_standard -lPs4_extension_kernel_execute_dynlib_prepare_dlclose -lPs4_common_kernel -lPs4_common_user -lPs4_common_generic -lPs4LibCInternalAdaptive_stub -lPs4LibKernelAdaptive_stub -lSceLibcInternal_stub -lkernel_stub -lps4Kernel_stub -lPs4_base_stub_resolve_minimal -lPs4_base_kernel_dlsym_standard -lPs4_base_kernel_seek_elf_address_standard -lPs4_base_assembler_register_parameter_standard -lPs4_base_assembler_system_call_standard
 
-LIBS	:= $(WHOLE_START) -lretro_orbis $(WHOLE_END) $(PS4_LIBS) 
+LIBS	:= $(WHOLE_START) -lretro_orbis $(WHOLE_END) $(PS4_LIBS)
 
 TARGETS := $(TARGET).elf
 
@@ -157,10 +155,10 @@ $(TARGET).elf: $(OBJ) libretro_orbis.a
 	$(LD) $(CRTFILE) $(OBJ) $(LDFLAGS) $(LIBDIRS) $(LIBS) -o $@
 
 clean:
-	rm -f $(OBJ) $(TARGET).elf 
+	rm -f $(OBJ) $(TARGET).elf
 	rm -f $(OBJ:.o=.depend)
 
-.PHONY: clean all 
+.PHONY: clean all
 .PRECIOUS: %.depend
 
 -include $(OBJ:.o=.depend)

Makefile.pandora

@@ -36,7 +36,7 @@ retroarch.pnd: install
 	pnd_make -c -p retroarch.pnd -d $(PNDDIR)/ -x $(PNDDIR)/PXML.xml -i $(PNDDIR)/icon.png
 
 clean:
-	rm -f *.o 
+	rm -f *.o
 	rm -f audio/*.o
 	rm -f conf/*.o
 	rm -f gfx/*.o

Makefile.ps2

@@ -5,16 +5,19 @@ HAVE_LOGGER        = 0
 HAVE_FILE_LOGGER   = 0
 HAVE_THREADS       = 0
 BIG_STACK          = 0
-MUTE_WARNINGS      = 0
+MUTE_WARNINGS      = 1
 PS2_IP = 192.168.1.150
 
-#Configuration for IRX
-EE_BIN2O = bin2o
-IRX_DIR = $(PS2SDK)/iop/irx
-
 TARGET = retroarchps2.elf
 TARGET_RELEASE = retroarchps2-release.elf
 
+# Lib CDVD
+CDVD_DIR = ps2/libcdvd
+
+# Compile the IRXs first
+IRX_DIR = ps2/irx
+IRX_FILES = $(wildcard ps2/irx/*.c)
+
 ifeq ($(DEBUG), 1)
    OPTIMIZE_LV	:= -O0 -g
 	RARCH_DEFINES += -DDEBUG
@@ -27,25 +30,21 @@ ifeq ($(MUTE_WARNINGS), 1)
    DISABLE_WARNINGS := -Wno-sign-compare -Wno-unused -Wno-parentheses
 endif
 
-INCDIR = -I$(PS2DEV)/gsKit/include -I$(PS2SDK)/ports/include
-INCDIR += -Ips2 -Ips2/include -Ilibretro-common/include
-INCDIR += -Ideps -Ideps/stb -Ideps/libz -Ideps/7zip -Ideps/pthreads -Ideps/pthreads/platform/ps2 -Ideps/pthreads/platform/helper
+INCDIR = -I$(PS2DEV)/gsKit/include -I$(PS2SDK)/ports/include -I$(CDVD_DIR)/ee
+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.
-LIBS += -lretro_ps2 -lgskit -ldmakit -lgskit_toolkit -laudsrv -lpad -lmc -lhdd -lsdl -lfileXio -lpatches -lpoweroff
+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 -lz
+LIBS += -lcdvdfs -lpatches -lpoweroff
 
-#IRX modules
-# IRX modules - modules have to be in IRX_DIR
-IRX = iomanX.irx fileXio.irx mcman.irx mcserv.irx usbd.irx usbhdfsd.irx freesd.irx audsrv.irx poweroff.irx ps2dev9.irx ps2atad.irx ps2hdd.irx ps2fs.irx
-IRX_OBJ = $(IRX:.irx=.o)
-EE_OBJS += $(IRX_OBJ)
 
 ifeq ($(HAVE_THREADS), 1)
 RARCH_DEFINES += -DHAVE_THREADS
@@ -65,8 +64,15 @@ endif
 
 CFLAGS += $(RARCH_DEFINES)
 
+# All the IRX objects
+EE_OBJS += $(IRX_DIR)/freemtap_irx.o $(IRX_DIR)/freepad_irx.o $(IRX_DIR)/freesio2_irx.o $(IRX_DIR)/iomanX_irx.o
+EE_OBJS += $(IRX_DIR)/fileXio_irx.o $(IRX_DIR)/mcman_irx.o $(IRX_DIR)/mcserv_irx.o $(IRX_DIR)/usbd_irx.o
+EE_OBJS += $(IRX_DIR)/usbhdfsd_irx.o $(IRX_DIR)/freesd_irx.o $(IRX_DIR)/audsrv_irx.o $(IRX_DIR)/poweroff_irx.o
+EE_OBJS += $(IRX_DIR)/cdvd_irx.o
+
 # Missing objecst on the PS2SDK
-EE_OBJS += ps2/compat_files/compat_ctype.o ps2/compat_files/time.o
+EE_OBJS += ps2/compat_files/compat_ctype.o ps2/compat_files/time.o ps2/compat_files/ps2_devices.o 
+EE_OBJS += ps2/compat_files/fileXio_cdvd.o ps2/compat_files/ps2_descriptor.o
 
 #EE_OBJS = griffin/griffin.o bootstrap/ps2/kernel_functions.o
 EE_OBJS += griffin/griffin.o
@@ -77,14 +83,18 @@ EE_LDFLAGS = $(LDFLAGS)
 EE_LIBS = $(LIBS)
 EE_ASFLAGS = $(ASFLAGS)
 EE_INCS = $(INCDIR)
-EE_IRX_OBJ = $(IRX_OBJ) 
 EE_BIN = $(TARGET)
 EE_GPVAL = $(GPVAL)
 
-all: $(EE_IRX_OBJ) $(EE_BIN)
+
+all: irxdir $(EE_BIN)
+
+irxdir:
+	$(MAKE) -C $(IRX_DIR)
 
 clean:
 	rm -f $(EE_BIN) $(EE_OBJS)
+	$(MAKE) -C $(IRX_DIR) clean
 
 prepare:
 	ps2client -h $(PS2_IP) reset
@@ -100,12 +110,8 @@ package:
 
 release: clean all package
 
-#Specific file name and output per IRX Module
-$(EE_IRX_OBJ):
-	$(EE_BIN2O) $(EE_GPVAL) $(IRX_DIR)/$(@:.o=.irx) $@ $(@:.o=_irx)
-
 #Include preferences
-include $(PS2SDK)/samples/Makefile.pref 
+include $(PS2SDK)/samples/Makefile.pref
 include $(PS2SDK)/samples/Makefile.eeglobal
 
 #Linking with C++

Makefile.ps3

@@ -33,7 +33,13 @@ EBOOT_PATH		= pkg/ps3/USRDIR/EBOOT.BIN
 CORE_PATH		= pkg/ps3/USRDIR/cores/CORE.SELF
 
 LDDIRS = -L. -L$(CELL_SDK)/target/ppu/lib/PSGL/RSX/ultra-opt
-INCDIRS = -I. -Idefines -Ideps/libz -Ilibretro-common/include -Ideps -Ideps/stb
+INCDIRS = -I. \
+			 -Idefines \
+			 -Ideps \
+			 -Ideps/stb \
+			 -Ideps/rcheevos/include \
+			 -Ilibretro-common/include \
+			 -Ilibretro-common/include/compat/zlib
 
 # system platform
 system_platform = unix
@@ -63,7 +69,8 @@ endif
 
 PPU_SRCS		= griffin/griffin.c
 
-DEFINES += -DHAVE_MENU -DHAVE_RGUI -DHAVE_XMB -DHAVE_LIBRETRODB -DHAVE_MATERIALUI -DHAVE_SHADERPIPELINE -DRARCH_INTERNAL -DMSB_FIRST -DHAVE_OVERLAY -DHAVE_CC_RESAMPLER -DHAVE_STB_VORBIS -DHAVE_STB_FONT -DHAVE_RUNAHEAD -DHAVE_DR_MP3 -DHAVE_DR_FLAC
+#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
@@ -87,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)
@@ -112,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
 
@@ -159,7 +163,7 @@ create-core:
 
 create-npdrm-salamander:
 	$(MAKE_FSELF_NPDRM) $(SALAMANDER_TARGET) $(EBOOT_PATH)
-	
+
 create-salamander:
 	$(MAKE_SELF) $(SALAMANDER_TARGET) $(EBOOT_PATH) $(CONTENT_ID_FULL)
 

Makefile.ps3.cobra

@@ -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
@@ -155,7 +153,7 @@ create-core:
 
 create-npdrm-salamander:
 	$(MAKE_FSELF_NPDRM) $(SALAMANDER_TARGET) $(EBOOT_PATH)
-	
+
 create-salamander:
 	$(MAKE_SELF) $(SALAMANDER_TARGET) $(EBOOT_PATH) $(CONTENT_ID_FULL)
 

Makefile.ps3.salamander

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

Makefile.psl1ght

@@ -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,14 +89,17 @@ 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)
 
 ifeq ($(DEBUG), 1)
    CFLAGS += -O0 -g
 else
-   CFLAGS += -O3 -g 
+   CFLAGS += -O3 -g
    CXXFLAGS += -03 -g
 endif
 

Makefile.psp1

@@ -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 =

Makefile.psp1.salamander

@@ -25,7 +25,7 @@ ifeq ($(HAVE_FILE_LOGGER), 1)
 CFLAGS		+= -DHAVE_FILE_LOGGER
 endif
 
-CFLAGS += $(RARCH_DEFINES) 
+CFLAGS += $(RARCH_DEFINES)
 
 EXTRA_TARGETS   = EBOOT.PBP
 PSP_EBOOT_TITLE = RetroArch
@@ -51,7 +51,7 @@ OBJS = frontend/frontend_salamander.o \
 		 libretro-common/hash/rhash.o \
 		 file_path_str.o \
 		 verbosity.o \
-		 bootstrap/psp1/kernel_functions.o 
+		 bootstrap/psp1/kernel_functions.o
 
 PSPSDK=$(shell psp-config --pspsdk-path)
 include $(PSPSDK)/lib/build.mak

Makefile.switch

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

Makefile.vita

@@ -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
+	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
@@ -116,7 +115,7 @@ endif
 CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions
 
 VITA_LIBS := -lSceDisplay_stub -lSceGxm_stub -lSceNet_stub -lSceNetCtl_stub \
-	-lSceSysmodule_stub -lSceCtrl_stub -lSceTouch_stub -lSceAudio_stub \
+	-lSceSysmodule_stub -lSceCtrl_stub -lSceHid_stub -lSceTouch_stub -lSceAudio_stub \
 	-lScePower_stub -lSceRtc_stub -lSceCommonDialog_stub -lScePgf_stub \
 	-lSceFiber_stub -lSceMotion_stub -lSceAppMgr_stub -lpthread -lpng -lz
 

Makefile.vita.salamander

@@ -22,7 +22,7 @@ RARCH_DEFINES = -DVITA -DIS_SALAMANDER -DRARCH_CONSOLE
 LIBDIR =
 LDFLAGS =
 LIBS = -lSceDisplay_stub -lSceGxm_stub -lSceNet_stub -lSceNetCtl_stub\
-     -lSceSysmodule_stub -lSceCtrl_stub -lSceAudio_stub -lSceFiber_stub\
+     -lSceSysmodule_stub -lSceCtrl_stub -lSceHid_stub -lSceAudio_stub -lSceFiber_stub\
      -lScePower_stub -lSceRtc_stub -lSceCommonDialog_stub -lScePgf_stub \
      -lSceMotion_stub -lSceAppMgr_stub -lfreetype -lpng -lm -lc
 

Makefile.wii.salamander

@@ -30,12 +30,12 @@ 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 
+INCLUDE += -I$(DEVKITPRO)/libogc/include
 LIBDIRS := -L$(DEVKITPRO)/libogc/lib/wii -L.
 else
-INCLUDE += -Iwii/libogc/include 
+INCLUDE += -Iwii/libogc/include
 LIBDIRS := -Lwii/libogc/libs/wii -L.
 endif
 

Makefile.wiiu

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

Makefile.win

@@ -1,5 +1,6 @@
 TARGET = retroarch.exe
 
+HAVE_AUDIOMIXER = 1
 HAVE_DINPUT = 1
 HAVE_XAUDIO = 1
 HAVE_DSOUND = 1
@@ -32,9 +33,7 @@ HAVE_FREETYPE := 1
 HAVE_FFMPEG   := 0
 
 HAVE_CG       := 1
-HAVE_LIBXML2  := 0
 HAVE_ZLIB     := 1
-WANT_ZLIB     := 1
 HAVE_CC_RESAMPLER := 1
 
 ifeq ($(HAVE_CG), 1)
@@ -46,11 +45,6 @@ FREETYPE_CFLAGS  := -DHAVE_FREETYPE -Ifreetype2
 FREETYPE_LIBS    := -lfreetype
 endif
 
-ifeq ($(HAVE_LIBXML2), 1)
-LIBXML2_CFLAGS   := -Ilibxml2 -DHAVE_LIBXML2 -DHAVE_GLSL
-LIBXML2_LIBS     := -lxml2 -liconv
-endif
-
 ifeq ($(HAVE_SDL), 1)
 SDL_LIBS         := -lSDL
 SDL_CFLAGS       := -ISDL -DHAVE_SDL
@@ -62,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
@@ -86,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

README-mali_fbdev_r4p0.md

@@ -1,7 +1,7 @@
 USAGE NOTES
 ===========
 
-This driver is meant for devices with Allwinner SoCs with Mali400 3D block and a 
+This driver is meant for devices with Allwinner SoCs with Mali400 3D block and a
 good fbdev implementation. It is derived from the old Android GLES driver.
 
 It was meant to be used on Cubieboard/Cubieboard2/Cubietruck, but it should not
@@ -19,7 +19,7 @@ First we will clone and build the kernel:
 git clone https://github.com/mireq/linux-sunxi.git -b sunxi-3.4 --depth 1
 
 Now we edit drivers/video/sunxi/disp/dev_fb.c, and uncomment the line 1074:
-// Fb_wait_for_vsync(info); 
+// Fb_wait_for_vsync(info);
 
 It is assumed you have a cross-compiler installed, so we configure and build the kernel and modules:
 
@@ -50,7 +50,7 @@ Now we need the headers. We can get them from here:
 
 http://malideveloper.arm.com/develop-for-mali/sdks/opengl-es-sdk-for-linux/#opengl-es-sdk-for-linux-download
 
-Download whatever version you want. We just get the headers from here, not machine-dependant compiled code. 
+Download whatever version you want. We just get the headers from here, not machine-dependant compiled code.
 
 Extract the files and copy the directories inside inc to /usr/include .
 
@@ -60,27 +60,27 @@ In the end you should have this on your system:
 
    /usr/include/EGL/
       eglext.h
-      egl.h           
-      eglplatform.h   
+      egl.h
+      eglplatform.h
       fbdev_window.h
    /usr/include/GLES/
       glext.h
-      gl.h  
+      gl.h
       glplatform.h
    /usr/include/GLES2
       gl2ext.h
-      gl2.h  
+      gl2.h
       gl2platform.h
    /usr/include/GLES3
       gl3ext.h
-      gl3.h  
+      gl3.h
       gl3platform.h
 
 To enable mali_fbdev you must configure RetroArch with --enable-gles and --enable-mali_fbdev.
 
 This is an example of what you would use on a CubieBoard2 for a lightweight RetroArch:
 
-./configure --enable-gles --enable-mali_fbdev --disable-x11 --disable-sdl2 --enable-floathard --disable-ffmpeg --disable-netplay --enable-udev --disable-sdl --disable-pulse --disable-oss --disable-freetype --disable-7zip --disable-libxml2
+./configure --enable-gles --enable-mali_fbdev --disable-x11 --disable-sdl2 --enable-floathard --disable-ffmpeg --disable-netplay --enable-udev --disable-sdl --disable-pulse --disable-oss --disable-freetype --disable-7zip
 
 NOTE: A TTY hack is used to auto-clean the console on exit, and the fbdev ioctls are used to retrieve
 current video mode. Both things work good, but they are not exactly ideal solutions.

README.md

@@ -31,7 +31,7 @@ Latest binaries are currently hosted on the [buildbot](http://buildbot.libretro.
 
 ## Support
 
-To reach developers, either make an issue here on GitHub, make a thread on the [forum](http://www.libretro.com/forums/), chat on [Discord](https://discord.gg/C4amCeV), or visit our IRC channel: #retroarch @ irc.freenode.org.
+To reach developers, either make an issue here on GitHub, make a thread on the [forum](http://www.libretro.com/forums/), chat on [discord](https://discord.gg/C4amCeV), or visit our IRC channel: #retroarch @ irc.freenode.org.
 
 ## Documentation
 
@@ -105,7 +105,6 @@ OSX port of RetroArch requires latest versions of XCode to build.
 RetroArch can utilize these libraries if enabled:
 
    - nvidia-cg-toolkit
-   - libxml2 (GLSL XML shaders)
    - libfreetype2 (TTF font rendering on screen)
 
 RetroArch needs at least one of these audio driver libraries:
@@ -148,7 +147,7 @@ Instructions for compiling and installing RetroArch can be found in the [Libretr
 
 ## CRT 15Khz Resolution Switching
 
-CRT SwitchRes will turn on, on the fly. However, you will need to restart RetroArch to disable it. With CRT SwitchRes enable RetroArch will start in 2560 x 480 @ 60.  
+CRT SwitchRes will turn on, on the fly. However, you will need to restart RetroArch to disable it. With CRT SwitchRes enable RetroArch will start in 2560 x 480 @ 60.
 
 If you are running Windows, before enabling the CRT SwitchRes options please make sure you have installed CRTEmudriver and installed some modelines. The minimum modelines for all games to switch correctly are:
 

audio/audio_driver.h

@@ -1,323 +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_set_own_driver(void);
-
-void audio_driver_unset_own_driver(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);
-
-bool audio_driver_owns_driver(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);
-
-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

audio/audio_thread_wrapper.c

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

audio/audio_thread_wrapper.h

@@ -19,7 +19,7 @@
 
 #include <boolean.h>
 
-#include "audio_driver.h"
+#include "../retroarch.h"
 
 /**
  * audio_init_thread:

audio/common/mmdevice_common.c

@@ -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;
+}

audio/common/mmdevice_common.h

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

audio/common/mmdevice_common_inline.h

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

audio/drivers/alsa.c

@@ -21,7 +21,7 @@
 
 #include <alsa/asoundlib.h>
 
-#include "../audio_driver.h"
+#include "../../retroarch.h"
 #include "../../verbosity.h"
 
 typedef struct alsa
@@ -180,6 +180,7 @@ error:
 #define BYTES_TO_FRAMES(bytes, frame_bits)  ((bytes) * 8 / frame_bits)
 #define FRAMES_TO_BYTES(frames, frame_bits) ((frames) * frame_bits / 8)
 
+static bool alsa_start(void *data, bool is_shutdown);
 static ssize_t alsa_write(void *data, const void *buf_, size_t size_)
 {
    alsa_t *alsa              = (alsa_t*)data;
@@ -188,6 +189,12 @@ static ssize_t alsa_write(void *data, const void *buf_, size_t size_)
    snd_pcm_sframes_t size    = BYTES_TO_FRAMES(size_, alsa->frame_bits);
    size_t frames_size        = alsa->has_float ? sizeof(float) : sizeof(int16_t);
 
+   /* Workaround buggy menu code.
+    * If a write happens while we're paused, we might never progress. */
+   if (alsa->is_paused)
+      if (!alsa_start(alsa, false))
+         return -1;
+
    if (alsa->nonblock)
    {
       while (size)
@@ -269,6 +276,8 @@ static bool alsa_alive(void *data)
 static bool alsa_stop(void *data)
 {
    alsa_t *alsa = (alsa_t*)data;
+   if (alsa->is_paused)
+	  return true;
 
    if (alsa->can_pause
          && !alsa->is_paused)
@@ -293,6 +302,8 @@ static void alsa_set_nonblock_state(void *data, bool state)
 static bool alsa_start(void *data, bool is_shutdown)
 {
    alsa_t *alsa = (alsa_t*)data;
+   if (!alsa->is_paused)
+	  return true;
 
    if (alsa->can_pause
          && alsa->is_paused)

audio/drivers/alsa_qsa.c

@@ -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;
 }
 

audio/drivers/alsathread.c

@@ -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,
 };

audio/drivers/audioio.c

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

audio/drivers/coreaudio.c

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

audio/drivers/coreaudio3.m

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

audio/drivers/ctr_csnd_audio.c

@@ -19,7 +19,7 @@
 #include <retro_miscellaneous.h>
 #include <retro_timers.h>
 
-#include "../audio_driver.h"
+#include "../../retroarch.h"
 
 typedef struct
 {

audio/drivers/ctr_dsp_audio.c

@@ -17,7 +17,7 @@
 #include <string.h>
 #include <malloc.h>
 
-#include "../audio_driver.h"
+#include "../../retroarch.h"
 #include "../../ctr/ctr_debug.h"
 
 typedef struct

audio/drivers/dsound.c

@@ -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,
 };

audio/drivers/gx_audio.c

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

audio/drivers/jack.c

@@ -25,7 +25,7 @@
 #include <boolean.h>
 #include <rthreads/rthreads.h>
 
-#include "../audio_driver.h"
+#include "../../retroarch.h"
 #include "../../configuration.h"
 #include "../../verbosity.h"
 

audio/drivers/nullaudio.c

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

audio/drivers/openal.c

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

audio/drivers/opensl.c

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

audio/drivers/oss.c

@@ -33,7 +33,7 @@
 #include "config.h"
 #endif
 
-#include "../audio_driver.h"
+#include "../../retroarch.h"
 #include "../../verbosity.h"
 
 #ifdef HAVE_OSS_BSD

audio/drivers/ps2_audio.c

@@ -21,86 +21,19 @@
 #include <kernel.h>
 #include <audsrv.h>
 
-#include "../audio_driver.h"
+#include "../../retroarch.h"
+
+#define AUDIO_BUFFER 128 * 1024
+#define AUDIO_CHANNELS 2
+#define AUDIO_BITS 16
 
 typedef struct ps2_audio
 {
-   fifo_buffer_t* buffer;
    bool nonblocking;
-   volatile bool running;
-   int worker_thread;
-   int lock;
-   int cond_lock;
+   bool running;
 
 } ps2_audio_t;
 
-static ps2_audio_t *backup_ps2;
-static u8 audioThreadStack[4 * 1024] __attribute__ ((aligned(16)));
-
-#define AUDIO_OUT_BUFFER 2 * 1024
-#define AUDIO_BUFFER 64 * 1024
-#define AUDIO_CHANNELS 2
-#define AUDIO_BITS 16
-#define AUDIO_PRIORITY 0x7F /* LOWER VALUE GRATHER PRIORITY*/
-
-static void audioMainLoop(void *data)
-{
-   char out_tmp[AUDIO_OUT_BUFFER];
-   ps2_audio_t* ps2 = backup_ps2;
-
-   while (ps2->running)
-   {
-      size_t size;
-
-      WaitSema(ps2->lock);
-      size = MIN(fifo_read_avail(ps2->buffer), sizeof(out_tmp)); 
-      fifo_read(ps2->buffer, out_tmp, size);
-      iSignalSema(ps2->lock);
-      iSignalSema(ps2->cond_lock);
-
-      audsrv_wait_audio(size);
-      audsrv_play_audio(out_tmp, size);
-   }
-
-   audsrv_stop_audio();
-   ExitDeleteThread();
-}
-
-static void audioCreateThread(ps2_audio_t *ps2)
-{
-   int ret;
-   ee_thread_t thread;
-
-   thread.func=&audioMainLoop;
-   thread.stack=audioThreadStack;
-   thread.stack_size=sizeof(audioThreadStack);
-   thread.gp_reg=&_gp;
-   thread.initial_priority=AUDIO_PRIORITY;
-   thread.attr=thread.option=0;
-
-   /*Backup the PS2 content to be used in the thread */
-   backup_ps2 = ps2;
-
-   ps2->running = true;
-   ps2->worker_thread = CreateThread(&thread);
-
-   if (ps2->worker_thread >= 0)
-   {
-      ret = StartThread(ps2->worker_thread, NULL);
-      if (ret < 0)
-         printf("sound_init: StartThread returned %d\n", ret);
-   }
-   else
-      printf("CreateThread failed: %d\n", ps2->worker_thread);
-}
-
-static void audioStopNDeleteThread(ps2_audio_t *ps2)
-{
-   ps2->running = false;
-   if (ps2->worker_thread)
-      ps2->worker_thread = 0;
-}
-
 static void audioConfigure(ps2_audio_t *ps2, unsigned rate)
 {
    int err;
@@ -112,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());
    }
@@ -120,23 +54,6 @@ static void audioConfigure(ps2_audio_t *ps2, unsigned rate)
    audsrv_set_volume(MAX_VOLUME);
 }
 
-static void audioCreateSemas(ps2_audio_t *ps2)
-{
-   ee_sema_t lock_info;
-   ee_sema_t cond_lock_info;
-
-   lock_info.max_count = 1;
-   lock_info.init_count = 1;
-   lock_info.option = 0;
-   ps2->lock = CreateSema(&lock_info);
-
-   cond_lock_info.init_count = 1;
-   cond_lock_info.max_count  = 1;
-   cond_lock_info.option = 0;
-
-   ps2->cond_lock = CreateSema(&cond_lock_info);
-}
-
 static void *ps2_audio_init(const char *device,
       unsigned rate, unsigned latency,
       unsigned block_frames,
@@ -147,10 +64,7 @@ static void *ps2_audio_init(const char *device,
    if (!ps2)
       return NULL;
 
-   ps2->buffer = fifo_new(AUDIO_BUFFER);
    audioConfigure(ps2, rate);
-   audioCreateSemas(ps2);
-   audioCreateThread(ps2);
 
    return ps2;
 }
@@ -158,48 +72,25 @@ 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;
 
-   if(ps2->running){
-      audioStopNDeleteThread(ps2);
-
-      if (ps2->lock){
-         iDeleteSema(ps2->lock);
-         ps2->lock = 0;
-      }
-
-      if (ps2->cond_lock){
-         iDeleteSema(ps2->cond_lock);
-         ps2->cond_lock = 0;
-      }
-
-   }
-   fifo_free(ps2->buffer);
+   ps2->running = false;
+   audsrv_stop_audio();
    free(ps2);
 }
 
 static ssize_t ps2_audio_write(void *data, const void *buf, size_t size)
 {
+   int bytes_sent;
    ps2_audio_t* ps2 = (ps2_audio_t*)data;
 
    if (!ps2->running)
       return -1;
 
-   if (ps2->nonblocking)
-   {
-      if (fifo_write_avail(ps2->buffer) < size)
-         return 0;
-   }
+   bytes_sent = audsrv_play_audio(buf, size);
 
-   while (fifo_write_avail(ps2->buffer) < size)
-      WaitSema(ps2->cond_lock);
-
-   WaitSema(ps2->lock);
-   fifo_write(ps2->buffer, buf, size);
-   iSignalSema(ps2->lock);
-
-   return size;
+   return bytes_sent;
 }
 
 static bool ps2_audio_alive(void *data)
@@ -220,8 +111,8 @@ static bool ps2_audio_stop(void *data)
 
    if (ps2)
    {
-      audioStopNDeleteThread(ps2);
       audsrv_stop_audio();
+      ps2->running = false;
    }
 
    return stop;
@@ -233,10 +124,7 @@ static bool ps2_audio_start(void *data, bool is_shutdown)
    bool       start = true;
 
    if (ps2)
-   {
-      if (!ps2->running && !ps2->worker_thread)
-         audioCreateThread(ps2);
-   }
+      ps2->running = true;
 
    return start;
 }
@@ -259,13 +147,7 @@ static size_t ps2_audio_write_avail(void *data)
    ps2_audio_t* ps2 = (ps2_audio_t*)data;
 
    if (ps2 && ps2->running)
-   {
-      size_t size;
-      WaitSema(ps2->lock);
-      size = AUDIO_BUFFER - fifo_read_avail(ps2->buffer); 
-      iSignalSema(ps2->lock);
-      return size;
-   }
+      return AUDIO_BUFFER;
 
    return 0;
 }

audio/drivers/ps3_audio.c

@@ -19,7 +19,7 @@
 
 #include <queues/fifo_queue.h>
 
-#include "../audio_driver.h"
+#include "../../retroarch.h"
 
 #include "../../defines/ps3_defines.h"
 

audio/drivers/psp_audio.c

@@ -40,7 +40,7 @@
 #define SceUID uint32_t
 #endif
 
-#include "../audio_driver.h"
+#include "../../retroarch.h"
 
 typedef struct psp_audio
 {
@@ -186,7 +186,7 @@ static void psp_audio_free(void *data)
             psp->running = false;
             sthread_join(psp->worker_thread);
       }
-      
+
       if (psp->cond)
             scond_free(psp->cond);
       if (psp->fifo_lock)
@@ -205,7 +205,7 @@ static ssize_t psp_audio_write(void *data, const void *buf, size_t size)
    psp_audio_t* psp = (psp_audio_t*)data;
    uint16_t write_pos   = psp->write_pos;
    uint16_t sampleCount = size / sizeof(uint32_t);
-   
+
    if (!psp->running)
       return -1;
 
@@ -241,7 +241,6 @@ static ssize_t psp_audio_write(void *data, const void *buf, size_t size)
    slock_unlock(psp->fifo_lock);
    return size;
 
-   
 }
 
 static bool psp_audio_alive(void *data)

audio/drivers/pulse.c

@@ -23,7 +23,7 @@
 #include <retro_miscellaneous.h>
 #include <retro_endianness.h>
 
-#include "../audio_driver.h"
+#include "../../retroarch.h"
 #include "../../verbosity.h"
 
 typedef struct
@@ -237,12 +237,19 @@ error:
    return NULL;
 }
 
+static bool pulse_start(void *data, bool is_shutdown);
 static ssize_t pulse_write(void *data, const void *buf_, size_t size)
 {
    pa_t           *pa = (pa_t*)data;
    const uint8_t *buf = (const uint8_t*)buf_;
    size_t     written = 0;
 
+   /* Workaround buggy menu code.
+    * If a write happens while we're paused, we might never progress. */
+   if (pa->is_paused)
+      if (!pulse_start(pa, false))
+         return -1;
+
    pa_threaded_mainloop_lock(pa->mainloop);
    while (size)
    {
@@ -270,6 +277,8 @@ static bool pulse_stop(void *data)
 {
    bool ret;
    pa_t *pa = (pa_t*)data;
+   if (pa->is_paused)
+      return true;
 
    RARCH_LOG("[PulseAudio]: Pausing.\n");
 
@@ -296,6 +305,8 @@ static bool pulse_start(void *data, bool is_shutdown)
 {
    bool ret;
    pa_t *pa = (pa_t*)data;
+   if (!pa->is_paused)
+      return true;
 
    RARCH_LOG("[PulseAudio]: Unpausing.\n");
 

audio/drivers/roar.c

@@ -23,7 +23,7 @@
 
 #include <boolean.h>
 
-#include "../audio_driver.h"
+#include "../../retroarch.h"
 #include "../../verbosity.h"
 
 typedef struct

audio/drivers/rsound.c

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

audio/drivers/rsound.h

@@ -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() */

audio/drivers/rwebaudio.c

@@ -18,7 +18,7 @@
 #include <unistd.h>
 #include <boolean.h>
 
-#include "../audio_driver.h"
+#include "../../retroarch.h"
 
 /* forward declarations */
 unsigned RWebAudioSampleRate(void);

audio/drivers/sdl_audio.c

@@ -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"
 

audio/drivers/switch_audio.c

@@ -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
@@ -120,7 +120,7 @@ static ssize_t switch_audio_write(void *data, const void *buf, size_t size)
 
 	if (to_write > switch_audio_buffer_size(NULL) - swa->current_buffer->data_size)
 		to_write = switch_audio_buffer_size(NULL) - swa->current_buffer->data_size;
-	
+
    #ifndef HAVE_LIBNX
 	memcpy(((uint8_t*) swa->current_buffer->sample_data) + swa->current_buffer->data_size, buf, to_write);
    #else
@@ -137,7 +137,7 @@ static ssize_t switch_audio_write(void *data, const void *buf, size_t size)
 	}
 
 	swa->last_append = svcGetSystemTick();
-	
+
 	return to_write;
 }
 
@@ -328,7 +328,7 @@ static void *switch_audio_init(const char *device,
    swa->is_paused      = true;
 
    RARCH_LOG("[Audio]: Audio initialized\n");
-   
+
    return swa;
 
 fail_audio_output:

audio/drivers/switch_libnx_audren_audio.c

@@ -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,
+};

audio/drivers/switch_libnx_audren_thread_audio.c

@@ -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,
+};

audio/drivers/switch_thread_audio.c

@@ -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"
@@ -237,7 +237,7 @@ static void *switch_thread_audio_init(const char *device, unsigned rate, unsigne
       if (switch_audio_ipc_output_append_buffer(swa, &swa->buffers[i]) != 0)
          goto fail_audio_output;
    }
-   
+
    compat_mutex_create(&swa->fifoLock);
    swa->fifo = fifo_new(swa->fifoSize);
 

audio/drivers/tinyalsa.c

@@ -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 */
@@ -2169,10 +2169,9 @@ static void * tinyalsa_init(const char *devicestr, unsigned rate,
    unsigned int device          = 0;
    unsigned int frames_per_ms   = 0;
    unsigned int orig_rate       = rate;
-   unsigned int max_rate, min_rate;
+   unsigned int max_rate, min_rate, buffer_size;
    float initial_latency;
 
-   snd_pcm_uframes_t         buffer_size;
    struct pcm_config         config;
 
    tinyalsa_t *tinyalsa      = (tinyalsa_t*)calloc(1, sizeof(tinyalsa_t));
@@ -2258,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));
 

audio/drivers/wasapi.c

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

audio/drivers/wiiu_audio.c

@@ -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
 {

audio/drivers/xaudio.c

@@ -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, 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,
 };

audio/drivers/xaudio27.h

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

audio/drivers/xenon360_audio.c

@@ -21,7 +21,7 @@
 
 #include <retro_inline.h>
 
-#include "../audio_driver.h"
+#include "../../retroarch.h"
 
 #define SOUND_FREQUENCY 48000
 #define MAX_BUFFER 2048

audio/drivers_resampler/cc_resampler.c

@@ -149,7 +149,7 @@ done:
 }
 
 static void *resampler_CC_init(const struct resampler_config *config,
-      double bandwidth_mod, 
+      double bandwidth_mod,
       enum resampler_quality quality,
       resampler_simd_mask_t mask)
 {
@@ -488,7 +488,7 @@ static void resampler_CC_process(void *re_, struct resampler_data *data)
 }
 
 static void *resampler_CC_init(const struct resampler_config *config,
-      double bandwidth_mod, 
+      double bandwidth_mod,
       enum resampler_quality quality,
       resampler_simd_mask_t mask)
 {

audio/drivers_resampler/cc_resampler_neon.S

@@ -78,7 +78,6 @@
 #      d23: (temp)               #      d31: buffer[6]
 #           (temp)               #           buffer[7]
 
-
 resampler_CC_downsample_neon:
 _resampler_CC_downsample_neon:
 
@@ -89,7 +88,6 @@ push {r4}
 
 mov r4, r0
 
-
 veor q0, q0, q0
 vmov.f32 s1, #1.0
 vmov.f32 s2, #2.0
@@ -102,18 +100,15 @@ vmov.f32 q5, #1.0
 vmov.f32 q6, #3.0
 vmov.f32 q7, #0.25
 
-
 vldr s5, [r2, #32]
 vdiv.f32 s6, s20, s4
 vadd.f32 s7, s6, s8
 vdup.f32 q4, d2[0]
 vmin.f32 q4, q4, q5
 
-
 lsl r3, #3
 add r3, r3, r1
 
-
 cmp r3, r1
 beq 3f
 1:
@@ -199,7 +194,6 @@ vpop {q4,q5,q6,q7}
 
 bx lr
 
-
 .align 4
 .globl resampler_CC_upsample_neon
 #ifndef __MACH__
@@ -256,7 +250,6 @@ bx lr
 #      d23: (temp)               #      d31: buffer[6]
 #           (temp)               #           buffer[7]
 
-
 resampler_CC_upsample_neon:
 _resampler_CC_upsample_neon:
 
@@ -267,7 +260,6 @@ push {r4}
 
 mov r4, r0
 
-
 veor q0, q0, q0
 vmov.f32 s0, #1.0
 vmov.f32 s2, #-1.0
@@ -280,18 +272,15 @@ vmov.f32 q5, #1.0
 vmov.f32 q6, #3.0
 vmov.f32 q7, #0.25
 
-
 vldr s5, [r2, #32]
 vdiv.f32 s6, s20, s4
 vadd.f32 s7, s6, s8
 vdup.f32 q4, d2[0]
 vmin.f32 q4, q4, q5
 
-
 lsl r3, #3
 add r3, r3, r1
 
-
 cmp r3, r1
 beq 4f
 1:
@@ -356,7 +345,6 @@ vst1.f32 d20, [r4, :64]!
 
 vadd.f32 s5, s5, s6
 
-
 vcmpe.f32	s5, s20
 vmrs	APSR_nzcv, fpscr
 blt 2b
@@ -368,7 +356,6 @@ vsub.f32 s5, s5, s20
 cmp r3, r1
 bne 1b
 
-
 4:
 vst1.f32 {q14-q15}, [r2, :256]
 vstr s5, [r2, #32]

bootstrap/gx/ogc.ld

@@ -86,7 +86,7 @@ SECTIONS
 		KEEP (*(.fini))
 		. = ALIGN(32);   /* REQUIRED. LD is flaky without it. */
 	} = 0
-	
+
 	PROVIDE (__etext = .);
 	PROVIDE (_etext = .);
 	PROVIDE (etext = .);
@@ -167,7 +167,6 @@ SECTIONS
 	.jcr            : { KEEP (*(.jcr)) }
 	.got		  : { *(.got.plt) *(.got) }
 
-
 	/*	We want the small data sections together, so single-instruction offsets
 		can access them all, and initialized data all before uninitialized, so
 		we can shorten the on-disk segment size.  */
@@ -182,7 +181,7 @@ SECTIONS
 
 	_edata = .;
 	PROVIDE (edata = .);
-	
+
 	.sbss      :
 	{
 		__sbss_start = .;

bootstrap/gx/rvl.ld

@@ -97,7 +97,7 @@ SECTIONS
 		KEEP (*(.fini))
 		. = ALIGN(32);   /* REQUIRED. LD is flaky without it. */
 	} = 0
-	
+
 	PROVIDE (__etext = .);
 	PROVIDE (_etext = .);
 	PROVIDE (etext = .);
@@ -178,7 +178,6 @@ SECTIONS
 	.jcr            : { KEEP (*(.jcr)) }
 	.got		  : { *(.got.plt) *(.got) }
 
-
 	/*	We want the small data sections together, so single-instruction offsets
 		can access them all, and initialized data all before uninitialized, so
 		we can shorten the on-disk segment size.  */
@@ -193,7 +192,7 @@ SECTIONS
 
 	_edata = .;
 	PROVIDE (edata = .);
-	
+
 	.sbss      :
 	{
 		__sbss_start = .;

bootstrap/psp1/kernel_functions_prx/main.c

@@ -56,7 +56,7 @@ void exitspawn_kernel(const char *fileName, SceSize args, void *argp)
    game_param.unk5 = 0x10000;
 
    int k1 = pspSdkSetK1(0);
-   //sceKernelSuspendAllUserThreads(); 
+   //sceKernelSuspendAllUserThreads();
    int ret = sceKernelLoadExecVSHMs2(fileName, &game_param);
    pspSdkSetK1(k1);
 }

camera/camera_driver.c

@@ -1,251 +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
-#if defined(HAVE_AVFOUNDATION)
-#if defined(HAVE_COCOA) || defined(HAVE_COCOATOUCH)
-    &camera_avfoundation,
-#endif
-#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;
-static bool camera_driver_data_own            = 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_data_own = false;
-         camera_driver          = NULL;
-         camera_data            = NULL;
-         break;
-      case RARCH_CAMERA_CTL_SET_OWN_DRIVER:
-         camera_driver_data_own = true;
-         break;
-      case RARCH_CAMERA_CTL_UNSET_OWN_DRIVER:
-         camera_driver_data_own = false;
-         break;
-      case RARCH_CAMERA_CTL_OWNS_DRIVER:
-         return camera_driver_data_own;
-      case RARCH_CAMERA_CTL_SET_ACTIVE:
-         camera_driver_active = true;
-         break;
-      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);
-        }
-        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;
-}

camera/camera_driver.h

@@ -1,113 +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_OWN_DRIVER,
-   RARCH_CAMERA_CTL_UNSET_OWN_DRIVER,
-   RARCH_CAMERA_CTL_OWNS_DRIVER,
-   RARCH_CAMERA_CTL_SET_ACTIVE,
-   RARCH_CAMERA_CTL_UNSET_ACTIVE,
-   RARCH_CAMERA_CTL_IS_ACTIVE,
-   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

camera/drivers/android.c

@@ -17,7 +17,7 @@
 
 #include <glsym/glsym.h>
 
-#include "../camera_driver.h"
+#include "../../retroarch.h"
 
 typedef struct android_camera
 {

camera/drivers/nullcamera.c

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

camera/drivers/rwebcam.c

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

camera/drivers/video4linux2.c

@@ -45,7 +45,7 @@
 
 #include <compat/strl.h>
 
-#include "../camera_driver.h"
+#include "../../retroarch.h"
 #include "../../verbosity.h"
 
 struct buffer

cheevos-new/badges.c

@@ -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)
@@ -34,7 +48,7 @@ void set_badge_menu_texture(badges_ctx_t * badges, int i)
 
 #ifdef HAVE_MENU
    menu_display_reset_textures_list(badge_file, fullpath,
-         &badges->menu_texture_list[i],TEXTURE_FILTER_MIPMAP_LINEAR);
+         &badges->menu_texture_list[i],TEXTURE_FILTER_MIPMAP_LINEAR, NULL, NULL);
 #endif
 }
 

cheevos-new/badges.h

@@ -16,10 +16,10 @@
 #ifndef __RARCH_CHEEVOS_BADGE_H
 #define __RARCH_CHEEVOS_BADGE_H
 
-#include "../menu/menu_driver.h"
-
 #include <retro_common_api.h>
 
+#include "../menu/menu_driver.h"
+
 RETRO_BEGIN_DECLS
 
 #define CHEEVOS_BADGE_LIMIT 256

cheevos-new/cheevos.h

@@ -27,49 +27,49 @@
 
 RETRO_BEGIN_DECLS
 
-typedef struct cheevos_ctx_desc
+typedef struct rcheevos_ctx_desc
 {
    unsigned idx;
    char *s;
    size_t len;
-} cheevos_ctx_desc_t;
+} rcheevos_ctx_desc_t;
 
 enum
 {
-   CHEEVOS_ACTIVE_SOFTCORE = 1 << 0,
-   CHEEVOS_ACTIVE_HARDCORE = 1 << 1
+   RCHEEVOS_ACTIVE_SOFTCORE = 1 << 0,
+   RCHEEVOS_ACTIVE_HARDCORE = 1 << 1
 };
 
-bool cheevos_load(const void *data);
+bool rcheevos_load(const void *data);
 
-void cheevos_reset_game(void);
+void rcheevos_reset_game(void);
 
-void cheevos_populate_menu(void *data);
+void rcheevos_populate_menu(void *data);
 
-bool cheevos_get_description(cheevos_ctx_desc_t *desc);
+bool rcheevos_get_description(rcheevos_ctx_desc_t *desc);
 
-bool cheevos_apply_cheats(bool *data_bool);
+bool rcheevos_apply_cheats(bool *data_bool);
 
-bool cheevos_unload(void);
+bool rcheevos_unload(void);
 
-bool cheevos_toggle_hardcore_mode(void);
+bool rcheevos_toggle_hardcore_mode(void);
 
-void cheevos_test(void);
+void rcheevos_test(void);
 
-bool cheevos_set_cheats(void);
+bool rcheevos_set_cheats(void);
 
-void cheevos_set_support_cheevos(bool state);
+void rcheevos_set_support_cheevos(bool state);
 
-bool cheevos_get_support_cheevos(void);
+bool rcheevos_get_support_cheevos(void);
 
-int cheevos_get_console(void);
+int rcheevos_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;
+extern bool rcheevos_loaded;
+extern bool rcheevos_hardcore_active;
+extern bool rcheevos_hardcore_paused;
+extern bool rcheevos_state_loaded_flag;
+extern int rcheevos_cheats_are_enabled;
+extern int rcheevos_cheats_were_enabled;
 
 RETRO_END_DECLS