Move WAV loading functionality to a wav_loader module with dr_wav (adds AIFF support)

Author: DeeJayLSP

COPYRIGHT.txt

@@ -235,6 +235,11 @@ Comment: doctest
 Copyright: 2016-2023, Viktor Kirilov
 License: Expat
 
+Files: thirdparty/dr_libs/*
+Comment: dr_libs
+Copyright: 2020 David Reid
+License: public-domain or Unlicense or Expat
+
 Files: thirdparty/embree/*
 Comment: Embree
 Copyright: 2009-2021 Intel Corporation

doc/classes/AudioStreamWAV.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <class name="AudioStreamWAV" inherits="AudioStream" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
-		Stores audio data loaded from WAV files.
+		Stores audio data loaded from WAV and AIFF files.
 	</brief_description>
 	<description>
-		AudioStreamWAV stores sound samples loaded from WAV files. To play the stored sound, use an [AudioStreamPlayer] (for non-positional audio) or [AudioStreamPlayer2D]/[AudioStreamPlayer3D] (for positional audio). The sound can be looped.
+		AudioStreamWAV stores sound samples loaded from WAV and AIFF files. To play the stored sound, use an [AudioStreamPlayer] (for non-positional audio) or [AudioStreamPlayer2D]/[AudioStreamPlayer3D] (for positional audio). The sound can be looped.
 		This class can also be used to store dynamically-generated PCM audio data. See also [AudioStreamGenerator] for procedural audio generation.
 	</description>
 	<tutorials>

doc/classes/ResourceImporterWAV.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <class name="ResourceImporterWAV" inherits="ResourceImporter" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
-		Imports a WAV audio file for playback.
+		Imports WAV and AIFF audio files for playback.
 	</brief_description>
 	<description>
-		WAV is an uncompressed format, which can provide higher quality compared to Ogg Vorbis and MP3. It also has the lowest CPU cost to decode. This means high numbers of WAV sounds can be played at the same time, even on low-end devices.
-		By default, Godot imports WAV files using the lossy Quite OK Audio compression. You may change this by setting the [member compress/mode] property.
+		WAV and AIFF are uncompressed formats, which can provide higher quality compared to Ogg Vorbis and MP3. It also has the lowest CPU cost to decode. This means high numbers of WAV and AIFF sounds can be played at the same time, even on low-end devices.
+		By default, Godot imports WAV and AIFF files using the lossy Quite OK Audio compression. You may change this by setting the [member compress/mode] property.
 	</description>
 	<tutorials>
 		<link title="Importing audio samples">$DOCS_URL/tutorials/assets_pipeline/importing_audio_samples.html</link>
@@ -25,7 +25,7 @@
 		</member>
 		<member name="edit/loop_mode" type="int" setter="" getter="" default="0">
 			Controls how audio should loop.
-			- [b]Detect From WAV:[/b] Uses loop information from the WAV metadata.
+			- [b]Detect From WAV:[/b] Uses loop information from the WAV metadata (AIFF does not support this).
 			- [b]Disabled:[/b] Don't loop audio, even if the metadata indicates the file playback should loop.
 			- [b]Forward:[/b] Standard audio looping. Plays the audio forward from the beginning to [member edit/loop_end], then returns to [member edit/loop_begin] and repeats.
 			- [b]Ping-Pong:[/b] Plays the audio forward until [member edit/loop_end], then backwards to [member edit/loop_begin], repeating this cycle.

editor/import/resource_importer_wav.cpp

@@ -42,6 +42,9 @@ String ResourceImporterWAV::get_visible_name() const {
 
 void ResourceImporterWAV::get_recognized_extensions(List<String> *p_extensions) const {
 	p_extensions->push_back("wav");
+	p_extensions->push_back("aif");
+	p_extensions->push_back("aiff");
+	p_extensions->push_back("aifc");
 }
 
 String ResourceImporterWAV::get_save_extension() const {

modules/wav_loader/SCsub

@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+from misc.utility.scons_hints import *
+
+Import("env")
+Import("env_modules")
+
+env_wav_loader = env_modules.Clone()
+
+# Godot source files
+env_wav_loader.add_source_files(env.modules_sources, "*.cpp")

modules/wav_loader/config.py

@@ -0,0 +1,6 @@
+def can_build(env, platform):
+    return True
+
+
+def configure(env):
+    pass