FAudio: Had to pass function pointers from the struct FAudioVoiceCallBack

In Short, audio works. Just gotta deal with the windows event system
pthreads might have what I need, winpthreads can even be used on windows

Signed-off-by: Zach Bacon <zachbacon@vba-m.com>

CHANGELOG.md

@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [2.1.9] - 2024-02-03
+=======================
+* 84b0a3e3 - Remove SDL sound driver [rkitover]
+* 2ad7dd1a - Fix wav audio recording [40356555+Aikku93]
+* 23ef8ef0 - Dialog appearance improvements + link warning [zachbacon]
+* a0452701 - build: don't fseeko64()/ftello64() on musl libc [rkitover]
+* 9e9fe812 - visualboyadvance-m.metainfo.xml: add screenshots to the metainfo [zachbacon]
+
 ## [2.1.8] - 2023-12-13
 
 ========================

CMakeLists.txt

@@ -45,7 +45,7 @@ if(TAG_RELEASE)
     include(MakeReleaseCommitAndTag)
 endif()
 
-set(VCPKG_DEPS pkgconf zlib sdl2 gettext wxwidgets)
+set(VCPKG_DEPS pkgconf zlib "sdl2[samplerate]" gettext wxwidgets)
 
 set(VCPKG_DEPS_OPTIONAL
     sfml   ENABLE_LINK

DEVELOPER-MANUAL.md

@@ -73,8 +73,61 @@ https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
 the description of your work should be in the **commit message NOT the pull
 request description**.
 
-Make sure your git history is clean and logical, edit when necessary with
-`rebase -i`.
+The title line must be no more than 50 characters and the description must be
+wrapped at 72 characters. Most commit message editor interfaces will help you
+with this. The title line must not end with a period.
+
+Write everything in the imperative mood, e.g. change, fix, **NOT** changes,
+changed, fixed, fixes etc..
+
+A commit message must always have a title and a description, the description
+must be independent of the title line, if necessary repeat the information in
+the title line in the description.
+
+Make sure the git history in your branch is clean and logical, edit when
+necessary with `rebase -i`.
+
+Use one commit per logical change if necessary, most work can be squashed into
+one commit when you are done. It is not necessary to have separate commits
+per-file if they are one logical change. We are less strict about this than
+other projects, fewer is better.
+
+The commit title line should be prefixed with an area, unless it involves the
+wxWidgets GUI app, in which case it should **NOT** have a prefix.
+
+The text after the area prefix should not be capitalized.
+
+Please use one of these area prefixes otherwise:
+
+- doc: documentation, README.md etc.
+- build: cmake, installdeps, preprocessor compatibility defines, etc.
+- gb-core: the GameBoy emulator core
+- gba-core: the GameBoy Advance emulator core
+- libretro: the libretro core glue and build
+- sdl-app: anything for the SDL app
+- translations: anything related to translations
+
+. Add other areas here if needed.
+
+If a commit fixes a regression, use a title line such as:
+
+```console
+Fix regression <PROBLEM> in <SHORT-SHA>
+```
+, you can get the short sha from `git log --oneline -100` or similar.
+
+The commit description for a regression must refer to the breaking change in
+reference format, which you can get from e.g. `git log --format=reference -20`.
+
+You can refer to github issues using `#<ISSUE-NUMBER>` freely in the description
+text.
+
+If a commit fixes an issue, add a line at the end of the description such as:
+
+```console
+Fix #<ISSUE-NUMBER>.
+```
+.
 
 #### Collaboration on a Branch
 

README.md

@@ -37,11 +37,11 @@ Chat](https://web.libera.chat/).
 
 Game Boy and Game Boy Advance Emulator
 
-The forums are [here](https://board.vba-m.com/).
+The forums are [here](https://board.visualboyadvance-m.org/).
 
 Windows and Mac builds are in the [releases tab](https://github.com/visualboyadvance-m/visualboyadvance-m/releases).
 
-Nightly builds for Windows and macOS are at [https://nightly.vba-m.com/](https://nightly.vba-m.com/).
+Nightly builds for Windows and macOS are at [https://nightly.visualboyadvance-m.org/](https://nightly.visualboyadvance-m.org/).
 
 **PLEASE TEST THE NIGHTLY OR MASTER WITH A FACTORY RESET BEFORE REPORTING
 ISSUES**
@@ -152,7 +152,7 @@ And the following development libraries:
 - [gettext](https://www.gnu.org/software/gettext/) and gettext-tools (optional, with ENABLE_NLS)
 - [SDL2](https://www.libsdl.org/) (required)
 - [SFML](https://www.sfml-dev.org/) (optional, for link)
-- [OpenAL](https://www.openal.org/) or [openal-soft](https://kcat.strangesoft.net/openal.html) (optional, a sound interface)
+- [OpenAL](https://www.openal.org/) or [openal-soft](https://kcat.strangesoft.net/openal.html) (required, a sound interface)
 - [wxWidgets](https://wxwidgets.org/) (required for GUI, 2.8 and non-stl builds are no longer supported)
 
 On Linux and similar, you also need the version of GTK your wxWidgets is linked

cmake/FindSDL2.cmake

@@ -202,6 +202,25 @@ IF(SDL2_LIBRARY_TEMP)
 		SET(SDL2_LIBRARY_TEMP ${MINGW32_LIBRARY} ${SDL2_LIBRARY_TEMP} -lversion -limm32)
 	ENDIF(MINGW)
 
+	# Add libsamplerate with vcpkg
+	if(CMAKE_TOOLCHAIN_FILE MATCHES "vcpkg")
+	    if(WIN32)
+		unset(arch_suffix)
+		unset(path_prefix)
+		if(VCPKG_TARGET_TRIPLET MATCHES -static)
+		    set(arch_suffix  -static)
+		endif()
+		if(CMAKE_BUILD_TYPE MATCHES "^(Debug|RelWithDebInfo)$")
+		    set(path_prefix debug)
+		endif()
+		set(installed_prefix ${_VCPKG_INSTALLED_DIR}/${WINARCH}-windows${arch_suffix}/${path_prefix})
+
+		SET(SDL2_LIBRARY_TEMP ${SDL2_LIBRARY_TEMP} ${installed_prefix}/lib/samplerate.lib)
+	    else()
+		SET(SDL2_LIBRARY_TEMP ${SDL2_LIBRARY_TEMP} -lsamplerate)
+	    endif()
+	endif()
+
         # Add some stuff from pkg-config, if available
         IF(NOT PKG_CONFIG_EXECUTABLE)
             FIND_PACKAGE(PkgConfig QUIET)

cmake/Set-Toolchain-vcpkg.cmake

@@ -145,7 +145,7 @@ function(vcpkg_is_installed vcpkg_exe pkg_name pkg_ver pkg_triplet powershell ou
 
     string(REPLACE "-" "." pkg_ver ${pkg_ver})
 
-    if(NOT DEFINED VCPKG_INSTALLED)
+    if(NOT DEFINED VCPKG_INSTALLED_COUNT)
         if(VCPKG_ROOT MATCHES "^C:/Program Files/Microsoft Visual Studio/")
             execute_process(
                 COMMAND ${powershell}
@@ -157,6 +157,7 @@ function(vcpkg_is_installed vcpkg_exe pkg_name pkg_ver pkg_triplet powershell ou
             execute_process(
                 COMMAND ${vcpkg_exe} list
                 OUTPUT_VARIABLE vcpkg_list_text
+                ERROR_QUIET
             )
         endif()
 
@@ -191,7 +192,7 @@ function(vcpkg_is_installed vcpkg_exe pkg_name pkg_ver pkg_triplet powershell ou
     if(NOT VCPKG_INSTALLED_COUNT GREATER 0)
         return()
     endif()
-    
+
     math(EXPR idx_max "(${VCPKG_INSTALLED_COUNT} - 1) * 4")
 
     foreach(idx RANGE 0 ${idx_max} 4)
@@ -202,7 +203,7 @@ function(vcpkg_is_installed vcpkg_exe pkg_name pkg_ver pkg_triplet powershell ou
         list(GET VCPKG_INSTALLED ${idx_ver}     inst_pkg_ver)
         list(GET VCPKG_INSTALLED ${idx_rev}     inst_pkg_rev)
         list(GET VCPKG_INSTALLED ${idx_triplet} inst_pkg_triplet)
-        
+
         if(NOT inst_pkg_triplet STREQUAL pkg_triplet)
             continue()
         endif()
@@ -221,16 +222,27 @@ endfunction()
 
 function(get_binary_packages vcpkg_exe)
     set(binary_packages_installed FALSE PARENT_SCOPE)
-    
+
     unset(triplets)
-    if(VCPKG_TARGET_TRIPLET MATCHES "^(.*)-static\$")
-        list(APPEND triplets "${CMAKE_MATCH_1}")
+    unset(host_triplet)
+    # Determine host triplet for vcpkg build dependencies
+    if(WIN32)
+        if($ENV{PROCESSOR_ARCHITECTURE} MATCHES "[Aa][Rr][Mm]64")
+            set(host_triplet "arm64-windows")
+        elseif($ENV{PROCESSOR_ARCHITECTURE} MATCHES "[Aa][Mm][Dd]64|[Xx]64")
+            set(host_triplet "x64-windows")
+        else()
+            set(host_triplet "x86-windows")
+        endif()
     endif()
-    list(APPEND triplets "${VCPKG_TARGET_TRIPLET}")
+    if(DEFINED host_triplet)
+        list(APPEND triplets ${host_triplet})
+    endif()
+    list(APPEND triplets ${VCPKG_TARGET_TRIPLET})
 
     foreach(triplet ${triplets})
         file(
-            DOWNLOAD "https://nightly.vba-m.com/vcpkg/${triplet}/" "${CMAKE_BINARY_DIR}/binary_package_list_${triplet}.html"
+            DOWNLOAD "https://nightly.visualboyadvance-m.org/vcpkg/${triplet}/" "${CMAKE_BINARY_DIR}/binary_package_list_${triplet}.html"
             STATUS pkg_list_status
         )
         list(GET pkg_list_status 1 pkg_list_error)
@@ -242,13 +254,14 @@ function(get_binary_packages vcpkg_exe)
         endif()
     endforeach()
 
-    unset(binary_packages_html)
+    unset(binary_packages)
     foreach(triplet ${triplets})
-        file(
-            STRINGS "${CMAKE_BINARY_DIR}/binary_package_list_${triplet}.html" links
-            REGEX "<a href=\".*[.]zip"
-        )
-        string(APPEND binary_packages_html "${links}\n")
+        file(READ "${CMAKE_BINARY_DIR}/binary_package_list_${triplet}.html" raw_html)
+        string(REGEX MATCHALL "<a href=\"[^\"]+[.]zip\"" links ${raw_html})
+        foreach(link ${links})
+            string(REGEX REPLACE "<a href=\"([^\"]+[.]zip)\"" "\\1" pkg ${link})
+            list(APPEND binary_packages ${pkg})
+        endforeach()
     endforeach()
 
     set(vcpkg_binpkg_dir ${CMAKE_BINARY_DIR}/vcpkg-binpkg)
@@ -265,18 +278,16 @@ function(get_binary_packages vcpkg_exe)
     endif()
 
     if(WIN32)
-        set(powershell powershell)
+        find_program(powershell powershell.exe HINTS "/Windows/System32/WindowsPowerShell/v1.0" REQUIRED)
     else()
-        set(powershell pwsh)
+        find_program(powershell pwsh REQUIRED)
     endif()
 
-    unset(binary_packages)
     unset(to_install)
-    foreach(pkg ${binary_packages_html})
-        if(NOT pkg MATCHES "<a href=\"([^_]+)_([^_]+)_([^.]+)[.]zip\"")
+    foreach(pkg ${binary_packages})
+        if(NOT pkg MATCHES "([^_]+)_([^_]+)_([^.]+)[.]zip")
             continue()
         endif()
-        set(pkg         "${CMAKE_MATCH_1}_${CMAKE_MATCH_2}_${CMAKE_MATCH_3}.zip")
         set(pkg_name    ${CMAKE_MATCH_1})
         set(pkg_version ${CMAKE_MATCH_2})
         set(pkg_triplet ${CMAKE_MATCH_3})
@@ -295,10 +306,10 @@ function(get_binary_packages vcpkg_exe)
         foreach(pkg ${to_install})
             string(REGEX REPLACE "^[^_]+_[^_]+_([^.]+)[.]zip\$" "\\1" pkg_triplet ${pkg})
 
-            message(STATUS "Downloading https://nightly.vba-m.com/vcpkg/${pkg_triplet}/${pkg} ...")
+            message(STATUS "Downloading https://nightly.visualboyadvance-m.org/vcpkg/${pkg_triplet}/${pkg} ...")
 
             file(
-                DOWNLOAD "https://nightly.vba-m.com/vcpkg/${pkg_triplet}/${pkg}" "${bin_pkgs_dir}/${pkg}"
+                DOWNLOAD "https://nightly.visualboyadvance-m.org/vcpkg/${pkg_triplet}/${pkg}" "${bin_pkgs_dir}/${pkg}"
                 STATUS pkg_download_status
             )
             list(GET pkg_download_status 1 pkg_download_error)
@@ -376,7 +387,7 @@ function(vcpkg_set_toolchain)
     else()
         set(VCPKG_ROOT $ENV{VCPKG_ROOT})
     endif()
-    
+
     set(VCPKG_ROOT ${VCPKG_ROOT} CACHE FILEPATH "vcpkg installation root path" FORCE)
 
     if(NOT EXISTS ${VCPKG_ROOT})

doc/ReadMe.MFC.txt

@@ -9,7 +9,7 @@
 
 VisualBoyAdvance-M
 Nintendo Game Boy & Game Boy Advance Emulator
-Project Homepage: http://vba-m.com
+Project Homepage: http://visualboyadvance-m.org
 
 This program is distributed under the GNU General Public License
 http://www.gnu.org/licenses/gpl.html

installdeps

@@ -1024,7 +1024,7 @@ solus_installdeps() {
     check sudo eopkg -y install -c system.devel
     check sudo eopkg -y install git ccache ninja
 
-    set -- sdl2-devel wxwidgets-devel libgtk-2-devel libgtk-3-devel
+    set -- sdl2-devel wxwidgets-devel libgtk-2-devel libgtk-3-devel libglu-devel
 
     [ -n "$ENABLE_OPENAL" ] && set -- "$@" openal-soft-devel
 
@@ -1095,15 +1095,24 @@ gentoo_installdeps() {
     wx_slot=$(equery -qC list -p -F '$slot' x11-libs/wxGTK | grep gtk3 | sort -rV | head -1)
 
     ebuilds="\
-      sys-devel/gcc      sys-devel/make     dev-util/cmake          dev-util/ccache sys-devel/binutils \
-      media-libs/libsdl2 media-libs/libsfml x11-libs/wxGTK:$wx_slot sys-libs/zlib   dev-util/pkgconf \
-      dev-lang/nasm      dev-util/ninja"
+      sys-devel/gcc \
+      dev-build/make \
+      dev-build/cmake \
+      dev-util/ccache \
+      sys-devel/binutils \
+      media-libs/libsdl2 \
+      media-libs/libsfml \
+      x11-libs/wxGTK:$wx_slot \
+      sys-libs/zlib \
+      dev-util/pkgconf \
+      dev-lang/nasm \
+      dev-build/ninja"
 
     [ -n "$ENABLE_OPENAL" ] && ebuilds="$ebuilds media-libs/openal"
 
     [ -n "$ENABLE_FFMPEG" ] && ebuilds="$ebuilds media-video/ffmpeg"
 
-    check sudo emerge -vn $ebuilds
+    check sudo emerge -vna $ebuilds
 
     build_instructions
 }